You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2020/12/22 19:24:57 UTC
[ws-axiom] branch master updated: Update various JavaEE dependencies
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/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 78747b7 Update various JavaEE dependencies
78747b7 is described below
commit 78747b7e1f50001563a30537edde059f6e6a3bf6
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Tue Dec 22 19:24:01 2020 +0000
Update various JavaEE dependencies
---
.github/dependabot.yml | 10 ++++++++
axiom-api/pom.xml | 6 ++---
axiom-compat/pom.xml | 2 +-
pom.xml | 28 +++++++++-------------
samples/pom.xml | 2 +-
systests/eclipse-tests/pom.xml | 2 +-
systests/osgi-tests/pom.xml | 4 ++--
.../java/org/apache/axiom/test/BlueprintTest.java | 2 +-
.../org/apache/axiom/test/DataSourceUtilsTest.java | 4 ++--
.../java/org/apache/axiom/test/FactoryTest.java | 2 +-
.../test/java/org/apache/axiom/test/JAXBTest.java | 2 +-
.../test/java/org/apache/axiom/test/SJSXPTest.java | 2 +-
.../java/org/apache/axiom/test/SystemDepsTest.java | 2 +-
.../org/apache/axiom/test/UsesConstraintsTest.java | 2 +-
testing/dom-testsuite/pom.xml | 4 ++--
testing/saaj-testsuite/pom.xml | 4 ++--
.../ts/saaj/element/TestGetOwnerDocument.java | 1 -
testing/soap-testsuite/pom.xml | 4 ++--
testing/testutils/pom.xml | 4 ++--
testing/xml-testsuite/pom.xml | 6 ++---
20 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fd7e1a1..8042446 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -19,8 +19,18 @@ updates:
schedule:
interval: "daily"
ignore:
+ - dependency-name: "com.sun.activation:jakarta.activation"
+ versions: ">= 2.0"
+ - dependency-name: "com.sun.mail:jakarta.mail"
+ versions: ">= 2.0"
+ - dependency-name: "com.sun.xml.messaging.saaj:saaj-impl"
+ versions: ">= 2.0"
- dependency-name: "com.sun.xml.ws:jaxws-rt"
versions: ">= 3.0"
+ - dependency-name: "jakarta.activation:jakarta.activation-api"
+ versions: ">= 2.0"
+ - dependency-name: "jakarta.xml.soap:jakarta.xml.soap-api"
+ versions: ">= 2.0"
- dependency-name: "org.eclipse.jetty:jetty-server"
versions: ">= 10.0"
- dependency-name: "org.eclipse.jetty:jetty-webapp"
diff --git a/axiom-api/pom.xml b/axiom-api/pom.xml
index 3c5d9de..92cbe7a 100644
--- a/axiom-api/pom.xml
+++ b/axiom-api/pom.xml
@@ -53,8 +53,8 @@
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -112,7 +112,7 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/axiom-compat/pom.xml b/axiom-compat/pom.xml
index b047410..874c6fe 100644
--- a/axiom-compat/pom.xml
+++ b/axiom-compat/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 7e265f2..f074222 100644
--- a/pom.xml
+++ b/pom.xml
@@ -262,14 +262,8 @@
<dependencies>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.6.2</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>jakarta.mail</artifactId>
+ <version>1.6.5</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -408,14 +402,14 @@
<version>${aspectj.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
- <version>1.3.8</version>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
+ <version>1.4.2</version>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- <version>1.3.28</version>
+ <version>1.5.2</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -468,14 +462,14 @@
<version>8.0.1</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
- <version>1.2.0</version>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
diff --git a/samples/pom.xml b/samples/pom.xml
index 0b7d616..1b52b4e 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
+ <artifactId>jakarta.activation</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/eclipse-tests/pom.xml b/systests/eclipse-tests/pom.xml
index e4d54c8..f89dab3 100644
--- a/systests/eclipse-tests/pom.xml
+++ b/systests/eclipse-tests/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
+ <artifactId>jakarta.activation</artifactId>
<scope>test</scope>
</dependency>
diff --git a/systests/osgi-tests/pom.xml b/systests/osgi-tests/pom.xml
index 7af19cd..c4686f3 100644
--- a/systests/osgi-tests/pom.xml
+++ b/systests/osgi-tests/pom.xml
@@ -67,12 +67,12 @@
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
+ <artifactId>jakarta.activation</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
<scope>test</scope>
</dependency>
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java
index 5f5f867..57aa2de 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/BlueprintTest.java
@@ -43,7 +43,7 @@ public class BlueprintTest {
url("link:classpath:org.apache.aries.proxy.link"),
url("link:classpath:org.apache.aries.blueprint.api.link"),
url("link:classpath:org.apache.aries.blueprint.core.link"),
- url("link:classpath:com.sun.activation.javax.activation.link"),
+ url("link:classpath:com.sun.activation.jakarta.activation.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-dom.link"),
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/DataSourceUtilsTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/DataSourceUtilsTest.java
index 9fa2561..5da7a57 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/DataSourceUtilsTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/DataSourceUtilsTest.java
@@ -40,8 +40,8 @@ public class DataSourceUtilsTest {
@Configuration
public static Option[] configuration() {
return options(
- url("link:classpath:com.sun.activation.javax.activation.link"),
- url("link:classpath:com.sun.mail.javax.mail.link"),
+ url("link:classpath:com.sun.activation.jakarta.activation.link"),
+ url("link:classpath:com.sun.mail.jakarta.mail.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
junitBundles());
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
index cac92ae..baf833b 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
@@ -51,7 +51,7 @@ public class FactoryTest {
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:stax2-api.link"),
url("link:classpath:com.fasterxml.woodstox.woodstox-core.link"),
- url("link:classpath:com.sun.activation.javax.activation.link"),
+ url("link:classpath:com.sun.activation.jakarta.activation.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
index e6b5543..5778a1f 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
@@ -48,7 +48,7 @@ public class JAXBTest {
@Configuration
public static Option[] configuration() {
return options(
- url("link:classpath:com.sun.activation.javax.activation.link"),
+ url("link:classpath:com.sun.activation.jakarta.activation.link"),
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:stax2-api.link"),
url("link:classpath:com.fasterxml.woodstox.woodstox-core.link"),
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
index 409f4a3..40f19b4 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
@@ -51,7 +51,7 @@ public class SJSXPTest {
return options(
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:org.apache.servicemix.bundles.jaxp-ri.link"),
- url("link:classpath:com.sun.activation.javax.activation.link"),
+ url("link:classpath:com.sun.activation.jakarta.activation.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
index fece857..9b692a9 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
@@ -44,7 +44,7 @@ public class SystemDepsTest {
@Configuration
public static Option[] configuration() {
return options(
- url("link:classpath:com.sun.activation.javax.activation.link"),
+ url("link:classpath:com.sun.activation.jakarta.activation.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
index a57f5cf..2d885b1 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
@@ -105,7 +105,7 @@ public class UsesConstraintsTest {
bundles.add(context.installBundle("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"));
bundles.add(context.installBundle("link:classpath:stax2-api.link"));
bundles.add(context.installBundle("link:classpath:com.fasterxml.woodstox.woodstox-core.link"));
- bundles.add(context.installBundle("link:classpath:com.sun.activation.javax.activation.link"));
+ bundles.add(context.installBundle("link:classpath:com.sun.activation.jakarta.activation.link"));
bundles.add(context.installBundle("link:classpath:org.apache.james.apache-mime4j-core.link"));
bundles.add(context.installBundle("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"));
// This bundle will be wired to the javax.xml.stream package exported by the ServiceMix stax-api bundle.
diff --git a/testing/dom-testsuite/pom.xml b/testing/dom-testsuite/pom.xml
index 5086970..676478a 100644
--- a/testing/dom-testsuite/pom.xml
+++ b/testing/dom-testsuite/pom.xml
@@ -76,8 +76,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
</dependencies>
diff --git a/testing/saaj-testsuite/pom.xml b/testing/saaj-testsuite/pom.xml
index efb8429..627a50e 100644
--- a/testing/saaj-testsuite/pom.xml
+++ b/testing/saaj-testsuite/pom.xml
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
index c132b0c..c213036 100644
--- a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
+++ b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
@@ -43,7 +43,6 @@ public class TestGetOwnerDocument extends SAAJTestCase {
protected void runTest() throws Throwable {
Document doc = newSOAPFactory().createElement(new QName("test")).getOwnerDocument();
assertThat(doc).isNotInstanceOf(SOAPPart.class);
- assertThat(doc).isNotInstanceOf(javax.xml.soap.Node.class);
assertThat(doc.createElementNS(null, "test")).isInstanceOf(SOAPElement.class);
}
}
diff --git a/testing/soap-testsuite/pom.xml b/testing/soap-testsuite/pom.xml
index 0d15694..9b739bd 100644
--- a/testing/soap-testsuite/pom.xml
+++ b/testing/soap-testsuite/pom.xml
@@ -50,8 +50,8 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/testing/testutils/pom.xml b/testing/testutils/pom.xml
index 28696d6..5ce302f 100644
--- a/testing/testutils/pom.xml
+++ b/testing/testutils/pom.xml
@@ -52,8 +52,8 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/testing/xml-testsuite/pom.xml b/testing/xml-testsuite/pom.xml
index 7f25817..0f03774 100644
--- a/testing/xml-testsuite/pom.xml
+++ b/testing/xml-testsuite/pom.xml
@@ -50,12 +50,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>