Skip to content

Conversation

@reta
Copy link
Contributor

@reta reta commented Apr 22, 2025

Description

Update bundled JDK to 21.0.7+6 (April 2025 Patch releases)

Related Issues

Part of #18009

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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: Andriy Redko <drreta@gmail.com>
@andrross
Copy link
Member

I added the label to backport this to the 3.0 release branch. @reta any reason not to include this update in the 3.0 release?

@reta
Copy link
Contributor Author

reta commented Apr 22, 2025

I added the label to backport this to the 3.0 release branch. @reta any reason not to include this update in the 3.0 release?

Nope, should be just in time, thanks @andrross !

@github-actions
Copy link
Contributor

❌ Gradle check result for aef891d: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

❌ Gradle check result for aef891d: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

❌ Gradle check result for aef891d: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

❌ Gradle check result for aef891d: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Contributor

✅ Gradle check result for aef891d: SUCCESS

@codecov
Copy link

codecov bot commented Apr 23, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.53%. Comparing base (6afec2a) to head (aef891d).
Report is 66 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #18041      +/-   ##
============================================
- Coverage     72.57%   72.53%   -0.05%     
- Complexity    67160    67163       +3     
============================================
  Files          5478     5478              
  Lines        310130   310132       +2     
  Branches      45087    45087              
============================================
- Hits         225068   224945     -123     
- Misses        66661    66861     +200     
+ Partials      18401    18326      -75     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@reta reta merged commit 436038d into opensearch-project:main Apr 23, 2025
65 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 23, 2025
Signed-off-by: Andriy Redko <drreta@gmail.com>
(cherry picked from commit 436038d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
andrross pushed a commit that referenced this pull request Apr 23, 2025
…18049)

(cherry picked from commit 436038d)

Signed-off-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 1, 2025
…18049)

(cherry picked from commit 436038d)

Signed-off-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 1ce861b)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 1, 2025
…18049)

(cherry picked from commit 436038d)

Signed-off-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 1ce861b)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
andrross pushed a commit that referenced this pull request May 1, 2025
…18049) (#18179)

(cherry picked from commit 436038d)




(cherry picked from commit 1ce861b)

Signed-off-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
reta pushed a commit that referenced this pull request May 2, 2025
…18049) (#18180)

(cherry picked from commit 436038d)




(cherry picked from commit 1ce861b)

Signed-off-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@hasselg
Copy link

hasselg commented May 6, 2025

Will this fix be ported for 2.19.3?

prudhvigodithi pushed a commit to prudhvigodithi/OpenSearch that referenced this pull request May 6, 2025
…h-project#18041) (opensearch-project#18049)

(cherry picked from commit 436038d)

Signed-off-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.19 2.19
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.19
# Create a new branch
git switch --create backport/backport-18041-to-2.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 436038d2be54df8979466841fccc6db4971bcb75
# Push it to GitHub
git push --set-upstream origin backport/backport-18041-to-2.19
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.19

Then, create a pull request where the base branch is 2.19 and the compare/head branch is backport/backport-18041-to-2.19.

@andrross
Copy link
Member

andrross commented May 6, 2025

@hasselg Yes, this was backported in #18180

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.19 backport 3.0 backport-failed Build Build Tasks/Gradle Plugin, groovy scripts, build tools, Javadoc enforcement. skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants