Skip to content

Bump Elasticsearch to a minimum of JDK 21 #112252

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
merged 17 commits into from
Sep 11, 2024
Merged

Bump Elasticsearch to a minimum of JDK 21 #112252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2eaa25c
Prepare for JDK 21
ChrisHegarty Aug 27, 2024
543a090
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Aug 28, 2024
77e476e
bump ci build versions
ChrisHegarty Aug 28, 2024
8c86e98
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Aug 29, 2024
513069c
bump fips java version
ChrisHegarty Aug 29, 2024
932f387
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Aug 29, 2024
435b546
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Aug 30, 2024
c8a7b93
Bump byte buddy
ChrisHegarty Aug 30, 2024
ed50f35
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Aug 30, 2024
23ae210
Update integTest minimumCompilerVersion
ChrisHegarty Aug 31, 2024
8786591
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Aug 31, 2024
e797ae2
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Aug 31, 2024
fb30292
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Sep 1, 2024
7f3ba47
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Sep 4, 2024
fdaa1e6
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Sep 7, 2024
d736cb8
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Sep 10, 2024
d665209
Merge branch 'main' into prepare_for_jdk_21
elasticmachine Sep 11, 2024
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 .ci/java-versions-aarch64.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# build and test Elasticsearch for this branch. Valid Java versions
# are 'java' or 'openjdk' followed by the major release number.

ES_BUILD_JAVA=jdk17
ES_BUILD_JAVA=jdk21
Copy link
Contributor

@mark-vieira mark-vieira Sep 11, 2024

Choose a reason for hiding this comment

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

I think this can just be openjdk21 as well. I don't think we need separate ones for arm vs x64 anymore.

Copy link
Contributor Author

@ChrisHegarty ChrisHegarty Sep 11, 2024

Choose a reason for hiding this comment

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

Oh! Good catch Mark. Let’s do that in a follow up.

2 changes: 1 addition & 1 deletion .ci/java-versions-fips.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# build and test Elasticsearch for this branch. Valid Java versions
# are 'java' or 'openjdk' followed by the major release number.

ES_BUILD_JAVA=openjdk17
ES_BUILD_JAVA=openjdk21
2 changes: 1 addition & 1 deletion .ci/java-versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# build and test Elasticsearch for this branch. Valid Java versions
# are 'java' or 'openjdk' followed by the major release number.

ES_BUILD_JAVA=openjdk17
ES_BUILD_JAVA=openjdk21
2 changes: 1 addition & 1 deletion ...e/internal/fake_git/remote/build-tools-internal/src/main/resources/minimumCompilerVersion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17
21
2 changes: 1 addition & 1 deletion build-tools-internal/src/main/resources/minimumCompilerVersion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17
21
2 changes: 1 addition & 1 deletion build-tools-internal/src/main/resources/minimumRuntimeVersion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17
21
2 changes: 1 addition & 1 deletion ...gin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public Set<String> getSupportedAnnotationTypes() {

@Override
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.RELEASE_17;
return SourceVersion.RELEASE_21;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public Set<String> getSupportedAnnotationTypes() {

@Override
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.latest();
return SourceVersion.RELEASE_21;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public Set<String> getSupportedAnnotationTypes() {

@Override
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.RELEASE_17;
return SourceVersion.RELEASE_21;
}

@Override
Expand Down