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

[Backport 2.x] Backporting #14861 to 2.x #14961

Merged

Conversation

dblock
Copy link
Member

@dblock dblock commented Jul 24, 2024

Backporting #14861 manually.

  • Bump org.apache.commons:commons-lang3 in /plugins/repository-hdfs

Bumps org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0.


updated-dependencies:

  • dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ...

Signed-off-by: dependabot[bot] support@github.com

  • Updating SHAs

Signed-off-by: dependabot[bot] support@github.com

  • Update changelog

Signed-off-by: dependabot[bot] support@github.com


Signed-off-by: dependabot[bot] support@github.com
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 76be615)

Description

[Describe what this change achieves]

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

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.

…ns/repository-hdfs (opensearch-project#14861)

* Bump org.apache.commons:commons-lang3 in /plugins/repository-hdfs

Bumps org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Update changelog

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 76be615)
@dblock dblock force-pushed the backport/backport-14861-to-2.x branch from b648335 to 51f00b7 Compare July 24, 2024 15:19
Copy link
Contributor

❌ Gradle check result for bf51125: 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?

Copy link
Contributor

❌ Gradle check result for b648335: 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?

Copy link
Contributor

❕ Gradle check result for 51f00b7: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Jul 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.56%. Comparing base (8b55e04) to head (51f00b7).
Report is 1 commits behind head on 2.x.

Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #14961      +/-   ##
============================================
- Coverage     71.60%   71.56%   -0.04%     
+ Complexity    62778    62728      -50     
============================================
  Files          5123     5123              
  Lines        294467   294467              
  Branches      42909    42909              
============================================
- Hits         210855   210739     -116     
- Misses        65901    66042     +141     
+ Partials      17711    17686      -25     

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

@dblock dblock merged commit 7223644 into opensearch-project:2.x Jul 24, 2024
31 of 32 checks passed
@dblock dblock deleted the backport/backport-14861-to-2.x branch July 24, 2024 22:35
@dblock dblock added the v2.16.0 Issues and PRs related to version 2.16.0 label Jul 24, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.16 failed:

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

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.16 2.16
# Navigate to the new working tree
pushd ../.worktrees/backport-2.16
# Create a new branch
git switch --create backport/backport-14961-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 72236440e4d15f9ff88b2f14914774e4e8aa43a5
# Push it to GitHub
git push --set-upstream origin backport/backport-14961-to-2.16
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.16

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

@dblock dblock removed v2.16.0 Issues and PRs related to version 2.16.0 backport 2.16 labels Jul 24, 2024
@dblock
Copy link
Member Author

dblock commented Jul 24, 2024

Not critical for 2.16, removing labels.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants