opensearch-project / opensearch-java

Java Client for OpenSearch
Apache License 2.0
105 stars 169 forks source link

Bump commons-codec:commons-codec from 1.11.0 to 1.17.0 in java-codegen #1023

Closed Xtansia closed 2 weeks ago

Xtansia commented 2 weeks ago

Description

Bump the version of commons-codec:commons-codec being transitively pulled in in java-codegen to appease Mend/WhiteSource.

Issues Resolved

Fixes #1022

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.

opensearch-trigger-bot[bot] commented 2 weeks ago

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

reta commented 2 weeks ago

@Xtansia apologies, could you please backport to 2.x manually? thank you

Xtansia commented 2 weeks ago

@reta this will fail backport because the code gen PR hasn't been backported to 2.x. So this isn't an issue for 2.x, but depends on if you'd like the generator backported