This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.17.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.17.x by this push:
new c87a6f667 [AMQ-8590] Update karaf feature to use jaxb-runtime vs
jaxb-impl
c87a6f667 is described below
commit c87a6f667c4ccf1705faf637afcb02bc13af6b02
Author: Matt Pavlovich <[email protected]>
AuthorDate: Fri Apr 22 08:51:59 2022 -0500
[AMQ-8590] Update karaf feature to use jaxb-runtime vs jaxb-impl
(cherry picked from commit 3bf085c3094304e4041969dc757306eeb7be2e0c)
---
activemq-karaf/src/main/resources/features-core.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/activemq-karaf/src/main/resources/features-core.xml
b/activemq-karaf/src/main/resources/features-core.xml
index f81cdc1cf..108d279d1 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -29,7 +29,7 @@
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/1.0-alpha-2</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='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${jaxb-bundle-version}</bundle>
<bundle>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
<!-- uber osgi bundle means client is not that lean, todo: introduce
client osgi bundle -->
<bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
diff --git a/pom.xml b/pom.xml
index 91838b8de..f03527552 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<jackson-version>2.13.2</jackson-version>
<jackson-databind-version>2.13.2.2</jackson-databind-version>
<jasypt-version>1.9.3</jasypt-version>
- <jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
+ <jaxb-bundle-version>2.3.2_1</jaxb-bundle-version>
<jetty9-version>9.4.46.v20220331</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jmdns-version>3.4.1</jmdns-version>