diff --git a/samples/sample-all-deactivated/build.gradle.kts b/samples/sample-all-deactivated/build.gradle.kts index f79b10af..c5c781e6 100644 --- a/samples/sample-all-deactivated/build.gradle.kts +++ b/samples/sample-all-deactivated/build.gradle.kts @@ -39,6 +39,8 @@ dependencies { implementation("commons-beanutils:commons-beanutils:1.10.1") implementation("commons-io:commons-io:2.19.0") implementation("commons-logging:commons-logging:1.3.5") + implementation("dk.brics.automaton:automaton:1.11-8") + implementation("dk.brics:automaton:1.12-4") implementation("dom4j:dom4j:1.6.1") implementation("jakarta.activation:jakarta.activation-api:2.1.3") implementation("jakarta.annotation:jakarta.annotation-api:3.0.0") diff --git a/samples/sample-all-deactivated/build.out b/samples/sample-all-deactivated/build.out index 394bdaaa..75a216b5 100644 --- a/samples/sample-all-deactivated/build.out +++ b/samples/sample-all-deactivated/build.out @@ -38,6 +38,8 @@ compileClasspath - Compile classpath for source set 'main'. +--- commons-beanutils:commons-beanutils:1.10.1 FAILED +--- commons-io:commons-io:2.19.0 FAILED +--- commons-logging:commons-logging:1.3.5 FAILED ++--- dk.brics.automaton:automaton:1.11-8 FAILED ++--- dk.brics:automaton:1.12-4 FAILED +--- dom4j:dom4j:1.6.1 FAILED +--- jakarta.activation:jakarta.activation-api:2.1.3 FAILED +--- jakarta.annotation:jakarta.annotation-api:3.0.0 FAILED diff --git a/samples/sample-all/build.gradle.kts b/samples/sample-all/build.gradle.kts index 6331cc3e..c423637d 100644 --- a/samples/sample-all/build.gradle.kts +++ b/samples/sample-all/build.gradle.kts @@ -42,6 +42,8 @@ dependencies { implementation("commons-beanutils:commons-beanutils:1.10.1") implementation("commons-io:commons-io:2.19.0") implementation("commons-logging:commons-logging:1.3.5") + implementation("dk.brics.automaton:automaton:1.11-8") + implementation("dk.brics:automaton:1.12-4") implementation("dom4j:dom4j:1.6.1") implementation("jakarta.activation:jakarta.activation-api:2.1.3") implementation("jakarta.annotation:jakarta.annotation-api:3.0.0") diff --git a/samples/sample-all/build.out b/samples/sample-all/build.out index 8a1f6d28..c4b12386 100644 --- a/samples/sample-all/build.out +++ b/samples/sample-all/build.out @@ -71,6 +71,8 @@ compileClasspath - Compile classpath for source set 'main'. +--- commons-beanutils:commons-beanutils:1.10.1 (*) +--- commons-io:commons-io:2.19.0 +--- commons-logging:commons-logging:1.3.5 -> org.slf4j:jcl-over-slf4j:2.0.17 (*) ++--- dk.brics.automaton:automaton:1.11-8 -> dk.brics:automaton:1.12-4 ++--- dk.brics:automaton:1.12-4 +--- dom4j:dom4j:1.6.1 -> org.dom4j:dom4j:2.1.4 +--- jakarta.activation:jakarta.activation-api:2.1.3 +--- jakarta.annotation:jakarta.annotation-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 38fdb8bf..326a622a 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 @@ -166,6 +166,10 @@ public enum CapabilityDefinition { "commons-io:commons-io", "org.apache.commons:commons-io" ), + DK_BRICS_AUTOMATON(HIGHEST_VERSION, + "dk.brics.automaton:automaton", + "dk.brics:automaton" + ), DOM4J(HIGHEST_VERSION, "dom4j:dom4j", "org.dom4j:dom4j"