You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2013/11/27 11:26:28 UTC
git commit: AMQ-4903: AMQ Karaf should depend to http feature instead
of jetty to support both Karaf 2.x and 3.x. Thanks to Jean for the patch.
Updated Branches:
refs/heads/trunk a7f57b540 -> 927be0ce7
AMQ-4903: AMQ Karaf should depend to http feature instead of jetty to support both Karaf 2.x and 3.x. Thanks to Jean for the patch.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/927be0ce
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/927be0ce
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/927be0ce
Branch: refs/heads/trunk
Commit: 927be0ce7af57daca70084574101ccfe506409da
Parents: a7f57b5
Author: Claus Ibsen <cl...@gmail.com>
Authored: Wed Nov 27 11:28:33 2013 +0100
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Wed Nov 27 11:28:33 2013 +0100
----------------------------------------------------------------------
activemq-karaf/src/main/resources/features-core.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/927be0ce/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 9c18f0c..5f5c03c 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -39,7 +39,7 @@
<!-- All bundles needed by the broker -->
<feature name="activemq" description="ActiveMQ broker libraries" version="${project.version}" resolver="(obr)" start-level="50">
- <feature>jetty</feature>
+ <feature>http</feature>
<feature version="${project.version}">activemq-client</feature>
<bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
<bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
@@ -64,4 +64,4 @@
<bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
-->
</feature>
- </features>
\ No newline at end of file
+ </features>