[maven-release-plugin] copy for tag nmr-parent-1.6.1
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/nmr/tags/nmr-parent-1.6.1@1503993 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d056cac..c2e0e8c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -24,8 +24,8 @@
Apache ServiceMix NMR 1.6.1 contains a few bug fixes. Compared to the 1.6.0 release, it also contains
the following dependency upgrades:
- - Upgrade from Camel 2.10.3 to Camel 2.10.5
- - Upgrade from Karaf 2.10.0 to Karaf 2.11.0
+ - Upgrade from Camel 2.10.3 to Camel 2.10.6
+ - Upgrade from Karaf 2.2.10 to Karaf 2.2.11
See the change log below for more informations.
diff --git a/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml b/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml
index 4fb6155..15d3e98 100644
--- a/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml
+++ b/jbi/cluster/config/src/main/resources/OSGI-INF/blueprint/jbi-cluster.xml
@@ -26,7 +26,7 @@
<property name="name" value="${clusterName}" />
</bean>
- <bean id="pool" class="org.apache.servicemix.jbi.cluster.requestor.ActiveMQJmsRequestorPool" init-method="afterPropertiesSet" destroy-method="destroy">
+ <bean id="pool" class="org.apache.servicemix.jbi.cluster.requestor.GenericJmsRequestorPool" init-method="afterPropertiesSet" destroy-method="destroy">
<property name="connectionFactory" ref="connectionFactory" />
<property name="destinationName" value="${destinationName}" />
</bean>
diff --git a/parent/pom.xml b/parent/pom.xml
index 06784e9..bbab68e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,7 +40,7 @@
<properties>
<activemq.version>5.7.0</activemq.version>
<aries.version>0.3</aries.version>
- <camel.version>2.10.5</camel.version>
+ <camel.version>2.10.6</camel.version>
<karaf.version>2.2.11</karaf.version>
<servicemix.components.version>2013.01</servicemix.components.version>
<servicemix.nmr.version>${project.version}</servicemix.nmr.version>
diff --git a/pom.xml b/pom.xml
index 696b58e..59a3955 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,11 +73,11 @@
<geronimo-servlet.version>1.1.2</geronimo-servlet.version>
<!-- Bundles -->
- <ant.bundle.version>1.7.0_4</ant.bundle.version>
- <aopalliance.bundle.version>1.0_4</aopalliance.bundle.version>
- <asm.bundle.version>2.2.3_4</asm.bundle.version> <!-- spring osgi test requires ASM 2 instead of 3 -->
+ <ant.bundle.version>1.7.0_6</ant.bundle.version>
+ <aopalliance.bundle.version>1.0_6</aopalliance.bundle.version>
+ <asm.bundle.version>2.2.3_5</asm.bundle.version> <!-- spring osgi test requires ASM 2 instead of 3 -->
<cglib.bundle.version>2.1_3_6</cglib.bundle.version>
- <wsdl4j.bundle.version>1.6.2_3</wsdl4j.bundle.version>
+ <wsdl4j.bundle.version>1.6.2_6</wsdl4j.bundle.version>
<!-- Components and SMX Resources -->
<servicemix3.version>3.4.0</servicemix3.version>
