activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1485655 - in /activemq/trunk: activemq-karaf/src/main/resources/features.xml pom.xml
Date Thu, 23 May 2013 11:54:11 GMT
Author: davsclaus
Date: Thu May 23 11:54:10 2013
New Revision: 1485655

URL: http://svn.apache.org/r1485655
Log:
AMQ-4552: activemq feature to install in karaf. Still some problems.

Modified:
    activemq/trunk/activemq-karaf/src/main/resources/features.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1485655&r1=1485654&r2=1485655&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Thu May 23 11:54:10 2013
@@ -57,7 +57,13 @@
       <bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
       <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
       <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
+      <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-bundle-version}</bundle>
+<!-- Scala 2.9 is not OSGi bundle. But 2.10 is
       <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
+-->
+<!--
+      <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+-->
     </feature>
 
     <!-- Starts the broker with default configuration and web console -->

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1485655&r1=1485654&r2=1485655&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Thu May 23 11:54:10 2013
@@ -102,6 +102,7 @@
     <saxon-bundle-version>9.4.0.1_2</saxon-bundle-version>
     <scala-plugin-version>3.1.0</scala-plugin-version>
     <scala-version>2.9.1</scala-version>
+    <scala-bundle-version>2.9.1_3</scala-bundle-version>
     <scalatest-version>1.8</scalatest-version>
     <slf4j-version>1.6.6</slf4j-version>
     <snappy-bundle-version>1.0.4.1_1</snappy-bundle-version>
@@ -119,7 +120,7 @@
     <xstream-version>1.4.4</xstream-version>
     <xbean-version>3.13</xbean-version>
     <xerces-version>2.9.1</xerces-version>
-    <zookeeper-version>3.3.5</zookeeper-version>
+    <zookeeper-version>3.4.5</zookeeper-version>
 
     <pax-exam-version>2.6.0</pax-exam-version>
     <paxexam-karaf-container-version>1.0.0</paxexam-karaf-container-version>



Mime
View raw message