Upgrade to Jakarta Activation 2.1.0

Closes gh-33045
pull/33080/head
Andy Wilkinson 2 years ago
parent 524d0599b1
commit b357239861

@ -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;
} }

@ -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"

@ -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")

@ -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")

@ -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")
} }
} }

Loading…
Cancel
Save