diff --git a/framework-api/framework-api.gradle b/framework-api/framework-api.gradle index 482719644d4..978ff802e6d 100644 --- a/framework-api/framework-api.gradle +++ b/framework-api/framework-api.gradle @@ -98,12 +98,9 @@ tasks.register('schemaZip', Zip) { moduleProjects.each { module -> def Properties schemas = new Properties(); - def schemaFile = module.sourceSets.main.resources.find { + module.sourceSets.main.resources.find { (it.path.endsWith("META-INF/spring.schemas") || it.path.endsWith("META-INF\\spring.schemas")) - } - if (schemaFile != null) { - schemaFile.withInputStream { schemas.load(it) } - } + }?.withInputStream { schemas.load(it) } for (def key : schemas.keySet()) { def shortName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c75a..f8e1ee3125f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e1113280ef..bad7c2462f5 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-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME