Skip to content

Upgrade to gradle 8.14 on branch_10x (backport). #14591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dweiss merged 4 commits into from
Apr 30, 2025
Merged

Upgrade to gradle 8.14 on branch_10x (backport). #14591

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a838b9
Upgrade to gradle 8.14 on branch_10x (backport).
dweiss Apr 30, 2025
aa9c082
Correct the wrapper script.
dweiss Apr 30, 2025
192dd8b
Upgrade groovy to 4.0.26
dweiss Apr 30, 2025
87a41ef
Remove changes to MMapDirectory.
dweiss Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/run-checks-gradle-upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 3 additions & 2 deletions build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.jar.sha256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2db75c40782f5e8ba1fc278a5574bab070adccb2d21ca5a6e5ed840888448046
7d3a4ac4de1c32b59bc6a4eb8ecb8e612ccd0cf1ae1e99f66902da64df296172
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.jar.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.10.0
8.14.0
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,9 @@ private static <A> MMapIndexInputProvider<A> lookupProvider() {
// access through the lookup:
final var constr = lookup.findConstructor(cls, MethodType.methodType(void.class, int.class));
try {
return (MMapIndexInputProvider<A>) constr.invoke(maxPermits);
@SuppressWarnings("unchecked")

@uschindler uschindler Apr 30, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed here? This was only to workaround a java 24 bug.

@dweiss dweiss Apr 30, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assumed that it'd still fail with javac 24 if you're running with that. But apparently it works so it (javac) must be --target (or --source, or --release) sensitive somehow.

@uschindler uschindler Apr 30, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's why I asked. The compilation with java 24 on Jenkins worked all the time.

It is only an issue if release is targeting 24. They had some language updates. But we should open a bug report about this.

I will make a reproducer and open issue for 24.

var res = (MMapIndexInputProvider<A>) constr.invoke(maxPermits);
return res;
} catch (RuntimeException | Error e) {
throw e;
} catch (Throwable th) {
Expand Down
4 changes: 2 additions & 2 deletions versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down