Updated Branches: refs/heads/trunk 3d6065ea3 -> 0203cde15
https://issues.apache.org/jira/browse/AMQ-4702 - added additional bundlel jaxb impl Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0203cde1 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0203cde1 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0203cde1 Branch: refs/heads/trunk Commit: 0203cde15029bd2df8ff0efc87c54b598ddac9b3 Parents: 3d6065e Author: Dejan Bosanac <[email protected]> Authored: Thu Sep 5 14:41:10 2013 +0200 Committer: Dejan Bosanac <[email protected]> Committed: Thu Sep 5 14:41:10 2013 +0200 ---------------------------------------------------------------------- activemq-karaf/src/main/resources/features.xml | 1 + pom.xml | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/0203cde1/activemq-karaf/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml index 0d52028..0efa898 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> http://git-wip-us.apache.org/repos/asf/activemq/blob/0203cde1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1564e9e..39c905f 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>
