This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new fd39ac4 Update JAXB API
fd39ac4 is described below
commit fd39ac4a85f8e155107c951f189c7f57fc22ff80
Author: Andreas Veithen <[email protected]>
AuthorDate: Tue Dec 29 17:26:05 2020 +0000
Update JAXB API
---
.github/dependabot.yml | 4 ++++
modules/jaxbri-codegen/pom.xml | 4 ++--
modules/jaxws/pom.xml | 10 ++--------
modules/metadata/pom.xml | 10 ++--------
modules/samples/jaxws-addressbook/pom.xml | 11 ++---------
modules/samples/jaxws-calculator/pom.xml | 11 ++---------
modules/samples/jaxws-interop/pom.xml | 11 ++---------
pom.xml | 15 ++++++++++-----
8 files changed, 26 insertions(+), 50 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c2990c4..ff4554d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -30,8 +30,12 @@ updates:
versions: ">= 2.0"
- dependency-name: "com.sun.xml.ws:*"
versions: ">= 3.0"
+ - dependency-name: "jakarta.activation:jakarta.activation-api"
+ versions: ">= 1.2.2"
- dependency-name: "jakarta.servlet.jsp:jakarta.servlet.jsp-api"
versions: ">= 3.0"
+ - dependency-name: "jakarta.xml.bind:jakarta.xml.bind-api"
+ versions: ">= 3.0"
- dependency-name: "jakarta.xml.soap:jakarta.xml.soap-api"
versions: ">= 2.0"
# Jetty 9 supports Servlets 3.1.
diff --git a/modules/jaxbri-codegen/pom.xml b/modules/jaxbri-codegen/pom.xml
index 601c5e0..3c9b9f5 100644
--- a/modules/jaxbri-codegen/pom.xml
+++ b/modules/jaxbri-codegen/pom.xml
@@ -56,8 +56,8 @@
<artifactId>jaxb-xjc</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
diff --git a/modules/jaxws/pom.xml b/modules/jaxws/pom.xml
index 4d89309..3907975 100644
--- a/modules/jaxws/pom.xml
+++ b/modules/jaxws/pom.xml
@@ -74,14 +74,8 @@
<artifactId>xalan</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/modules/metadata/pom.xml b/modules/metadata/pom.xml
index 4a83a1e..4df2d9d 100755
--- a/modules/metadata/pom.xml
+++ b/modules/metadata/pom.xml
@@ -75,14 +75,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
diff --git a/modules/samples/jaxws-addressbook/pom.xml
b/modules/samples/jaxws-addressbook/pom.xml
index 3ea24aa..b0d2509 100644
--- a/modules/samples/jaxws-addressbook/pom.xml
+++ b/modules/samples/jaxws-addressbook/pom.xml
@@ -74,15 +74,8 @@
</build>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
diff --git a/modules/samples/jaxws-calculator/pom.xml
b/modules/samples/jaxws-calculator/pom.xml
index a147a16..fdaa6d3 100644
--- a/modules/samples/jaxws-calculator/pom.xml
+++ b/modules/samples/jaxws-calculator/pom.xml
@@ -57,15 +57,8 @@
</build>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
diff --git a/modules/samples/jaxws-interop/pom.xml
b/modules/samples/jaxws-interop/pom.xml
index 2664857..04124ca 100644
--- a/modules/samples/jaxws-interop/pom.xml
+++ b/modules/samples/jaxws-interop/pom.xml
@@ -29,15 +29,8 @@
<name>JAXWS Interop Sample</name>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <artifactId>jsr173</artifactId>
- <groupId>javax.xml</groupId>
- </exclusion>
- </exclusions>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
diff --git a/pom.xml b/pom.xml
index 8295b58..2a7ecc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -495,6 +495,7 @@
<woden.version>1.0M11-SNAPSHOT</woden.version>
<axiom.version>1.3.0-SNAPSHOT</axiom.version>
<xmlschema.version>2.2.5</xmlschema.version>
+ <activation.version>1.2.1</activation.version>
<ant.version>1.10.9</ant.version>
<antlr.version>2.7.7</antlr.version>
<aspectj.version>1.9.6</aspectj.version>
@@ -511,7 +512,6 @@
<httpcore.version>4.4.14</httpcore.version>
<httpclient.version>4.5.13</httpclient.version>
<intellij.version>5.0</intellij.version>
- <jaxb.api.version>2.3.1</jaxb.api.version>
<jaxbri.version>2.3.3</jaxbri.version>
<jetty.version>9.4.35.v20201120</jetty.version>
<jibx.version>1.3.3</jibx.version>
@@ -591,9 +591,14 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>${activation.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
- <version>1.2.1</version>
+ <version>${activation.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -606,9 +611,9 @@
<version>${jaxbri.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb.api.version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.3</version>
</dependency>
<dependency>
<groupId>jakarta.xml.soap</groupId>
