diff --git a/samples/sample-all-deactivated/build.gradle.kts b/samples/sample-all-deactivated/build.gradle.kts index 78de452c..80d02998 100644 --- a/samples/sample-all-deactivated/build.gradle.kts +++ b/samples/sample-all-deactivated/build.gradle.kts @@ -66,7 +66,6 @@ dependencies { implementation("javax.annotation:javax.annotation-api:1.3.2") implementation("javax.annotation:jsr250-api:1.0") implementation("javax.ejb:ejb-api:3.0") - implementation("javax.ejb:ejb:2.1") implementation("javax.ejb:javax.ejb-api:3.2.2") implementation("javax.el:el-api:2.2") implementation("javax.el:javax.el-api:3.0.0") diff --git a/samples/sample-all-deactivated/build.out b/samples/sample-all-deactivated/build.out index fede795c..575d2871 100644 --- a/samples/sample-all-deactivated/build.out +++ b/samples/sample-all-deactivated/build.out @@ -64,7 +64,6 @@ compileClasspath - Compile classpath for source set 'main'. +--- javax.annotation:javax.annotation-api:1.3.2 FAILED +--- javax.annotation:jsr250-api:1.0 FAILED +--- javax.ejb:ejb-api:3.0 FAILED -+--- javax.ejb:ejb:2.1 FAILED +--- javax.ejb:javax.ejb-api:3.2.2 FAILED +--- javax.el:el-api:2.2 FAILED +--- javax.el:javax.el-api:3.0.0 FAILED diff --git a/samples/sample-all/build.gradle.kts b/samples/sample-all/build.gradle.kts index 26f136af..eb39a302 100644 --- a/samples/sample-all/build.gradle.kts +++ b/samples/sample-all/build.gradle.kts @@ -69,7 +69,6 @@ dependencies { implementation("javax.annotation:javax.annotation-api:1.3.2") implementation("javax.annotation:jsr250-api:1.0") implementation("javax.ejb:ejb-api:3.0") - implementation("javax.ejb:ejb:2.1") implementation("javax.ejb:javax.ejb-api:3.2.2") implementation("javax.el:el-api:2.2") implementation("javax.el:javax.el-api:3.0.0") diff --git a/samples/sample-all/build.out b/samples/sample-all/build.out index 3b6f6f7d..0e5142a7 100644 --- a/samples/sample-all/build.out +++ b/samples/sample-all/build.out @@ -104,7 +104,6 @@ compileClasspath - Compile classpath for source set 'main'. +--- javax.annotation:jsr250-api:1.0 -> javax.annotation:javax.annotation-api:1.3.2 +--- javax.ejb:ejb-api:3.0 -> javax.ejb:javax.ejb-api:3.2.2 | \--- javax.transaction:javax.transaction-api:1.3 -+--- javax.ejb:ejb:2.1 -> javax.ejb:javax.ejb-api:3.2.2 (*) +--- javax.ejb:javax.ejb-api:3.2.2 (*) +--- javax.el:el-api:2.2 -> javax.el:javax.el-api:3.0.0 +--- javax.el:javax.el-api:3.0.0 diff --git a/src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java b/src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java index 5ce86ce8..94bb482a 100644 --- a/src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java +++ b/src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java @@ -337,7 +337,6 @@ public enum CapabilityDefinition { "org.apache.tomcat:tomcat-annotations-api" ), JAVAX_EJB_API(HIGHEST_VERSION, JavaxEjbApiRule.class, - "javax.ejb:ejb", "jakarta.ejb:jakarta.ejb-api", "javax.ejb:javax.ejb-api", "javax.ejb:ejb-api"