You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2014/09/19 07:55:31 UTC
git commit: AMQ-5366: Upgrade to Camel 2.14
Repository: activemq
Updated Branches:
refs/heads/trunk 4ff5a3e48 -> f54e771df
AMQ-5366: Upgrade to Camel 2.14
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f54e771d
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f54e771d
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f54e771d
Branch: refs/heads/trunk
Commit: f54e771df08dc5354fb4b104dff8a027704ff589
Parents: 4ff5a3e
Author: Claus Ibsen <cl...@gmail.com>
Authored: Fri Sep 19 07:55:23 2014 +0200
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Fri Sep 19 07:55:23 2014 +0200
----------------------------------------------------------------------
activemq-camel/pom.xml | 2 +-
pom.xml | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/f54e771d/activemq-camel/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 3efebe8..d06befc 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -91,7 +91,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring3</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq/blob/f54e771d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 31a4197..c705671 100755
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<aopalliance-version>1.0</aopalliance-version>
<aries-version>1.0.0</aries-version>
<axion-version>1.0-M3-dev</axion-version>
- <camel-version>2.13.2</camel-version>
+ <camel-version>2.14.0</camel-version>
<camel-version-range>[2.12,3)</camel-version-range>
<cglib-version>2.2</cglib-version>
<commons-beanutils-version>1.8.3</commons-beanutils-version>
@@ -585,9 +585,10 @@
<artifactId>camel-test</artifactId>
<version>${camel-version}</version>
</dependency>
+ <!-- when upgrading to Spring 4.x then use camel-test-spring -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring3</artifactId>
<version>${camel-version}</version>
</dependency>