diff --git a/.github/workflows/run-checks-gradle-upgrade.yml b/.github/workflows/run-checks-gradle-upgrade.yml index b026ce96bba2..1db4b3c60bca 100644 --- a/.github/workflows/run-checks-gradle-upgrade.yml +++ b/.github/workflows/run-checks-gradle-upgrade.yml @@ -30,7 +30,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - java-version: [ '23-ea' ] + java-version: [ '24' ] uses-alt-java: [ true, false ] runs-on: ${{ matrix.os }} 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.java index d084243b2a5d..fbb0a56c57e3 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 @@ -60,8 +60,9 @@ public static void main(String[] args) { public static void checkVersion() { int major = Runtime.version().feature(); - if (major != 21 && major != 22 && major != 23) { - throw new IllegalStateException("java version must be 21, 22 or 23, your version: " + major); + if (major < 21 || major > 24) { + throw new IllegalStateException( + "java version must be >= 21 and <= 24, your version: " + major); } } diff --git a/gradle/wrapper/gradle-wrapper.jar.sha256 b/gradle/wrapper/gradle-wrapper.jar.sha256 index 6d5fdcd3f30c..30bde90fc90a 100644 --- a/gradle/wrapper/gradle-wrapper.jar.sha256 +++ b/gradle/wrapper/gradle-wrapper.jar.sha256 @@ -1 +1 @@ -2db75c40782f5e8ba1fc278a5574bab070adccb2d21ca5a6e5ed840888448046 \ No newline at end of file +7d3a4ac4de1c32b59bc6a4eb8ecb8e612ccd0cf1ae1e99f66902da64df296172 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar.version b/gradle/wrapper/gradle-wrapper.jar.version index 7f6758ef97bc..2a5dd0d63896 100644 --- a/gradle/wrapper/gradle-wrapper.jar.version +++ b/gradle/wrapper/gradle-wrapper.jar.version @@ -1 +1 @@ -8.10.0 +8.14.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b4155759..ca025c83a7cc 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-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/versions.toml b/versions.toml index 82f09293e273..52028e18ef97 100644 --- a/versions.toml +++ b/versions.toml @@ -10,7 +10,7 @@ errorprone = "2.36.0" flexmark = "0.64.8" # @keep This is GJF version for spotless/ tidy. googleJavaFormat = "1.23.0" -groovy = "4.0.22" +groovy = "4.0.26" hamcrest = "2.2" icu4j = "77.1" javacc = "7.0.12" @@ -20,7 +20,7 @@ jmh = "1.37" jts = "1.17.0" junit = "4.13.1" # @keep Minimum gradle version to run the build -minGradle = "8.10" +minGradle = "8.14" # @keep This is the minimum required Java version. minJava = "21" morfologik = "2.1.9"