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

Update Jackson 2 libs from 2.17.1 to 2.17.2 #1286

Merged
merged 1 commit into from
Jul 15, 2024
Merged

Conversation

@aaime
Copy link
Member

aaime commented Jul 15, 2024

Looks like this one was left behind while GT and GS ones were merged. Proceeding to merge and backport, to re-align.

@aaime aaime merged commit 30a25bd into GeoWebCache:main Jul 15, 2024
9 checks passed
@aaime
Copy link
Member

aaime commented Jul 15, 2024

The backport to 1.24.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1d343a87... Update Jackson 2 libs from 2.17.1 to 2.17.2
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging geowebcache/pom.xml
CONFLICT (content): Merge conflict in geowebcache/pom.xml

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

Then, create a pull request where the base branch is 1.24.x and the compare/head branch is backport-1286-to-1.24.x.

@mprins
Copy link
Contributor Author

mprins commented Jul 16, 2024

Looks like this one was left behind while GT and GS ones were merged. Proceeding to merge and backport, to re-align.

@aaime I'm, not a member of @GeoWebCache so I can't merge or label anything here

@mprins mprins deleted the patch-1 branch July 16, 2024 06:57
@aaime
Copy link
Member

aaime commented Jul 16, 2024

Aaah, I see

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

Successfully merging this pull request may close these issues.

2 participants