mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Upgrade to Jakarta Mail 2.1 and switch to Eclipse Angus RI
Closes gh-33059 Closes gh-33050
This commit is contained in:
parent
6940e348a7
commit
3a2703e8f6
@ -43,7 +43,6 @@ dependencies {
|
|||||||
optional("com.github.ben-manes.caffeine:caffeine")
|
optional("com.github.ben-manes.caffeine:caffeine")
|
||||||
optional("com.hazelcast:hazelcast")
|
optional("com.hazelcast:hazelcast")
|
||||||
optional("com.hazelcast:hazelcast-spring")
|
optional("com.hazelcast:hazelcast-spring")
|
||||||
optional("com.sun.mail:jakarta.mail")
|
|
||||||
optional("com.zaxxer:HikariCP")
|
optional("com.zaxxer:HikariCP")
|
||||||
optional("io.dropwizard.metrics:metrics-jmx")
|
optional("io.dropwizard.metrics:metrics-jmx")
|
||||||
optional("io.lettuce:lettuce-core")
|
optional("io.lettuce:lettuce-core")
|
||||||
@ -100,6 +99,7 @@ dependencies {
|
|||||||
optional("org.aspectj:aspectjweaver")
|
optional("org.aspectj:aspectjweaver")
|
||||||
optional("org.cache2k:cache2k-micrometer")
|
optional("org.cache2k:cache2k-micrometer")
|
||||||
optional("org.cache2k:cache2k-spring")
|
optional("org.cache2k:cache2k-spring")
|
||||||
|
optional("org.eclipse.angus:angus-mail")
|
||||||
optional("org.eclipse.jetty:jetty-server") {
|
optional("org.eclipse.jetty:jetty-server") {
|
||||||
exclude group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api"
|
exclude group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api"
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,6 @@ dependencies {
|
|||||||
optional("com.github.ben-manes.caffeine:caffeine")
|
optional("com.github.ben-manes.caffeine:caffeine")
|
||||||
optional("com.hazelcast:hazelcast")
|
optional("com.hazelcast:hazelcast")
|
||||||
optional("com.hazelcast:hazelcast-spring")
|
optional("com.hazelcast:hazelcast-spring")
|
||||||
optional("com.sun.mail:jakarta.mail")
|
|
||||||
optional("com.zaxxer:HikariCP")
|
optional("com.zaxxer:HikariCP")
|
||||||
optional("io.lettuce:lettuce-core")
|
optional("io.lettuce:lettuce-core")
|
||||||
optional("io.micrometer:micrometer-observation")
|
optional("io.micrometer:micrometer-observation")
|
||||||
@ -38,6 +37,7 @@ dependencies {
|
|||||||
optional("org.aspectj:aspectjweaver")
|
optional("org.aspectj:aspectjweaver")
|
||||||
optional("org.cache2k:cache2k-micrometer")
|
optional("org.cache2k:cache2k-micrometer")
|
||||||
optional("org.cache2k:cache2k-spring")
|
optional("org.cache2k:cache2k-spring")
|
||||||
|
optional("org.eclipse.angus:angus-mail")
|
||||||
optional("org.eclipse.jetty:jetty-server") {
|
optional("org.eclipse.jetty:jetty-server") {
|
||||||
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,6 @@ dependencies {
|
|||||||
optional("com.oracle.database.jdbc:ojdbc8")
|
optional("com.oracle.database.jdbc:ojdbc8")
|
||||||
optional("com.oracle.database.jdbc:ucp")
|
optional("com.oracle.database.jdbc:ucp")
|
||||||
optional("com.samskivert:jmustache")
|
optional("com.samskivert:jmustache")
|
||||||
optional("com.sun.mail:jakarta.mail")
|
|
||||||
optional("io.lettuce:lettuce-core")
|
optional("io.lettuce:lettuce-core")
|
||||||
optional("io.projectreactor.netty:reactor-netty-http")
|
optional("io.projectreactor.netty:reactor-netty-http")
|
||||||
optional("io.r2dbc:r2dbc-spi")
|
optional("io.r2dbc:r2dbc-spi")
|
||||||
@ -65,6 +64,7 @@ dependencies {
|
|||||||
optional("org.apache.tomcat:tomcat-jdbc")
|
optional("org.apache.tomcat:tomcat-jdbc")
|
||||||
optional("org.apiguardian:apiguardian-api")
|
optional("org.apiguardian:apiguardian-api")
|
||||||
optional("org.apache.groovy:groovy-templates")
|
optional("org.apache.groovy:groovy-templates")
|
||||||
|
optional("org.eclipse.angus:angus-mail")
|
||||||
optional("com.github.ben-manes.caffeine:caffeine")
|
optional("com.github.ben-manes.caffeine:caffeine")
|
||||||
optional("com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute")
|
optional("com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute")
|
||||||
optional("com.sendgrid:sendgrid-java") {
|
optional("com.sendgrid:sendgrid-java") {
|
||||||
|
@ -14,6 +14,21 @@ bom {
|
|||||||
issueLabels = ["type: dependency-upgrade"]
|
issueLabels = ["type: dependency-upgrade"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
library("Angus Mail", "1.0.0") {
|
||||||
|
group("org.eclipse.angus") {
|
||||||
|
modules = [
|
||||||
|
"angus-core",
|
||||||
|
"angus-mail",
|
||||||
|
"angus-dsn",
|
||||||
|
"angus-gimap",
|
||||||
|
"angus-imap",
|
||||||
|
"jakarta.mail",
|
||||||
|
"logging-mailhandler",
|
||||||
|
"pop3",
|
||||||
|
"smtp"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
library("Artemis", "2.26.0") {
|
library("Artemis", "2.26.0") {
|
||||||
group("org.apache.activemq") {
|
group("org.apache.activemq") {
|
||||||
modules = [
|
modules = [
|
||||||
@ -505,10 +520,7 @@ bom {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
library("Jakarta Mail", "2.0.1") {
|
library("Jakarta Mail", "2.1.0") {
|
||||||
prohibit("[2.1.0-RC1,)") {
|
|
||||||
because "it exceeds our Jakarta EE 9 baseline"
|
|
||||||
}
|
|
||||||
group("jakarta.mail") {
|
group("jakarta.mail") {
|
||||||
modules = [
|
modules = [
|
||||||
"jakarta.mail-api"
|
"jakarta.mail-api"
|
||||||
@ -1489,13 +1501,6 @@ bom {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
library("Sun Mail", "2.0.1") {
|
|
||||||
group("com.sun.mail") {
|
|
||||||
modules = [
|
|
||||||
"jakarta.mail"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
library("Thymeleaf", "3.1.0.RC1") {
|
library("Thymeleaf", "3.1.0.RC1") {
|
||||||
group("org.thymeleaf") {
|
group("org.thymeleaf") {
|
||||||
modules = [
|
modules = [
|
||||||
|
@ -7,5 +7,5 @@ description = "Starter for using Java Mail and Spring Framework's email sending
|
|||||||
dependencies {
|
dependencies {
|
||||||
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
|
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
|
||||||
api("org.springframework:spring-context-support")
|
api("org.springframework:spring-context-support")
|
||||||
api("com.sun.mail:jakarta.mail")
|
api("org.eclipse.angus:jakarta.mail")
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user