From 8cfd0d2749e0190b97dbfbf1c006b5c3a8eebb44 Mon Sep 17 00:00:00 2001 From: leccyril Date: Mon, 9 May 2022 12:00:04 +0400 Subject: [PATCH 1/3] fix import wrong version of com.sun.mail com.sun.mail became jakarta mail since 2019 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 862e2444f..1127b78c7 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ dependencies { "commons-codec:commons-codec:$commonsCodecVersion", "org.apache.commons:commons-lang3:$commonsLangVersion", "org.apache.commons:commons-collections4:$commonsCollectionsVersion", - 'com.sun.mail:javax.mail:1.6.2' + 'com.sun.mail:jakarta.mail:2.0.1' // optional timezone caching.. implementation 'javax.cache:cache-api:1.1.1', optional From d2d36325089c4d9456d5e77cb6b9a7cb87d67c9e Mon Sep 17 00:00:00 2001 From: "cyril.leclerc" Date: Mon, 9 May 2022 12:56:38 +0400 Subject: [PATCH 2/3] Fix import of old lib com.sun.mail => jakarta.mail, causes conflicts for example with greenMail server. --- src/main/java/net/fortuna/ical4j/model/parameter/Email.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Email.java b/src/main/java/net/fortuna/ical4j/model/parameter/Email.java index 19288ab03..b045e91d9 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Email.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Email.java @@ -1,14 +1,13 @@ package net.fortuna.ical4j.model.parameter; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; import net.fortuna.ical4j.model.Content; import net.fortuna.ical4j.model.Encodable; import net.fortuna.ical4j.model.Parameter; import net.fortuna.ical4j.model.ParameterFactory; import net.fortuna.ical4j.util.CompatibilityHints; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; - import static net.fortuna.ical4j.util.CompatibilityHints.KEY_RELAXED_PARSING; /** From bfd4266df85b62ef662039fbedb4ee13a14617c0 Mon Sep 17 00:00:00 2001 From: "cyril.leclerc" Date: Mon, 9 May 2022 12:56:38 +0400 Subject: [PATCH 3/3] Fix import of old lib com.sun.mail => jakarta.mail, causes conflicts for example with greenMail server. --- .../groovy/net/fortuna/ical4j/model/parameter/EmailTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/net/fortuna/ical4j/model/parameter/EmailTest.groovy b/src/test/groovy/net/fortuna/ical4j/model/parameter/EmailTest.groovy index 81b0d23f7..cb3cbd41e 100644 --- a/src/test/groovy/net/fortuna/ical4j/model/parameter/EmailTest.groovy +++ b/src/test/groovy/net/fortuna/ical4j/model/parameter/EmailTest.groovy @@ -3,8 +3,8 @@ package net.fortuna.ical4j.model.parameter import net.fortuna.ical4j.AbstractBuilderTest import net.fortuna.ical4j.model.Calendar import net.fortuna.ical4j.util.CompatibilityHints +import jakarta.mail.internet.AddressException; -import javax.mail.internet.AddressException /** * Created by fortuna on 6/09/15.