From 64738ea708512cbb8e20076bfe7b6c4b4d43efd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Barto=C5=A1?= Date: Tue, 21 Feb 2023 11:21:12 +0100 Subject: [PATCH] Fix issues with JakartaEE Mail dependencies This reverts commit da4644844ed88818c05d777460624403326ab01c --- Quarkus3 branch sync no. 12 (31.3.2023) Resolved conflicts: keycloak/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java - Modified --- pom.xml | 13 ++----------- quarkus/pom.xml | 1 - quarkus/runtime/pom.xml | 6 ------ services/pom.xml | 4 ---- .../email/DefaultEmailSenderProvider.java | 18 +++++++++--------- .../keycloak/testsuite/util/GreenMailRule.java | 2 +- .../org/keycloak/testsuite/util/MailUtils.java | 8 ++++---- .../util/MessageHandlerFactoryImpl.java | 6 +++--- ...dActionUpdateEmailWithVerificationTest.java | 8 ++++---- .../RequiredActionEmailVerificationTest.java | 4 ++-- ...ionUpdateEmailTestWithVerificationTest.java | 8 ++++---- .../testsuite/admin/SMTPConnectionTest.java | 2 +- .../org/keycloak/testsuite/admin/UserTest.java | 2 +- .../broker/AbstractFirstBrokerLoginTest.java | 2 +- ...thenticationSessionFailoverClusterTest.java | 2 +- .../crossdc/ActionTokenCrossDCTest.java | 4 ++-- .../federation/ldap/LDAPNoCacheTest.java | 4 ++-- .../federation/storage/UserStorageTest.java | 2 +- .../testsuite/forms/BrowserButtonsTest.java | 4 ++-- .../testsuite/forms/BruteForceTest.java | 2 +- .../keycloak/testsuite/forms/RegisterTest.java | 2 +- .../ResetCredentialsAlternativeFlowsTest.java | 2 +- .../testsuite/forms/ResetPasswordTest.java | 4 ++-- .../org/keycloak/testsuite/i18n/EmailTest.java | 4 ++-- .../keycloak/testsuite/util/MailAssert.java | 8 ++++---- .../keycloak/testsuite/util/MailServer.java | 8 ++++---- .../keycloak/testsuite/util/SslMailServer.java | 2 +- testsuite/utils/pom.xml | 9 --------- .../org/keycloak/testsuite/MailServer.java | 6 +++--- 29 files changed, 59 insertions(+), 88 deletions(-) diff --git a/pom.xml b/pom.xml index b7efbb68ce0..60b799f5906 100644 --- a/pom.xml +++ b/pom.xml @@ -88,10 +88,8 @@ ${jackson.version} + 2.0.1 3.1.0 - 2.1.1 - 1.6.5 - 6.0.0 3.1.0 4.0.0 @@ -176,8 +174,7 @@ 21.5.0.0 - - 1.6.12 + 2.0.0-alpha-3 2.2 2.10 4.13.2 @@ -427,12 +424,6 @@ - - com.sun.mail jakarta.mail diff --git a/quarkus/pom.xml b/quarkus/pom.xml index f1f402a2d9a..947cce85275 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -46,7 +46,6 @@ 2.0.1.Final 1.4.1.SP1 1.8.3 - 2.0.1 UTF-8 3.8.1 diff --git a/quarkus/runtime/pom.xml b/quarkus/runtime/pom.xml index fdd097a1645..aadcaefb4c0 100644 --- a/quarkus/runtime/pom.xml +++ b/quarkus/runtime/pom.xml @@ -572,15 +572,9 @@ - com.sun.mail jakarta.mail - ${com.sun.jakarta.mail.version} org.apache.santuario diff --git a/services/pom.xml b/services/pom.xml index 17c1060f57e..75141773f27 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -55,10 +55,6 @@ freemarker provided - com.sun.mail jakarta.mail diff --git a/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java b/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java index 6b848971cac..2bbf006e7da 100644 --- a/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java +++ b/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java @@ -26,15 +26,15 @@ import org.keycloak.truststore.HostnameVerificationPolicy; import org.keycloak.truststore.JSSETruststoreConfigurator; import org.keycloak.vault.VaultStringSecret; -import javax.mail.Address; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.Address; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMultipart; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import java.io.UnsupportedEncodingException; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java index efc82f3efaa..64418a11391 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java @@ -22,7 +22,7 @@ import com.icegreen.greenmail.util.ServerSetup; import org.junit.rules.ExternalResource; import org.keycloak.models.RealmModel; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.lang.Thread.UncaughtExceptionHandler; import java.net.SocketException; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java index 22ff33a4cf6..c4f3be70582 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.util; -import javax.mail.Address; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.internet.MimeMessage; import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java index 2e5bc9f9eed..25c3a499c66 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java @@ -5,9 +5,9 @@ import org.subethamail.smtp.MessageHandler; import org.subethamail.smtp.MessageHandlerFactory; import org.subethamail.smtp.RejectException; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.internet.MimeMessage; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java index 3660cc05717..01b4e126667 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java @@ -20,10 +20,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.IOException; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.jboss.arquillian.graphene.page.Page; import org.junit.Assert; import org.junit.Rule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java index f7d2ec3d6a9..55f88f55b6c 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java @@ -61,8 +61,8 @@ import org.keycloak.testsuite.util.UserActionTokenBuilder; import org.keycloak.testsuite.util.MailUtils; import java.io.Closeable; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.io.IOException; import java.net.URISyntaxException; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java index 49271c62480..a4dd2135399 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java @@ -21,10 +21,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.IOException; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.jboss.arquillian.graphene.page.Page; import org.junit.Rule; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java index f0b33d8f0c3..814159ffb71 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java @@ -27,7 +27,7 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.UserBuilder; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java index fdff2060b98..cc89dfaf483 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java @@ -88,7 +88,7 @@ import org.keycloak.util.JsonSerialization; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.NotFoundException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java index 008e7f04f60..c6d7a7c0aea 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java @@ -2,7 +2,7 @@ package org.keycloak.testsuite.broker; import java.util.List; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.core.Response; import com.google.common.collect.ImmutableMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java index 2dd2508c1fd..6c9416fa5ab 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.util.WaitUtils.pause; import java.io.IOException; -import javax.mail.MessagingException; +import jakarta.mail.MessagingException; import org.jboss.arquillian.graphene.page.Page; import org.junit.Test; import org.keycloak.services.managers.AuthenticationSessionManager; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/ActionTokenCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/ActionTokenCrossDCTest.java index 0d02fab58cd..d03ab5ef71b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/ActionTokenCrossDCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/ActionTokenCrossDCTest.java @@ -33,8 +33,8 @@ import org.keycloak.testsuite.util.MailUtils; import java.io.IOException; import java.util.LinkedList; import java.util.List; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.core.Response; import org.jboss.arquillian.graphene.page.Page; import org.junit.Assert; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java index 72472cfb2ec..4457e46f844 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.jboss.arquillian.graphene.page.Page; import org.junit.ClassRule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java index 7985e11fd10..5af546a56f3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java @@ -52,7 +52,7 @@ import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.TestCleanup; import org.openqa.selenium.Cookie; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; import java.io.File; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java index 8f6169f26eb..50709befb2a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java @@ -20,8 +20,8 @@ package org.keycloak.testsuite.forms; import static org.junit.Assert.assertEquals; import java.io.IOException; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.jboss.arquillian.graphene.page.Page; import org.junit.Before; import org.junit.Rule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java index e6e9c4f6271..cc96529ff4f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java @@ -49,7 +49,7 @@ import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.RealmRepUtil; import org.keycloak.testsuite.util.UserBuilder; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.net.MalformedURLException; import java.util.Calendar; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java index 842055f7339..18b087357b7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java @@ -51,7 +51,7 @@ import org.keycloak.testsuite.util.MailUtils; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.UserBuilder; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.core.Response; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java index bb29150dce4..4fa1eb4929a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java @@ -48,7 +48,7 @@ import org.keycloak.testsuite.pages.PasswordPage; import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.util.*; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.util.Arrays; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java index 299f0933946..c02d9ace03c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java @@ -63,8 +63,8 @@ import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.testsuite.util.UserActionTokenBuilder; import org.keycloak.testsuite.util.UserBuilder; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.io.Closeable; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java index e65da224832..993df9c4872 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java @@ -20,8 +20,8 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.io.IOException; import java.util.Arrays; import org.jboss.arquillian.graphene.page.Page; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java index e2bb9678561..c40bd287104 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java @@ -19,10 +19,10 @@ package org.keycloak.testsuite.util; import org.jboss.logging.Logger; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMessage.RecipientType; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage.RecipientType; +import jakarta.mail.internet.MimeMultipart; import java.io.IOException; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java index c3f6c22a3e1..362a5224055 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java @@ -21,10 +21,10 @@ import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.ServerSetup; import org.jboss.logging.Logger; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMessage.RecipientType; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage.RecipientType; +import jakarta.mail.internet.MimeMultipart; import java.io.IOException; import java.lang.Thread.UncaughtExceptionHandler; import java.net.SocketException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java index cfaf5e26bc6..fd457b85742 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java @@ -20,7 +20,7 @@ package org.keycloak.testsuite.util; import org.jboss.logging.Logger; import org.subethamail.smtp.server.SMTPServer; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml index 3d42e5e3f16..8dd6f140a93 100755 --- a/testsuite/utils/pom.xml +++ b/testsuite/utils/pom.xml @@ -35,10 +35,6 @@ - com.sun.mail jakarta.mail @@ -290,11 +286,6 @@ ${mssql-jdbc.version} - - commons-io - commons-io - ${commons-io.version} - diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java index 1c8fe27a555..73cdd625015 100755 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java @@ -20,9 +20,9 @@ package org.keycloak.testsuite; import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.ServerSetup; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMessage.RecipientType; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage.RecipientType; +import jakarta.mail.internet.MimeMultipart; public class MailServer {