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 78644d2 Update JavaMail and JAF
78644d2 is described below
commit 78644d275f80068daeb4d3fb75a2d890a1663eb9
Author: Andreas Veithen <[email protected]>
AuthorDate: Mon Dec 28 17:21:22 2020 +0000
Update JavaMail and JAF
---
.github/dependabot.yml | 2 ++
databinding-tests/jaxbri-tests/pom.xml | 2 +-
modules/adb/pom.xml | 4 ++--
modules/integration/pom.xml | 2 +-
modules/jaxws-integration/pom.xml | 2 +-
modules/jaxws/pom.xml | 2 +-
modules/kernel/pom.xml | 4 ++--
modules/osgi-tests/pom.xml | 6 +-----
modules/osgi-tests/src/test/java/OSGiTest.java | 4 ++--
modules/tool/axis2-ant-plugin/pom.xml | 2 +-
modules/tool/axis2-idea-plugin/pom.xml | 2 +-
modules/transport/mail/pom.xml | 2 +-
pom.xml | 14 ++++----------
13 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 051286d..0c7f26a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -22,6 +22,8 @@ updates:
# 1.7 is the last version to support Java 8.
- dependency-name: "com.google.googlejavaformat:google-java-format"
versions: ">= 1.8"
+ - 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:*"
diff --git a/databinding-tests/jaxbri-tests/pom.xml
b/databinding-tests/jaxbri-tests/pom.xml
index 3b572e4..269fe08 100644
--- a/databinding-tests/jaxbri-tests/pom.xml
+++ b/databinding-tests/jaxbri-tests/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/modules/adb/pom.xml b/modules/adb/pom.xml
index 6218b6b..2fd0123 100644
--- a/modules/adb/pom.xml
+++ b/modules/adb/pom.xml
@@ -71,12 +71,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>
</dependencies>
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 78e55f2..c5d8520 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -132,7 +132,7 @@
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
+ <artifactId>jakarta.activation</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/jaxws-integration/pom.xml
b/modules/jaxws-integration/pom.xml
index 08499fb..53de80a 100644
--- a/modules/jaxws-integration/pom.xml
+++ b/modules/jaxws-integration/pom.xml
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
+ <artifactId>jakarta.activation</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/jaxws/pom.xml b/modules/jaxws/pom.xml
index b004c8a..e5b9a86 100644
--- a/modules/jaxws/pom.xml
+++ b/modules/jaxws/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
diff --git a/modules/kernel/pom.xml b/modules/kernel/pom.xml
index c83d8e9..bd62382 100644
--- a/modules/kernel/pom.xml
+++ b/modules/kernel/pom.xml
@@ -107,7 +107,7 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -117,7 +117,7 @@
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
+ <artifactId>jakarta.activation</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/modules/osgi-tests/pom.xml b/modules/osgi-tests/pom.xml
index 5a96b01..11aff65 100644
--- a/modules/osgi-tests/pom.xml
+++ b/modules/osgi-tests/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -127,10 +127,6 @@
<version>1.2</version>
</artifact>
<artifact>
- <groupId>com.sun.activation</groupId>
-
<artifactId>javax.activation</artifactId>
- </artifact>
- <artifact>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
<version>3.1_7</version>
diff --git a/modules/osgi-tests/src/test/java/OSGiTest.java
b/modules/osgi-tests/src/test/java/OSGiTest.java
index 39f3650..cd32b0c 100644
--- a/modules/osgi-tests/src/test/java/OSGiTest.java
+++ b/modules/osgi-tests/src/test/java/OSGiTest.java
@@ -61,8 +61,8 @@ public class OSGiTest {
url("link:classpath:org.apache.felix.configadmin.link"),
url("link:classpath:org.apache.servicemix.bundles.wsdl4j.link"),
url("link:classpath:org.apache.geronimo.specs.geronimo-ws-metadata_2.0_spec.link"),
- url("link:classpath:com.sun.activation.javax.activation.link"),
- url("link:classpath:com.sun.mail.javax.mail.link"), // TODO:
should no longer be necessary
+
url("link:classpath:com.sun.activation.jakarta.activation.link"),
+ url("link:classpath:com.sun.mail.jakarta.mail.link"), // TODO:
should no longer be necessary
url("link:classpath:org.apache.geronimo.specs.geronimo-servlet_2.5_spec.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
diff --git a/modules/tool/axis2-ant-plugin/pom.xml
b/modules/tool/axis2-ant-plugin/pom.xml
index 3e78e8d..c4677d7 100644
--- a/modules/tool/axis2-ant-plugin/pom.xml
+++ b/modules/tool/axis2-ant-plugin/pom.xml
@@ -81,7 +81,7 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
diff --git a/modules/tool/axis2-idea-plugin/pom.xml
b/modules/tool/axis2-idea-plugin/pom.xml
index b869026..3605c44 100644
--- a/modules/tool/axis2-idea-plugin/pom.xml
+++ b/modules/tool/axis2-idea-plugin/pom.xml
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
diff --git a/modules/transport/mail/pom.xml b/modules/transport/mail/pom.xml
index 762527e..1e0e4bc 100644
--- a/modules/transport/mail/pom.xml
+++ b/modules/transport/mail/pom.xml
@@ -110,7 +110,7 @@
<dependencies>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 2b0e2ba..ebdea3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -593,8 +593,8 @@
</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>org.glassfish.jaxb</groupId>
@@ -812,14 +812,8 @@
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.5.6</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>jakarta.mail</artifactId>
+ <version>1.6.5</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
