Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jakarta-ee-10'

Browse Source
This commit is contained in:
Andy Wilkinson
2022-11-08 12:14:48 +00:00
parent 6940e348a7 b1fcc38338
commit bf1c185377
9 changed files with 42 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java
View File

@@ -96,6 +96,9 @@ public class CheckClasspathForProhibitedDependencies extends DefaultTask {
if (group.equals("org.apache.geronimo.specs")) {
return true;
}
if (group.equals("com.sun.activation")) {
return true;
}
return false;
}

2
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
View File

@@ -43,7 +43,6 @@ dependencies {
optional("com.github.ben-manes.caffeine:caffeine")
optional("com.hazelcast:hazelcast")
optional("com.hazelcast:hazelcast-spring")
optional("com.sun.mail:jakarta.mail")
optional("com.zaxxer:HikariCP")
optional("io.dropwizard.metrics:metrics-jmx")
optional("io.lettuce:lettuce-core")
@@ -100,6 +99,7 @@ dependencies {
optional("org.aspectj:aspectjweaver")
optional("org.cache2k:cache2k-micrometer")
optional("org.cache2k:cache2k-spring")
optional("org.eclipse.angus:angus-mail")
optional("org.eclipse.jetty:jetty-server") {
exclude group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api"
}

2
spring-boot-project/spring-boot-actuator/build.gradle
View File

@@ -19,7 +19,6 @@ dependencies {
optional("com.github.ben-manes.caffeine:caffeine")
optional("com.hazelcast:hazelcast")
optional("com.hazelcast:hazelcast-spring")
optional("com.sun.mail:jakarta.mail")
optional("com.zaxxer:HikariCP")
optional("io.lettuce:lettuce-core")
optional("io.micrometer:micrometer-observation")
@@ -38,6 +37,7 @@ dependencies {
optional("org.aspectj:aspectjweaver")
optional("org.cache2k:cache2k-micrometer")
optional("org.cache2k:cache2k-spring")
optional("org.eclipse.angus:angus-mail")
optional("org.eclipse.jetty:jetty-server") {
exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
}

2
spring-boot-project/spring-boot-autoconfigure/build.gradle
View File

@@ -29,7 +29,6 @@ dependencies {
optional("com.oracle.database.jdbc:ojdbc8")
optional("com.oracle.database.jdbc:ucp")
optional("com.samskivert:jmustache")
optional("com.sun.mail:jakarta.mail")
optional("io.lettuce:lettuce-core")
optional("io.projectreactor.netty:reactor-netty-http")
optional("io.r2dbc:r2dbc-spi")
@@ -65,6 +64,7 @@ dependencies {
optional("org.apache.tomcat:tomcat-jdbc")
optional("org.apiguardian:apiguardian-api")
optional("org.apache.groovy:groovy-templates")
optional("org.eclipse.angus:angus-mail")
optional("com.github.ben-manes.caffeine:caffeine")
optional("com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute")
optional("com.sendgrid:sendgrid-java") {

108
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -14,6 +14,21 @@ bom {
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") {
group("org.apache.activemq") {
modules = [
@@ -255,20 +270,10 @@ bom {
]
}
}
library("Glassfish JAXB", "3.0.2") {
prohibit("[3.1.0-M1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Glassfish JAXB", "4.0.1") {
group("org.glassfish.jaxb") {
modules = [
"codemodel",
"codemodel-annotation-compiler",
"jaxb-jxc",
"jaxb-runtime",
"jaxb-xjc",
"txw2",
"txwc2",
"xsom"
imports = [
"jaxb-bom"
]
}
}
@@ -345,10 +350,7 @@ bom {
]
}
}
library("Hibernate Validator", "7.0.5.Final") {
prohibit("[8.0.0.Alpha1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Hibernate Validator", "8.0.0.Final") {
group("org.hibernate.validator") {
modules = [
"hibernate-validator",
@@ -450,65 +452,42 @@ bom {
]
}
}
library("Jakarta Activation", "2.0.1") {
prohibit("[2.1.0-RC1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
group("com.sun.activation") {
modules = [
"jakarta.activation"
]
}
library("Jakarta Activation", "2.1.0") {
group("jakarta.activation") {
modules = [
"jakarta.activation-api"
]
}
}
library("Jakarta Annotation", "2.0.0") {
prohibit("[2.1.0-B1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Jakarta Annotation", "2.1.1") {
group("jakarta.annotation") {
modules = [
"jakarta.annotation-api"
]
}
}
library("Jakarta JMS", "3.0.0") {
prohibit("[3.1.0,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Jakarta JMS", "3.1.0") {
group("jakarta.jms") {
modules = [
"jakarta.jms-api"
]
}
}
library("Jakarta Json", "2.0.2") {
prohibit("[2.1.0-RC1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Jakarta Json", "2.1.1") {
group("jakarta.json") {
modules = [
"jakarta.json-api"
]
}
}
library("Jakarta Json Bind", "2.0.0") {
prohibit("[3.0.0-RC1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Jakarta Json Bind", "3.0.0") {
group("jakarta.json.bind") {
modules = [
"jakarta.json.bind-api"
]
}
}
library("Jakarta Mail", "2.0.1") {
prohibit("[2.1.0-RC1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Jakarta Mail", "2.1.0") {
group("jakarta.mail") {
modules = [
"jakarta.mail-api"
@@ -522,10 +501,7 @@ bom {
]
}
}
library("Jakarta Persistence", "3.0.0") {
prohibit("[3.1.0-RC1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Jakarta Persistence", "3.1.0") {
group("jakarta.persistence") {
modules = [
"jakarta.persistence-api"
@@ -575,30 +551,21 @@ bom {
]
}
}
library("Jakarta XML Bind", "3.0.1") {
prohibit("[4.0.0-RC1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Jakarta XML Bind", "4.0.0") {
group("jakarta.xml.bind") {
modules = [
"jakarta.xml.bind-api"
]
}
}
library("Jakarta XML SOAP", "2.0.1") {
prohibit("[3.0.0-RC1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Jakarta XML SOAP", "3.0.0") {
group("jakarta.xml.soap") {
modules = [
"jakarta.xml.soap-api"
]
}
}
library("Jakarta XML WS", "3.0.1") {
prohibit("[4.0.0-RC1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Jakarta XML WS", "4.0.0") {
group("jakarta.xml.ws") {
modules = [
"jakarta.xml.ws-api"
@@ -1300,10 +1267,7 @@ bom {
]
}
}
library("SAAJ Impl", "2.0.1") {
prohibit("[3.0.0-M1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("SAAJ Impl", "3.0.0") {
group("com.sun.xml.messaging.saaj") {
modules = [
"saaj-impl"
@@ -1489,13 +1453,6 @@ bom {
]
}
}
library("Sun Mail", "2.0.1") {
group("com.sun.mail") {
modules = [
"jakarta.mail"
]
}
}
library("Thymeleaf", "3.1.0.RC1") {
group("org.thymeleaf") {
modules = [
@@ -1599,10 +1556,7 @@ bom {
]
}
}
library("Yasson", "2.0.4") {
prohibit("[3.0.0-RC1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
library("Yasson", "3.0.0") {
group("org.eclipse") {
modules = [
"yasson"

2
spring-boot-project/spring-boot-starters/spring-boot-starter-mail/build.gradle
View File

@@ -7,5 +7,5 @@ description = "Starter for using Java Mail and Spring Framework's email sending
dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
api("org.springframework:spring-context-support")
api("com.sun.mail:jakarta.mail")
api("org.eclipse.angus:jakarta.mail")
}

3
spring-boot-project/spring-boot-test-autoconfigure/build.gradle
View File

@@ -26,7 +26,8 @@ dependencies {
optional("org.hibernate.orm:hibernate-core")
optional("org.junit.jupiter:junit-jupiter-api")
optional("org.seleniumhq.selenium:htmlunit-driver") {
exclude group: "commons-logging", module: "commons-logging"
exclude(group: "commons-logging", module: "commons-logging")
exclude(group: "com.sun.activation", module: "jakarta.activation")
}
optional("org.seleniumhq.selenium:selenium-api")
optional("org.springframework:spring-orm")

1
spring-boot-project/spring-boot-test/build.gradle
View File

@@ -29,6 +29,7 @@ dependencies {
optional("org.skyscreamer:jsonassert")
optional("org.seleniumhq.selenium:htmlunit-driver") {
exclude(group: "commons-logging", module: "commons-logging")
exclude(group: "com.sun.activation", module: "jakarta.activation")
}
optional("org.seleniumhq.selenium:selenium-api")
optional("org.springframework:spring-test")

1
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/build.gradle
View File

@@ -19,5 +19,6 @@ dependencies {
testImplementation("org.seleniumhq.selenium:selenium-api")
testImplementation("org.seleniumhq.selenium:htmlunit-driver") {
exclude group: "commons-logging", module: "commons-logging"
exclude(group: "com.sun.activation", module: "jakarta.activation")
}
}