diff --git a/samples/sample-all-deactivated/build.gradle.kts b/samples/sample-all-deactivated/build.gradle.kts index c5c781e6..6f1ed818 100644 --- a/samples/sample-all-deactivated/build.gradle.kts +++ b/samples/sample-all-deactivated/build.gradle.kts @@ -101,8 +101,8 @@ dependencies { implementation("junit:junit:4.13.2") implementation("log4j:log4j:1.2.17") implementation("mysql:mysql-connector-java:8.0.33") - implementation("net.java.dev.jna:jna:5.17.0") implementation("net.java.dev.jna:jna-platform:5.17.0") + implementation("net.java.dev.jna:jna:5.17.0") implementation("net.java.dev.jna:platform:3.5.2") implementation("net.jcip:jcip-annotations:1.0") implementation("net.jpountz.lz4:lz4:1.3") @@ -139,6 +139,7 @@ dependencies { implementation("org.bouncycastle:bcjmail-jdk15on:1.70") implementation("org.bouncycastle:bcjmail-jdk15to18:1.80") implementation("org.bouncycastle:bcjmail-jdk18on:1.80") + implementation("org.bouncycastle:bcjmail-lts8on:2.73.7") implementation("org.bouncycastle:bcmail-fips:2.1.6") implementation("org.bouncycastle:bcmail-jdk14:1.80") implementation("org.bouncycastle:bcmail-jdk15+:1.46") @@ -147,6 +148,7 @@ dependencies { implementation("org.bouncycastle:bcmail-jdk15to18:1.80") implementation("org.bouncycastle:bcmail-jdk16:1.46") implementation("org.bouncycastle:bcmail-jdk18on:1.80") + implementation("org.bouncycastle:bcmail-lts8on:2.73.7") implementation("org.bouncycastle:bcpg-fips:2.1.11") implementation("org.bouncycastle:bcpg-jdk12:130") implementation("org.bouncycastle:bcpg-jdk14:1.80") @@ -156,11 +158,13 @@ dependencies { implementation("org.bouncycastle:bcpg-jdk15to18:1.80") implementation("org.bouncycastle:bcpg-jdk16:1.46") implementation("org.bouncycastle:bcpg-jdk18on:1.80") + implementation("org.bouncycastle:bcpg-lts8on:2.73.7") implementation("org.bouncycastle:bcpkix-fips:2.1.9") implementation("org.bouncycastle:bcpkix-jdk14:1.80") implementation("org.bouncycastle:bcpkix-jdk15on:1.70") implementation("org.bouncycastle:bcpkix-jdk15to18:1.80") implementation("org.bouncycastle:bcpkix-jdk18on:1.80") + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") implementation("org.bouncycastle:bcprov-debug-jdk14:1.80") implementation("org.bouncycastle:bcprov-debug-jdk15on:1.70") implementation("org.bouncycastle:bcprov-debug-jdk15to18:1.79") @@ -183,11 +187,13 @@ dependencies { implementation("org.bouncycastle:bcprov-jdk15to18:1.80") implementation("org.bouncycastle:bcprov-jdk16:1.46") implementation("org.bouncycastle:bcprov-jdk18on:1.80") + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") implementation("org.bouncycastle:bctls-fips:2.1.20") implementation("org.bouncycastle:bctls-jdk14:1.80") implementation("org.bouncycastle:bctls-jdk15on:1.70") implementation("org.bouncycastle:bctls-jdk15to18:1.80") implementation("org.bouncycastle:bctls-jdk18on:1.80") + implementation("org.bouncycastle:bctls-lts8on:2.73.7") implementation("org.bouncycastle:bctsp-jdk14:1.46") implementation("org.bouncycastle:bctsp-jdk15+:1.46") implementation("org.bouncycastle:bctsp-jdk15:1.46") @@ -197,6 +203,7 @@ dependencies { implementation("org.bouncycastle:bcutil-jdk15on:1.70") implementation("org.bouncycastle:bcutil-jdk15to18:1.80") implementation("org.bouncycastle:bcutil-jdk18on:1.80") + implementation("org.bouncycastle:bcutil-lts8on:2.73.7") implementation("org.codehaus.woodstox:woodstox-core-asl:4.4.1") implementation("org.codehaus.woodstox:woodstox-core-lgpl:4.4.1") implementation("org.codehaus.woodstox:wstx-asl:4.0.6") diff --git a/samples/sample-all-deactivated/build.out b/samples/sample-all-deactivated/build.out index 75a216b5..6a76cb70 100644 --- a/samples/sample-all-deactivated/build.out +++ b/samples/sample-all-deactivated/build.out @@ -109,8 +109,8 @@ compileClasspath - Compile classpath for source set 'main'. +--- junit:junit:4.13.2 FAILED +--- log4j:log4j:1.2.17 FAILED +--- mysql:mysql-connector-java:8.0.33 FAILED -+--- net.java.dev.jna:jna:5.17.0 FAILED +--- net.java.dev.jna:jna-platform:5.17.0 FAILED ++--- net.java.dev.jna:jna:5.17.0 FAILED +--- net.java.dev.jna:platform:3.5.2 FAILED +--- net.jcip:jcip-annotations:1.0 FAILED +--- net.jpountz.lz4:lz4:1.3 FAILED @@ -147,6 +147,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.bouncycastle:bcjmail-jdk15on:1.70 FAILED +--- org.bouncycastle:bcjmail-jdk15to18:1.80 FAILED +--- org.bouncycastle:bcjmail-jdk18on:1.80 FAILED ++--- org.bouncycastle:bcjmail-lts8on:2.73.7 FAILED +--- org.bouncycastle:bcmail-fips:2.1.6 FAILED +--- org.bouncycastle:bcmail-jdk14:1.80 FAILED +--- org.bouncycastle:bcmail-jdk15+:1.46 FAILED @@ -155,6 +156,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.bouncycastle:bcmail-jdk15to18:1.80 FAILED +--- org.bouncycastle:bcmail-jdk16:1.46 FAILED +--- org.bouncycastle:bcmail-jdk18on:1.80 FAILED ++--- org.bouncycastle:bcmail-lts8on:2.73.7 FAILED +--- org.bouncycastle:bcpg-fips:2.1.11 FAILED +--- org.bouncycastle:bcpg-jdk12:130 FAILED +--- org.bouncycastle:bcpg-jdk14:1.80 FAILED @@ -164,11 +166,13 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.bouncycastle:bcpg-jdk15to18:1.80 FAILED +--- org.bouncycastle:bcpg-jdk16:1.46 FAILED +--- org.bouncycastle:bcpg-jdk18on:1.80 FAILED ++--- org.bouncycastle:bcpg-lts8on:2.73.7 FAILED +--- org.bouncycastle:bcpkix-fips:2.1.9 FAILED +--- org.bouncycastle:bcpkix-jdk14:1.80 FAILED +--- org.bouncycastle:bcpkix-jdk15on:1.70 FAILED +--- org.bouncycastle:bcpkix-jdk15to18:1.80 FAILED +--- org.bouncycastle:bcpkix-jdk18on:1.80 FAILED ++--- org.bouncycastle:bcpkix-lts8on:2.73.7 FAILED +--- org.bouncycastle:bcprov-debug-jdk14:1.80 FAILED +--- org.bouncycastle:bcprov-debug-jdk15on:1.70 FAILED +--- org.bouncycastle:bcprov-debug-jdk15to18:1.79 FAILED @@ -191,11 +195,13 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.bouncycastle:bcprov-jdk15to18:1.80 FAILED +--- org.bouncycastle:bcprov-jdk16:1.46 FAILED +--- org.bouncycastle:bcprov-jdk18on:1.80 FAILED ++--- org.bouncycastle:bcprov-lts8on:2.73.7 FAILED +--- org.bouncycastle:bctls-fips:2.1.20 FAILED +--- org.bouncycastle:bctls-jdk14:1.80 FAILED +--- org.bouncycastle:bctls-jdk15on:1.70 FAILED +--- org.bouncycastle:bctls-jdk15to18:1.80 FAILED +--- org.bouncycastle:bctls-jdk18on:1.80 FAILED ++--- org.bouncycastle:bctls-lts8on:2.73.7 FAILED +--- org.bouncycastle:bctsp-jdk14:1.46 FAILED +--- org.bouncycastle:bctsp-jdk15+:1.46 FAILED +--- org.bouncycastle:bctsp-jdk15:1.46 FAILED @@ -205,6 +211,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.bouncycastle:bcutil-jdk15on:1.70 FAILED +--- org.bouncycastle:bcutil-jdk15to18:1.80 FAILED +--- org.bouncycastle:bcutil-jdk18on:1.80 FAILED ++--- org.bouncycastle:bcutil-lts8on:2.73.7 FAILED +--- org.codehaus.woodstox:woodstox-core-asl:4.4.1 FAILED +--- org.codehaus.woodstox:woodstox-core-lgpl:4.4.1 FAILED +--- org.codehaus.woodstox:wstx-asl:4.0.6 FAILED diff --git a/samples/sample-all/build.gradle.kts b/samples/sample-all/build.gradle.kts index c423637d..9a5e62bc 100644 --- a/samples/sample-all/build.gradle.kts +++ b/samples/sample-all/build.gradle.kts @@ -104,8 +104,8 @@ dependencies { implementation("junit:junit:4.13.2") implementation("log4j:log4j:1.2.17") implementation("mysql:mysql-connector-java:8.0.33") - implementation("net.java.dev.jna:jna:5.17.0") implementation("net.java.dev.jna:jna-platform:5.17.0") + implementation("net.java.dev.jna:jna:5.17.0") implementation("net.java.dev.jna:platform:3.5.2") implementation("net.jcip:jcip-annotations:1.0") implementation("net.jpountz.lz4:lz4:1.3") @@ -142,6 +142,7 @@ dependencies { implementation("org.bouncycastle:bcjmail-jdk15on:1.70") implementation("org.bouncycastle:bcjmail-jdk15to18:1.80") implementation("org.bouncycastle:bcjmail-jdk18on:1.80") + implementation("org.bouncycastle:bcjmail-lts8on:2.73.7") implementation("org.bouncycastle:bcmail-fips:2.1.6") implementation("org.bouncycastle:bcmail-jdk14:1.80") implementation("org.bouncycastle:bcmail-jdk15+:1.46") @@ -150,6 +151,7 @@ dependencies { implementation("org.bouncycastle:bcmail-jdk15to18:1.80") implementation("org.bouncycastle:bcmail-jdk16:1.46") implementation("org.bouncycastle:bcmail-jdk18on:1.80") + implementation("org.bouncycastle:bcmail-lts8on:2.73.7") implementation("org.bouncycastle:bcpg-fips:2.1.11") implementation("org.bouncycastle:bcpg-jdk12:130") implementation("org.bouncycastle:bcpg-jdk14:1.80") @@ -159,11 +161,13 @@ dependencies { implementation("org.bouncycastle:bcpg-jdk15to18:1.80") implementation("org.bouncycastle:bcpg-jdk16:1.46") implementation("org.bouncycastle:bcpg-jdk18on:1.80") + implementation("org.bouncycastle:bcpg-lts8on:2.73.7") implementation("org.bouncycastle:bcpkix-fips:2.1.9") implementation("org.bouncycastle:bcpkix-jdk14:1.80") implementation("org.bouncycastle:bcpkix-jdk15on:1.70") implementation("org.bouncycastle:bcpkix-jdk15to18:1.80") implementation("org.bouncycastle:bcpkix-jdk18on:1.80") + implementation("org.bouncycastle:bcpkix-lts8on:2.73.7") implementation("org.bouncycastle:bcprov-debug-jdk14:1.80") implementation("org.bouncycastle:bcprov-debug-jdk15on:1.70") implementation("org.bouncycastle:bcprov-debug-jdk15to18:1.79") @@ -186,11 +190,13 @@ dependencies { implementation("org.bouncycastle:bcprov-jdk15to18:1.80") implementation("org.bouncycastle:bcprov-jdk16:1.46") implementation("org.bouncycastle:bcprov-jdk18on:1.80") + implementation("org.bouncycastle:bcprov-lts8on:2.73.7") implementation("org.bouncycastle:bctls-fips:2.1.20") implementation("org.bouncycastle:bctls-jdk14:1.80") implementation("org.bouncycastle:bctls-jdk15on:1.70") implementation("org.bouncycastle:bctls-jdk15to18:1.80") implementation("org.bouncycastle:bctls-jdk18on:1.80") + implementation("org.bouncycastle:bctls-lts8on:2.73.7") implementation("org.bouncycastle:bctsp-jdk14:1.46") implementation("org.bouncycastle:bctsp-jdk15+:1.46") implementation("org.bouncycastle:bctsp-jdk15:1.46") @@ -200,6 +206,7 @@ dependencies { implementation("org.bouncycastle:bcutil-jdk15on:1.70") implementation("org.bouncycastle:bcutil-jdk15to18:1.80") implementation("org.bouncycastle:bcutil-jdk18on:1.80") + implementation("org.bouncycastle:bcutil-lts8on:2.73.7") implementation("org.codehaus.woodstox:woodstox-core-asl:4.4.1") implementation("org.codehaus.woodstox:woodstox-core-lgpl:4.4.1") implementation("org.codehaus.woodstox:wstx-asl:4.0.6") @@ -264,13 +271,13 @@ jvmDependencyConflicts { enforceSlf4JSimple() } conflictResolution { - select(CapabilityDefinition.BOUNCYCASTLE_BCMAIL, "org.bouncycastle:bcmail-jdk18on") - select(CapabilityDefinition.BOUNCYCASTLE_BCPG, "org.bouncycastle:bcpg-jdk18on") - select(CapabilityDefinition.BOUNCYCASTLE_BCPKIX, "org.bouncycastle:bcpkix-jdk18on") - select(CapabilityDefinition.BOUNCYCASTLE_BCPROV, "org.bouncycastle:bcprov-jdk18on") - select(CapabilityDefinition.BOUNCYCASTLE_BCTLS, "org.bouncycastle:bctls-jdk18on") + select(CapabilityDefinition.BOUNCYCASTLE_BCMAIL, "org.bouncycastle:bcmail-lts8on") + select(CapabilityDefinition.BOUNCYCASTLE_BCPG, "org.bouncycastle:bcpg-lts8on") + select(CapabilityDefinition.BOUNCYCASTLE_BCPKIX, "org.bouncycastle:bcpkix-lts8on") + select(CapabilityDefinition.BOUNCYCASTLE_BCPROV, "org.bouncycastle:bcprov-lts8on") + select(CapabilityDefinition.BOUNCYCASTLE_BCTLS, "org.bouncycastle:bctls-lts8on") select(CapabilityDefinition.BOUNCYCASTLE_BCTSP, "org.bouncycastle:bctsp-jdk15on") - select(CapabilityDefinition.BOUNCYCASTLE_BCUTIL, "org.bouncycastle:bcutil-jdk18on") + select(CapabilityDefinition.BOUNCYCASTLE_BCUTIL, "org.bouncycastle:bcutil-lts8on") select(CapabilityDefinition.CGLIB, "cglib:cglib") select(CapabilityDefinition.JAKARTA_SERVLET_API, "jakarta.servlet:jakarta.servlet-api") select(CapabilityDefinition.JAVAX_ACTIVATION_API, "javax.activation:javax.activation-api") diff --git a/samples/sample-all/build.out b/samples/sample-all/build.out index c4b12386..4cb52c10 100644 --- a/samples/sample-all/build.out +++ b/samples/sample-all/build.out @@ -148,9 +148,9 @@ compileClasspath - Compile classpath for source set 'main'. | +--- org.slf4j:slf4j-api:2.0.17 (*) | \--- org.slf4j:slf4j-bom:2.0.17 (*) +--- mysql:mysql-connector-java:8.0.33 -> com.mysql:mysql-connector-j:9.2.0 (*) -+--- net.java.dev.jna:jna:5.17.0 +--- net.java.dev.jna:jna-platform:5.17.0 | \--- net.java.dev.jna:jna:5.17.0 ++--- net.java.dev.jna:jna:5.17.0 +--- net.java.dev.jna:platform:3.5.2 -> net.java.dev.jna:jna-platform:5.17.0 (*) +--- net.jcip:jcip-annotations:1.0 +--- net.jpountz.lz4:lz4:1.3 -> org.lz4:lz4-java:1.8.0 @@ -201,76 +201,84 @@ compileClasspath - Compile classpath for source set 'main'. | +--- org.apache.commons:commons-lang3:3.17.0 | \--- org.slf4j:slf4j-api:1.7.36 -> 2.0.17 (*) +--- org.apache.velocity:velocity:1.7 -> org.apache.velocity:velocity-engine-core:2.4.1 (*) -+--- org.bouncycastle:bc-fips-debug:2.1.0 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bc-fips:2.1.0 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcjmail-jdk15on:1.70 -> org.bouncycastle:bcmail-jdk18on:1.80 -| \--- org.bouncycastle:bcpkix-jdk18on:[1.80,1.81) -> 1.80 -| \--- org.bouncycastle:bcutil-jdk18on:[1.80,1.81) -> 1.80 -| \--- org.bouncycastle:bcprov-jdk18on:[1.80,1.81) -> 1.80 -+--- org.bouncycastle:bcjmail-jdk15to18:1.80 -> org.bouncycastle:bcmail-jdk18on:1.80 (*) -+--- org.bouncycastle:bcjmail-jdk18on:1.80 -> org.bouncycastle:bcmail-jdk18on:1.80 (*) -+--- org.bouncycastle:bcmail-fips:2.1.6 -> org.bouncycastle:bcmail-jdk18on:1.80 (*) -+--- org.bouncycastle:bcmail-jdk14:1.80 -> org.bouncycastle:bcmail-jdk18on:1.80 (*) -+--- org.bouncycastle:bcmail-jdk15+:1.46 -> org.bouncycastle:bcmail-jdk18on:1.80 (*) -+--- org.bouncycastle:bcmail-jdk15:1.46 -> org.bouncycastle:bcmail-jdk18on:1.80 (*) -+--- org.bouncycastle:bcmail-jdk15on:1.70 -> org.bouncycastle:bcmail-jdk18on:1.80 (*) -+--- org.bouncycastle:bcmail-jdk15to18:1.80 -> org.bouncycastle:bcmail-jdk18on:1.80 (*) -+--- org.bouncycastle:bcmail-jdk16:1.46 -> org.bouncycastle:bcmail-jdk18on:1.80 (*) -+--- org.bouncycastle:bcmail-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpg-fips:2.1.11 -> org.bouncycastle:bcpg-jdk18on:1.80 -| \--- org.bouncycastle:bcprov-jdk18on:[1.80,1.81) -> 1.80 -+--- org.bouncycastle:bcpg-jdk12:130 -> org.bouncycastle:bcpg-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpg-jdk14:1.80 -> org.bouncycastle:bcpg-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpg-jdk15+:1.46 -> org.bouncycastle:bcpg-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpg-jdk15:1.46 -> org.bouncycastle:bcpg-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpg-jdk15on:1.70 -> org.bouncycastle:bcpg-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpg-jdk15to18:1.80 -> org.bouncycastle:bcpg-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpg-jdk16:1.46 -> org.bouncycastle:bcpg-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpg-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpkix-fips:2.1.9 -> org.bouncycastle:bcpkix-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpkix-jdk14:1.80 -> org.bouncycastle:bcpkix-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpkix-jdk15on:1.70 -> org.bouncycastle:bcpkix-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpkix-jdk15to18:1.80 -> org.bouncycastle:bcpkix-jdk18on:1.80 (*) -+--- org.bouncycastle:bcpkix-jdk18on:1.80 (*) -+--- org.bouncycastle:bcprov-debug-jdk14:1.80 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-debug-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-debug-jdk15to18:1.79 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-debug-jdk18on:1.79 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-ext-debug-jdk14:1.74 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-ext-debug-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-ext-debug-jdk15to18:1.77 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-ext-debug-jdk18on:1.77 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-ext-jdk14:1.78.1 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-ext-jdk15:1.46 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-ext-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-ext-jdk15to18:1.78.1 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-ext-jdk16:1.46 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-ext-jdk18on:1.78.1 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-jdk12:130 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-jdk14:1.80 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-jdk15+:1.46 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-jdk15:1.46 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-jdk15to18:1.80 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-jdk16:1.46 -> org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bcprov-jdk18on:1.80 -+--- org.bouncycastle:bctls-fips:2.1.20 -> org.bouncycastle:bctls-jdk18on:1.80 -| \--- org.bouncycastle:bcutil-jdk18on:[1.80,1.81) -> 1.80 (*) -+--- org.bouncycastle:bctls-jdk14:1.80 -> org.bouncycastle:bctls-jdk18on:1.80 (*) -+--- org.bouncycastle:bctls-jdk15on:1.70 -> org.bouncycastle:bctls-jdk18on:1.80 (*) -+--- org.bouncycastle:bctls-jdk15to18:1.80 -> org.bouncycastle:bctls-jdk18on:1.80 (*) -+--- org.bouncycastle:bctls-jdk18on:1.80 (*) ++--- org.bouncycastle:bc-fips-debug:2.1.0 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bc-fips:2.1.0 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcjmail-jdk15on:1.70 -> org.bouncycastle:bcmail-lts8on:2.73.7 +| \--- org.bouncycastle:bcpkix-lts8on:[2.73.7,2.74.0) -> 2.73.7 +| \--- org.bouncycastle:bcutil-lts8on:[2.73.7,2.74.0) -> 2.73.7 +| \--- org.bouncycastle:bcprov-lts8on:[2.73.7,2.74.0) -> 2.73.7 ++--- org.bouncycastle:bcjmail-jdk15to18:1.80 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcjmail-jdk18on:1.80 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcjmail-lts8on:2.73.7 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcmail-fips:2.1.6 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcmail-jdk14:1.80 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcmail-jdk15+:1.46 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcmail-jdk15:1.46 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcmail-jdk15on:1.70 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcmail-jdk15to18:1.80 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcmail-jdk16:1.46 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcmail-jdk18on:1.80 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcmail-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpg-fips:2.1.11 -> org.bouncycastle:bcpg-lts8on:2.73.7 +| +--- org.bouncycastle:bcprov-lts8on:[2.73.7,2.74.0) -> 2.73.7 +| \--- org.bouncycastle:bcutil-lts8on:[2.73.7,2.74.0) -> 2.73.7 (*) ++--- org.bouncycastle:bcpg-jdk12:130 -> org.bouncycastle:bcpg-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpg-jdk14:1.80 -> org.bouncycastle:bcpg-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpg-jdk15+:1.46 -> org.bouncycastle:bcpg-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpg-jdk15:1.46 -> org.bouncycastle:bcpg-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpg-jdk15on:1.70 -> org.bouncycastle:bcpg-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpg-jdk15to18:1.80 -> org.bouncycastle:bcpg-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpg-jdk16:1.46 -> org.bouncycastle:bcpg-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpg-jdk18on:1.80 -> org.bouncycastle:bcpg-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpg-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpkix-fips:2.1.9 -> org.bouncycastle:bcpkix-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpkix-jdk14:1.80 -> org.bouncycastle:bcpkix-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpkix-jdk15on:1.70 -> org.bouncycastle:bcpkix-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpkix-jdk15to18:1.80 -> org.bouncycastle:bcpkix-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpkix-jdk18on:1.80 -> org.bouncycastle:bcpkix-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcpkix-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcprov-debug-jdk14:1.80 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-debug-jdk15on:1.70 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-debug-jdk15to18:1.79 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-debug-jdk18on:1.79 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-ext-debug-jdk14:1.74 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-ext-debug-jdk15on:1.70 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-ext-debug-jdk15to18:1.77 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-ext-debug-jdk18on:1.77 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-ext-jdk14:1.78.1 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-ext-jdk15:1.46 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-ext-jdk15on:1.70 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-ext-jdk15to18:1.78.1 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-ext-jdk16:1.46 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-ext-jdk18on:1.78.1 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-jdk12:130 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-jdk14:1.80 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-jdk15+:1.46 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-jdk15:1.46 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-jdk15on:1.70 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-jdk15to18:1.80 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-jdk16:1.46 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-jdk18on:1.80 -> org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bcprov-lts8on:2.73.7 ++--- org.bouncycastle:bctls-fips:2.1.20 -> org.bouncycastle:bctls-lts8on:2.73.7 +| \--- org.bouncycastle:bcutil-lts8on:[2.73.7,2.74.0) -> 2.73.7 (*) ++--- org.bouncycastle:bctls-jdk14:1.80 -> org.bouncycastle:bctls-lts8on:2.73.7 (*) ++--- org.bouncycastle:bctls-jdk15on:1.70 -> org.bouncycastle:bctls-lts8on:2.73.7 (*) ++--- org.bouncycastle:bctls-jdk15to18:1.80 -> org.bouncycastle:bctls-lts8on:2.73.7 (*) ++--- org.bouncycastle:bctls-jdk18on:1.80 -> org.bouncycastle:bctls-lts8on:2.73.7 (*) ++--- org.bouncycastle:bctls-lts8on:2.73.7 (*) +--- org.bouncycastle:bctsp-jdk14:1.46 -> org.bouncycastle:bctsp-jdk15on:1.46 -| +--- org.bouncycastle:bcprov-jdk15on:1.46 -> org.bouncycastle:bcprov-jdk18on:1.80 -| \--- org.bouncycastle:bcmail-jdk15on:1.46 -> org.bouncycastle:bcmail-jdk18on:1.80 (*) +| +--- org.bouncycastle:bcprov-jdk15on:1.46 -> org.bouncycastle:bcprov-lts8on:2.73.7 +| \--- org.bouncycastle:bcmail-jdk15on:1.46 -> org.bouncycastle:bcmail-lts8on:2.73.7 (*) +--- org.bouncycastle:bctsp-jdk15+:1.46 -> org.bouncycastle:bctsp-jdk15on:1.46 (*) +--- org.bouncycastle:bctsp-jdk15:1.46 -> org.bouncycastle:bctsp-jdk15on:1.46 (*) +--- org.bouncycastle:bctsp-jdk15on:1.46 (*) +--- org.bouncycastle:bctsp-jdk16:1.46 -> org.bouncycastle:bctsp-jdk15on:1.46 (*) -+--- org.bouncycastle:bcutil-jdk14:1.80 -> org.bouncycastle:bcutil-jdk18on:1.80 (*) -+--- org.bouncycastle:bcutil-jdk15on:1.70 -> org.bouncycastle:bcutil-jdk18on:1.80 (*) -+--- org.bouncycastle:bcutil-jdk15to18:1.80 -> org.bouncycastle:bcutil-jdk18on:1.80 (*) -+--- org.bouncycastle:bcutil-jdk18on:1.80 (*) ++--- org.bouncycastle:bcutil-jdk14:1.80 -> org.bouncycastle:bcutil-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcutil-jdk15on:1.70 -> org.bouncycastle:bcutil-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcutil-jdk15to18:1.80 -> org.bouncycastle:bcutil-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcutil-jdk18on:1.80 -> org.bouncycastle:bcutil-lts8on:2.73.7 (*) ++--- org.bouncycastle:bcutil-lts8on:2.73.7 (*) +--- org.codehaus.woodstox:woodstox-core-asl:4.4.1 | +--- javax.xml.stream:stax-api:1.0-2 -> stax:stax-api:1.0.1 | \--- org.codehaus.woodstox:stax2-api:3.1.4 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 326a622a..f8d12e03 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 @@ -78,9 +78,11 @@ public enum CapabilityDefinition { "org.bouncycastle:bcmail-jdk15to18", "org.bouncycastle:bcmail-jdk16", "org.bouncycastle:bcmail-jdk18on", + "org.bouncycastle:bcmail-lts8on", "org.bouncycastle:bcjmail-jdk15on", "org.bouncycastle:bcjmail-jdk15to18", - "org.bouncycastle:bcjmail-jdk18on" + "org.bouncycastle:bcjmail-jdk18on", + "org.bouncycastle:bcjmail-lts8on" ), BOUNCYCASTLE_BCPG(HIGHEST_VERSION, "org.bouncycastle:bcpg-fips", @@ -91,14 +93,16 @@ public enum CapabilityDefinition { "org.bouncycastle:bcpg-jdk15on", "org.bouncycastle:bcpg-jdk15to18", "org.bouncycastle:bcpg-jdk16", - "org.bouncycastle:bcpg-jdk18on" + "org.bouncycastle:bcpg-jdk18on", + "org.bouncycastle:bcpg-lts8on" ), BOUNCYCASTLE_BCPKIX(HIGHEST_VERSION, "org.bouncycastle:bcpkix-fips", "org.bouncycastle:bcpkix-jdk14", "org.bouncycastle:bcpkix-jdk15on", "org.bouncycastle:bcpkix-jdk15to18", - "org.bouncycastle:bcpkix-jdk18on" + "org.bouncycastle:bcpkix-jdk18on", + "org.bouncycastle:bcpkix-lts8on" ), BOUNCYCASTLE_BCPROV(HIGHEST_VERSION, "org.bouncycastle:bcprov-debug-jdk14", @@ -123,6 +127,7 @@ public enum CapabilityDefinition { "org.bouncycastle:bcprov-jdk15to18", "org.bouncycastle:bcprov-jdk16", "org.bouncycastle:bcprov-jdk18on", + "org.bouncycastle:bcprov-lts8on", "org.bouncycastle:bc-fips", "org.bouncycastle:bc-fips-debug" ), @@ -131,6 +136,7 @@ public enum CapabilityDefinition { "org.bouncycastle:bctls-jdk15on", "org.bouncycastle:bctls-jdk15to18", "org.bouncycastle:bctls-jdk18on", + "org.bouncycastle:bctls-lts8on", "org.bouncycastle:bctls-fips" ), BOUNCYCASTLE_BCTSP(HIGHEST_VERSION, @@ -144,7 +150,8 @@ public enum CapabilityDefinition { "org.bouncycastle:bcutil-jdk14", "org.bouncycastle:bcutil-jdk15on", "org.bouncycastle:bcutil-jdk15to18", - "org.bouncycastle:bcutil-jdk18on" + "org.bouncycastle:bcutil-jdk18on", + "org.bouncycastle:bcutil-lts8on" ), C3P0(HIGHEST_VERSION, "c3p0:c3p0",