You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2013/10/11 15:38:33 UTC
git commit: Switch bat to the latest version of zookeeper,
we can fix it's OSGi metadata using a wrap URL handler.
Updated Branches:
refs/heads/trunk 74234ed79 -> 52f418d6c
Switch bat to the latest version of zookeeper, we can fix it's OSGi metadata using a wrap URL handler.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/52f418d6
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/52f418d6
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/52f418d6
Branch: refs/heads/trunk
Commit: 52f418d6c9e6c7df8313f976b8458c37c2a1a858
Parents: 74234ed
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Fri Oct 11 09:38:31 2013 -0400
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Fri Oct 11 09:38:31 2013 -0400
----------------------------------------------------------------------
activemq-karaf/src/main/resources/features.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/52f418d6/activemq-karaf/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 0efa898..f14a889 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -31,7 +31,7 @@
<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-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&Export-Package=org.apache.zookeeper*;-noimport:=true&overwrite=merge</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>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/activemq/blob/52f418d6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 38cdbb9..f8e7e93 100755
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
<org.osgi.core-version>4.3.1</org.osgi.core-version>
<p2psockets-version>1.1.2</p2psockets-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-jms-version>0.24</qpid-jms-version>
<regexp-version>1.3</regexp-version>