diff --git a/samples/sample-all-deactivated/build.gradle.kts b/samples/sample-all-deactivated/build.gradle.kts index 6f1ed818..1c719caf 100644 --- a/samples/sample-all-deactivated/build.gradle.kts +++ b/samples/sample-all-deactivated/build.gradle.kts @@ -10,6 +10,7 @@ dependencies { implementation("cglib:cglib-nodep:3.3.0") implementation("cglib:cglib:3.3.0") implementation("ch.qos.logback:logback-classic:1.5.18") + implementation("com.github.librepdf:openpdf:2.0.3") implementation("com.github.spotbugs:spotbugs-annotations:4.9.3") implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1") implementation("com.google.code.findbugs:annotations:3.0.1") @@ -19,6 +20,7 @@ dependencies { implementation("com.google.guava:listenablefuture:1.0") implementation("com.intellij:annotations:12.0") implementation("com.jwebmp:javax.inject:1.1") + implementation("com.lowagie:itext:4.2.2") implementation("com.mchange:c3p0:0.11.0") implementation("com.mchange:mchange-commons-java:0.3.2") implementation("com.miglayout:miglayout-swing:11.4.2") @@ -42,6 +44,7 @@ dependencies { implementation("dk.brics.automaton:automaton:1.11-8") implementation("dk.brics:automaton:1.12-4") implementation("dom4j:dom4j:1.6.1") + implementation("itext:itext:1.3.1") implementation("jakarta.activation:jakarta.activation-api:2.1.3") implementation("jakarta.annotation:jakarta.annotation-api:3.0.0") implementation("jakarta.ejb:jakarta.ejb-api:4.0.1") diff --git a/samples/sample-all-deactivated/build.out b/samples/sample-all-deactivated/build.out index 6a76cb70..c26219ff 100644 --- a/samples/sample-all-deactivated/build.out +++ b/samples/sample-all-deactivated/build.out @@ -9,6 +9,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- cglib:cglib-nodep:3.3.0 FAILED +--- cglib:cglib:3.3.0 FAILED +--- ch.qos.logback:logback-classic:1.5.18 FAILED ++--- com.github.librepdf:openpdf:2.0.3 FAILED +--- com.github.spotbugs:spotbugs-annotations:4.9.3 FAILED +--- com.github.stephenc.jcip:jcip-annotations:1.0-1 FAILED +--- com.google.code.findbugs:annotations:3.0.1 FAILED @@ -18,6 +19,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- com.google.guava:listenablefuture:1.0 FAILED +--- com.intellij:annotations:12.0 FAILED +--- com.jwebmp:javax.inject:1.1 FAILED ++--- com.lowagie:itext:4.2.2 FAILED +--- com.mchange:c3p0:0.11.0 FAILED +--- com.mchange:mchange-commons-java:0.3.2 FAILED +--- com.miglayout:miglayout-swing:11.4.2 FAILED @@ -41,6 +43,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- dk.brics.automaton:automaton:1.11-8 FAILED +--- dk.brics:automaton:1.12-4 FAILED +--- dom4j:dom4j:1.6.1 FAILED ++--- itext:itext:1.3.1 FAILED +--- jakarta.activation:jakarta.activation-api:2.1.3 FAILED +--- jakarta.annotation:jakarta.annotation-api:3.0.0 FAILED +--- jakarta.ejb:jakarta.ejb-api:4.0.1 diff --git a/samples/sample-all/build.gradle.kts b/samples/sample-all/build.gradle.kts index 9a5e62bc..fdff2168 100644 --- a/samples/sample-all/build.gradle.kts +++ b/samples/sample-all/build.gradle.kts @@ -13,6 +13,7 @@ dependencies { implementation("cglib:cglib-nodep:3.3.0") implementation("cglib:cglib:3.3.0") implementation("ch.qos.logback:logback-classic:1.5.18") + implementation("com.github.librepdf:openpdf:2.0.3") implementation("com.github.spotbugs:spotbugs-annotations:4.9.3") implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1") implementation("com.google.code.findbugs:annotations:3.0.1") @@ -22,6 +23,7 @@ dependencies { implementation("com.google.guava:listenablefuture:1.0") implementation("com.intellij:annotations:12.0") implementation("com.jwebmp:javax.inject:1.1") + implementation("com.lowagie:itext:4.2.2") implementation("com.mchange:c3p0:0.11.0") implementation("com.mchange:mchange-commons-java:0.3.2") implementation("com.miglayout:miglayout-swing:11.4.2") @@ -45,6 +47,7 @@ dependencies { implementation("dk.brics.automaton:automaton:1.11-8") implementation("dk.brics:automaton:1.12-4") implementation("dom4j:dom4j:1.6.1") + implementation("itext:itext:1.3.1") implementation("jakarta.activation:jakarta.activation-api:2.1.3") implementation("jakarta.annotation:jakarta.annotation-api:3.0.0") implementation("jakarta.ejb:jakarta.ejb-api:4.0.1") diff --git a/samples/sample-all/build.out b/samples/sample-all/build.out index 4cb52c10..c35cf3c3 100644 --- a/samples/sample-all/build.out +++ b/samples/sample-all/build.out @@ -30,6 +30,8 @@ compileClasspath - Compile classpath for source set 'main'. +--- ch.qos.logback:logback-classic:1.5.18 -> org.slf4j:slf4j-simple:2.0.17 | +--- org.slf4j:slf4j-api:2.0.17 (*) | \--- org.slf4j:slf4j-bom:2.0.17 (*) ++--- com.github.librepdf:openpdf:2.0.3 -> com.lowagie:itext:4.2.2 +| \--- com.itextpdf:itextpdf:5.5.6 +--- com.github.spotbugs:spotbugs-annotations:4.9.3 | \--- com.google.code.findbugs:jsr305:3.0.2 +--- com.github.stephenc.jcip:jcip-annotations:1.0-1 -> net.jcip:jcip-annotations:1.0 @@ -44,6 +46,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- com.google.guava:listenablefuture:1.0 -> com.google.guava:guava:33.4.8-jre (*) +--- com.intellij:annotations:12.0 -> org.jetbrains:annotations:26.0.2 +--- com.jwebmp:javax.inject:1.1 ++--- com.lowagie:itext:4.2.2 (*) +--- com.mchange:c3p0:0.11.0 (*) +--- com.mchange:mchange-commons-java:0.3.2 +--- com.miglayout:miglayout-swing:11.4.2 @@ -74,6 +77,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- 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 ++--- itext:itext:1.3.1 -> com.lowagie:itext:4.2.2 (*) +--- jakarta.activation:jakarta.activation-api:2.1.3 +--- jakarta.annotation:jakarta.annotation-api:3.0.0 +--- jakarta.ejb:jakarta.ejb-api:4.0.1 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 f8d12e03..57f6b499 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 @@ -227,6 +227,11 @@ public enum CapabilityDefinition { "org.jetbrains:annotations", "com.intellij:annotations" ), + ITEXT(HIGHEST_VERSION, + "itext:itext", + "com.lowagie:itext", + "com.github.librepdf:openpdf" + ), JAVA_ASSIST(HIGHEST_VERSION, "javassist:javassist", "org.javassist:javassist",