Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Jakarta Activation 2.1.0

Browse Source 
Closes gh-33045
This commit is contained in:
Andy Wilkinson 2022-11-08 09:47:27 +00:00
parent 524d0599b1
commit b357239861
5 changed files with 8 additions and 10 deletions
Show Stats 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")) { if (group.equals("org.apache.geronimo.specs")) {
return true; return true;
} }
if (group.equals("com.sun.activation")) {
return true;
}
return false; return false;
} }

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

@ -452,15 +452,7 @@ bom {
] ]
} }
} }
library("Jakarta Activation", "2.0.1") { library("Jakarta Activation", "2.1.0") {
prohibit("[2.1.0-RC1,)") {
because "it exceeds our Jakarta EE 9 baseline"
}
group("com.sun.activation") {
modules = [
"jakarta.activation"
]
}
group("jakarta.activation") { group("jakarta.activation") {
modules = [ modules = [
"jakarta.activation-api" "jakarta.activation-api"

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.hibernate.orm:hibernate-core")
optional("org.junit.jupiter:junit-jupiter-api") optional("org.junit.jupiter:junit-jupiter-api")
optional("org.seleniumhq.selenium:htmlunit-driver") { 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.seleniumhq.selenium:selenium-api")
optional("org.springframework:spring-orm") 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.skyscreamer:jsonassert")
optional("org.seleniumhq.selenium:htmlunit-driver") { 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.seleniumhq.selenium:selenium-api")
optional("org.springframework:spring-test") 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:selenium-api")
testImplementation("org.seleniumhq.selenium:htmlunit-driver") { testImplementation("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")
} }
} }