Updating Spring to 5.3.32

[aaime]

No description provided.

[aaime]

The backport to 1.24.x failed:

The process '/usr/bin/git' failed with exit code 1

stderr

error: could not apply 55e1f0b6... Updating Spring to 5.3.32
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".

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-1224-to-1.24.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 55e1f0b6baf1a980b1c0d6554a3980ba5fd0ddda
# Push it to GitHub
git push --set-upstream origin backport-1224-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-1224-to-1.24.x.

[aaime]

The backport to 1.23.x failed:

The process '/usr/bin/git' failed with exit code 1

stderr

error: could not apply 55e1f0b6... Updating Spring to 5.3.32
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".

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

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