Update activemq version

git-svn-id: https://svn.argeo.org/slc/trunk@2206 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index a0e05c72857659b968998fd66bcef3092b60e981..fcf9d8b20722971091dabfba73ec220641c02044 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -17,7 +17,7 @@
                <version.ant>1.7.0</version.ant>
                <version.jetty>6.1.14</version.jetty>
                <version.maven-bundle-plugin>1.4.3</version.maven-bundle-plugin>
-               <version.activemq>5.2.0</version.activemq>
+               <!-- <version.activemq>5.2.0</version.activemq> -->
        </properties>
        <scm>
                <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>
@@ -766,30 +766,34 @@ limitations under the License.
                        </dependency>
 
                        <!-- ActiveMQ -->
-                       <!--  <dependency>
-                               <groupId>org.apache.activemq</groupId>
+                       <!--
+                               <dependency> <groupId>org.apache.activemq</groupId>
                                <artifactId>com.springsource.org.apache.activemq</artifactId>
-                               <version>${version.activemq}</version>
-                       </dependency>-->
-                       <!-- <dependency>
-                               <groupId>org.apache.activemq</groupId>
+                               <version>${version.activemq}</version> </dependency>
+                       -->
+                       <!--
+                               <dependency> <groupId>org.apache.activemq</groupId>
                                <artifactId>com.springsource.org.apache.activemq.web</artifactId>
-                               <version>${version.activemq}</version>
-                       </dependency>
-                       <dependency>
+                               <version>${version.activemq}</version> </dependency> <dependency>
                                <groupId>org.apache.activemq</groupId>
                                <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
-                               <version>${version.activemq}</version>
-                       </dependency> -->
-                       <!-- <dependency>
-                               <groupId>org.apache.xbean</groupId>
+                               <version>${version.activemq}</version> </dependency>
+                       -->
+                       <!--
+                               <dependency> <groupId>org.apache.xbean</groupId>
                                <artifactId>com.springsource.org.apache.xbean.spring</artifactId>
-                               <version>3.3.0</version>
-                       </dependency>-->
+                               <version>3.3.0</version> </dependency>
+                       -->
+                       <dependency>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq</artifactId>
+                               <version>5.2.0.argeo.1</version>
+                       </dependency>
+
                        <dependency>
                                <groupId>org.apache.camel</groupId>
                                <artifactId>com.springsource.org.apache.camel</artifactId>
-                               <version>1.3.0</version> 
+                               <version>1.3.0</version>
                        </dependency>
 
                </dependencies>

diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index e1894a7884c239c61d574c7f9bdb58e5339de90c..870829059c37d177eb5535f423ecbcb11371636b 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -120,7 +120,6 @@
                <dependency>
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.activemq</artifactId>
-                       <version>5.2.0</version>
                </dependency>
                <!--
                        <dependency> <groupId>org.apache.activemq</groupId>