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

Upgrade commons-text from 1.12.0 to 1.13.0 #1365

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Conversation

sikeoka
Copy link
Contributor

@sikeoka sikeoka commented Feb 10, 2025

This is just a regular dependency upgrade.

@aaime aaime merged commit 999ae98 into GeoWebCache:main Feb 17, 2025
13 checks passed
@geoserver-bot
Copy link
Collaborator

The backport to 1.25.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c81669e5... Upgrade commons-text from 1.12.0 to 1.13.0
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 set 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.25.x 1.25.x
# Navigate to the new working tree
cd .worktrees/backport-1.25.x
# Create a new branch
git switch --create backport-1365-to-1.25.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c81669e5ac02b15baf11c4c04fe320bf3a44f77d
# Push it to GitHub
git push --set-upstream origin backport-1365-to-1.25.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.25.x

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

@geoserver-bot
Copy link
Collaborator

The backport to 1.26.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c81669e5... Upgrade commons-text from 1.12.0 to 1.13.0
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 set 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.26.x 1.26.x
# Navigate to the new working tree
cd .worktrees/backport-1.26.x
# Create a new branch
git switch --create backport-1365-to-1.26.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c81669e5ac02b15baf11c4c04fe320bf3a44f77d
# Push it to GitHub
git push --set-upstream origin backport-1365-to-1.26.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.26.x

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

@sikeoka sikeoka deleted the dep-ctext branch February 19, 2025 16:27
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.

3 participants