Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #834 from mattrpav/AMQ-8590 

[AMQ-8590] Update karaf feature to use jaxb-runtime vs jaxb-impl
This commit is contained in:
Jean-Baptiste Onofré 2022-04-24 07:42:17 +02:00 committed by GitHub
parent 1aa3031ebe 3bf085c309
commit 80d4fc3e2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-karaf/src/main/resources/features-core.xml
View File

@ -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-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.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.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> <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 --> <!-- uber osgi bundle means client is not that lean, todo: introduce client osgi bundle -->
<bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle> <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>

2
pom.xml
View File

@ -71,7 +71,7 @@
<jackson-version>2.13.2</jackson-version> <jackson-version>2.13.2</jackson-version>
<jackson-databind-version>2.13.2.2</jackson-databind-version> <jackson-databind-version>2.13.2.2</jackson-databind-version>
<jasypt-version>1.9.3</jasypt-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> <jetty9-version>9.4.46.v20220331</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version> <jetty-version>${jetty9-version}</jetty-version>
<jmdns-version>3.4.1</jmdns-version> <jmdns-version>3.4.1</jmdns-version>