SMXCOMP-977: Upgrade to ActiveMQ 5.9.0
git-svn-id: https://svn.apache.org/repos/asf/servicemix/components/trunk@1535999 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bindings/servicemix-cxf-bc/pom.xml b/bindings/servicemix-cxf-bc/pom.xml
index 2c424b4..4e0c674 100644
--- a/bindings/servicemix-cxf-bc/pom.xml
+++ b/bindings/servicemix-cxf-bc/pom.xml
@@ -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>
diff --git a/bindings/servicemix-http/pom.xml b/bindings/servicemix-http/pom.xml
index c8c95f4..b8dbc4e 100644
--- a/bindings/servicemix-http/pom.xml
+++ b/bindings/servicemix-http/pom.xml
@@ -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>
diff --git a/bindings/servicemix-jms/pom.xml b/bindings/servicemix-jms/pom.xml
index e31e5d2..49d1fab 100644
--- a/bindings/servicemix-jms/pom.xml
+++ b/bindings/servicemix-jms/pom.xml
@@ -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>
diff --git a/engines/servicemix-wsn2005/pom.xml b/engines/servicemix-wsn2005/pom.xml
index 3ae3ee0..4a10171 100644
--- a/engines/servicemix-wsn2005/pom.xml
+++ b/engines/servicemix-wsn2005/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index a912956..a5f1abd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/shared-libraries/servicemix-common/pom.xml b/shared-libraries/servicemix-common/pom.xml
index 16e2f29..1647120 100644
--- a/shared-libraries/servicemix-common/pom.xml
+++ b/shared-libraries/servicemix-common/pom.xml
@@ -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>
