You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2019/01/14 07:39:58 UTC
[cxf] branch CXF-7910_jakarta_jaxws-api updated: [CXF-7910] add
jakarta.xml.soap-api and jakarta.jws-api to fix OSGi errors,
use existing cxf.specs.jaxws.api.version property
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7910_jakarta_jaxws-api
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/CXF-7910_jakarta_jaxws-api by this push:
new c1dab25 [CXF-7910] add jakarta.xml.soap-api and jakarta.jws-api to fix OSGi errors, use existing cxf.specs.jaxws.api.version property
c1dab25 is described below
commit c1dab25679e1d8587abe8af368b0510d9c005a17
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Mon Jan 14 08:39:37 2019 +0100
[CXF-7910] add jakarta.xml.soap-api and jakarta.jws-api to fix OSGi errors, use existing cxf.specs.jaxws.api.version property
---
osgi/karaf/features/src/main/resources/features.xml | 6 ++++--
parent/pom.xml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 34fedc0..8d7c13b 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -27,9 +27,11 @@
<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.3/2.3_1</bundle>
- <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/2.3_1</bundle>
+ <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/${cxf.specs.jaxws.api.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:jakarta.xml.soap/jakarta.xml.soap-api/1.4.1</bundle>
+ <bundle start-level="10" dependency="true">mvn:jakarta.jws/jakarta.jws-api/1.1.1</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>
@@ -229,7 +231,7 @@
<feature version="${project.version}">cxf-http</feature>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-frontend-simple/${project.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-frontend-jaxws/${project.version}</bundle>
- <library type="endorsed" export="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/2.3_1</library>
+ <library type="endorsed" export="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/${cxf.specs.jaxws.api.version}</library>
</feature>
<feature name="cxf-jaxrs" version="${project.version}">
<feature version="${project.version}">cxf-core</feature>
diff --git a/parent/pom.xml b/parent/pom.xml
index e3699a8..680a2a5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -155,7 +155,7 @@
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
<cxf.slf4j.version>1.7.25</cxf.slf4j.version>
- <cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
+ <cxf.specs.jaxws.api.version>2.3_1</cxf.specs.jaxws.api.version>
<cxf.spring.version>5.1.3.RELEASE</cxf.spring.version>
<cxf.spring.boot.version>2.1.1.RELEASE</cxf.spring.boot.version>
<cxf.spring.security.version>5.1.2.RELEASE</cxf.spring.security.version>