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 #106482

Merged
merged 5 commits into from
Mar 19, 2024
Merged

Conversation

mark-vieira
Copy link
Contributor

Bumping bundled JDK to Java 22 since it is now GA.

@mark-vieira mark-vieira added :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts >upgrade auto-backport-and-merge v7.17.19 v8.13.1 labels Mar 19, 2024
@mark-vieira mark-vieira requested a review from a team as a code owner March 19, 2024 14:05
@elasticsearchmachine elasticsearchmachine added v8.14.0 Team:Delivery Meta label for Delivery team labels Mar 19, 2024
@elasticsearchmachine
Copy link
Collaborator

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

@elasticsearchmachine
Copy link
Collaborator

Hi @mark-vieira, I've created a changelog YAML for you.

@mark-vieira mark-vieira force-pushed the bundle-jdk-22-update branch from bbcc737 to 6fa670d Compare March 19, 2024 17:10
@mark-vieira
Copy link
Contributor Author

@elasticmachine update branch

@mark-vieira
Copy link
Contributor Author

@elasticmachine update branch

@mark-vieira mark-vieira merged commit 2ab2a06 into elastic:main Mar 19, 2024
17 checks passed
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
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 106482

mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Mar 19, 2024
# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolver.java
mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Mar 19, 2024
# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/AdoptiumJdkToolchainResolver.java
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolver.java
#	build-tools-internal/src/test/groovy/org/elasticsearch/gradle/internal/toolchain/AdoptiumJdkToolchainResolverSpec.groovy
#	gradle/verification-metadata.xml
elasticsearchmachine pushed a commit that referenced this pull request Mar 19, 2024
# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolver.java
elasticsearchmachine pushed a commit that referenced this pull request Mar 19, 2024
* Update bundled JDK to Java 22 (#106482)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/AdoptiumJdkToolchainResolver.java
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolver.java
#	build-tools-internal/src/test/groovy/org/elasticsearch/gradle/internal/toolchain/AdoptiumJdkToolchainResolverSpec.groovy
#	gradle/verification-metadata.xml

* Revert toolchain resolver changes
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 v7.17.19 v8.13.1 v8.14.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants