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

https://issues.apache.org/jira/browse/AMQ-4034 - fixing activemq-broker feature 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1433970 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2013-01-16 15:05:53 +00:00
parent a0f785a758
commit 1b27f95393
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-karaf/pom.xml
View File

@ -26,6 +26,7 @@
</parent>
<artifactId>activemq-karaf</artifactId>
<packaging>bundle</packaging>
<name>ActiveMQ :: Apache Karaf</name>
<description>Provides resources for running ActiveMQ in Apache Karaf</description>
@ -176,6 +177,7 @@
</Import-Package>
<Private-Package>!*</Private-Package>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>

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

@ -61,26 +61,28 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
<bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
<!-- the following 4 bundles is needed by activemq-console -->
<bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
<bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf-proto/${hawtbuf-version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
</feature>
<feature name="activemq-spring" version="${project.version}" resolver="(obr)" start-level="50">
<feature version="[1.2,2)">spring-dm</feature>
<feature version="${project.version}">activemq</feature>
<feature version="${project.version}">activemq-broker</feature>
<bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-spring/${project.version}</bundle>
</feature>
<feature name="activemq-blueprint" version="${project.version}" resolver="(obr)" start-level="50">
<feature version="${project.version}">activemq</feature>
<feature version="${project.version}">activemq-broker</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-jexl/2.0.1</bundle>
<bundle dependency="true">mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries-version}</bundle>
<bundle dependency="true">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries-version}</bundle>
<bundle dependency="true">mvn:org.apache.xbean/xbean-blueprint/${xbean-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-blueprint/${project.version}</bundle>
</feature>
@ -102,7 +104,7 @@
</feature>
<feature name="activemq-camel" version="${project.version}" resolver="(obr)" start-level="50">
<feature version="${project.version}">activemq</feature>
<feature version="${project.version}">activemq-broker</feature>
<feature version="${camel-version-range}">camel-jms</feature>
<bundle>mvn:org.apache.activemq/activemq-camel/${project.version}</bundle>
</feature>

1
pom.xml
View File

@ -1444,7 +1444,6 @@
<profile>
<id>unstable</id>
<modules>
<module>activemq-karaf-itest</module>
</modules>
</profile>
<profile>