cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [cxf] 04/09: [CXF-7910] add jakarta.xml.soap-api and jakarta.jws-api to fix OSGi errors, use existing cxf.specs.jaxws.api.version property
Date Wed, 14 Aug 2019 19:52:43 GMT
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

commit 129a02d671c9aa0bcbb3be1ffd732d7937583667
Author: Dennis Kieselhorst <mail@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 | 4 +++-
 parent/pom.xml                                      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 2008db1..2cd5fc6 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>
diff --git a/parent/pom.xml b/parent/pom.xml
index 5fbc372..a78dcb8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -188,7 +188,7 @@
         <cxf.servlet-api.version>3.1.0</cxf.servlet-api.version>
         <cxf.slf4j.version>1.7.28</cxf.slf4j.version>
         <cxf.snakeyaml.version>1.24</cxf.snakeyaml.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.boot.version>2.1.7.RELEASE</cxf.spring.boot.version>
         <cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
         <cxf.spring.mock>spring-test</cxf.spring.mock>


Mime
View raw message