From ea0f1be7c7be94e37695fdc0121f04c24d998878 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Thu, 30 Oct 2025 15:07:28 -0400 Subject: [PATCH 1/2] Update gradle to 9.2.0 Attempted to resolve TODO on line 1099, however some of the API is still not recognized. Added a 9.2+ to the TODO --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 0eb77c1108..8eb971728e 100644 --- a/build.gradle +++ b/build.gradle @@ -1096,7 +1096,7 @@ tasks.register('schemaZip', Zip) { shortName = '' } - /* TODO until Gradle 9.1.1 or 9.2 + /* TODO until Gradle 9.1.1 or 9.2+ subproject.sourceSets.main.resources.find { it.path.endsWith("META-INF${File.separator}spring.schemas") }?.withInputStream { schemas.load(it) }*/ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6a38a8cea6..49ab6fc3f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 160c515e900d3ee54f4630164b55938da71ada8c Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Mon, 3 Nov 2025 07:16:31 -0500 Subject: [PATCH 2/2] Remove Gradle workaround from schema processing The TODO comment indicated this workaround was needed until Gradle 9.1.1 or 9.2. Since Gradle has been updated to 9.2.0 in the workaround is no longer necessary. This change simplifies the schema loading code by using the more concise `?.withInputStream` pattern instead of the verbose null-check and conditional logic that was required by earlier Gradle versions. --- build.gradle | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 8eb971728e..e2c76b1355 100644 --- a/build.gradle +++ b/build.gradle @@ -1096,18 +1096,9 @@ tasks.register('schemaZip', Zip) { shortName = '' } - /* TODO until Gradle 9.1.1 or 9.2+ subproject.sourceSets.main.resources.find { it.path.endsWith("META-INF${File.separator}spring.schemas") - }?.withInputStream { schemas.load(it) }*/ - - File schemasFile = subproject.sourceSets.main.resources.find { - it.path.endsWith("META-INF${File.separator}spring.schemas") - } - - if (schemasFile) { - schemasFile.withInputStream { schemas.load(it) } - } + }?.withInputStream { schemas.load(it) } for (def key : schemas.keySet()) { File xsdFile = subproject.sourceSets.main.resources.find {