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/10 11:52:49 UTC
[cxf] 01/01: [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 db537e142b9ff28d53f0f45216aafe315e5395ea
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 | 12 ++++++------
maven-plugins/codegen-plugin/pom.xml | 6 +++---
.../codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml | 12 ++++++------
maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml | 14 +++++++-------
.../codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml | 14 +++++++-------
parent/pom.xml | 6 +++---
pom.xml | 1 +
services/wsn/wsn-core/pom.xml | 2 +-
tools/javato/ws/pom.xml | 4 ++--
10 files changed, 38 insertions(+), 37 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 945642b..0848ecc 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 7d3540b..13649fe 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -230,9 +230,9 @@
</activation>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${cxf.jaxb.version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -240,9 +240,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/pom.xml b/maven-plugins/codegen-plugin/pom.xml
index e87aad1..a6743c1 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -199,9 +199,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${cxf.jaxb.version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
</dependency>
</dependencies>
</plugin>
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 38c3261..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>
@@ -165,9 +165,9 @@
<version>1.1.3</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.11</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
</dependency>
</dependencies>
</profile>
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 0fd9367..c4e5b23 100644
--- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
+++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml
@@ -74,9 +74,9 @@
</build>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -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 d6b4b65..eb8e7a2 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
@@ -76,9 +76,9 @@
</build>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -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 cea480e..0883fc6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2862,9 +2862,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>com.sun.activation</groupId>
diff --git a/pom.xml b/pom.xml
index cd9d59f..f3c206b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -687,6 +687,7 @@
<excludes>
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
<exclude>javax.xml.bind:jaxb-api</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 2d2aca3..d0f1706 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -110,7 +110,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 9a1bf25..a086b27 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -233,8 +233,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>