Apache Solr open-source search software
SOLR-17545: Upgrade to Gradle 8.10 (#2848)
Houston Putmanaaa2401040bb
diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.javaindex f7e07eb164a..88d91028552 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java@@ -55,9 +55,9 @@ public class WrapperDownloader {public static void checkVersion() {int major = Runtime.getRuntime().version().feature();- if (major < 11 || major > 21) {+ if (major < 21 || major > 23) {throw new IllegalStateException(- "java version must be between 11 and 21, your version: " + major);+ "java version must be between 21 and 23, your version: " + major);}}diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradleindex bd90ad35426..6c637e540df 100644--- a/gradle/documentation/render-javadoc.gradle+++ b/gradle/documentation/render-javadoc.gradle@@ -32,7 +32,7 @@ allprojects {missingdoclet "org.apache.solr.tools:missing-doclet"}- ext {+ project.ext {relativeDocPath = project.path.replaceFirst(/:\w+:/, "").replace(':', '/')}diff --git a/gradle/globals.gradle b/gradle/globals.gradleindex 4f782ae38c5..d8a99de69c2 100644--- a/gradle/globals.gradle+++ b/gradle/globals.gradle@@ -37,7 +37,7 @@ allprojects {// so :solr:core will have solr-core.jar, etc.project.archivesBaseName = project.path.replaceAll("^:", "").replace(':', '-')- ext {+ project.ext {// Utility method to support passing overrides via -P or -D.propertyOrDefault = { propName, defValue ->def resultdiff --git a/gradle/node.gradle b/gradle/node.gradleindex 3da3a51d40e..ff8404c2db2 100644--- a/gradle/node.gradle+++ b/gradle/node.gradle@@ -34,7 +34,7 @@ configure([project(":solr:packaging"), project(":solr:solr-ref-guide"), project(}}- ext {+ project.ext {rootNodeDir = "$rootDir/.gradle/node"nodeProjectDir = file("$rootNodeDir/$project.name")}diff --git a/gradle/solr/packaging.gradle b/gradle/solr/packaging.gradleindex 11ffb560688..1b5325f908b 100644--- a/gradle/solr/packaging.gradle+++ b/gradle/solr/packaging.gradle@@ -38,7 +38,7 @@configure(allprojects.findAll {project -> project.path.startsWith(":solr:modules:") || project.path == ":solr:prometheus-exporter" || project.path == ":solr:cross-dc-manager" }) {plugins.withType(JavaPlugin) {- ext {+ project.ext {packagingDir = file("${buildDir}/packaging")if (project.path.startsWith(":solr:prometheus-exporter") || project.path.startsWith(":solr:cross-dc-manager")) {deps = packagingDirdiff --git a/gradle/testing/alternative-jdk-support.gradle b/gradle/testing/alternative-jdk-support.gradleindex 72cdabdab4b..a1ff1b4b014 100644--- a/gradle/testing/alternative-jdk-support.gradle+++ b/gradle/testing/alternative-jdk-support.gradle@@ -87,6 +87,6 @@ if (jvmGradle != jvmCurrent) {// Set up root project's properties.rootProject.ext.runtimeJavaHome = jvmCurrent.javaHome-rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(new InstallationLocation(jvmCurrent.javaHome, "specific path")).getLanguageVersion()+rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(InstallationLocation.userDefined(jvmCurrent.javaHome, "specific path")).getLanguageVersion()rootProject.ext.usesAltJvm = (jvmGradle != jvmCurrent);diff --git a/gradle/testing/beasting.gradle b/gradle/testing/beasting.gradleindex 8934100ec10..67c20140ba8 100644--- a/gradle/testing/beasting.gradle+++ b/gradle/testing/beasting.gradle@@ -27,7 +27,7 @@ def beastingMode = gradle.startParameter.taskNames.any{ name -> name == 'beast'allprojects {plugins.withType(JavaPlugin) {- ext {+ project.ext {testOptions += [[propName: 'tests.dups', value: 0, description: "Reiterate runs of entire test suites ('beast' task)."]]diff --git a/gradle/testing/profiling.gradle b/gradle/testing/profiling.gradleindex ce9e7d43e03..8b1e5147efc 100644--- a/gradle/testing/profiling.gradle+++ b/gradle/testing/profiling.gradle@@ -19,7 +19,7 @@ def recordings = files()allprojects {plugins.withType(JavaPlugin) {- ext {+ project.ext {testOptions += [[propName: 'tests.profile', value: false, description: "Enable java flight recorder profiling."]]diff --git a/gradle/testing/randomization.gradle b/gradle/testing/randomization.gradleindex 2b617b99aa8..183943a39e7 100644--- a/gradle/testing/randomization.gradle+++ b/gradle/testing/randomization.gradle@@ -79,7 +79,7 @@ allprojects {// Configure test property defaults and their descriptions.allprojects {plugins.withType(JavaPlugin) {- ext {+ project.ext {testOptions += [// seed, repetition and amplification.[propName: 'tests.seed', value: { -> rootSeed }, description: "Sets the master randomization seed."],@@ -124,7 +124,7 @@ allprojects {// Add Solr-specific test configs settings.configure(allprojects.findAll {project -> project.path.startsWith(":solr") }) {plugins.withType(JavaPlugin) {- ext {+ project.ext {testOptions += [[propName: 'tests.src.home', value: null, description: "See SOLR-14023."],[propName: 'solr.tests.use.numeric.points', value: null, description: "Point implementation to use (true=numerics, false=trie)."],@@ -137,14 +137,14 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr") }) {allprojects {plugins.withType(JavaPlugin) {afterEvaluate {- ext.testOptionsResolved = testOptions.findAll { opt ->+ project.ext.testOptionsResolved = testOptions.findAll { opt ->propertyOrDefault(opt.propName, opt.value) != null}.collectEntries { opt ->[(opt.propName): Objects.toString(resolvedTestOption(opt.propName))]}// Compute the "reproduce with" string.- ext.testOptionsForReproduceLine = testOptions.findAll { opt ->+ project.ext.testOptionsForReproduceLine = testOptions.findAll { opt ->if (opt["includeInReproLine"] == false) {return false}diff --git a/gradle/testing/slowest-tests-at-end.gradle b/gradle/testing/slowest-tests-at-end.gradleindex eaf9cd1a2f1..d24e523394d 100644--- a/gradle/testing/slowest-tests-at-end.gradle+++ b/gradle/testing/slowest-tests-at-end.gradle@@ -22,7 +22,7 @@ def allSuites = []allprojects {plugins.withType(JavaPlugin) {- ext {+ project.ext {testOptions += [[propName: 'tests.slowestTests', value: true, description: "Print the summary of the slowest tests."],[propName: 'tests.slowestSuites', value: true, description: "Print the summary of the slowest suites."]diff --git a/gradle/validation/check-environment.gradle b/gradle/validation/check-environment.gradleindex 6fcaf761a19..6e5c01ef19c 100644--- a/gradle/validation/check-environment.gradle+++ b/gradle/validation/check-environment.gradle@@ -22,7 +22,7 @@ import org.gradle.util.GradleVersionconfigure(rootProject) {ext {- expectedGradleVersion = '8.4'+ expectedGradleVersion = '8.10'}wrapper {diff --git a/gradle/validation/jar-checks.gradle b/gradle/validation/jar-checks.gradleindex 6c87c50f023..7547214299d 100644--- a/gradle/validation/jar-checks.gradle+++ b/gradle/validation/jar-checks.gradle@@ -1,3 +1,5 @@+import java.util.stream.Collectors+/** Licensed to the Apache Software Foundation (ASF) under one or more* contributor license agreements. See the NOTICE file distributed with@@ -74,14 +76,14 @@ subprojects {// Configure jarValidation configuration for all projects. Any dependency// declared on this configuration (or any configuration it extends from) will// be verified.- configurations {+ project.configurations {jarValidation}// For Java projects, add all dependencies from the following configurations// to jar validationplugins.withType(JavaPlugin) {- configurations {+ project.configurations {jarValidation {extendsFrom runtimeClasspathextendsFrom compileClasspath@@ -107,16 +109,24 @@ subprojects {}def excludeRules = configurations.jarValidation.excludeRules+ List<Map<String, String>> excludeRuleMaps;+ if (excludeRules && excludeRules.size() > 0) {+ excludeRuleMaps = excludeRules.stream().map {rule ->+ if (rule.module != null) {+ Map.of("group", rule.group, "module", rule.module)+ } else {+ Map.of("group", rule.group)+ }+ }.collect(Collectors.toList())+ }ArrayDeque<ResolvedDependency> queue = new ArrayDeque<>()configurations.jarValidation.extendsFrom.each { conf ->- if (excludeRules) {+ if (excludeRules && excludeRules.size() > 0) {conf = conf.copyRecursive()conf.canBeResolved = trueconf.canBeConsumed = true- def newConfExcludeRules = new HashSet<>(conf.excludeRules)- newConfExcludeRules.addAll(excludeRules)- conf.excludeRules = newConfExcludeRules+ excludeRuleMaps.forEach {conf.exclude(it)}}if (conf.canBeResolved) {queue.addAll(conf.resolvedConfiguration.firstLevelModuleDependencies)diff --git a/gradle/validation/spotless.gradle b/gradle/validation/spotless.gradleindex 76fecdfad98..d4444a87671 100644--- a/gradle/validation/spotless.gradle+++ b/gradle/validation/spotless.gradle@@ -24,7 +24,7 @@ configure(allprojects) { prj ->plugins.withType(JavaPlugin) {prj.apply plugin: 'com.diffplug.spotless'- ext {+ project.ext {spotlessJavaSetup = (Action){it.toggleOffOn() // obviously, only to be used sparingly.// TODO: Work out how to support multiple different header files (we havediff --git a/gradle/wrapper/gradle-wrapper.jar.sha256 b/gradle/wrapper/gradle-wrapper.jar.sha256index f78f56fee75..67dead8f441 100644--- a/gradle/wrapper/gradle-wrapper.jar.sha256+++ b/gradle/wrapper/gradle-wrapper.jar.sha256@@ -1 +1 @@-0336f591bc0ec9aa0c9988929b93ecc916b3c1d52aed202c7381db144aa0ef15+2db75c40782f5e8ba1fc278a5574bab070adccb2d21ca5a6e5ed840888448046diff --git a/gradle/wrapper/gradle-wrapper.jar.version b/gradle/wrapper/gradle-wrapper.jar.versionindex a2f28f43be3..dd78a707858 100644--- a/gradle/wrapper/gradle-wrapper.jar.version+++ b/gradle/wrapper/gradle-wrapper.jar.version@@ -1 +1 @@-8.4.0+8.10.2\ No newline at end of filediff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex 744c64d1277..9355b415575 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,7 @@distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zipnetworkTimeout=10000+validateDistributionUrl=truezipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/distsdiff --git a/gradlew b/gradlewindex 0aa671a76c2..c8ad2977471 100755--- a/gradlew+++ b/gradlew@@ -15,6 +15,8 @@# See the License for the specific language governing permissions and# limitations under the License.#+# SPDX-License-Identifier: Apache-2.0+################################################################################@@ -55,7 +57,7 @@# Darwin, MinGW, and NonStop.## (3) This script is generated from the Groovy template-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt# within the Gradle project.## You can find Gradle at https://github.com/gradle/gradle/.@@ -84,7 +86,8 @@ done# shellcheck disable=SC2034APP_BASE_NAME=${0##*/}# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s+' "$PWD" ) || exit# Use the maximum available, or set MAX_FD != -1 to use that value.MAX_FD=maximum@@ -161,7 +164,7 @@ if [ ! -e "$GRADLE_WRAPPER_JAR" ]; then"$JAVACMD" $JAVA_OPTS "$APP_HOME/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "$GRADLE_WRAPPER_JAR"WRAPPER_STATUS=$?if [ "$WRAPPER_STATUS" -eq 1 ]; then- echo "ERROR: Something went wrong. Make sure you're using Java version between 11 and 21."+ echo "ERROR: Something went wrong. Make sure you're using Java version between 21 and 23."exit $WRAPPER_STATUSelif [ "$WRAPPER_STATUS" -ne 0 ]; thenexit $WRAPPER_STATUSdiff --git a/gradlew.bat b/gradlew.batindex 938e3ce94ee..ff65d8f6012 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -13,6 +13,8 @@@rem See the License for the specific language governing permissions and@rem limitations under the License.@rem+@rem SPDX-License-Identifier: Apache-2.0+@rem@if "%DEBUG%"=="" @echo off@rem ##########################################################################@@ -48,11 +50,11 @@ set JAVA_EXE=java.exe%JAVA_EXE% -version >NUL 2>&1if %ERRORLEVEL% equ 0 goto execute-echo.-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.-echo.-echo Please set the JAVA_HOME variable in your environment to match the-echo location of your Java installation.+echo. 1>&2+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2+echo. 1>&2+echo Please set the JAVA_HOME variable in your environment to match the 1>&2+echo location of your Java installation. 1>&2goto fail@@ -62,11 +64,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exeif exist "%JAVA_EXE%" goto execute-echo.-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%-echo.-echo Please set the JAVA_HOME variable in your environment to match the-echo location of your Java installation.+echo. 1>&2+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2+echo. 1>&2+echo Please set the JAVA_HOME variable in your environment to match the 1>&2+echo location of your Java installation. 1>&2goto fail@@ -108,7 +110,7 @@ goto fail:failWithJvmMessage@rem https://github.com/apache/lucene/pull/819-echo Error: Something went wrong. Make sure you're using Java version between 11 and 21.+echo Error: Something went wrong. Make sure you're using Java version between 21 and 23.:failrem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead ofdiff --git a/settings.gradle b/settings.gradleindex a9dd4a99ba1..7035b75bfdf 100644--- a/settings.gradle+++ b/settings.gradle@@ -25,7 +25,7 @@ pluginManagement {}plugins {- id 'com.gradle.develocity' version '3.17.6'+ id 'com.gradle.develocity' version '3.18.1'id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'}