svn commit: r1399810 - in /servicemix/components/trunk: bindings/servicemix-jms/src/test/resources/org/apache/servicemix/jms/spring-jca.xml pom.xml

[gertv]

Author: gertv
Date: Thu Oct 18 19:32:03 2012
New Revision: 1399810

URL: http://svn.apache.org/viewvc?rev=1399810&view=rev
Log:
SMX4-1263: Upgrade to ActiveMQ 5.7.0

Modified:
    
servicemix/components/trunk/bindings/servicemix-jms/src/test/resources/org/apache/servicemix/jms/spring-jca.xml
    servicemix/components/trunk/pom.xml

Modified: 
servicemix/components/trunk/bindings/servicemix-jms/src/test/resources/org/apache/servicemix/jms/spring-jca.xml
URL: 
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/src/test/resources/org/apache/servicemix/jms/spring-jca.xml?rev=1399810&r1=1399809&r2=1399810&view=diff
==============================================================================
--- 
servicemix/components/trunk/bindings/servicemix-jms/src/test/resources/org/apache/servicemix/jms/spring-jca.xml
 (original)
+++ 
servicemix/components/trunk/bindings/servicemix-jms/src/test/resources/org/apache/servicemix/jms/spring-jca.xml
 Thu Oct 18 19:32:03 2012
@@ -35,7 +35,7 @@
     <sm:flows>
       <sm:sedaFlow />
       <sm:jcaFlow connectionManager="#connectionManager"
-                  
jmsURL="tcp://localhost:${activemq.port1}?jms.asyncDispatch=true&amp;jms.useAsyncSend=true"
 />
+                  
jmsURL="tcp://localhost:${activemq.port1}?jms.useAsyncSend=true" />
     </sm:flows>
 
     <sm:activationSpecs>
@@ -118,7 +118,7 @@
   
   <!-- A managed JMS ConnectionFactory for ActiveMQ -->
   <amqra:managedConnectionFactory id="activemqMCF" 
resourceAdapter="#resourceAdapter" />
-  <amqra:resourceAdapter  id="resourceAdapter" 
serverUrl="tcp://localhost:${activemq.port1}?jms.asyncDispatch=true&amp;jms.useAsyncSend=true"/>
+  <amqra:resourceAdapter  id="resourceAdapter" 
serverUrl="tcp://localhost:${activemq.port1}?jms.useAsyncSend=true"/>
   <jencks:connectionFactory  id="connectionFactory"
                              managedConnectionFactory="#activemqMCF"
                              connectionManager="#connectionManager" />

Modified: servicemix/components/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/components/trunk/pom.xml?rev=1399810&r1=1399809&r2=1399810&view=diff
==============================================================================
--- servicemix/components/trunk/pom.xml (original)
+++ servicemix/components/trunk/pom.xml Thu Oct 18 19:32:03 2012
@@ -82,7 +82,7 @@
 
         <!-- ActiveMQ -->
         <activeio.version>3.1.2</activeio.version>
-        <activemq.version>5.5.1</activemq.version>
+        <activemq.version>5.7.0</activemq.version>
         
         <!-- Camel -->
         <camel.version>2.10.1</camel.version>