You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/28 10:32:21 UTC
[2/5] git commit: CAMEL-7835 Clean up the pom.xml setting of
camel-test-spring40 and camel-test-spring3
CAMEL-7835 Clean up the pom.xml setting of camel-test-spring40 and camel-test-spring3
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9ba2dc63
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9ba2dc63
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9ba2dc63
Branch: refs/heads/master
Commit: 9ba2dc63d0614195dfefe88a037cdbdc4ac94090
Parents: d0388df
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Sep 28 16:22:20 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Sep 28 16:31:52 2014 +0800
----------------------------------------------------------------------
components/camel-test-spring3/pom.xml | 34 ++---------------------------
components/camel-test-spring40/pom.xml | 34 +----------------------------
2 files changed, 3 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9ba2dc63/components/camel-test-spring3/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring3/pom.xml b/components/camel-test-spring3/pom.xml
index 581c7b3..9d55492 100644
--- a/components/camel-test-spring3/pom.xml
+++ b/components/camel-test-spring3/pom.xml
@@ -32,6 +32,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.test.spring.*</camel.osgi.export.pkg>
+ <spring-version>${spring32-version}</spring-version>
</properties>
<dependencies>
@@ -47,38 +48,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <!-- we need to override the other spring version -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring32-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring32-version}</version>
+ <version>${spring-version}</version>
</dependency>
<!-- test dependencies -->
http://git-wip-us.apache.org/repos/asf/camel/blob/9ba2dc63/components/camel-test-spring40/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring40/pom.xml b/components/camel-test-spring40/pom.xml
index f13e99d..281878e 100644
--- a/components/camel-test-spring40/pom.xml
+++ b/components/camel-test-spring40/pom.xml
@@ -51,39 +51,7 @@
<artifactId>spring-test</artifactId>
<version>${spring40-version}</version>
</dependency>
- <!-- we need to override the other spring version -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring40-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring40-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${spring40-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring40-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring40-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring40-version}</version>
- </dependency>
-
-
+
<!-- test dependencies -->
<dependency>
<groupId>org.slf4j</groupId>