-
Notifications
You must be signed in to change notification settings - Fork 300
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
[FasterXML/Woodstox] Woodstox Version Bump to 6.4.0 #2197
[FasterXML/Woodstox] Woodstox Version Bump to 6.4.0 #2197
Conversation
Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]>
@peternied the bot will automatically backport if i label the PR as such right? I do not need add anything into the body of the PR? |
The backport to
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-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-2197-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d93c9eec7893861a278e5fb34f0701334007bad8
# Push it to GitHub
git push --set-upstream origin backport/backport-2197-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x Then, create a pull request where the |
The backport to
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-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-2197-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d93c9eec7893861a278e5fb34f0701334007bad8
# Push it to GitHub
git push --set-upstream origin backport/backport-2197-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3 Then, create a pull request where the |
Signed-off-by: Stephen Crawford <[email protected]> (cherry picked from commit d93c9ee)
@scrawfor99 Looks like the backport to 1.x and 1.3 failed. There was a pretty big change in the build.gradle in 2.2 which may affect backports. In this case, I don't see woodstox in the build.gradle of 1.3 or 1.x. Is there any action to be taken for those branches? |
@cwperks I just checked as well and because the woodstox dependency is not present in 1.3 or 1.x it should be fine as-is. The concern is the traversed dependencies through woodstox which need to be updated but without those dependencies there should not be a need for concern. |
Signed-off-by: Stephen Crawford <[email protected]> (cherry picked from commit d93c9ee) Co-authored-by: Stephen Crawford <[email protected]>
…ect#2197) Signed-off-by: Stephen Crawford <[email protected]>
…ect#2197) (opensearch-project#2199) Signed-off-by: Stephen Crawford <[email protected]> (cherry picked from commit d93c9ee) Co-authored-by: Stephen Crawford <[email protected]>
Updated FasterXML/Woodstox version to 6.4.0
Backport to 2.x., 1.x, 1.3
Check List
New functionality includes testingNew functionality has been documentedBy 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.