You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2013/10/26 16:49:50 UTC
svn commit: r1535999 - in /servicemix/components/trunk:
bindings/servicemix-cxf-bc/pom.xml bindings/servicemix-http/pom.xml
bindings/servicemix-jms/pom.xml engines/servicemix-wsn2005/pom.xml pom.xml
shared-libraries/servicemix-common/pom.xml
Author: gertv
Date: Sat Oct 26 14:49:50 2013
New Revision: 1535999
URL: http://svn.apache.org/r1535999
Log:
SMXCOMP-977: Upgrade to ActiveMQ 5.9.0
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml
servicemix/components/trunk/bindings/servicemix-http/pom.xml
servicemix/components/trunk/bindings/servicemix-jms/pom.xml
servicemix/components/trunk/engines/servicemix-wsn2005/pom.xml
servicemix/components/trunk/pom.xml
servicemix/components/trunk/shared-libraries/servicemix-common/pom.xml
Modified: servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml?rev=1535999&r1=1535998&r2=1535999&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml Sat Oct 26 14:49:50 2013
@@ -271,7 +271,17 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -301,7 +311,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-broker</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
Modified: servicemix/components/trunk/bindings/servicemix-http/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-http/pom.xml?rev=1535999&r1=1535998&r2=1535999&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-http/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-http/pom.xml Sat Oct 26 14:49:50 2013
@@ -187,6 +187,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: servicemix/components/trunk/bindings/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-jms/pom.xml?rev=1535999&r1=1535998&r2=1535999&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-jms/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-jms/pom.xml Sat Oct 26 14:49:50 2013
@@ -82,7 +82,12 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: servicemix/components/trunk/engines/servicemix-wsn2005/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-wsn2005/pom.xml?rev=1535999&r1=1535998&r2=1535999&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-wsn2005/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-wsn2005/pom.xml Sat Oct 26 14:49:50 2013
@@ -67,7 +67,15 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: servicemix/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/pom.xml?rev=1535999&r1=1535998&r2=1535999&view=diff
==============================================================================
--- servicemix/components/trunk/pom.xml (original)
+++ servicemix/components/trunk/pom.xml Sat Oct 26 14:49:50 2013
@@ -83,7 +83,7 @@
<!-- ActiveMQ -->
<activeio.version>3.1.2</activeio.version>
- <activemq.version>5.7.0</activemq.version>
+ <activemq.version>5.9.0</activemq.version>
<!-- Camel -->
<camel.version>2.12.1</camel.version>
@@ -321,7 +321,17 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-client</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
<version>${activemq.version}</version>
</dependency>
<dependency>
@@ -335,6 +345,11 @@
<version>${activemq.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-spring</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
<version>${commons-jexl.version}</version>
@@ -452,6 +467,10 @@
<groupId>org.jencks</groupId>
<artifactId>jencks</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: servicemix/components/trunk/shared-libraries/servicemix-common/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/shared-libraries/servicemix-common/pom.xml?rev=1535999&r1=1535998&r2=1535999&view=diff
==============================================================================
--- servicemix/components/trunk/shared-libraries/servicemix-common/pom.xml (original)
+++ servicemix/components/trunk/shared-libraries/servicemix-common/pom.xml Sat Oct 26 14:49:50 2013
@@ -139,7 +139,12 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>