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/08/14 19:52:40 UTC
[cxf] 01/09: [CXF-7910] Change JAX-WS javax to jakarta artifact
dependencies
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 1448dd059193dac0a975520707ae98b1fe3a7e18
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Thu Jan 10 12:52:23 2019 +0100
[CXF-7910] Change JAX-WS javax to jakarta artifact dependencies
---
.../src/main/release/samples/jax_rs/minimal_osgi/pom.xml | 4 ++--
distribution/src/main/release/samples/pom.xml | 6 +++---
.../codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml | 6 +++---
maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml | 8 ++++----
.../codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml | 8 ++++----
parent/pom.xml | 12 +++---------
pom.xml | 1 +
services/wsn/wsn-core/pom.xml | 2 +-
tools/javato/ws/pom.xml | 4 ++--
9 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
index e256f7a..7c86c94 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
@@ -85,8 +85,8 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
- <version>2.9.0</version>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.3</artifactId>
+ <version>2.3_1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index c826bb4..f0a5960 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -253,9 +253,9 @@
<version>1.3.1</version>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.3.0</version>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>javax.activation</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 82d4685..ec96ff2 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
@@ -155,9 +155,9 @@
<version>1.3.1</version>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.2.9</version>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</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 488c23b..4defdaf 100644
--- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
@@ -84,10 +84,10 @@
<version>1.3.1</version>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.3.0</version>
- </dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.2</version>
+ </dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
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 f4b1d3a..7ae73fa 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
@@ -86,10 +86,10 @@
<version>1.3.1</version>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.3.0</version>
- </dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.2</version>
+ </dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index f710fe9..562798c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2831,15 +2831,9 @@
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.3.0</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
diff --git a/pom.xml b/pom.xml
index 83db038..a7b6d03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -683,6 +683,7 @@
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
<exclude>javax.xml.bind:jaxb-api</exclude>
<exclude>com.sun.xml.bind:jaxb-core</exclude>
+ <exclude>javax.xml.ws:jaxws-api</exclude>
</excludes>
</bannedDependencies>
</rules>
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 92fb40b..82b1306 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -101,7 +101,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.2.10</version>
+ <version>2.3.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index 3988cb3..b6a0f49 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -229,8 +229,8 @@
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>