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 2012/09/17 12:00:53 UTC

svn commit: r1386535 - in /activemq/trunk: activemq-karaf/src/main/resources/features.xml pom.xml

Author: davsclaus
Date: Mon Sep 17 10:00:53 2012
New Revision: 1386535

URL: http://svn.apache.org/viewvc?rev=1386535&view=rev
Log:
AMQ-4047: activemq-option feature included needed JARs

Modified:
    activemq/trunk/activemq-karaf/src/main/resources/features.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1386535&r1=1386534&r2=1386535&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Mon Sep 17 10:00:53 2012
@@ -66,6 +66,13 @@
         <feature version="${activemq-version}">activemq-blueprint</feature>
         <feature version="[7.5,8.0)">jetty</feature>
         <bundle>mvn:org.apache.activemq/activemq-optional/${activemq-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle>
+        <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient-version}</bundle>
+        <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient-version}</bundle>
     </feature>
 
     <feature name="activemq-camel" version="${activemq-version}" resolver="(obr)">

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1386535&r1=1386534&r2=1386535&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Mon Sep 17 10:00:53 2012
@@ -43,6 +43,7 @@
     <activesoap-version>1.3</activesoap-version>
     <annogen-version>0.1.0</annogen-version>
     <ant-version>1.8.4</ant-version>
+    <ant-bundle-version>1.7.0_6</ant-bundle-version>
     <aopalliance-version>1.0</aopalliance-version>
     <aries-version>0.3</aries-version>
     <axion-version>1.0-M3-dev</axion-version>
@@ -91,6 +92,7 @@
     <regexp-version>1.3</regexp-version>
     <rome-version>1.0</rome-version>
     <saxon-version>9.4</saxon-version>
+    <saxon-bundle-version>9.4.0.1_2</saxon-bundle-version>
     <slf4j-version>1.6.6</slf4j-version>
     <spring-version>3.0.7.RELEASE</spring-version>
     <spring-osgi-version>1.2.1</spring-osgi-version>
@@ -100,6 +102,8 @@
     <woodstox-core-asl-version>4.1.4</woodstox-core-asl-version>
     <xalan-version>2.7.1</xalan-version>
     <xmlbeans-version>2.5.0</xmlbeans-version>
+    <xmlbeans-bundle-version>2.5.0_2</xmlbeans-bundle-version>
+    <xmlresolver-bundle-version>1.2_5</xmlresolver-bundle-version>
     <xpp3-version>1.1.4c</xpp3-version>
     <xstream-version>1.4.3</xstream-version>
     <xbean-version>3.11.1</xbean-version>