activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject activemq git commit: AMQ-5344: Replace bundles with feature
Date Fri, 25 Nov 2016 08:16:48 GMT
Repository: activemq
Updated Branches:
  refs/heads/master b6bca3976 -> 89c1a7b8b


AMQ-5344: Replace bundles with feature


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

Branch: refs/heads/master
Commit: 89c1a7b8ba1e6196220dc79dfc5a5a332ec074b6
Parents: b6bca39
Author: Benjamin Graf <benjamin.graf@gmx.net>
Authored: Wed Nov 23 14:19:23 2016 +0100
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Fri Nov 25 09:16:28 2016 +0100

----------------------------------------------------------------------
 activemq-karaf/src/main/resources/features-core.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/89c1a7b8/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 752e4d2..3f52fbf 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -46,6 +46,7 @@
 
     <!-- All bundles needed by the broker -->
     <feature name="activemq" description="ActiveMQ broker libraries" version="${project.version}"
resolver="(obr)" start-level="50">
+      <feature>connector</feature>
       <feature>http</feature>
       <feature version="${project.version}">activemq-client</feature>
       <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
@@ -60,8 +61,6 @@
       <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
       <bundle dependency="true">mvn:joda-time/joda-time/${jodatime-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-transaction-version}</bundle>
-      <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
       <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
       <bundle dependency="true">mvn:org.apache.activemq/activeio-core/${activeio-version}</bundle>
       <bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>


Mime
View raw message