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 2008/12/09 12:07:54 UTC
svn commit: r724660 - in /servicemix/smx3/trunk: core/servicemix-core/pom.xml
distributions/apache-servicemix/src/main/assembly/bin.xml
platforms/geronimo/servicemix-service/pom.xml pom.xml
Author: gertv
Date: Tue Dec 9 03:07:52 2008
New Revision: 724660
URL: http://svn.apache.org/viewvc?rev=724660&view=rev
Log:
SM-1723: Upgrade to ActiveMQ 5.2.0
Modified:
servicemix/smx3/trunk/core/servicemix-core/pom.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml
servicemix/smx3/trunk/platforms/geronimo/servicemix-service/pom.xml
servicemix/smx3/trunk/pom.xml
Modified: servicemix/smx3/trunk/core/servicemix-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/pom.xml?rev=724660&r1=724659&r2=724660&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/pom.xml (original)
+++ servicemix/smx3/trunk/core/servicemix-core/pom.xml Tue Dec 9 03:07:52 2008
@@ -66,6 +66,10 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-pool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
<optional>true</optional>
</dependency>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml?rev=724660&r1=724659&r2=724660&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml Tue Dec 9 03:07:52 2008
@@ -99,6 +99,7 @@
<include>backport-util-concurrent:backport-util-concurrent</include>
<include>org.apache.activemq:activemq-core</include>
<include>org.apache.activemq:activemq-ra</include>
+ <include>org.apache.activemq:activemq-pool</include>
<include>org.apache.activemq:activeio-core</include>
<include>commons-logging:commons-logging</include>
<include>commons-beanutils:commons-beanutils-core</include>
Modified: servicemix/smx3/trunk/platforms/geronimo/servicemix-service/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/platforms/geronimo/servicemix-service/pom.xml?rev=724660&r1=724659&r2=724660&view=diff
==============================================================================
--- servicemix/smx3/trunk/platforms/geronimo/servicemix-service/pom.xml (original)
+++ servicemix/smx3/trunk/platforms/geronimo/servicemix-service/pom.xml Tue Dec 9 03:07:52 2008
@@ -30,10 +30,6 @@
<artifactId>servicemix-service</artifactId>
<name>ServiceMix :: Geronimo :: ServiceMix service</name>
- <properties>
- <activemq-version>4.1.1</activemq-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=724660&r1=724659&r2=724660&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Tue Dec 9 03:07:52 2008
@@ -84,7 +84,7 @@
<mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
<xbean-version>3.4.3</xbean-version>
<spring-version>2.5.5</spring-version>
- <activemq-version>5.1.0</activemq-version>
+ <activemq-version>5.2.0</activemq-version>
<activeio-version>3.1.0</activeio-version>
<camel-version>1.4.0</camel-version>
<jencks-version>2.1</jencks-version>
@@ -838,6 +838,11 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-pool</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
<version>${activemq-version}</version>
<exclusions>