Skip to content

Commit

Permalink
Merge pull request #170 from gradlex-org/gradle-8.11
Browse files Browse the repository at this point in the history 
Gradle 8.11 upgrade
  • Loading branch information
@jjohannes
jjohannes authored Nov 12, 2024
2 parents 6cfb3c3 + 9e1b262 commit 27a58ca
Show file tree
Hide file tree
Showing 7 changed files with 159 additions and 107 deletions.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
44 changes: 20 additions & 24 deletions samples/sample-all-deactivated/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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")
Expand Down Expand Up @@ -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
}
40 changes: 19 additions & 21 deletions samples/sample-all-deactivated/build.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.
1 change: 1 addition & 0 deletions samples/sample-all-deactivated/build.sample.conf
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
executable: gradlew
args: -s
expected-output-file: build.out
Loading

0 comments on commit 27a58ca

Please sign in to comment.