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

Merge pull request #645 from jbonofre/AMQ-8218 

[AMQ-8218] Installing activemq features breaks http commands
This commit is contained in:
Jean-Baptiste Onofré 2021-04-06 06:56:49 +02:00 committed by GitHub
parent 85cf3476ea ee808b310a
commit 2d812f012c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,12 +20,10 @@
<features name="activemq-core-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"> <features name="activemq-core-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
<repository>mvn:org.apache.karaf.features/spring-legacy/[4,5)/xml/features</repository>
<!-- Bundles needed if only client will be deployed in the container --> <!-- Bundles needed if only client will be deployed in the container -->
<feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}"> <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}">
<feature version="[4,5)">spring</feature> <feature version="[4,5)">spring</feature>
<feature version="[4,5)">shell-compat</feature> <feature>aries-blueprint</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
@ -50,10 +48,6 @@
<feature>connector</feature> <feature>connector</feature>
<feature>http</feature> <feature>http</feature>
<feature version="${project.version}">activemq-client</feature> <feature version="${project.version}">activemq-client</feature>
<conditional>
<condition>shell</condition>
<bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
</conditional>
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io-version}</bundle> <bundle dependency="true">mvn:commons-io/commons-io/${commons-io-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:org.apache.commons/commons-lang3/${commons-lang-version}</bundle> <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang-version}</bundle>

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

@ -37,6 +37,11 @@
<feature version="${project.version}">activemq-web-console</feature> <feature version="${project.version}">activemq-web-console</feature>
</feature> </feature>
<feature name="activemq-shell" version="${project.version}">
<feature>shell-compat</feature>
<bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
</feature>
<feature name="activemq-camel" version="${project.version}"> <feature name="activemq-camel" version="${project.version}">
<feature version="${project.version}">activemq-client</feature> <feature version="${project.version}">activemq-client</feature>
<bundle>mvn:org.apache.activemq/activemq-camel/${project.version}</bundle> <bundle>mvn:org.apache.activemq/activemq-camel/${project.version}</bundle>
@ -46,6 +51,10 @@
<feature version="${camel-version-range}">camel-blueprint</feature> <feature version="${camel-version-range}">camel-blueprint</feature>
</feature> </feature>
<!--
Don't forget to bind Karaf JMX server to 0.0.0.0 to have a functional webconsole:
In etc/org.apache.karaf.management.cfg, both rmiRegistryHost and rmiServerHost should use 0.0.0.0
-->
<feature name="activemq-web-console" version="${project.version}"> <feature name="activemq-web-console" version="${project.version}">
<feature>war</feature> <feature>war</feature>
<feature>eventadmin</feature> <feature>eventadmin</feature>