diff --git a/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java b/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java index 005a900c88..56814c827e 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java @@ -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; } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d9d9941a6a..b0e1fbec8f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -452,15 +452,7 @@ 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" diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index 1119f2c521..eb4968cdf0 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -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") diff --git a/spring-boot-project/spring-boot-test/build.gradle b/spring-boot-project/spring-boot-test/build.gradle index 530a616460..3094feadbd 100644 --- a/spring-boot-project/spring-boot-test/build.gradle +++ b/spring-boot-project/spring-boot-test/build.gradle @@ -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") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/build.gradle index c67dfd4f9c..3544726c57 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/build.gradle @@ -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") } }