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

Switch bat to the latest version of zookeeper, we can fix it's OSGi metadata using a wrap URL handler.

This commit is contained in:
Hiram Chirino 2013-10-11 09:38:31 -04:00
parent 74234ed797
commit 52f418d6c9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</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> <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}$Import-Package=*;resolution:=optional&amp;Export-Package=org.apache.zookeeper*;-noimport:=true&amp;overwrite=merge</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 -->
<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>

2
pom.xml
View File

@ -98,7 +98,7 @@
<org.osgi.core-version>4.3.1</org.osgi.core-version> <org.osgi.core-version>4.3.1</org.osgi.core-version>
<p2psockets-version>1.1.2</p2psockets-version> <p2psockets-version>1.1.2</p2psockets-version>
<linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version> <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
<zookeeper-version>3.3.6</zookeeper-version> <zookeeper-version>3.4.5</zookeeper-version>
<qpid-proton-version>0.5</qpid-proton-version> <qpid-proton-version>0.5</qpid-proton-version>
<qpid-jms-version>0.24</qpid-jms-version> <qpid-jms-version>0.24</qpid-jms-version>
<regexp-version>1.3</regexp-version> <regexp-version>1.3</regexp-version>