From 0203cde15029bd2df8ff0efc87c54b598ddac9b3 Mon Sep 17 00:00:00 2001
From: Dejan Bosanac <dejan@nighttale.net>
Date: Thu, 5 Sep 2013 14:41:10 +0200
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-4702 - added
 additional bundlel jaxb impl

---
 activemq-karaf/src/main/resources/features.xml | 1 +
 pom.xml                                        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 0d520287aa..0efa898bac 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -28,6 +28,7 @@
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
         <bundle dependency="true">mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/${jaxb-basics-version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
         <bundle dependency="false">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
         <bundle dependency="false">mvn:commons-net/commons-net/${commons-net-version}</bundle>
         <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
diff --git a/pom.xml b/pom.xml
index 1564e9e881..39c905f605 100755
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
     <httpcore-version>4.2.4</httpcore-version>
     <jackson-version>1.9.12</jackson-version>
     <jasypt-version>1.9.0</jasypt-version>
+    <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
     <jdom-version>1.0</jdom-version>
     <jetty-version>7.6.9.v20130131</jetty-version>
     <jmdns-version>3.4.1</jmdns-version>