Skip to content

Commit 0d9276f

Browse files
committed
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.
1 parent dee7a85 commit 0d9276f

File tree

6 files changed

+20
-10
lines changed

6 files changed

+20
-10
lines changed

modules/adb/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@
8888
<artifactId>jakarta.mail-api</artifactId>
8989
<scope>test</scope>
9090
</dependency>
91+
<dependency>
92+
<groupId>org.eclipse.angus</groupId>
93+
<artifactId>angus-activation</artifactId>
94+
<scope>test</scope>
95+
</dependency>
9196
</dependencies>
9297

9398
<build>

modules/distribution/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,10 @@
297297
<dependency>
298298
<groupId>org.eclipse.angus</groupId>
299299
<artifactId>angus-activation</artifactId>
300-
<version>2.0.1</version>
301300
</dependency>
302301
<dependency>
303302
<groupId>org.eclipse.angus</groupId>
304303
<artifactId>angus-mail</artifactId>
305-
<version>2.0.2</version>
306304
</dependency>
307305
<dependency>
308306
<groupId>com.fasterxml.woodstox</groupId>

modules/kernel/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
<scope>test</scope>
135135
</dependency>
136136
<dependency>
137-
<groupId>jakarta.mail</groupId>
138-
<artifactId>jakarta.mail-api</artifactId>
137+
<groupId>org.eclipse.angus</groupId>
138+
<artifactId>angus-mail</artifactId>
139139
<scope>test</scope>
140140
</dependency>
141141
<dependency>

modules/transport/mail/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545

4646
<dependencies>
4747
<dependency>
48-
<groupId>jakarta.mail</groupId>
49-
<artifactId>jakarta.mail-api</artifactId>
48+
<groupId>org.eclipse.angus</groupId>
49+
<artifactId>angus-mail</artifactId>
5050
</dependency>
5151

5252
<dependency>

modules/webapp/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,10 @@
241241
<dependency>
242242
<groupId>org.eclipse.angus</groupId>
243243
<artifactId>angus-mail</artifactId>
244-
<version>2.0.2</version>
245244
</dependency>
246245
<dependency>
247246
<groupId>org.eclipse.angus</groupId>
248247
<artifactId>angus-activation</artifactId>
249-
<version>2.0.1</version>
250248
</dependency>
251249
<dependency>
252250
<groupId>com.fasterxml.woodstox</groupId>

pom.xml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@
466466
<woden.version>1.0M10</woden.version>
467467
<axiom.version>2.0.0-SNAPSHOT</axiom.version>
468468
<xmlschema.version>2.3.0</xmlschema.version>
469-
<activation.version>2.1.2</activation.version>
470469
<ant.version>1.10.14</ant.version>
471470
<antlr.version>2.7.7</antlr.version>
472471
<aspectj.version>1.9.9.1</aspectj.version>
@@ -526,7 +525,12 @@
526525
<dependency>
527526
<groupId>jakarta.activation</groupId>
528527
<artifactId>jakarta.activation-api</artifactId>
529-
<version>${activation.version}</version>
528+
<version>2.1.2</version>
529+
</dependency>
530+
<dependency>
531+
<groupId>org.eclipse.angus</groupId>
532+
<artifactId>angus-activation</artifactId>
533+
<version>2.0.1</version>
530534
</dependency>
531535
<dependency>
532536
<groupId>org.glassfish.jaxb</groupId>
@@ -746,6 +750,11 @@
746750
<artifactId>jakarta.mail-api</artifactId>
747751
<version>2.1.2</version>
748752
</dependency>
753+
<dependency>
754+
<groupId>org.eclipse.angus</groupId>
755+
<artifactId>angus-mail</artifactId>
756+
<version>2.0.2</version>
757+
</dependency>
749758
<dependency>
750759
<groupId>org.apache.geronimo.specs</groupId>
751760
<artifactId>geronimo-annotation_1.0_spec</artifactId>

0 commit comments

Comments
 (0)