From f54e771df08dc5354fb4b104dff8a027704ff589 Mon Sep 17 00:00:00 2001
From: Claus Ibsen <claus.ibsen@gmail.com>
Date: Fri, 19 Sep 2014 07:55:23 +0200
Subject: [PATCH] AMQ-5366: Upgrade to Camel 2.14

---
 activemq-camel/pom.xml | 2 +-
 pom.xml                | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 3efebe80aa..d06befca81 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>
diff --git a/pom.xml b/pom.xml
index 31a41972c2..c7056711b6 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>