Skip to content

Migrate the site descriptor to the v2 model - #552

Merged
slachiewicz merged 1 commit into
masterfrom
agent/site-descriptor-v2
Sep 10, 2026
Merged

Migrate the site descriptor to the v2 model#552
slachiewicz merged 1 commit into
masterfrom
agent/site-descriptor-v2

Conversation

@slachiewicz

Copy link
Copy Markdown
Member

The site descriptor was still the v1 <project xmlns=".../DECORATION/1.8.0"> model, which makes every site build log "You MUST migrate to the new model as soon as possible otherwise your build will break in the future". It holds only menus, so the conversion is the root element and the namespace. Last of the estate sweep — the other fifteen repositories are in review now.

Overlaps with #536, deliberately flagged rather than merged around. That PR fixes the schemaLocation in this same file, which pointed DECORATION/1.8.0 at decoration-1.0.0.xsd. The two changes sit at different layers: #536 corrects the v1 declaration, this one leaves v1 behind and deletes that line. Its other hunk, the doubled slash in download.xml.vm, is untouched here and still wanted either way.

Whichever lands second needs a trivial rebase. I have no preference on the order; if #536 goes first I will rebase this one.

Verified: descriptor validates against site-2.1.0.xsd; mvn site → BUILD SUCCESS with the warning gone from the log.

This change was created with AI assistance.

Doxia Sitetools warns that the pre-2.0.0 site model will break in a future version.
@slachiewicz
slachiewicz merged commit 9f6f9e2 into master Sep 10, 2026
21 checks passed
@slachiewicz
slachiewicz deleted the agent/site-descriptor-v2 branch September 10, 2026 16:50
@github-actions github-actions Bot added this to the 3.4.1 milestone Sep 10, 2026
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.

1 participant