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 0d9276f1d7 Fix Jakarta Activation and Mail dependencies
0d9276f1d7 is described below
commit 0d9276f1d75d40694b90d01ceb8bce2845039ed7
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Wed Nov 1 01:02:43 2023 +0000
Fix Jakarta Activation and Mail dependencies
Commit af639ba incorrectly replaced dependencies on
com.sun.activation:jakarta.activation (resp. com.sun.mail:jakarta.mail)
by jakarta.activation:jakarta.activation-api (resp.
jakarta.mail:jakarta.mail-api). At the same time, a change in Axiom
added an unnecessary dependency on the Jakarta Mail implementation
to axiom-legacy-attachments. With that unnecessary dependency removed,
we now need to fix the dependencies in Axis2.
While we are at it, use proper dependency management for these
dependencies.
---
modules/adb/pom.xml | 5 +++++
modules/distribution/pom.xml | 2 --
modules/kernel/pom.xml | 4 ++--
modules/transport/mail/pom.xml | 4 ++--
modules/webapp/pom.xml | 2 --
pom.xml | 13 +++++++++++--
6 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/modules/adb/pom.xml b/modules/adb/pom.xml
index 6899825606..a5bc4b9ba6 100644
--- a/modules/adb/pom.xml
+++ b/modules/adb/pom.xml
@@ -88,6 +88,11 @@
<artifactId>jakarta.mail-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index c2c3e63c57..fef191039f 100755
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -297,12 +297,10 @@
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
- <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
- <version>2.0.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
diff --git a/modules/kernel/pom.xml b/modules/kernel/pom.xml
index c7bf084d61..3da9c6489b 100644
--- a/modules/kernel/pom.xml
+++ b/modules/kernel/pom.xml
@@ -134,8 +134,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/transport/mail/pom.xml b/modules/transport/mail/pom.xml
index b5080e1f39..ea6530f981 100644
--- a/modules/transport/mail/pom.xml
+++ b/modules/transport/mail/pom.xml
@@ -45,8 +45,8 @@
<dependencies>
<dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-mail</artifactId>
</dependency>
<dependency>
diff --git a/modules/webapp/pom.xml b/modules/webapp/pom.xml
index 7470980a28..bc56e36f39 100644
--- a/modules/webapp/pom.xml
+++ b/modules/webapp/pom.xml
@@ -241,12 +241,10 @@
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
- <version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
- <version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
diff --git a/pom.xml b/pom.xml
index e0618a2fbf..e508dbcc1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,7 +466,6 @@
<woden.version>1.0M10</woden.version>
<axiom.version>2.0.0-SNAPSHOT</axiom.version>
<xmlschema.version>2.3.0</xmlschema.version>
- <activation.version>2.1.2</activation.version>
<ant.version>1.10.14</ant.version>
<antlr.version>2.7.7</antlr.version>
<aspectj.version>1.9.9.1</aspectj.version>
@@ -526,7 +525,12 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>${activation.version}</version>
+ <version>2.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -746,6 +750,11 @@
<artifactId>jakarta.mail-api</artifactId>
<version>2.1.2</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-mail</artifactId>
+ <version>2.0.2</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
