diff --git a/samples/sample-all-deactivated/build.gradle.kts b/samples/sample-all-deactivated/build.gradle.kts index 78de452c..7b64b5c7 100644 --- a/samples/sample-all-deactivated/build.gradle.kts +++ b/samples/sample-all-deactivated/build.gradle.kts @@ -251,8 +251,8 @@ dependencies { implementation("stax:stax-api:1.0.1") implementation("velocity:velocity:1.4") implementation("woodstox:wstx-asl:2.9.3") + implementation("woodstox:wstx-lgpl:3.2.7") - implementation("com.google.collections:google-collections:1.0") // moved down: https://github.com/gradle/gradle/issues/22326 - - // implementation("woodstox:wstx-lgpl:3.2.7") - has no POM file + // moved down: https://github.com/gradle/gradle/issues/22326 + implementation("com.google.collections:google-collections:1.0") } diff --git a/samples/sample-all-deactivated/build.out b/samples/sample-all-deactivated/build.out index fede795c..540e8d54 100644 --- a/samples/sample-all-deactivated/build.out +++ b/samples/sample-all-deactivated/build.out @@ -249,6 +249,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- stax:stax-api:1.0.1 FAILED +--- velocity:velocity:1.4 FAILED +--- woodstox:wstx-asl:2.9.3 FAILED ++--- woodstox:wstx-lgpl:3.2.7 FAILED \--- com.google.collections:google-collections:1.0 FAILED A web-based, searchable dependency report is available by adding the --scan option. diff --git a/samples/sample-all/build.gradle.kts b/samples/sample-all/build.gradle.kts index 26f136af..47e4be1f 100644 --- a/samples/sample-all/build.gradle.kts +++ b/samples/sample-all/build.gradle.kts @@ -254,10 +254,10 @@ dependencies { implementation("stax:stax-api:1.0.1") implementation("velocity:velocity:1.4") implementation("woodstox:wstx-asl:2.9.3") + implementation("woodstox:wstx-lgpl:3.2.7") - implementation("com.google.collections:google-collections:1.0") // moved down: https://github.com/gradle/gradle/issues/22326 - - // implementation("woodstox:wstx-lgpl:3.2.7") - has no POM file + // moved down: https://github.com/gradle/gradle/issues/22326 + implementation("com.google.collections:google-collections:1.0") } jvmDependencyConflicts { diff --git a/samples/sample-all/build.out b/samples/sample-all/build.out index 3b6f6f7d..324cec14 100644 --- a/samples/sample-all/build.out +++ b/samples/sample-all/build.out @@ -354,6 +354,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- stax:stax-api:1.0.1 +--- velocity:velocity:1.4 -> org.apache.velocity:velocity-engine-core:2.3 (*) +--- woodstox:wstx-asl:2.9.3 -> org.codehaus.woodstox:woodstox-core-asl:4.4.1 (*) ++--- woodstox:wstx-lgpl:3.2.7 -> org.codehaus.woodstox:woodstox-core-asl:4.4.1 (*) \--- com.google.collections:google-collections:1.0 -> com.google.guava:guava:33.0.0-jre (*) (c) - A dependency constraint, not a dependency. The dependency affected by the constraint occurs elsewhere in the tree. 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..98871efa 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 @@ -274,7 +274,8 @@ public enum CapabilityDefinition { "org.codehaus.woodstox:woodstox-core-lgpl", "org.codehaus.woodstox:wstx-asl", "org.codehaus.woodstox:wstx-lgpl", - "woodstox:wstx-asl" + "woodstox:wstx-asl", + "woodstox:wstx-lgpl" ), JAKARTA_ACTIVATION_API(HIGHEST_VERSION, JakartaActivationApiRule.class, "jakarta.activation:jakarta.activation-api",