You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/12/07 08:00:32 UTC
[1/3] camel git commit: clean-up: remove unused field and unused
imports
Repository: camel
Updated Branches:
refs/heads/master 3e857d1e7 -> 86e22d436
clean-up: remove unused field and unused imports
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/02ca0085
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/02ca0085
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/02ca0085
Branch: refs/heads/master
Commit: 02ca0085a8eb6adcc30fef723f52e81becfe5a7f
Parents: 3e857d1
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Sun Dec 6 13:43:01 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 7 07:29:09 2015 +0100
----------------------------------------------------------------------
.../spring/UseOverridePropertiesWithPropertiesComponent.java | 2 --
.../AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java | 3 ---
.../camel/test/spring/CamelSpringOverridePropertiesTest.java | 5 -----
3 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/02ca0085/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseOverridePropertiesWithPropertiesComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseOverridePropertiesWithPropertiesComponent.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseOverridePropertiesWithPropertiesComponent.java
index 1e17d9b..a045aa0 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseOverridePropertiesWithPropertiesComponent.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseOverridePropertiesWithPropertiesComponent.java
@@ -22,8 +22,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.junit.Test;
-
/**
* Indicates that the annotated method returns a {@link java.util.Properties} for use in the test, and that
* those properties override any existing properties configured on the {@link org.apache.camel.component.properties.PropertiesComponent}.
http://git-wip-us.apache.org/repos/asf/camel/blob/02ca0085/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
index 9bb41c8..89f36ab 100644
--- a/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
+++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/issues/AdviceWithInterceptSendToEndpointWithLoadbalancerTest.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.test.issues;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.test.spring.CamelSpringTestSupport;
http://git-wip-us.apache.org/repos/asf/camel/blob/02ca0085/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesTest.java
index 02a9fb8..0da0836 100644
--- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesTest.java
+++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesTest.java
@@ -18,14 +18,12 @@ package org.apache.camel.test.spring;
import java.util.Properties;
-import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.BootstrapWith;
import org.springframework.test.context.ContextConfiguration;
@@ -39,9 +37,6 @@ import org.springframework.test.context.ContextConfiguration;
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class CamelSpringOverridePropertiesTest {
- @Autowired
- private CamelContext camelContext;
-
@Produce(uri = "direct:start")
private ProducerTemplate start;
[3/3] camel git commit: Reduce the dependencies
Posted by da...@apache.org.
Reduce the dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/86e22d43
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/86e22d43
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/86e22d43
Branch: refs/heads/master
Commit: 86e22d436eadb91a1bba801b2b9da2682776c482
Parents: d44532d
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 7 07:34:44 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 7 07:34:44 2015 +0100
----------------------------------------------------------------------
components/camel-test-spring/pom.xml | 24 ------------------------
1 file changed, 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/86e22d43/components/camel-test-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index 83832cb..ba73e02 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -49,30 +49,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
<!-- test dependencies -->
<dependency>
[2/3] camel git commit: fix warning: remove unnecessary overriding of
managed version of spring dependencies
Posted by da...@apache.org.
fix warning: remove unnecessary overriding of managed version of spring dependencies
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d44532d9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d44532d9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d44532d9
Branch: refs/heads/master
Commit: d44532d97002b195cd62e34f12b5e08ac99b6254
Parents: 02ca008
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Sun Dec 6 13:44:10 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 7 07:29:10 2015 +0100
----------------------------------------------------------------------
components/camel-test-spring/pom.xml | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d44532d9/components/camel-test-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index 0bf35e0..83832cb 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -48,38 +48,30 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring4-version}</version>
</dependency>
- <!-- we need to override the other spring version -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring4-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring4-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>${spring4-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>${spring4-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring4-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring4-version}</version>
</dependency>
<!-- test dependencies -->