From 25c04d488d0414ebc42831dd02b85247a2bb5c61 Mon Sep 17 00:00:00 2001 From: d036670 Date: Tue, 21 Nov 2023 09:44:17 +0100 Subject: [PATCH] refactor: move jakarta mail dependency to spring boot mail With upgrade to spring boot 3 wont work anymore but we consume a different library TODO, move imports import javax.mail.* to jakarta.mail.* e.g. import javax.mail.internet.InternetAddress -> import jakarta.mail.internet.InternetAddress --- dependencies.gradle | 2 +- server/build.gradle | 2 +- uaa/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index d855f5266b7..2bd3dcb121a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -55,7 +55,6 @@ libraries.hsqldb = "org.hsqldb:hsqldb" libraries.jacksonAnnotations = "com.fasterxml.jackson.core:jackson-annotations" libraries.jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind" libraries.jacksonDataformatYaml = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml" -libraries.javaxMail = "com.sun.mail:jakarta.mail" libraries.javaxServlet = "javax.servlet:jstl" libraries.javaxValidationApi = "javax.validation:validation-api" libraries.javaxXmlBindApi = "javax.xml.bind:jaxb-api" @@ -87,6 +86,7 @@ libraries.springBootStarterLog4j2 = "org.springframework.boot:spring-boot-starte libraries.springBootStarterTest = "org.springframework.boot:spring-boot-starter-test" libraries.springBootStarterTomcat = "org.springframework.boot:spring-boot-starter-tomcat" libraries.springBootStarterWeb = "org.springframework.boot:spring-boot-starter-web" +libraries.springBootStarterMail = "org.springframework.boot:spring-boot-starter-mail" libraries.springContext = "org.springframework:spring-context" libraries.springContextSupport = "org.springframework:spring-context-support" libraries.springJdbc = "org.springframework:spring-jdbc" diff --git a/server/build.gradle b/server/build.gradle index b1c56e3c947..0427e87dccc 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -8,7 +8,6 @@ dependencies { implementation(libraries.tomcatJdbc) providedCompile(libraries.tomcatEmbed) - implementation(libraries.javaxMail) implementation(libraries.jacksonDatabind) implementation(libraries.jsonPath) { @@ -24,6 +23,7 @@ dependencies { implementation(libraries.springSecurityCore) implementation(libraries.springSecurityJwt) implementation(libraries.springSecurityWeb) + implementation(libraries.springBootStarterMail) implementation(libraries.spingSamlEsapiDependencyVersion) { transitive = false } diff --git a/uaa/build.gradle b/uaa/build.gradle index 0b20bad08a1..2c937febf2f 100644 --- a/uaa/build.gradle +++ b/uaa/build.gradle @@ -91,10 +91,10 @@ dependencies { testImplementation(libraries.springSecurityLdap) testImplementation(libraries.springSecuritySaml) testImplementation(libraries.springSecurityTest) + testImplementation(libraries.springBootStarterMail) testImplementation(libraries.mockito) testImplementation(libraries.tomcatJdbc) testImplementation(libraries.springRestdocs) - testImplementation(libraries.javaxMail) testImplementation(libraries.greenmail) }