Skip to content

Comments

[FasterXML/Woodstox] Woodstox Version Bump to 6.4.0#2197

Merged
cliu123 merged 5 commits intoopensearch-project:mainfrom
stephen-crawford:woodstox-bump
Oct 26, 2022
Merged

[FasterXML/Woodstox] Woodstox Version Bump to 6.4.0#2197
cliu123 merged 5 commits intoopensearch-project:mainfrom
stephen-crawford:woodstox-bump

Conversation

@stephen-crawford
Copy link
Contributor

Updated FasterXML/Woodstox version to 6.4.0

Backport to 2.x., 1.x, 1.3

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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.

@stephen-crawford stephen-crawford requested a review from a team October 26, 2022 14:15
@stephen-crawford stephen-crawford added backport 1.x backport to 1.x branch backport 1.3 backport to 1.3 branch backport 2.x labels Oct 26, 2022
@stephen-crawford
Copy link
Contributor Author

@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?

@cliu123 cliu123 merged commit d93c9ee into opensearch-project:main Oct 26, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.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-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 base branch is 1.x and the compare/head branch is backport/backport-2197-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 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-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 base branch is 1.3 and the compare/head branch is backport/backport-2197-to-1.3.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 26, 2022
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
(cherry picked from commit d93c9ee)
@cwperks
Copy link
Member

cwperks commented Oct 26, 2022

@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?

@stephen-crawford
Copy link
Contributor Author

@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.

@stephen-crawford stephen-crawford removed backport 1.x backport to 1.x branch backport 1.3 backport to 1.3 branch labels Oct 26, 2022
peternied pushed a commit that referenced this pull request Oct 26, 2022
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
(cherry picked from commit d93c9ee)

Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
stephen-crawford added a commit to stephen-crawford/security that referenced this pull request Nov 10, 2022
…ect#2197)

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
wuychn pushed a commit to ochprince/security that referenced this pull request Mar 16, 2023
…ect#2197) (opensearch-project#2199)

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
(cherry picked from commit d93c9ee)

Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@stephen-crawford stephen-crawford deleted the woodstox-bump branch April 11, 2023 14:02
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.

5 participants