diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0aaefbca..94113f20 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/samples/sample-all-deactivated/build.gradle.kts b/samples/sample-all-deactivated/build.gradle.kts index d701278a..a661d8e1 100644 --- a/samples/sample-all-deactivated/build.gradle.kts +++ b/samples/sample-all-deactivated/build.gradle.kts @@ -14,7 +14,6 @@ dependencies { implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1") implementation("com.google.code.findbugs:annotations:3.0.1") implementation("com.google.code.findbugs:findbugs-annotations:3.0.1") - implementation("com.google.collections:google-collections:1.0") implementation("com.google.guava:guava-jdk5:17.0") implementation("com.google.guava:guava:33.0.0-jre") implementation("com.google.guava:listenablefuture:1.0") @@ -25,6 +24,7 @@ dependencies { implementation("com.miglayout:miglayout-swing:5.0") implementation("com.miglayout:miglayout:3.7.4") implementation("com.mysql:mysql-connector-j:8.3.0") + implementation("com.sun.activation:jakarta.activation:2.0.1") implementation("com.sun.activation:javax.activation:1.2.0") implementation("com.sun.mail:jakarta.mail:2.0.1") implementation("com.sun.mail:javax.mail:1.6.2") @@ -37,12 +37,11 @@ dependencies { implementation("com.zaxxer:HikariCP:5.0.1") implementation("commons-beanutils:commons-beanutils-core:1.8.3") implementation("commons-beanutils:commons-beanutils:1.9.4") - implementation("commons-collections:commons-collections:3.2.2") implementation("commons-io:commons-io:2.11.0") implementation("commons-logging:commons-logging:1.3.0") implementation("dom4j:dom4j:1.6.1") - implementation("jakarta.activation:jakarta.activation-api:2.1.0") - implementation("jakarta.annotation:jakarta.annotation-api:1.3.5") + implementation("jakarta.activation:jakarta.activation-api:2.0.0") + implementation("jakarta.annotation:jakarta.annotation-api:2.1.1") implementation("jakarta.ejb:jakarta.ejb-api:3.2.6") implementation("jakarta.el:jakarta.el-api:3.0.3") implementation("jakarta.inject:jakarta.inject-api:1.0.5") @@ -52,13 +51,12 @@ dependencies { implementation("jakarta.persistence:jakarta.persistence-api:2.2.3") implementation("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7") implementation("jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6") - implementation("jakarta.servlet:jakarta.servlet-api:4.0.4") - implementation("jakarta.transaction:jakarta.transaction-api:2.0.1") + implementation("jakarta.servlet:jakarta.servlet-api:5.0.0") implementation("jakarta.transaction:jakarta.transaction-api:2.0.1") implementation("jakarta.validation:jakarta.validation-api:2.0.1") - implementation("jakarta.websocket:jakarta.websocket-api:2.1.0") - implementation("jakarta.websocket:jakarta.websocket-client-api:2.1.0") - implementation("jakarta.ws.rs:jakarta.ws.rs-api:3.0.0") + // implementation("jakarta.websocket:jakarta.websocket-api:2.1.1") - Expected to find a selector with a failure but none was found + implementation("jakarta.websocket:jakarta.websocket-client-api:2.1.1") + implementation("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0") implementation("jakarta.xml.bind:jakarta.xml.bind-api:2.3.3") implementation("jakarta.xml.soap:jakarta.xml.soap-api:1.4.2") implementation("jakarta.xml.ws:jakarta.xml.ws-api:2.3.3") @@ -87,17 +85,15 @@ dependencies { implementation("javax.servlet:jstl:1.2") implementation("javax.servlet:servlet-api:2.5") implementation("javax.transaction:javax.transaction-api:1.3") - implementation("javax.transaction:javax.transaction-api:1.3") - implementation("javax.transaction:jta:1.1") implementation("javax.transaction:jta:1.1") implementation("javax.validation:validation-api:2.0.1.Final") implementation("javax.websocket:javax.websocket-api:1.1") - implementation("javax.websocket:javax.websocket-client-api:1.1") + implementation("javax.websocket:javax.websocket-client-api:1.0") implementation("javax.ws.rs:javax.ws.rs-api:2.1.1") implementation("javax.ws.rs:jsr311-api:1.1.1") implementation("javax.xml.bind:jaxb-api:2.3.1") implementation("javax.xml.soap:javax.xml.soap-api:1.4.0") - implementation("javax.xml.stream:stax-api:1.0-2") + implementation("javax.xml.stream:stax-api:1.0") implementation("javax.xml.ws:jaxws-api:2.3.1") implementation("jboss:javassist:3.8.0.GA") implementation("junit:junit-dep:4.8") @@ -127,16 +123,18 @@ dependencies { implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0") implementation("org.apache.logging.log4j:log4j-to-slf4j:2.23.0") implementation("org.apache.solr:solr-commons-csv:3.5.0") - implementation("org.apache.tomcat.embed:tomcat-embed-core:9.0.1") - implementation("org.apache.tomcat.embed:tomcat-embed-websocket:9.0.1") + implementation("org.apache.tomcat.embed:tomcat-embed-core:10.1.0") + implementation("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.0") implementation("org.apache.tomcat:servlet-api:6.0.53") - implementation("org.apache.tomcat:tomcat-annotations-api:9.0.1") - implementation("org.apache.tomcat:tomcat-servlet-api:9.0.1") + implementation("org.apache.tomcat:tomcat-annotations-api:10.1.1") + implementation("org.apache.tomcat:tomcat-servlet-api:10.1.1") implementation("org.apache.tomcat:tomcat-websocket-api:10.1.0") implementation("org.apache.tomcat:tomcat-websocket-client-api:10.1.0") implementation("org.apache.tomcat:tomcat-websocket:10.1.1") implementation("org.apache.velocity:velocity-engine-core:2.3") implementation("org.apache.velocity:velocity:1.7") + implementation("org.bouncycastle:bc-fips-debug:1.0.2.3") + implementation("org.bouncycastle:bc-fips:1.0.2.3") implementation("org.bouncycastle:bcjmail-jdk15on:1.70") implementation("org.bouncycastle:bcjmail-jdk15to18:1.70") implementation("org.bouncycastle:bcjmail-jdk18on:1.72") @@ -148,6 +146,7 @@ dependencies { implementation("org.bouncycastle:bcmail-jdk15to18:1.70") implementation("org.bouncycastle:bcmail-jdk16:1.46") implementation("org.bouncycastle:bcmail-jdk18on:1.71") + implementation("org.bouncycastle:bcpg-fips:1.0.6") implementation("org.bouncycastle:bcpg-jdk12:130") implementation("org.bouncycastle:bcpg-jdk14:1.70") implementation("org.bouncycastle:bcpg-jdk15+:1.46") @@ -156,6 +155,7 @@ dependencies { implementation("org.bouncycastle:bcpg-jdk15to18:1.70") implementation("org.bouncycastle:bcpg-jdk16:1.46") implementation("org.bouncycastle:bcpg-jdk18on:1.72") + implementation("org.bouncycastle:bcpkix-fips:1.0.7") implementation("org.bouncycastle:bcpkix-jdk14:1.70") implementation("org.bouncycastle:bcpkix-jdk15on:1.70") implementation("org.bouncycastle:bcpkix-jdk15to18:1.70") @@ -197,7 +197,7 @@ dependencies { implementation("org.bouncycastle:bcutil-jdk15to18:1.70") implementation("org.bouncycastle:bcutil-jdk18on:1.72") implementation("org.codehaus.woodstox:woodstox-core-asl:4.4.1") - implementation("org.codehaus.woodstox:woodstox-core-lgpl:4.4.1") + implementation("org.codehaus.woodstox:woodstox-core-lgpl:4.4.0") implementation("org.codehaus.woodstox:wstx-asl:4.0.6") implementation("org.codehaus.woodstox:wstx-lgpl:3.2.9") implementation("org.dom4j:dom4j:2.1.3") @@ -217,7 +217,7 @@ dependencies { implementation("org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final") implementation("org.hibernate.javax.persistence:hibernate-jpa-2.2-api:1.0.0.Beta2") implementation("org.javassist:javassist:3.29.1-GA") - implementation("org.jboss.resteasy:jaxrs-api:3.0.1.Final") + implementation("org.jboss.resteasy:jaxrs-api:2.0.0.GA") implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final") implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final") implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:2.0.0.Final") @@ -250,11 +250,7 @@ dependencies { implementation("velocity:velocity:1.4") implementation("woodstox:wstx-asl:2.9.3") - implementation("com.sun.activation:jakarta.activation:2.0.1") - implementation("org.bouncycastle:bc-fips-debug:1.0.2.3") - implementation("org.bouncycastle:bc-fips:1.0.2.3") - implementation("org.bouncycastle:bcpg-fips:1.0.6") - implementation("org.bouncycastle:bcpkix-fips:1.0.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 } diff --git a/samples/sample-all-deactivated/build.out b/samples/sample-all-deactivated/build.out index e53b378c..bc860b07 100644 --- a/samples/sample-all-deactivated/build.out +++ b/samples/sample-all-deactivated/build.out @@ -13,7 +13,6 @@ compileClasspath - Compile classpath for source set 'main'. +--- com.github.stephenc.jcip:jcip-annotations:1.0-1 FAILED +--- com.google.code.findbugs:annotations:3.0.1 FAILED +--- com.google.code.findbugs:findbugs-annotations:3.0.1 FAILED -+--- com.google.collections:google-collections:1.0 FAILED +--- com.google.guava:guava-jdk5:17.0 FAILED +--- com.google.guava:guava:33.0.0-jre FAILED +--- com.google.guava:listenablefuture:1.0 FAILED @@ -24,6 +23,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- com.miglayout:miglayout-swing:5.0 FAILED +--- com.miglayout:miglayout:3.7.4 FAILED +--- com.mysql:mysql-connector-j:8.3.0 FAILED ++--- com.sun.activation:jakarta.activation:2.0.1 FAILED +--- com.sun.activation:javax.activation:1.2.0 FAILED +--- com.sun.mail:jakarta.mail:2.0.1 FAILED +--- com.sun.mail:javax.mail:1.6.2 FAILED @@ -36,12 +36,11 @@ compileClasspath - Compile classpath for source set 'main'. +--- com.zaxxer:HikariCP:5.0.1 FAILED +--- commons-beanutils:commons-beanutils-core:1.8.3 FAILED +--- commons-beanutils:commons-beanutils:1.9.4 FAILED -+--- commons-collections:commons-collections:3.2.2 +--- commons-io:commons-io:2.11.0 FAILED +--- commons-logging:commons-logging:1.3.0 FAILED +--- dom4j:dom4j:1.6.1 FAILED -+--- jakarta.activation:jakarta.activation-api:2.1.0 FAILED -+--- jakarta.annotation:jakarta.annotation-api:1.3.5 FAILED ++--- jakarta.activation:jakarta.activation-api:2.0.0 FAILED ++--- jakarta.annotation:jakarta.annotation-api:2.1.1 FAILED +--- jakarta.ejb:jakarta.ejb-api:3.2.6 FAILED +--- jakarta.el:jakarta.el-api:3.0.3 FAILED +--- jakarta.inject:jakarta.inject-api:1.0.5 FAILED @@ -51,12 +50,11 @@ compileClasspath - Compile classpath for source set 'main'. +--- jakarta.persistence:jakarta.persistence-api:2.2.3 FAILED +--- jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7 FAILED +--- jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6 FAILED -+--- jakarta.servlet:jakarta.servlet-api:4.0.4 FAILED ++--- jakarta.servlet:jakarta.servlet-api:5.0.0 FAILED +--- jakarta.transaction:jakarta.transaction-api:2.0.1 +--- jakarta.validation:jakarta.validation-api:2.0.1 FAILED -+--- jakarta.websocket:jakarta.websocket-api:2.1.0 FAILED -+--- jakarta.websocket:jakarta.websocket-client-api:2.1.0 FAILED -+--- jakarta.ws.rs:jakarta.ws.rs-api:3.0.0 FAILED ++--- jakarta.websocket:jakarta.websocket-client-api:2.1.1 FAILED ++--- jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 FAILED +--- jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 FAILED +--- jakarta.xml.soap:jakarta.xml.soap-api:1.4.2 FAILED +--- jakarta.xml.ws:jakarta.xml.ws-api:2.3.3 FAILED @@ -88,12 +86,12 @@ compileClasspath - Compile classpath for source set 'main'. +--- javax.transaction:jta:1.1 FAILED +--- javax.validation:validation-api:2.0.1.Final FAILED +--- javax.websocket:javax.websocket-api:1.1 FAILED -+--- javax.websocket:javax.websocket-client-api:1.1 FAILED ++--- javax.websocket:javax.websocket-client-api:1.0 FAILED +--- javax.ws.rs:javax.ws.rs-api:2.1.1 FAILED +--- javax.ws.rs:jsr311-api:1.1.1 FAILED +--- javax.xml.bind:jaxb-api:2.3.1 FAILED +--- javax.xml.soap:javax.xml.soap-api:1.4.0 FAILED -+--- javax.xml.stream:stax-api:1.0-2 FAILED ++--- javax.xml.stream:stax-api:1.0 FAILED +--- javax.xml.ws:jaxws-api:2.3.1 FAILED +--- jboss:javassist:3.8.0.GA FAILED +--- junit:junit-dep:4.8 FAILED @@ -123,16 +121,18 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0 FAILED +--- org.apache.logging.log4j:log4j-to-slf4j:2.23.0 FAILED +--- org.apache.solr:solr-commons-csv:3.5.0 FAILED -+--- org.apache.tomcat.embed:tomcat-embed-core:9.0.1 FAILED -+--- org.apache.tomcat.embed:tomcat-embed-websocket:9.0.1 FAILED ++--- org.apache.tomcat.embed:tomcat-embed-core:10.1.0 FAILED ++--- org.apache.tomcat.embed:tomcat-embed-websocket:10.1.0 FAILED +--- org.apache.tomcat:servlet-api:6.0.53 FAILED -+--- org.apache.tomcat:tomcat-annotations-api:9.0.1 FAILED -+--- org.apache.tomcat:tomcat-servlet-api:9.0.1 FAILED ++--- org.apache.tomcat:tomcat-annotations-api:10.1.1 FAILED ++--- org.apache.tomcat:tomcat-servlet-api:10.1.1 FAILED +--- org.apache.tomcat:tomcat-websocket-api:10.1.0 FAILED +--- org.apache.tomcat:tomcat-websocket-client-api:10.1.0 FAILED +--- org.apache.tomcat:tomcat-websocket:10.1.1 FAILED +--- org.apache.velocity:velocity-engine-core:2.3 FAILED +--- org.apache.velocity:velocity:1.7 FAILED ++--- org.bouncycastle:bc-fips-debug:1.0.2.3 FAILED ++--- org.bouncycastle:bc-fips:1.0.2.3 FAILED +--- org.bouncycastle:bcjmail-jdk15on:1.70 FAILED +--- org.bouncycastle:bcjmail-jdk15to18:1.70 FAILED +--- org.bouncycastle:bcjmail-jdk18on:1.72 FAILED @@ -144,6 +144,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.bouncycastle:bcmail-jdk15to18:1.70 FAILED +--- org.bouncycastle:bcmail-jdk16:1.46 FAILED +--- org.bouncycastle:bcmail-jdk18on:1.71 FAILED ++--- org.bouncycastle:bcpg-fips:1.0.6 FAILED +--- org.bouncycastle:bcpg-jdk12:130 FAILED +--- org.bouncycastle:bcpg-jdk14:1.70 FAILED +--- org.bouncycastle:bcpg-jdk15+:1.46 FAILED @@ -152,6 +153,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.bouncycastle:bcpg-jdk15to18:1.70 FAILED +--- org.bouncycastle:bcpg-jdk16:1.46 FAILED +--- org.bouncycastle:bcpg-jdk18on:1.72 FAILED ++--- org.bouncycastle:bcpkix-fips:1.0.7 FAILED +--- org.bouncycastle:bcpkix-jdk14:1.70 FAILED +--- org.bouncycastle:bcpkix-jdk15on:1.70 FAILED +--- org.bouncycastle:bcpkix-jdk15to18:1.70 FAILED @@ -193,7 +195,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.bouncycastle:bcutil-jdk15to18:1.70 FAILED +--- org.bouncycastle:bcutil-jdk18on:1.72 FAILED +--- org.codehaus.woodstox:woodstox-core-asl:4.4.1 FAILED -+--- org.codehaus.woodstox:woodstox-core-lgpl:4.4.1 FAILED ++--- org.codehaus.woodstox:woodstox-core-lgpl:4.4.0 FAILED +--- org.codehaus.woodstox:wstx-asl:4.0.6 FAILED +--- org.codehaus.woodstox:wstx-lgpl:3.2.9 FAILED +--- org.dom4j:dom4j:2.1.3 FAILED @@ -213,7 +215,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final FAILED +--- org.hibernate.javax.persistence:hibernate-jpa-2.2-api:1.0.0.Beta2 FAILED +--- org.javassist:javassist:3.29.1-GA FAILED -+--- org.jboss.resteasy:jaxrs-api:3.0.1.Final FAILED ++--- org.jboss.resteasy:jaxrs-api:2.0.0.GA FAILED +--- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final FAILED +--- org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final FAILED +--- org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:2.0.0.Final FAILED @@ -245,10 +247,6 @@ 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 -+--- com.sun.activation:jakarta.activation:2.0.1 FAILED -+--- org.bouncycastle:bc-fips-debug:1.0.2.3 FAILED -+--- org.bouncycastle:bc-fips:1.0.2.3 FAILED -+--- org.bouncycastle:bcpg-fips:1.0.6 FAILED -\--- org.bouncycastle:bcpkix-fips:1.0.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-deactivated/build.sample.conf b/samples/sample-all-deactivated/build.sample.conf index cbb84e03..5e85609a 100644 --- a/samples/sample-all-deactivated/build.sample.conf +++ b/samples/sample-all-deactivated/build.sample.conf @@ -1,2 +1,3 @@ executable: gradlew +args: -s expected-output-file: build.out \ No newline at end of file diff --git a/samples/sample-all/build.gradle.kts b/samples/sample-all/build.gradle.kts index caca850c..ccbd6b84 100644 --- a/samples/sample-all/build.gradle.kts +++ b/samples/sample-all/build.gradle.kts @@ -17,17 +17,19 @@ dependencies { implementation("com.github.stephenc.jcip:jcip-annotations:1.0-1") implementation("com.google.code.findbugs:annotations:3.0.1") implementation("com.google.code.findbugs:findbugs-annotations:3.0.1") - implementation("com.google.collections:google-collections:1.0") implementation("com.google.guava:guava-jdk5:17.0") implementation("com.google.guava:guava:33.0.0-jre") implementation("com.google.guava:listenablefuture:1.0") implementation("com.intellij:annotations:12.0") implementation("com.jwebmp:javax.inject:1.1") implementation("com.mchange:c3p0:0.9.5.5") + implementation("com.mchange:mchange-commons-java:0.3.0") implementation("com.miglayout:miglayout-swing:5.0") implementation("com.miglayout:miglayout:3.7.4") implementation("com.mysql:mysql-connector-j:8.3.0") + implementation("com.sun.activation:jakarta.activation:2.0.1") implementation("com.sun.activation:javax.activation:1.2.0") + implementation("com.sun.mail:jakarta.mail:2.0.1") implementation("com.sun.mail:javax.mail:1.6.2") implementation("com.sun.mail:mailapi:2.0.0") implementation("com.vaadin.external.google:android-json:0.0.20131108.vaadin1") @@ -41,7 +43,7 @@ dependencies { implementation("commons-io:commons-io:2.11.0") implementation("commons-logging:commons-logging:1.3.0") implementation("dom4j:dom4j:1.6.1") - implementation("jakarta.activation:jakarta.activation-api:2.0.0!!") + implementation("jakarta.activation:jakarta.activation-api:2.0.0") implementation("jakarta.annotation:jakarta.annotation-api:2.1.1") implementation("jakarta.ejb:jakarta.ejb-api:4.0.0") implementation("jakarta.el:jakarta.el-api:4.0.0") @@ -120,16 +122,22 @@ dependencies { implementation("org.apache.logging.log4j:log4j-core:2.23.0") implementation("org.apache.logging.log4j:log4j-jcl:2.23.0") implementation("org.apache.logging.log4j:log4j-jul:2.23.0") + implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.23.0") + implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0") implementation("org.apache.logging.log4j:log4j-to-slf4j:2.23.0") implementation("org.apache.solr:solr-commons-csv:3.5.0") implementation("org.apache.tomcat.embed:tomcat-embed-core:10.1.0") + implementation("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.0") implementation("org.apache.tomcat:servlet-api:6.0.53") implementation("org.apache.tomcat:tomcat-annotations-api:10.1.1") implementation("org.apache.tomcat:tomcat-servlet-api:10.1.1") implementation("org.apache.tomcat:tomcat-websocket-api:10.1.0") implementation("org.apache.tomcat:tomcat-websocket-client-api:10.1.0") + implementation("org.apache.tomcat:tomcat-websocket:10.1.1") implementation("org.apache.velocity:velocity-engine-core:2.3") implementation("org.apache.velocity:velocity:1.7") + implementation("org.bouncycastle:bc-fips-debug:1.0.2.3") + implementation("org.bouncycastle:bc-fips:1.0.2.3") implementation("org.bouncycastle:bcjmail-jdk15on:1.70") implementation("org.bouncycastle:bcjmail-jdk15to18:1.70") implementation("org.bouncycastle:bcjmail-jdk18on:1.72") @@ -137,9 +145,11 @@ dependencies { implementation("org.bouncycastle:bcmail-jdk14:1.68") implementation("org.bouncycastle:bcmail-jdk15+:1.46") implementation("org.bouncycastle:bcmail-jdk15:1.46") + implementation("org.bouncycastle:bcmail-jdk15on:1.69") implementation("org.bouncycastle:bcmail-jdk15to18:1.70") implementation("org.bouncycastle:bcmail-jdk16:1.46") implementation("org.bouncycastle:bcmail-jdk18on:1.71") + implementation("org.bouncycastle:bcpg-fips:1.0.6") implementation("org.bouncycastle:bcpg-jdk12:130") implementation("org.bouncycastle:bcpg-jdk14:1.70") implementation("org.bouncycastle:bcpg-jdk15+:1.46") @@ -148,9 +158,11 @@ dependencies { implementation("org.bouncycastle:bcpg-jdk15to18:1.70") implementation("org.bouncycastle:bcpg-jdk16:1.46") implementation("org.bouncycastle:bcpg-jdk18on:1.72") + implementation("org.bouncycastle:bcpkix-fips:1.0.7") implementation("org.bouncycastle:bcpkix-jdk14:1.70") implementation("org.bouncycastle:bcpkix-jdk15on:1.70") implementation("org.bouncycastle:bcpkix-jdk15to18:1.70") + implementation("org.bouncycastle:bcpkix-jdk18on:1.72") implementation("org.bouncycastle:bcprov-debug-jdk14:1.70") implementation("org.bouncycastle:bcprov-debug-jdk15on:1.70") implementation("org.bouncycastle:bcprov-debug-jdk15to18:1.70") @@ -195,6 +207,7 @@ dependencies { implementation("org.eclipse.angus:angus-activation:1.1.0") implementation("org.eclipse.angus:jakarta.mail:1.0.0") implementation("org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2") + implementation("org.eclipse.jetty.toolchain:jetty-jakarta-websocket-api:2.0.0") implementation("org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2") implementation("org.glassfish.hk2.external:jakarta.inject:2.6.1") implementation("org.glassfish.hk2.external:javax.inject:2.4.0") @@ -208,6 +221,8 @@ dependencies { implementation("org.hibernate.javax.persistence:hibernate-jpa-2.2-api:1.0.0.Beta2") implementation("org.javassist:javassist:3.29.1-GA") implementation("org.jboss.resteasy:jaxrs-api:2.0.0.GA") + implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final") + implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final") implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:2.0.0.Final") implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec:1.0.1.Final") implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:1.0.1.Final") @@ -225,8 +240,11 @@ dependencies { implementation("org.slf4j:jcl-over-slf4j:2.0.12") implementation("org.slf4j:jul-to-slf4j:2.0.12") implementation("org.slf4j:log4j-over-slf4j:2.0.12") - implementation("org.slf4j:slf4j-simple:2.0.12") + implementation("org.slf4j:slf4j-jcl:1.7.9") + implementation("org.slf4j:slf4j-jdk14:2.0.12") + implementation("org.slf4j:slf4j-log4j12:2.0.12") implementation("org.slf4j:slf4j-nop:2.0.12") + implementation("org.slf4j:slf4j-simple:2.0.12") implementation("org.springframework:spring-aop:5.3.23") implementation("org.springframework:spring-jcl:6.1.4") implementation("postgresql:postgresql:9.1-901-1.jdbc4") @@ -234,33 +252,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") - has no POM file - // Declaration moved down here due to bug: https://github.com/gradle/gradle/issues/14220 - // Also, some dependencies disappear completely in the result (instead of showing what they have been substituted with). - // E.g.: 'org.bouncycastle:bcprov-*' do not show up as direct dependencies in the ':dependencies' report (or build scan), - // although they are declared in this file. - implementation("com.sun.activation:jakarta.activation:2.0.1") - implementation("org.bouncycastle:bc-fips-debug:1.0.2.3") - implementation("org.bouncycastle:bc-fips:1.0.2.3") - implementation("org.bouncycastle:bcmail-jdk15on:1.69") - implementation("org.bouncycastle:bcpg-fips:1.0.6") - implementation("org.bouncycastle:bcpkix-fips:1.0.7") - implementation("org.bouncycastle:bcpkix-jdk18on:1.72") + implementation("com.google.collections:google-collections:1.0") // moved down: https://github.com/gradle/gradle/issues/22326 - // DEACTIVATED DUE TO BUG https://github.com/gradle/gradle/issues/14220 - // implementation("com.sun.mail:jakarta.mail:2.0.1") - // implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.23.0") - // implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0") - // implementation("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.0") - // implementation("org.apache.tomcat:tomcat-websocket:10.1.1") - // implementation("org.eclipse.jetty.toolchain:jetty-jakarta-websocket-api:2.0.0") - // implementation("org.slf4j:slf4j-jcl:1.7.9") - // implementation("org.slf4j:slf4j-jdk14:2.0.12") - // implementation("org.slf4j:slf4j-log4j12:2.0.12") - // implementation("com.mchange:mchange-commons-java:0.3.0") - // implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final") - // implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final") + // implementation("woodstox:wstx-lgpl:3.2.7") - has no POM file } jvmDependencyConflicts { @@ -280,6 +275,4 @@ tasks.detectCollisions { // With ALL variations of bouncycastle modules in all variations in one build it is not possible to avoid all collisions collisionFilter.exclude("org/bouncycastle/**") collisionFilter.exclude("javax/xml/namespace/QName.class") - collisionFilter.exclude("com/sun/activation/registries/*") - collisionFilter.exclude("javax/transaction/*") } diff --git a/samples/sample-all/build.out b/samples/sample-all/build.out index 3fae1cfd..6992cdec 100644 --- a/samples/sample-all/build.out +++ b/samples/sample-all/build.out @@ -12,6 +12,8 @@ compileClasspath - Compile classpath for source set 'main'. | | | +--- org.slf4j:slf4j-api:2.0.12 (c) | | | +--- org.slf4j:slf4j-simple:2.0.12 (c) | | | +--- org.slf4j:slf4j-nop:2.0.12 -> org.slf4j:slf4j-simple:2.0.12 (c) +| | | +--- org.slf4j:slf4j-jdk14:2.0.12 -> org.slf4j:slf4j-simple:2.0.12 (c) +| | | +--- org.slf4j:slf4j-log4j12:2.0.12 -> org.slf4j:slf4j-simple:2.0.12 (c) | | | +--- org.slf4j:jcl-over-slf4j:2.0.12 (c) | | | +--- org.slf4j:log4j-over-slf4j:2.0.12 (c) | | | \--- org.slf4j:jul-to-slf4j:2.0.12 (c) @@ -19,7 +21,7 @@ compileClasspath - Compile classpath for source set 'main'. | \--- org.springframework:spring-core:5.3.23 (*) +--- asm:asm:3.3.1 -> org.ow2.asm:asm:9.2 +--- c3p0:c3p0:0.9.1.2 -> com.mchange:c3p0:0.9.5.5 -| \--- com.mchange:mchange-commons-java:0.2.19 +| \--- com.mchange:mchange-commons-java:0.2.19 -> 0.3.0 +--- cglib:cglib-nodep:3.2.12 -> cglib:cglib:3.3.0 | \--- org.ow2.asm:asm:7.1 -> 9.2 +--- cglib:cglib:3.3.0 (*) @@ -31,25 +33,30 @@ compileClasspath - Compile classpath for source set 'main'. +--- com.github.stephenc.jcip:jcip-annotations:1.0-1 -> net.jcip:jcip-annotations:1.0 +--- com.google.code.findbugs:annotations:3.0.1 -> com.github.spotbugs:spotbugs-annotations:4.8.3 (*) +--- com.google.code.findbugs:findbugs-annotations:3.0.1 -> com.github.spotbugs:spotbugs-annotations:4.8.3 (*) -+--- com.google.collections:google-collections:1.0 -> com.google.guava:guava:33.0.0-jre ++--- com.google.guava:guava-jdk5:17.0 -> com.google.guava:guava:33.0.0-jre | +--- com.google.guava:failureaccess:1.0.2 | +--- com.google.code.findbugs:jsr305:3.0.2 | +--- org.checkerframework:checker-qual:3.41.0 | +--- com.google.errorprone:error_prone_annotations:2.23.0 | \--- com.google.j2objc:j2objc-annotations:2.8 -+--- com.google.guava:guava-jdk5:17.0 -> com.google.guava:guava:33.0.0-jre (*) +--- com.google.guava:guava:33.0.0-jre (*) +--- com.google.guava:listenablefuture:1.0 -> com.google.guava:guava:33.0.0-jre (*) +--- com.intellij:annotations:12.0 -> org.jetbrains:annotations:24.0.0 +--- com.jwebmp:javax.inject:1.1 +--- com.mchange:c3p0:0.9.5.5 (*) ++--- com.mchange:mchange-commons-java:0.3.0 +--- com.miglayout:miglayout-swing:5.0 | \--- com.miglayout:miglayout-core:5.0 +--- com.miglayout:miglayout:3.7.4 -> com.miglayout:miglayout-swing:5.0 (*) +--- com.mysql:mysql-connector-j:8.3.0 | \--- com.google.protobuf:protobuf-java:3.25.1 ++--- com.sun.activation:jakarta.activation:2.0.1 -> jakarta.activation:jakarta.activation-api:2.1.1 ++--- com.sun.activation:javax.activation:1.2.0 -> javax.activation:javax.activation-api:1.2.0 ++--- com.sun.mail:jakarta.mail:2.0.1 -> jakarta.mail:jakarta.mail-api:2.1.0 +| \--- jakarta.activation:jakarta.activation-api:2.1.0 -> 2.1.1 +--- com.sun.mail:javax.mail:1.6.2 -| \--- javax.activation:activation:1.1 +| \--- javax.activation:activation:1.1 -> javax.activation:javax.activation-api:1.2.0 ++--- com.sun.mail:mailapi:2.0.0 -> jakarta.mail:jakarta.mail-api:2.1.0 (*) +--- com.vaadin.external.google:android-json:0.0.20131108.vaadin1 -> org.json:json:20240303 +--- com.vividsolutions:jts-core:1.14.0 +--- com.vividsolutions:jts:1.13 -> com.vividsolutions:jts-core:1.14.0 @@ -64,7 +71,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- commons-io:commons-io:2.11.0 +--- commons-logging:commons-logging:1.3.0 -> org.slf4j:jcl-over-slf4j:2.0.12 (*) +--- dom4j:dom4j:1.6.1 -> org.dom4j:dom4j:2.1.3 -+--- jakarta.activation:jakarta.activation-api:{strictly 2.0.0} -> com.sun.activation:jakarta.activation:2.0.1 ++--- jakarta.activation:jakarta.activation-api:2.0.0 -> 2.1.1 +--- jakarta.annotation:jakarta.annotation-api:2.1.1 +--- jakarta.ejb:jakarta.ejb-api:4.0.0 | \--- jakarta.transaction:jakarta.transaction-api:2.0.0 -> 2.0.1 @@ -72,6 +79,7 @@ compileClasspath - Compile classpath for source set 'main'. +--- jakarta.inject:jakarta.inject-api:1.0.5 -> com.jwebmp:javax.inject:1.1 +--- jakarta.json:jakarta.json-api:1.1.6 +--- jakarta.jws:jakarta.jws-api:3.0.0 ++--- jakarta.mail:jakarta.mail-api:2.1.0 (*) +--- jakarta.persistence:jakarta.persistence-api:3.0.0 +--- jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7 +--- jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6 @@ -82,14 +90,16 @@ compileClasspath - Compile classpath for source set 'main'. +--- jakarta.websocket:jakarta.websocket-client-api:2.1.1 +--- jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 +--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 -| \--- com.sun.activation:jakarta.activation:2.0.1 +| \--- com.sun.activation:jakarta.activation:2.0.1 -> jakarta.activation:jakarta.activation-api:2.1.1 +--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1 -| \--- com.sun.activation:jakarta.activation:2.0.1 +| \--- com.sun.activation:jakarta.activation:2.0.1 -> jakarta.activation:jakarta.activation-api:2.1.1 +--- jakarta.xml.ws:jakarta.xml.ws-api:3.0.1 | +--- jakarta.xml.bind:jakarta.xml.bind-api:3.0.1 (*) | +--- jakarta.xml.soap:jakarta.xml.soap-api:2.0.1 (*) | \--- jakarta.jws:jakarta.jws-api:3.0.0 +--- javassist:javassist:3.12.1.GA -> org.javassist:javassist:3.29.1-GA ++--- javax.activation:activation:1.1.1 -> javax.activation:javax.activation-api:1.2.0 ++--- javax.activation:javax.activation-api:1.2.0 +--- javax.annotation:javax.annotation-api:1.3.2 +--- 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 @@ -120,9 +130,11 @@ compileClasspath - Compile classpath for source set 'main'. +--- javax.ws.rs:javax.ws.rs-api:2.1.1 +--- javax.ws.rs:jsr311-api:1.1.1 -> javax.ws.rs:javax.ws.rs-api:2.1.1 +--- javax.xml.bind:jaxb-api:2.3.1 +| \--- javax.activation:javax.activation-api:1.2.0 +--- javax.xml.soap:javax.xml.soap-api:1.4.0 ++--- javax.xml.stream:stax-api:1.0 -> stax:stax-api:1.0.1 +--- javax.xml.ws:jaxws-api:2.3.1 -| +--- javax.xml.bind:jaxb-api:2.3.1 +| +--- javax.xml.bind:jaxb-api:2.3.1 (*) | +--- javax.xml.soap:javax.xml.soap-api:1.4.0 | \--- javax.annotation:javax.annotation-api:1.3.2 +--- jboss:javassist:3.8.0.GA -> org.javassist:javassist:3.29.1-GA @@ -160,26 +172,53 @@ compileClasspath - Compile classpath for source set 'main'. | | +--- org.apache.logging.log4j:log4j-core:2.23.0 -> org.apache.logging.log4j:log4j-to-slf4j:2.23.0 (c) | | +--- org.apache.logging.log4j:log4j-jcl:2.23.0 -> org.slf4j:jcl-over-slf4j:2.0.12 (c) | | +--- org.apache.logging.log4j:log4j-jul:2.23.0 -> org.slf4j:jul-to-slf4j:2.0.12 (c) +| | +--- org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0 -> org.slf4j:slf4j-simple:2.0.12 (c) +| | +--- org.apache.logging.log4j:log4j-slf4j-impl:2.23.0 -> org.slf4j:slf4j-simple:2.0.12 (c) | | \--- org.apache.logging.log4j:log4j-to-slf4j:2.23.0 (c) | \--- org.slf4j:slf4j-api:2.0.9 -> 2.0.12 (*) +--- org.apache.logging.log4j:log4j-jcl:2.23.0 -> org.slf4j:jcl-over-slf4j:2.0.12 (*) +--- org.apache.logging.log4j:log4j-jul:2.23.0 -> org.slf4j:jul-to-slf4j:2.0.12 | +--- org.slf4j:slf4j-api:2.0.12 (*) | \--- org.slf4j:slf4j-bom:2.0.12 (*) ++--- org.apache.logging.log4j:log4j-slf4j-impl:2.23.0 -> org.slf4j:slf4j-simple:2.0.12 (*) ++--- org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0 -> org.slf4j:slf4j-simple:2.0.12 (*) +--- org.apache.logging.log4j:log4j-to-slf4j:2.23.0 (*) +--- org.apache.solr:solr-commons-csv:3.5.0 (*) +--- org.apache.tomcat.embed:tomcat-embed-core:10.1.0 -> jakarta.servlet:jakarta.servlet-api:5.0.0 ++--- org.apache.tomcat.embed:tomcat-embed-websocket:10.1.0 -> jakarta.websocket:jakarta.websocket-api:2.1.1 +--- org.apache.tomcat:servlet-api:6.0.53 -> javax.servlet:javax.servlet-api:4.0.1 +--- org.apache.tomcat:tomcat-annotations-api:10.1.1 -> jakarta.annotation:jakarta.annotation-api:2.1.1 +--- org.apache.tomcat:tomcat-servlet-api:10.1.1 -> jakarta.servlet:jakarta.servlet-api:5.0.0 +--- org.apache.tomcat:tomcat-websocket-api:10.1.0 -> jakarta.websocket:jakarta.websocket-api:2.1.1 +--- org.apache.tomcat:tomcat-websocket-client-api:10.1.0 -> jakarta.websocket:jakarta.websocket-client-api:2.1.1 ++--- org.apache.tomcat:tomcat-websocket:10.1.1 -> jakarta.websocket:jakarta.websocket-api:2.1.1 +--- org.apache.velocity:velocity-engine-core:2.3 | +--- org.apache.commons:commons-lang3:3.11 -> 3.12.0 | \--- org.slf4j:slf4j-api:1.7.30 -> 2.0.12 (*) +--- org.apache.velocity:velocity:1.7 -> org.apache.velocity:velocity-engine-core:2.3 (*) -+--- org.bouncycastle:bcpg-jdk12:130 ++--- org.bouncycastle:bc-fips-debug:1.0.2.3 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bc-fips:1.0.2.3 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcjmail-jdk15on:1.70 -> org.bouncycastle:bcjmail-jdk18on:1.72 +| +--- org.bouncycastle:bcprov-jdk18on:1.72 -> org.bouncycastle:bcprov-jdk12:130 +| +--- org.bouncycastle:bcutil-jdk18on:1.72 +| | \--- org.bouncycastle:bcprov-jdk18on:1.72 -> org.bouncycastle:bcprov-jdk12:130 +| +--- org.bouncycastle:bcpkix-jdk18on:1.72 +| | +--- org.bouncycastle:bcprov-jdk18on:1.72 -> org.bouncycastle:bcprov-jdk12:130 +| | \--- org.bouncycastle:bcutil-jdk18on:1.72 (*) +| \--- com.sun.mail:jakarta.mail:[2.0,3.0) -> jakarta.mail:jakarta.mail-api:2.1.0 (*) ++--- org.bouncycastle:bcjmail-jdk15to18:1.70 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) ++--- org.bouncycastle:bcjmail-jdk18on:1.72 (*) ++--- org.bouncycastle:bcmail-fips:1.0.4 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) ++--- org.bouncycastle:bcmail-jdk14:1.68 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) ++--- org.bouncycastle:bcmail-jdk15+:1.46 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) ++--- org.bouncycastle:bcmail-jdk15:1.46 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) ++--- org.bouncycastle:bcmail-jdk15on:1.69 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) ++--- org.bouncycastle:bcmail-jdk15to18:1.70 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) ++--- org.bouncycastle:bcmail-jdk16:1.46 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) ++--- org.bouncycastle:bcmail-jdk18on:1.71 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) ++--- org.bouncycastle:bcpg-fips:1.0.6 -> org.bouncycastle:bcpg-jdk12:130 | \--- org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcpg-jdk12:130 (*) +--- org.bouncycastle:bcpg-jdk14:1.70 -> org.bouncycastle:bcpg-jdk12:130 (*) +--- org.bouncycastle:bcpg-jdk15+:1.46 -> org.bouncycastle:bcpg-jdk12:130 (*) +--- org.bouncycastle:bcpg-jdk15:1.46 -> org.bouncycastle:bcpg-jdk12:130 (*) @@ -187,29 +226,51 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.bouncycastle:bcpg-jdk15to18:1.70 -> org.bouncycastle:bcpg-jdk12:130 (*) +--- org.bouncycastle:bcpg-jdk16:1.46 -> org.bouncycastle:bcpg-jdk12:130 (*) +--- org.bouncycastle:bcpg-jdk18on:1.72 -> org.bouncycastle:bcpg-jdk12:130 (*) -+--- org.bouncycastle:bcpkix-jdk14:1.70 -> org.bouncycastle:bcpkix-jdk18on:1.72 -| +--- org.bouncycastle:bcprov-jdk18on:1.72 -> org.bouncycastle:bcprov-jdk12:130 -| \--- org.bouncycastle:bcutil-jdk18on:1.72 -| \--- org.bouncycastle:bcprov-jdk18on:1.72 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcpkix-fips:1.0.7 -> org.bouncycastle:bcpkix-jdk18on:1.72 (*) ++--- org.bouncycastle:bcpkix-jdk14:1.70 -> org.bouncycastle:bcpkix-jdk18on:1.72 (*) +--- org.bouncycastle:bcpkix-jdk15on:1.70 -> org.bouncycastle:bcpkix-jdk18on:1.72 (*) +--- org.bouncycastle:bcpkix-jdk15to18:1.70 -> org.bouncycastle:bcpkix-jdk18on:1.72 (*) ++--- org.bouncycastle:bcpkix-jdk18on:1.72 (*) ++--- org.bouncycastle:bcprov-debug-jdk14:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-debug-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-debug-jdk15to18:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-debug-jdk18on:1.71 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-ext-debug-jdk14:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-ext-debug-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-ext-debug-jdk15to18:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-ext-debug-jdk18on:1.71 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-ext-jdk14:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-ext-jdk15:1.46 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-ext-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-ext-jdk15to18:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-ext-jdk16:1.46 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-ext-jdk18on:1.71 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-jdk14:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-jdk15+:1.46 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-jdk15:1.46 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-jdk15to18:1.70 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-jdk16:1.46 -> org.bouncycastle:bcprov-jdk12:130 ++--- org.bouncycastle:bcprov-jdk18on:1.71 -> org.bouncycastle:bcprov-jdk12:130 +--- org.bouncycastle:bctls-fips:1.0.9 -> org.bouncycastle:bctls-jdk18on:1.72 -| \--- org.bouncycastle:bcprov-jdk18on:1.72 -> org.bouncycastle:bcprov-jdk12:130 +| +--- org.bouncycastle:bcprov-jdk18on:1.72 -> org.bouncycastle:bcprov-jdk12:130 +| \--- org.bouncycastle:bcutil-jdk18on:1.72 (*) +--- org.bouncycastle:bctls-jdk14:1.70 -> org.bouncycastle:bctls-jdk18on:1.72 (*) +--- org.bouncycastle:bctls-jdk15on:1.69 -> org.bouncycastle:bctls-jdk18on:1.72 (*) +--- org.bouncycastle:bctls-jdk15to18:1.70 -> org.bouncycastle:bctls-jdk18on:1.72 (*) +--- org.bouncycastle:bctls-jdk18on:1.72 (*) +--- org.bouncycastle:bctsp-jdk14:1.45 -> org.bouncycastle:bctsp-jdk15on:1.46 | +--- org.bouncycastle:bcprov-jdk15on:1.46 -> org.bouncycastle:bcprov-jdk12:130 -| \--- org.bouncycastle:bcmail-jdk15on:1.46 -> org.bouncycastle:bcjmail-jdk18on:1.72 -| +--- org.bouncycastle:bcprov-jdk18on:1.72 -> org.bouncycastle:bcprov-jdk12:130 -| +--- org.bouncycastle:bcutil-jdk18on:1.72 (*) -| +--- org.bouncycastle:bcpkix-jdk18on:1.72 (*) -| \--- com.sun.mail:jakarta.mail:[2.0,3.0) -> jakarta.mail:jakarta.mail-api:2.1.0 +| \--- org.bouncycastle:bcmail-jdk15on:1.46 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) +--- org.bouncycastle:bctsp-jdk15+:1.46 -> org.bouncycastle:bctsp-jdk15on:1.46 (*) +--- org.bouncycastle:bctsp-jdk15:1.45 -> org.bouncycastle:bctsp-jdk15on:1.46 (*) +--- org.bouncycastle:bctsp-jdk15on:1.46 (*) +--- org.bouncycastle:bctsp-jdk16:1.45 -> org.bouncycastle:bctsp-jdk15on:1.46 (*) ++--- org.bouncycastle:bcutil-jdk14:1.70 -> org.bouncycastle:bcutil-jdk18on:1.72 (*) ++--- org.bouncycastle:bcutil-jdk15on:1.70 -> org.bouncycastle:bcutil-jdk18on:1.72 (*) ++--- org.bouncycastle:bcutil-jdk15to18:1.70 -> org.bouncycastle:bcutil-jdk18on:1.72 (*) ++--- org.bouncycastle:bcutil-jdk18on:1.72 (*) +--- 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 @@ -217,8 +278,11 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.codehaus.woodstox:wstx-asl:4.0.6 -> org.codehaus.woodstox:woodstox-core-asl:4.4.1 (*) +--- org.codehaus.woodstox:wstx-lgpl:3.2.9 -> org.codehaus.woodstox:woodstox-core-asl:4.4.1 (*) +--- org.dom4j:dom4j:2.1.3 -+--- org.eclipse.angus:angus-activation:1.1.0 -> com.sun.activation:jakarta.activation:2.0.1 ++--- org.eclipse.angus:angus-activation:1.1.0 +| \--- jakarta.activation:jakarta.activation-api:2.1.1 ++--- org.eclipse.angus:jakarta.mail:1.0.0 -> jakarta.mail:jakarta.mail-api:2.1.0 (*) +--- org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2 -> jakarta.servlet:jakarta.servlet-api:5.0.0 ++--- org.eclipse.jetty.toolchain:jetty-jakarta-websocket-api:2.0.0 -> jakarta.websocket:jakarta.websocket-api:2.1.1 +--- org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2 +--- org.glassfish.hk2.external:jakarta.inject:2.6.1 -> com.jwebmp:javax.inject:1.1 +--- org.glassfish.hk2.external:javax.inject:2.4.0 -> com.jwebmp:javax.inject:1.1 @@ -232,6 +296,8 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.hibernate.javax.persistence:hibernate-jpa-2.2-api:1.0.0.Beta2 -> javax.persistence:javax.persistence-api:2.2 +--- org.javassist:javassist:3.29.1-GA +--- org.jboss.resteasy:jaxrs-api:2.0.0.GA -> javax.ws.rs:javax.ws.rs-api:2.1.1 ++--- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final -> javax.transaction:javax.transaction-api:1.3 ++--- org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final -> javax.transaction:javax.transaction-api:1.3 +--- org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:2.0.0.Final -> javax.transaction:javax.transaction-api:1.3 +--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec:1.0.1.Final -> javax.ws.rs:javax.ws.rs-api:2.1.1 +--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:1.0.1.Final -> javax.ws.rs:javax.ws.rs-api:2.1.1 @@ -274,21 +340,19 @@ compileClasspath - Compile classpath for source set 'main'. +--- org.slf4j:jcl-over-slf4j:2.0.12 (*) +--- org.slf4j:jul-to-slf4j:2.0.12 (*) +--- org.slf4j:log4j-over-slf4j:2.0.12 (*) -+--- org.slf4j:slf4j-simple:2.0.12 (*) ++--- org.slf4j:slf4j-jcl:1.7.9 -> org.slf4j:slf4j-simple:2.0.12 (*) ++--- org.slf4j:slf4j-jdk14:2.0.12 -> org.slf4j:slf4j-simple:2.0.12 (*) ++--- org.slf4j:slf4j-log4j12:2.0.12 -> org.slf4j:slf4j-simple:2.0.12 (*) +--- org.slf4j:slf4j-nop:2.0.12 -> org.slf4j:slf4j-simple:2.0.12 (*) ++--- org.slf4j:slf4j-simple:2.0.12 (*) +--- org.springframework:spring-aop:5.3.23 (*) +--- org.springframework:spring-jcl:6.1.4 -> org.slf4j:jcl-over-slf4j:2.0.12 (*) +--- postgresql:postgresql:9.1-901-1.jdbc4 -> org.postgresql:postgresql:42.5.0 +--- servletapi:servletapi:2.4 -> javax.servlet:javax.servlet-api:4.0.1 ++--- 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 (*) -+--- com.sun.activation:jakarta.activation:2.0.1 -+--- org.bouncycastle:bc-fips-debug:1.0.2.3 -> org.bouncycastle:bcprov-jdk12:130 -+--- org.bouncycastle:bc-fips:1.0.2.3 -> org.bouncycastle:bcprov-jdk12:130 -+--- org.bouncycastle:bcmail-jdk15on:1.69 -> org.bouncycastle:bcjmail-jdk18on:1.72 (*) -+--- org.bouncycastle:bcpg-fips:1.0.6 -> org.bouncycastle:bcpg-jdk12:130 (*) -+--- org.bouncycastle:bcpkix-fips:1.0.7 -> org.bouncycastle:bcpkix-jdk18on:1.72 (*) -\--- org.bouncycastle:bcpkix-jdk18on:1.72 (*) +\--- 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. (*) - Indicates repeated occurrences of a transitive dependency subtree. Gradle expands transitive dependency subtrees only once per project; repeat occurrences only display the root of the subtree, followed by this annotation. diff --git a/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/GuavaClasspathTest.groovy b/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/GuavaClasspathTest.groovy index 05de82ea..5ac591b3 100644 --- a/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/GuavaClasspathTest.groovy +++ b/src/test/groovy/org/gradlex/jvm/dependency/conflict/test/GuavaClasspathTest.groovy @@ -157,9 +157,9 @@ class GuavaClasspathTest extends Specification { } dependencies { - api("com.google.collections:google-collections:1.0") - api("com.google.guava:listenablefuture:1.0") api("com.google.guava:guava:$guavaVersion${versionSuffix ? '-' : ''}$versionSuffix") + api("com.google.guava:listenablefuture:1.0") + api("com.google.collections:google-collections:1.0") } tasks.register("printJars") { @@ -171,7 +171,7 @@ class GuavaClasspathTest extends Specification { """ expect: - expectedClasspath(guavaVersion, jvmEnv, classpath, dependencyVersions) == printJars().output.split('\n') as TreeSet + printJars().output.split('\n') as TreeSet == expectedClasspath(guavaVersion, jvmEnv, classpath, dependencyVersions) where: [guavaVersion, versionSuffix, dependencyVersions, jvmEnv, classpath] << allGuavaCombinations(true)