Skip to content

Validate GWC files for Raster Masking - #1593

Merged
aaime merged 1 commit into
GeoWebCache:mainfrom
dromagnoli:raster-mask
Sep 25, 2026
Merged

aaime merged 1 commit into
GeoWebCache:mainfrom
dromagnoli:raster-mask

Conversation

@dromagnoli

@dromagnoli dromagnoli commented Sep 24, 2026 •

Copy link
Copy Markdown
Contributor

Validate the GWC Raster file provided for Tile Masking and check for TYPOs in the specified gridset ID (i.e. EPGS:4326 rather than EPSG:4326)

@aaime aaime left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks!

@aaime
aaime merged commit 3393222 into GeoWebCache:main Sep 25, 2026
17 of 18 checks passed
@geoserver-bot

Copy link
Copy Markdown
Collaborator

The backport to 1.27.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 8dccf84d9... Validate GWC files for Raster Masking
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/core/src/main/java/org/geowebcache/filter/request/FileRasterFilter.java
CONFLICT (content): Merge conflict in geowebcache/core/src/main/java/org/geowebcache/filter/request/FileRasterFilter.java
Auto-merging geowebcache/rest/src/test/java/org/geowebcache/rest/filter/FilterUpdateControllerTest.java

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

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

@geoserver-bot

Copy link
Copy Markdown
Collaborator

The backport to 2.0.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
On branch backport-1593-to-2.0.x
You are currently cherry-picking commit 8dccf84d9.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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

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

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