activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r918415 - in /activemq/branches/activemq-5.3: activemq-camel/pom.xml activemq-optional/pom.xml pom.xml
Date Wed, 03 Mar 2010 11:15:40 GMT
Author: gtully
Date: Wed Mar  3 11:15:40 2010
New Revision: 918415

URL: http://svn.apache.org/viewvc?rev=918415&view=rev
Log:
merge -c 917534,917645 https://svn.apache.org/repos/asf/activemq/trunk - camel 2.2.0 for spring
3.0

Modified:
    activemq/branches/activemq-5.3/activemq-camel/pom.xml
    activemq/branches/activemq-5.3/activemq-optional/pom.xml
    activemq/branches/activemq-5.3/pom.xml

Modified: activemq/branches/activemq-5.3/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-camel/pom.xml?rev=918415&r1=918414&r2=918415&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-camel/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-camel/pom.xml Wed Mar  3 11:15:40 2010
@@ -131,6 +131,11 @@
       <scope>test</scope>
     </dependency>    
     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <scope>test</scope>

Modified: activemq/branches/activemq-5.3/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-optional/pom.xml?rev=918415&r1=918414&r2=918415&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-optional/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-optional/pom.xml Wed Mar  3 11:15:40 2010
@@ -72,6 +72,11 @@
       <version>${spring-version}</version>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+    <dependency>
       <groupId>aopalliance</groupId>
       <artifactId>aopalliance</artifactId>
     </dependency>

Modified: activemq/branches/activemq-5.3/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/pom.xml?rev=918415&r1=918414&r2=918415&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/pom.xml (original)
+++ activemq/branches/activemq-5.3/pom.xml Wed Mar  3 11:15:40 2010
@@ -44,7 +44,7 @@
     <aopalliance-version>1.0</aopalliance-version>
     <axion-version>1.0-M3-dev</axion-version>
     <axis-version>1.2-RC1</axis-version>
-    <camel-version>2.0.0</camel-version>
+    <camel-version>2.2.0</camel-version>
     <cglib-version>2.0</cglib-version>
     <commons-beanutils-version>1.6.1</commons-beanutils-version>
     <commons-collections-version>3.2.1</commons-collections-version>



Mime
View raw message