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

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

This commit is contained in:
Krzysztof Sobkowiak 2017-01-24 00:57:03 +01:00
parent 0ad62f722f
commit 6534a83c40
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@
<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'>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 -->
<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>
@ -49,7 +48,6 @@
<feature>http</feature> <feature>http</feature>
<feature version="${project.version}">activemq-client</feature> <feature version="${project.version}">activemq-client</feature>
<bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle> <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-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-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> <bundle dependency="true">mvn:commons-codec/commons-codec/1.9</bundle>

4
activemq-osgi/pom.xml
View File

@ -62,8 +62,6 @@
org.springframework*;version="[3,5)";resolution:=optional, org.springframework*;version="[3,5)";resolution:=optional,
org.xmlpull*;resolution:=optional, org.xmlpull*;resolution:=optional,
scala*;resolution:=optional, scala*;resolution:=optional,
org.apache.xbean.spring*;resolution:=optional;version="[3.13,5)",
org.apache.xbean*;version="[3.13,5)",
javax.annotation*, javax.annotation*,
!com.thoughtworks.qdox*, !com.thoughtworks.qdox*,
org.apache.commons.logging;version="[1.2,2)";resolution:=optional, 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, org.apache.activemq.web*;version=${project.version};-noimport:=true;-split-package:=merge-first,
</activemq.osgi.export> </activemq.osgi.export>
<activemq.osgi.private.pkg> <activemq.osgi.private.pkg>
org.apache.xbean*,
org.springframework.osgi*, org.springframework.osgi*,
org.fusesource.hawtdispatch*, org.fusesource.hawtdispatch*,
org.fusesource.mqtt*, org.fusesource.mqtt*,
@ -287,6 +286,7 @@
*;groupId=org.apache.activemq;inline=META-INF/services/*, *;groupId=org.apache.activemq;inline=META-INF/services/*,
*;groupId=org.apache.qpid;inline=META-INF/services/*, *;groupId=org.apache.qpid;inline=META-INF/services/*,
*;groupId=org.springframework.osgi;inline=true *;groupId=org.springframework.osgi;inline=true
*;groupId=org.apache.xbean;inline=true
<!-- <!--
groupId=org.fusesource.leveldbjni;inline=META-INF/native/*, groupId=org.fusesource.leveldbjni;inline=META-INF/native/*,
groupId=org.xerial.snappy;inline=org/xerial/snappy/* groupId=org.xerial.snappy;inline=org/xerial/snappy/*