You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/05/04 08:47:41 UTC
[sling-org-apache-sling-commons-messaging-mail] branch jakarta
updated: SLING-10017 Switch to Jakarta Mail and Activation APIs
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch jakarta
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-messaging-mail.git
The following commit(s) were added to refs/heads/jakarta by this push:
new 768172f SLING-10017 Switch to Jakarta Mail and Activation APIs
768172f is described below
commit 768172f73d108ad2b23f4c6c1561efc3d3342a36
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue May 4 10:32:39 2021 +0200
SLING-10017 Switch to Jakarta Mail and Activation APIs
* Update Jakarta Mail and Activation to 2.0.1
* Add com.sun.activation:jakarta.activation (required?)
* Use org.apache.servicemix.specs.activation-api-2.0.1 SNAPSHOT (SM-4760)
* Remove obsolete Commons Email dependency
* Update to GreenMail 2.0.0-alpha-1
---
pom.xml | 25 +++++++++++-----------
.../messaging/mail/it/tests/MailTestSupport.java | 3 ++-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8ba7714..a5ac055 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,20 +131,25 @@
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>2.0.0</version>
- <scope>provided</scope>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activation-api-2.0.1</artifactId>
+ <version>2.0.1_1-SNAPSHOT</version>
</dependency>
<!-- Sun -->
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>2.0.1</version>
<scope>provided</scope>
</dependency>
<!-- OSGi -->
@@ -186,12 +191,6 @@
<version>3.9</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>1.5</version>
- <scope>test</scope>
- </dependency>
<!-- Apache Felix -->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -264,7 +263,7 @@
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-alpha-1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/MailTestSupport.java b/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/MailTestSupport.java
index e6ee6b7..f76c858 100644
--- a/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/MailTestSupport.java
+++ b/src/test/java/org/apache/sling/commons/messaging/mail/it/tests/MailTestSupport.java
@@ -65,8 +65,9 @@ public abstract class MailTestSupport extends TestSupport {
// Sling Commons Messaging Mail
testBundle("bundle.filename"),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.messaging").versionAsInProject(),
- mavenBundle().groupId("jakarta.activation").artifactId("jakarta.activation-api").versionAsInProject(),
+ mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.activation-api-2.0.1").versionAsInProject(),
mavenBundle().groupId("jakarta.mail").artifactId("jakarta.mail-api").versionAsInProject(),
+ mavenBundle().groupId("com.sun.activation").artifactId("jakarta.activation").versionAsInProject(),
mavenBundle().groupId("com.sun.mail").artifactId("jakarta.mail").versionAsInProject(),
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").versionAsInProject(),
scr(),