servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r965448 - in /servicemix/smx3/trunk: distributions/apache-servicemix/src/main/assembly/unix-bin.xml distributions/apache-servicemix/src/main/assembly/windows-bin.xml pom.xml
Date Mon, 19 Jul 2010 12:16:01 GMT
Author: jbonofre
Date: Mon Jul 19 12:16:00 2010
New Revision: 965448

URL: http://svn.apache.org/viewvc?rev=965448&view=rev
Log:
[SM-1958] Upgrade to ActiveMQ 5.4-SNAPSHOT to break the OSGi dependency. Add KahaDB dependency
as it's now the default ActiveMQ backend.

Modified:
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
    servicemix/smx3/trunk/pom.xml

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml?rev=965448&r1=965447&r2=965448&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml Mon
Jul 19 12:16:00 2010
@@ -124,6 +124,7 @@
         <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:kahadb</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/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml?rev=965448&r1=965447&r2=965448&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
(original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
Mon Jul 19 12:16:00 2010
@@ -116,6 +116,7 @@
         <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:kahadb</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/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=965448&r1=965447&r2=965448&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Mon Jul 19 12:16:00 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 <!--
 
@@ -98,7 +98,7 @@
         <mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
         <xbean-version>3.4.3</xbean-version>
         <spring-version>2.5.6</spring-version>
-        <activemq-version>5.3.2</activemq-version>
+        <activemq-version>5.4-SNAPSHOT</activemq-version>
         <activeio-version>3.1.2</activeio-version>
         <camel-version>2.2.0</camel-version>
         <jencks-version>2.2</jencks-version>
@@ -797,6 +797,11 @@
                 <version>${activemq-version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>kahadb</artifactId>
+                <version>${activemq-version}</version>
+            </dependency>
+            <dependency>
                 <groupId>jivesoftware</groupId>
                 <artifactId>smack</artifactId>
                 <version>2.2.1</version>



Mime
View raw message