Updated Branches: refs/heads/trunk 839b154cd -> 74234ed79
Embed the linkedin packages in the osgi-bundle and rollback to previous zookeeper version since newer version suffers from the following regression: https://issues.apache.org/jira/browse/ZOOKEEPER-1334 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/74234ed7 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/74234ed7 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/74234ed7 Branch: refs/heads/trunk Commit: 74234ed797019d7aeb9f5e4a6721e5db1169e0f0 Parents: 839b154 Author: Hiram Chirino <[email protected]> Authored: Fri Oct 11 09:16:15 2013 -0400 Committer: Hiram Chirino <[email protected]> Committed: Fri Oct 11 09:16:28 2013 -0400 ---------------------------------------------------------------------- activemq-osgi/pom.xml | 10 +++++++--- pom.xml | 3 +-- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/74234ed7/activemq-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index b5be52d..f13127f 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -50,13 +50,11 @@ org.bouncycastle*;resolution:=optional, org.codehaus.jackson*;resolution:=optional, org.codehaus.jettison*;resolution:=optional, - org.linkedin*;resolution:=optional, org.jasypt*;resolution:=optional, org.eclipse.jetty*;resolution:=optional, org.apache.zookeeper*;resolution:=optional, org.fusesource.leveldbjni*;resolution:=optional, org.fusesource.hawtjni*;resolution:=optional, - org.linkedin*;resolution:=optional, org.springframework.jms*;version="[3,4]";resolution:=optional, org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional, org.springframework.transaction*;version="[3,4]";resolution:=optional, @@ -71,9 +69,14 @@ javax.naming*;resolution:=optional, org.apache.commons.pool*;resolution:=optional, org.apache.commons.net*;resolution:=optional, - com.sun.syndication*;resolution:=optional, + com.sun*;resolution:=optional, org.jvnet.jaxb2_commons*;resolution:=optional, org.xerial.snappy*;resolution:=optional, + groovy.lang*;resolution:=optional, + org.codehaus.groovy*;resolution:=optional, + org.apache.tools.ant*;resolution:=optional, + org.apache.log4j*;resolution:=optional, + org.json*;resolution:=optional, * </activemq.osgi.import.pkg> <activemq.osgi.export> @@ -86,6 +89,7 @@ org.fusesource.hawtbuf*, org.apache.qpid*, com.google.common*, + org.linkedin*, org.iq80* </activemq.osgi.private.pkg> <activemq.osgi.dynamic.import>*</activemq.osgi.dynamic.import> http://git-wip-us.apache.org/repos/asf/activemq/blob/74234ed7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b92b427..38cdbb9 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.4.3</zookeeper-version> + <zookeeper-version>3.3.6</zookeeper-version> <qpid-proton-version>0.5</qpid-proton-version> <qpid-jms-version>0.24</qpid-jms-version> <regexp-version>1.3</regexp-version> @@ -124,7 +124,6 @@ <xstream-version>1.4.4</xstream-version> <xbean-version>3.14</xbean-version> <xerces-version>2.11.0</xerces-version> - <zookeeper-version>3.4.5</zookeeper-version> <jaxb-basics-version>0.6.4</jaxb-basics-version> <stompjms-version>1.16</stompjms-version>
