activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject [1/2] activemq git commit: [AMQ-6576] Problem while installing activemq-camel with Camel 2.17.x or 2.18.x
Date Wed, 25 Jan 2017 12:37:37 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 56bb079c8 -> 5c035fac2


[AMQ-6576] Problem while installing activemq-camel with Camel 2.17.x or 2.18.x


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6534a83c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6534a83c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6534a83c

Branch: refs/heads/master
Commit: 6534a83c40e07fc5f9edb1b6a89ae58dd6908456
Parents: 0ad62f7
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Tue Jan 24 00:57:03 2017 +0100
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Tue Jan 24 00:57:03 2017 +0100

----------------------------------------------------------------------
 activemq-karaf/src/main/resources/features-core.xml | 2 --
 activemq-osgi/pom.xml                               | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/6534a83c/activemq-karaf/src/main/resources/features-core.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 75375eb..dd5e47f 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -33,7 +33,6 @@
         <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 -->
-        <bundle dependency="false">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
     </feature>
     
@@ -49,7 +48,6 @@
       <feature>http</feature>
       <feature version="${project.version}">activemq-client</feature>
       <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
-      <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
       <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
       <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
       <bundle dependency="true">mvn:commons-codec/commons-codec/1.9</bundle>

http://git-wip-us.apache.org/repos/asf/activemq/blob/6534a83c/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index ddf4dba..83216a2 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -62,8 +62,6 @@
       org.springframework*;version="[3,5)";resolution:=optional,
       org.xmlpull*;resolution:=optional,
       scala*;resolution:=optional,
-      org.apache.xbean.spring*;resolution:=optional;version="[3.13,5)",
-      org.apache.xbean*;version="[3.13,5)",
       javax.annotation*,
       !com.thoughtworks.qdox*,
       org.apache.commons.logging;version="[1.2,2)";resolution:=optional,
@@ -88,6 +86,7 @@
       org.apache.activemq.web*;version=${project.version};-noimport:=true;-split-package:=merge-first,
     </activemq.osgi.export>
     <activemq.osgi.private.pkg>
+         org.apache.xbean*,
          org.springframework.osgi*,
          org.fusesource.hawtdispatch*,
          org.fusesource.mqtt*,
@@ -287,6 +286,7 @@
               *;groupId=org.apache.activemq;inline=META-INF/services/*,
               *;groupId=org.apache.qpid;inline=META-INF/services/*,
               *;groupId=org.springframework.osgi;inline=true
+              *;groupId=org.apache.xbean;inline=true
               <!--
               groupId=org.fusesource.leveldbjni;inline=META-INF/native/*,
               groupId=org.xerial.snappy;inline=org/xerial/snappy/*


Mime
View raw message