Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgraded to Karaf 2.3.2 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1502430 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Claus Ibsen 2013-07-12 05:54:00 +00:00
parent 25028b0bba
commit bb7c33124b
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-karaf/pom.xml
View File

@ -37,7 +37,6 @@
<dom4j-bundle-version>1.6.1_2</dom4j-bundle-version> <dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
<xstream-bundle-version>1.3_3</xstream-bundle-version> <xstream-bundle-version>1.3_3</xstream-bundle-version>
<servicemix.specs.version>1.9.0</servicemix.specs.version> <servicemix.specs.version>1.9.0</servicemix.specs.version>
<karaf-version>2.2.9</karaf-version>
</properties> </properties>
<dependencies> <dependencies>

6
activemq-karaf/src/main/resources/features.xml
View File

@ -22,14 +22,15 @@
<!-- Bundles needed if only client will be deployed in the container --> <!-- 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 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-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-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-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="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-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency="false">mvn:commons-net/commons-net/${commons-net-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 --> <!-- 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 dependency="false">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle> <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
</feature> </feature>
@ -59,9 +60,6 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-bundle-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 <!-- 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.scala-lang/scala-library/${scala-version}</bundle>
-->
<!--
<bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
--> -->
</feature> </feature>

2
pom.xml
View File

@ -84,7 +84,7 @@
<junit-version>4.11</junit-version> <junit-version>4.11</junit-version>
<hamcrest-version>1.3</hamcrest-version> <hamcrest-version>1.3</hamcrest-version>
<jxta-version>2.0</jxta-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-api-version>0.6</leveldb-api-version>
<leveldb-version>0.6</leveldb-version> <leveldb-version>0.6</leveldb-version>
<leveldbjni-version>1.7</leveldbjni-version> <leveldbjni-version>1.7</leveldbjni-version>