Skip to content
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.

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

Update bundled JDK to Java 22 (again) #108654

Merged
merged 4 commits into from
May 15, 2024
Merged

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented May 15, 2024

This commit re-bumps the bundled JDK to Java 22 now that we have a tested workaround for the G1GC bug
(https://bugs.openjdk.org/browse/JDK-8329528).

relates #108571
relates #106987

This commit re-bumps the bundled JDK to Java 22 now that we have
a tested workaround for the G1GC bug
(https://bugs.openjdk.org/browse/JDK-8329528).

relates elastic#108571
relates elastic#106987
@rjernst rjernst added :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts >upgrade auto-backport-and-merge Automatically create backport pull requests and merge when ready v8.14.0 labels May 15, 2024
@rjernst rjernst requested a review from a team as a code owner May 15, 2024 00:17
@elasticsearchmachine elasticsearchmachine added v8.15.0 Team:Delivery Meta label for Delivery team labels May 15, 2024
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

@elasticsearchmachine
Copy link
Collaborator

Hi @rjernst, I've created a changelog YAML for you.

@mark-vieira
Copy link
Contributor

FYI, I added a couple of version tags, this needs to get backported to 7.17 as well (eventually). Also, you will want to revert these changes as well. This is the bit to remove the explicit toolchain stuff for Java 22 which is no longer necessary once the bundled JDK is bumped.

Copy link
Contributor

@ChrisHegarty ChrisHegarty left a comment

Choose a reason for hiding this comment

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

LGTM

@rjernst rjernst merged commit 2dceafc into elastic:main May 15, 2024
19 checks passed
@rjernst rjernst deleted the jdk/upgrade_to_22 branch May 15, 2024 16:14
rjernst added a commit to rjernst/elasticsearch that referenced this pull request May 15, 2024
This commit re-bumps the bundled JDK to Java 22 now that we have
a tested workaround for the G1GC bug
(https://bugs.openjdk.org/browse/JDK-8329528).

relates elastic#108571
relates elastic#106987
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.14
7.17 Commit could not be cherrypicked due to conflicts
8.13 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 108654

@rjernst rjernst removed the v8.13.5 label May 15, 2024
rjernst added a commit to rjernst/elasticsearch that referenced this pull request May 15, 2024
This commit re-bumps the bundled JDK to Java 22 now that we have
a tested workaround for the G1GC bug
(https://bugs.openjdk.org/browse/JDK-8329528).

relates elastic#108571
relates elastic#106987
elasticsearchmachine pushed a commit that referenced this pull request May 15, 2024
This commit re-bumps the bundled JDK to Java 22 now that we have
a tested workaround for the G1GC bug
(https://bugs.openjdk.org/browse/JDK-8329528).

relates #108571
relates #106987
elasticsearchmachine pushed a commit that referenced this pull request May 16, 2024
* Update bundled JDK to Java 22 (again) (#108654)

This commit re-bumps the bundled JDK to Java 22 now that we have
a tested workaround for the G1GC bug
(https://bugs.openjdk.org/browse/JDK-8329528).

relates #108571
relates #106987

* copy main openjdk toolchain resolver

* use 2 lines for workaround

* fix test

* update adoptium test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport-and-merge Automatically create backport pull requests and merge when ready backport pending :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts Team:Delivery Meta label for Delivery team >upgrade v7.17.22 v8.14.0 v8.15.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants