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 24af0f4bb4737a08a8211340f8c85d74bb5d8450
Author: Dennis Kieselhorst <m...@dekies.de>
AuthorDate: Mon Jan 14 17:55:17 2019 +0100
[CXF-7910] use jakarta.xml.soap-api and jakarta.jws-api
---
distribution/src/main/release/samples/pom.xml | 6 +++---
.../src/it/jdk-cxf-with-toolchain/pom.xml | 6 +++---
.../codegen-plugin/src/it/mark-generated/pom.xml | 6 +++---
.../src/it/wsdl-artifact-resolution/pom.xml | 6 +++---
osgi/karaf/features/src/main/resources/features.xml | 2 --
parent/pom.xml | 17 ++++++++++++++---
pom.xml | 2 ++
services/wsn/wsn-core/pom.xml | 8 ++++++++
tools/javato/ws/pom.xml | 4 ++--
9 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 8df6ab8..0a17c69 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -263,9 +263,9 @@
<version>1.2.0</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.3</version>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
index ec96ff2..afa96b3 100644
--- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml
@@ -160,9 +160,9 @@
<version>2.3.2</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.3</version>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
diff --git a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
index 4defdaf..34b61b5 100644
--- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
@@ -94,9 +94,9 @@
<version>1.1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.3</version>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>1.1.1</version>
</dependency>
</dependencies>
diff --git
a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
index 7ae73fa..b129d22 100644
--- a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml
@@ -96,9 +96,9 @@
<version>1.1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.3</version>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>1.1.1</version>
</dependency>
</dependencies>
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index 2cd5fc6..191c52e 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -24,11 +24,9 @@
<bundle
start-level="9">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
<bundle start-level="10"
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
<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.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>
diff --git a/parent/pom.xml b/parent/pom.xml
index a78dcb8..226eb87 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2841,9 +2841,14 @@
<version>1.2.0</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.3</version>
+ <groupId>jakarta.jws</groupId>
+ <artifactId>jakarta.jws-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
@@ -2855,6 +2860,12 @@
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jacorb</groupId>
diff --git a/pom.xml b/pom.xml
index a7b6d03..3a74e60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -684,6 +684,8 @@
<exclude>javax.xml.bind:jaxb-api</exclude>
<exclude>com.sun.xml.bind:jaxb-core</exclude>
<exclude>javax.xml.ws:jaxws-api</exclude>
+ <exclude>javax.jws:javax.jws-api</exclude>
+
<exclude>javax.xml.soap:javax.xml.soap-api</exclude>
</excludes>
</bannedDependencies>
</rules>
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 82b1306..fa35277 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -113,6 +113,14 @@
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>javax.jws</groupId>
+ <artifactId>javax.jws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
</exclusion>
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index b6a0f49..1fac852 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -215,8 +215,8 @@
<configuration>
<artifactItems>
<artifactItem>
-
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <groupId>jakarta.jws</groupId>
+
<artifactId>jakarta.jws-api</artifactId>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
