[SMX4-1263]upgrade to activemq 5.7.0
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk@1398618 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/features.xml b/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
index 3a77242..4eb6f69 100644
--- a/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
@@ -181,7 +181,7 @@
<feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
<bundle dependency="true">mvn:commons-net/commons-net/${commons-net.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+ <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix.components.version}</bundle>
</feature>
<feature name="servicemix-http" version="${servicemix.components.version}" resolver="(obr)" start-level='50'>
diff --git a/itests/tests/pom.xml b/itests/tests/pom.xml
index 945cc5d..7f0715f 100644
--- a/itests/tests/pom.xml
+++ b/itests/tests/pom.xml
@@ -309,8 +309,8 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
diff --git a/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java b/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
index 57ea718..78f1451 100644
--- a/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
+++ b/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
@@ -75,7 +75,7 @@
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl"),
getBundle("org.apache.neethi", "neethi"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.saaj-impl"),
- getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-pool"),
+ getBundle("commons-pool", "commons-pool"),
getBundle("org.codehaus.woodstox", "stax2-api"),
getBundle("org.codehaus.woodstox", "woodstox-core-asl"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.dom4j"),
diff --git a/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java b/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
index cf1f5a0..1423b2b 100644
--- a/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
+++ b/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
@@ -87,7 +87,7 @@
getBundle("org.springframework", "spring-tx"),
getBundle("org.apache.geronimo.specs", "geronimo-j2ee-management_1.1_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-jms_1.1_spec"),
- getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-pool"),
+ getBundle("commons-pool", "commons-pool"),
getBundle("org.apache.xbean", "xbean-spring"),
getBundle("org.apache.activemq", "activemq-core"),
getBundle("org.apache.activemq", "activemq-ra"),
diff --git a/parent/pom.xml b/parent/pom.xml
index 1a8ad97..43c6993 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
<!-- Properties -->
<properties>
- <activemq.version>5.5.1</activemq.version>
+ <activemq.version>5.7.0</activemq.version>
<activiti.version>5.9</activiti.version>
<camel.version>2.10.1</camel.version>
<cxf.version>2.6.2</cxf.version>
diff --git a/pom.xml b/pom.xml
index 345f2ba..45e9bf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
<commons-httpclient.bundle.version>3.1_6</commons-httpclient.bundle.version>
<commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
<commons-net.bundle.version>2.2</commons-net.bundle.version>
- <commons-pool.bundle.version>1.5.4_2</commons-pool.bundle.version>
+ <commons-pool.version>1.6</commons-pool.version>
<commons-vfs.bundle.version>1.0_5</commons-vfs.bundle.version>
<drools.bundle.version>5.1.1_1</drools.bundle.version>
<fastinfoset.bundle.version>1.2.7_3</fastinfoset.bundle.version>
@@ -370,9 +370,9 @@
<version>${commons-net.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
- <version>${commons-pool.bundle.version}</version>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
