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

Bump JDK to 21 #1384

Merged
merged 4 commits into from
Jun 12, 2024
Merged

Bump JDK to 21 #1384

merged 4 commits into from
Jun 12, 2024

Conversation

SuZhou-Joe
Copy link
Member

@SuZhou-Joe SuZhou-Joe commented Jun 12, 2024

Description

image

There is a jar hell issue in opensearch 3.0.0. Bump JDK to 21 to mitigate.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
Signed-off-by: SuZhou-Joe <[email protected]>
@SuZhou-Joe SuZhou-Joe changed the title fix: bump jdk Bump jdk to 21 Jun 12, 2024
@SuZhou-Joe SuZhou-Joe marked this pull request as ready for review June 12, 2024 04:10
@SuZhou-Joe SuZhou-Joe changed the title Bump jdk to 21 Bump JDK to 21 Jun 12, 2024
@SuZhou-Joe SuZhou-Joe merged commit e445a52 into opensearch-project:main Jun 12, 2024
54 of 57 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1384-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e445a5207cd74a215d4a326766b1fc0f65455537
# Push it to GitHub
git push --set-upstream origin backport/backport-1384-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1384-to-2.x.

SuZhou-Joe added a commit to SuZhou-Joe/opensearch-dashboards-functional-test that referenced this pull request Sep 6, 2024
* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

---------

Signed-off-by: SuZhou-Joe <[email protected]>
(cherry picked from commit e445a52)
SuZhou-Joe added a commit that referenced this pull request Sep 6, 2024
* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

---------

Signed-off-by: SuZhou-Joe <[email protected]>
(cherry picked from commit e445a52)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 6, 2024
* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

---------

Signed-off-by: SuZhou-Joe <[email protected]>
(cherry picked from commit e445a52)
(cherry picked from commit 539ab44)
SuZhou-Joe added a commit that referenced this pull request Sep 6, 2024
* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

* fix: bump jdk

Signed-off-by: SuZhou-Joe <[email protected]>

---------

Signed-off-by: SuZhou-Joe <[email protected]>
(cherry picked from commit e445a52)
(cherry picked from commit 539ab44)

Co-authored-by: SuZhou-Joe <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants