activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1502430 - in /activemq/trunk: activemq-karaf/pom.xml activemq-karaf/src/main/resources/features.xml pom.xml
Date Fri, 12 Jul 2013 05:54:01 GMT
Author: davsclaus
Date: Fri Jul 12 05:54:00 2013
New Revision: 1502430

URL: http://svn.apache.org/r1502430
Log:
Upgraded to Karaf 2.3.2

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

Modified: activemq/trunk/activemq-karaf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/pom.xml?rev=1502430&r1=1502429&r2=1502430&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/trunk/activemq-karaf/pom.xml Fri Jul 12 05:54:00 2013
@@ -37,7 +37,6 @@
     <dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
     <xstream-bundle-version>1.3_3</xstream-bundle-version>
     <servicemix.specs.version>1.9.0</servicemix.specs.version>
-    <karaf-version>2.2.9</karaf-version>
   </properties>
 
   <dependencies>

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=1502430&r1=1502429&r2=1502430&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Fri Jul 12 05:54:00 2013
@@ -22,14 +22,15 @@
 
     <!-- Bundles needed if only client will be deployed in the container -->
     <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}"
resolver="(obr)" start-level="50">
+        <feature version="[3.1,4)">spring</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
         <bundle dependency="false">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
         <bundle dependency="false">mvn:commons-net/commons-net/${commons-net-version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
         <!-- uber osgi bundle means client is not that lean, todo: introduce client osgi
bundle -->
-        <feature version="[3,4)">spring</feature>
         <bundle dependency="false">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
     </feature>
@@ -60,9 +61,6 @@
 <!-- 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 -->

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1502430&r1=1502429&r2=1502430&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Jul 12 05:54:00 2013
@@ -84,7 +84,7 @@
     <junit-version>4.11</junit-version>
     <hamcrest-version>1.3</hamcrest-version>
     <jxta-version>2.0</jxta-version>
-    <karaf-version>2.3.0</karaf-version>
+    <karaf-version>2.3.2</karaf-version>
     <leveldb-api-version>0.6</leveldb-api-version>
     <leveldb-version>0.6</leveldb-version>
     <leveldbjni-version>1.7</leveldbjni-version>



Mime
View raw message