Skip to content

Commit b94d273

Browse files
committed
Upgrade to Gradle 9.1.0
* Fix SXD schema collection for broken Groovy optional operator * Upgrade to Checkstyle `12.1.0` * Do not use Gradle configuration yet, since `checkstyleNohttp` is failing for serialization
1 parent 410f3b0 commit b94d273

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

build.gradle

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ configure(javaProjects) { subproject ->
266266

267267
checkstyle {
268268
configDirectory.set(rootProject.file('src/checkstyle'))
269-
toolVersion = '11.0.1'
269+
toolVersion = '12.1.0'
270270
}
271271

272272
jar {
@@ -564,9 +564,18 @@ tasks.register('schemaZip', Zip) {
564564
shortName = 'rabbit'
565565
}
566566

567+
/* TODO until Gradle 9.1.1 or 9.2
567568
subproject.sourceSets.main.resources.find {
568569
it.path.endsWith("META-INF${File.separator}spring.schemas")
569-
}?.withInputStream { schemas.load(it) }
570+
}?.withInputStream { schemas.load(it) }*/
571+
572+
File schemasFile = subproject.sourceSets.main.resources.find {
573+
it.path.endsWith("META-INF${File.separator}spring.schemas")
574+
}
575+
576+
if (schemasFile) {
577+
schemasFile.withInputStream { schemas.load(it) }
578+
}
570579

571580
for (def key : schemas.keySet()) {
572581
File xsdFile = subproject.sourceSets.main.resources.find {

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ org.gradle.jvmargs=-Xms512m -Xmx4g -Dfile.encoding=UTF-8
33
org.gradle.daemon=true
44
org.gradle.caching=true
55
org.gradle.parallel=true
6+
#org.gradle.configuration-cache=true
67
kotlin.stdlib.default.dependency=false

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
3+
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
118117

119118

120119
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
172171
# For Cygwin or MSYS, switch paths to Windows format before running java
173172
if "$cygwin" || "$msys" ; then
174173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176174

177175
JAVACMD=$( cygpath --unix "$JAVACMD" )
178176

@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
212210

213211
set -- \
214212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215-
-classpath "$CLASSPATH" \
216213
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217214
"$@"
218215

gradlew.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
7473

7574

7675
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)