Skip to content

Conversation

@aaime
Copy link
Member

@aaime aaime commented Dec 9, 2025

In addition I had to comment out yet another Validator usage in tests... the xlink.xsd is not getting downloaded by XMLUnit, even if it's available from the browser. We'll need to rethink that, but for the moment it's mostly a distraction, that class has plenty validators already commented out.

@aaime aaime requested a review from dromagnoli December 9, 2025 15:42
Copy link
Contributor

@dromagnoli dromagnoli left a comment

Choose a reason for hiding this comment

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

Looks good to me.
Only added a question/comment in a test class

Validator validator = new Validator(result);
validator.useXMLSchema(true);
validator.assertIsValid();
System.setProperty("http.agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36");
Copy link
Contributor

@dromagnoli dromagnoli Dec 9, 2025

Choose a reason for hiding this comment

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

is it needed?
what about the validators commented out section ?
(wondering if that was part of a debug session)

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch, I was trying to have the validator use a different user agent, as xlink.xsd was available from a browser.

@aaime aaime merged commit 0093c37 into GeoWebCache:main Dec 10, 2025
9 checks passed
@geoserver-bot
Copy link
Collaborator

The backport to 1.27.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 5e224a856... FullWMS: support fusing transparent tiles and generating an opaque output
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/wms/src/main/java/org/geowebcache/io/codec/ImageEncoderImpl.java
CONFLICT (content): Merge conflict in geowebcache/wms/src/main/java/org/geowebcache/io/codec/ImageEncoderImpl.java
Auto-merging geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSTileFuser.java
Auto-merging geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSTileFuserTest.java
CONFLICT (content): Merge conflict in geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSTileFuserTest.java
Auto-merging geowebcache/wmts/src/test/java/org/geowebcache/service/wmts/WMTSServiceTest.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-1459-to-1.27.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5e224a8561a3108494073ed71142aa4ff1cef0dc,15f61b27a765ba19ceec652717157d2ee802553d
# Push it to GitHub
git push --set-upstream origin backport-1459-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-1459-to-1.27.x.

@geoserver-bot
Copy link
Collaborator

The backport to 1.28.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 5e224a856... FullWMS: support fusing transparent tiles and generating an opaque output
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/wms/src/main/java/org/geowebcache/service/wms/WMSTileFuser.java
Auto-merging geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSTileFuserTest.java
CONFLICT (content): Merge conflict in geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSTileFuserTest.java
Auto-merging geowebcache/wmts/src/test/java/org/geowebcache/service/wmts/WMTSServiceTest.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.28.x 1.28.x
# Navigate to the new working tree
cd .worktrees/backport-1.28.x
# Create a new branch
git switch --create backport-1459-to-1.28.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5e224a8561a3108494073ed71142aa4ff1cef0dc,15f61b27a765ba19ceec652717157d2ee802553d
# Push it to GitHub
git push --set-upstream origin backport-1459-to-1.28.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.28.x

Then, create a pull request where the base branch is 1.28.x and the compare/head branch is backport-1459-to-1.28.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