You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2020/12/28 11:52:24 UTC
[axis-axis2-java-core] branch master updated: Update SAAJ version
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 511f8e4 Update SAAJ version
511f8e4 is described below
commit 511f8e45f26671785714f82e1d75793dced5308f
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Mon Dec 28 11:51:32 2020 +0000
Update SAAJ version
---
.github/dependabot.yml | 4 ++++
modules/adb-tests/pom.xml | 15 ---------------
modules/saaj/pom.xml | 6 ++----
pom.xml | 16 ++++------------
4 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 642f5a5..1f18250 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -19,8 +19,12 @@ updates:
schedule:
interval: "daily"
ignore:
+ - dependency-name: "com.sun.xml.messaging.saaj:saaj-impl"
+ versions: ">= 2.0"
- dependency-name: "com.sun.xml.ws:*"
versions: ">= 3.0"
+ - dependency-name: "jakarta.xml.soap:jakarta.xml.soap-api"
+ versions: ">= 2.0"
# Jetty 9 supports Servlets 3.1.
- dependency-name: "javax.servlet:javax.servlet-api"
versions: "> 3.1.0"
diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml
index 752285e..b81b465 100644
--- a/modules/adb-tests/pom.xml
+++ b/modules/adb-tests/pom.xml
@@ -86,25 +86,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>${saaj.impl.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <version>${saaj.api.version}</version>
- </dependency>
- <dependency>
<groupId>com.google.googlejavaformat</groupId>
<artifactId>google-java-format</artifactId>
<version>1.3</version>
</dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
- <version>${soap-api.version}</version>
- </dependency>
<dependency>
<!-- Both google-java-format and Maven depend on Guava. We need to select
a version that works for both. -->
diff --git a/modules/saaj/pom.xml b/modules/saaj/pom.xml
index 6b178e7..1bc90d2 100644
--- a/modules/saaj/pom.xml
+++ b/modules/saaj/pom.xml
@@ -66,9 +66,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
- <version>${soap-api.version}</version>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -112,7 +111,6 @@
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- <version>1.3.28</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 5105122..57f049f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -512,7 +512,6 @@
<httpcore.version>4.4.14</httpcore.version>
<httpclient.version>4.5.12</httpclient.version>
<intellij.version>5.0</intellij.version>
- <soap-api.version>1.4.0</soap-api.version>
<jaxb.api.version>2.3.1</jaxb.api.version>
<jaxbri.version>2.3.3</jaxbri.version>
<jettison.version>1.3.8</jettison.version>
@@ -537,8 +536,6 @@
<jaxws.rt.version>2.3.3</jaxws.rt.version>
<jaxws.api.version>2.3.1</jaxws.api.version>
<jsr311.api.version>1.1.1</jsr311.api.version>
- <saaj.impl.version>1.5.2</saaj.impl.version>
- <saaj.api.version>1.3.5</saaj.api.version>
<!-- This variable is used in some Xdocs and is substituted using Velocity. Note that
we can't use the project.version variable directly because of the dot. See
http://maven.apache.org/plugins/maven-site-plugin/examples/creating-content.html -->
@@ -616,9 +613,9 @@
<version>${jaxb.api.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
- <version>${soap-api.version}</version>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
+ <version>1.4.2</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
@@ -628,12 +625,7 @@
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- <version>${saaj.impl.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <version>${saaj.api.version}</version>
+ <version>1.5.2</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>