You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2019/01/14 10:52:19 UTC
[cxf] branch master updated: [CXF-7907]upgrade jaxb bundel to 2.3.x
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 3ec8668 [CXF-7907]upgrade jaxb bundel to 2.3.x
3ec8668 is described below
commit 3ec86684d7a866acfb019a60ee2b3b75744a28b6
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Mon Jan 14 18:52:00 2019 +0800
[CXF-7907]upgrade jaxb bundel to 2.3.x
---
osgi/karaf/features/src/main/resources/features.xml | 13 +++++++------
parent/pom.xml | 5 ++++-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 4261890..81a3e4a 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -26,22 +26,23 @@
<bundle start-level="10" dependency="true">mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle>
- <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle>
+ <bundle start-level="10" dependency="true">mvn:jakarta.xml.bind/jakarta.xml.bind-api/${cxf.jaxb.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.jaxrs.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle>
<bundle start-level="20">mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
<bundle start-level="20">mvn:com.fasterxml.woodstox/woodstox-core/${cxf.woodstox.core.version}</bundle>
- <bundle start-level="20">mvn:com.sun.xml.bind/jaxb-impl/${cxf.jaxb.bundle.version}</bundle>
- <bundle start-level="20">mvn:com.sun.xml.bind/jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
- <bundle start-level="20">mvn:com.sun.xml.bind/jaxb-core/${cxf.jaxb.bundle.version}</bundle>
+ <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${cxf.jaxb.bundle.version}</bundle>
+ <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
+ <bundle start-level="20">mvn:com.sun.istack/istack-commons-runtime/${cxf.istack.bundle.version}</bundle>
</feature>
<feature name="cxf-jaxb" version="${project.version}">
<feature version="${project.version}">cxf-specs</feature>
<feature version="${project.version}">cxf-wsdl</feature>
- <bundle start-level="20">mvn:com.sun.xml.bind/jaxb-impl/${cxf.jaxb.bundle.version}</bundle>
- <bundle start-level="20">mvn:com.sun.xml.bind/jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
+ <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-runtime/${cxf.jaxb.bundle.version}</bundle>
+ <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
+ <bundle start-level="20">mvn:com.sun.istack/istack-commons-runtime/${cxf.istack.bundle.version}</bundle>
</feature>
<!-- Current the abdera bundle is not working as we expect -->
<feature name="cxf-abdera" version="${project.version}">
diff --git a/parent/pom.xml b/parent/pom.xml
index b68e811..33facb3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -64,6 +64,7 @@
<cxf.osgi.javax.bind.version>[0,3)</cxf.osgi.javax.bind.version>
<cxf.osgi.javax.stream.version>[0,2)</cxf.osgi.javax.stream.version>
<cxf.osgi.javax.activation.version>[0,2)</cxf.osgi.javax.activation.version>
+ <cxf.osgi.javax.jws.version>[2,3)</cxf.osgi.javax.jws.version>
<cxf.osgi.javax.mail.version>[0,2)</cxf.osgi.javax.mail.version>
<cxf.osgi.javax.servlet.version>[0,4.1)</cxf.osgi.javax.servlet.version>
<cxf.osgi.javax.xml.ws.version>[0,3)</cxf.osgi.javax.xml.ws.version>
@@ -78,6 +79,7 @@
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.bcprov.version>1.60</cxf.bcprov.version>
<cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
+ <cxf.istack.bundle.version>3.0.7</cxf.istack.bundle.version>
<cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version>
<cxf.classmate.version>1.1.0</cxf.classmate.version>
<cxf.commons-codec.version>1.11</cxf.commons-codec.version>
@@ -203,9 +205,10 @@
<cxf.servicemix.jodatime.version>2.3_1</cxf.servicemix.jodatime.version>
<cxf.servicemix.jsoup.version>1.5.2_2</cxf.servicemix.jsoup.version>
<cxf.servicemix.specs.version>2.9.0</cxf.servicemix.specs.version>
+ <cxf.servicemix.specs.jaxb.version>2.3_1</cxf.servicemix.specs.jaxb.version>
<cxf.servicemix.jaxrs.specs.version>2.9.1</cxf.servicemix.jaxrs.specs.version>
<cxf.javax.mail.version>1.4.4</cxf.javax.mail.version>
- <cxf.jaxb.bundle.version>2.3.0</cxf.jaxb.bundle.version>
+ <cxf.jaxb.bundle.version>2.3.1_1</cxf.jaxb.bundle.version>
<cxf.saaj-impl.bundle.version>1.3.23_2</cxf.saaj-impl.bundle.version>
<cxf.osgi.saaj.version>[1.3,2)</cxf.osgi.saaj.version>
<cxf.stax-ex.version>1.7.6</cxf.stax-ex.version>