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

[GWC-1198] Upgrade Hazelcast from 5.3.1 to 5.3.6 #1199

Merged
merged 1 commit into from
Dec 11, 2023

Conversation

sikeoka
Copy link
Contributor

@sikeoka sikeoka commented Dec 1, 2023

This PR includes a dependency upgrade that contains security fixes and updates the modules using Hazelcast to work correctly after the last Hazelcast upgrade.

This PR must be backported to 1.24.x to fix an error caused by the last Hazelcast upgrade.

This PR is dependent on the GeoTools PR: geotools/geotools#4579

@aaime aaime closed this Dec 4, 2023
@aaime aaime reopened this Dec 4, 2023
@aaime
Copy link
Member

aaime commented Dec 4, 2023

GT method is now available, closed and reopened to force a new round of builds

@aaime aaime merged commit ff05a16 into GeoWebCache:main Dec 11, 2023
7 of 13 checks passed
@aaime
Copy link
Member

aaime commented Dec 11, 2023

The backport to 1.24.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 5b082d18... [GWC-1198] Upgrade Hazelcast from 5.3.1 to 5.3.6
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/distributed/pom.xml
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-1199-to-1.24.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5b082d18d1ac980575814a3c5b292cfa9ea0ca8b
# Push it to GitHub
git push --set-upstream origin backport-1199-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-1199-to-1.24.x.

@aaime
Copy link
Member

aaime commented Dec 11, 2023

This one needs a manual backport

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