activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [activemq] branch activemq-5.16.x updated: [AMQ-7014] Use shell conditional in Karaf features
Date Sat, 09 Jan 2021 06:34:09 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.16.x by this push:
     new d8bb493  [AMQ-7014] Use shell conditional in Karaf features
d8bb493 is described below

commit d8bb493b14bc1ee6b43d87f619ddc5fcecc19209
Author: jbonofre <jbonofre@apache.org>
AuthorDate: Thu Jan 7 14:47:36 2021 +0100

    [AMQ-7014] Use shell conditional in Karaf features
    
    (cherry picked from commit f95c4cf1934506c895e224451792b8ebe668d86c)
---
 activemq-karaf/src/main/resources/features-core.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index ea7c3fb..911bd45 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -50,7 +50,10 @@
       <feature>connector</feature>
       <feature>http</feature>
       <feature version="${project.version}">activemq-client</feature>
-      <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
+      <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-collections/commons-collections/${commons-collections-version}</bundle>
       <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>


Mime
View raw message