From f653fbfe14c212851c27f50bb06adbd7e4d46669 Mon Sep 17 00:00:00 2001
From: Claus Ibsen <davsclaus@apache.org>
Date: Mon, 17 Sep 2012 10:00:53 +0000
Subject: [PATCH] AMQ-4047: activemq-option feature included needed JARs

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1386535 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-karaf/src/main/resources/features.xml | 7 +++++++
 pom.xml                                        | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index b177a02cdd..8ae4c2de9c 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -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)">
diff --git a/pom.xml b/pom.xml
index 6e54362bc3..36310ac52a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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>