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

Upgrade bundled jdk to 15.0.1 and switch back to AdoptOpenJDK #64253

Merged
merged 1 commit into from Oct 29, 2020

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented Oct 27, 2020

This commit updates the bundled jdk to 15.0.1, and at the same time once
again switches the bundled jdk back to adoptopenjdk, which has fixed
their build problem and regained support for glibc 2.12.

closes #64026

This commit updates the bundled jdk to 15.0.1, and at the same time once
again switches the bundled jdk back to adoptopenjdk, which has fixed
their build problem and regained support for glibc 2.12.

closes elastic#64026
@rjernst rjernst added :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts >upgrade v8.0.0 v7.10.0 v7.11.0 labels Oct 27, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (:Core/Infra/Packaging)

@elasticmachine elasticmachine added the Team:Core/Infra Meta label for core/infra team label Oct 27, 2020
@jasontedor
Copy link
Member

The title says "Oracle" but I think you meant "AdoptOpenJDK"?

@rjernst rjernst changed the title Upgrade bundled jdk to 15.0.1 and switch back to Oracle Upgrade bundled jdk to 15.0.1 and switch back to AdoptOpenJDK Oct 29, 2020
@rjernst
Copy link
Member Author

rjernst commented Oct 29, 2020

That is indeed what I meant. I've corrected the PR title.

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

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

LGTM. I think this should go to the bundled JDK in the Docker image in 6.8 too (not a straightforward backport).

@rjernst rjernst merged commit 29a66a7 into elastic:master Oct 29, 2020
@rjernst rjernst deleted the jdk_flip_flop branch October 29, 2020 17:55
rjernst added a commit that referenced this pull request Oct 29, 2020
This commit updates the bundled jdk to 15.0.1, and at the same time once
again switches the bundled jdk back to adoptopenjdk, which has fixed
their build problem and regained support for glibc 2.12.

closes #64026
rjernst added a commit that referenced this pull request Oct 29, 2020
This commit updates the bundled jdk to 15.0.1, and at the same time once
again switches the bundled jdk back to adoptopenjdk, which has fixed
their build problem and regained support for glibc 2.12.

closes #64026
@rjernst
Copy link
Member Author

rjernst commented Oct 29, 2020

Just a note, while I changed this PR title, I failed to edit the commit message which still referenced switching to Oracle. So while it refers to switching back to Oracle, we have in fact switched back to AdoptOpenJDK

@mark-vieira mark-vieira added Team:Delivery Meta label for Delivery team and removed Team:Core/Infra Meta label for core/infra team labels Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts Team:Delivery Meta label for Delivery team >upgrade v6.8.14 v7.10.0 v7.11.0 v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch back to AdoptOpenJDK for bundled jdk
5 participants