Skip to content

Exclude category.xml from spotless and match site.xml formatting#54

Merged
khatchad merged 1 commit into
masterfrom
fix/category-xml-description
Jun 18, 2026
Merged

Exclude category.xml from spotless and match site.xml formatting#54
khatchad merged 1 commit into
masterfrom
fix/category-xml-description

Conversation

@khatchad

Copy link
Copy Markdown
Member

Addresses the review note on #53: the category <description> rendered with a leading space because spotless's eclipseWtp XML formatter collapsed it onto one line.

Fix: add category.xml to the spotless XML-format excludes (alongside its sibling hand-authored Eclipse descriptors site.xml/feature.xml/plugin.xml), and reformat the description on its own line to match site.xml.

Verified: spotless:check green and no longer rewrites category.xml; clean install still produces a populated target/repository.

🤖 Generated with Claude Code

The eclipseWtp XML formatter had collapsed the category description onto
the <description> line with a leading space (flagged in review). Its
sibling Eclipse descriptors (site.xml, feature.xml, plugin.xml) are
already excluded from that formatter; add category.xml too, and format
its description on its own line to match site.xml.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015krtPy49YGqBERvq4yDjCa
Copilot AI review requested due to automatic review settings June 18, 2026 03:44
@khatchad
khatchad merged commit 810a230 into master Jun 18, 2026
1 check passed
@khatchad
khatchad deleted the fix/category-xml-description branch June 18, 2026 03:44

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Updates Spotless configuration to stop reformatting the hand-authored Eclipse update-site category.xml, and aligns category.xml’s <description> formatting with the existing site.xml style so it renders without unintended leading whitespace.

Changes:

  • Exclude **/category.xml from Spotless’ eclipseWtp XML formatter (alongside site.xml/feature.xml/plugin.xml).
  • Reformat edu.cuny.citytech.refactoring.common.updatesite/category.xml to match the indentation and multi-line <description> structure used in site.xml.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
pom.xml Adds **/category.xml to the Spotless XML-format excludes to prevent unwanted formatter rewrites.
edu.cuny.citytech.refactoring.common.updatesite/category.xml Adjusts indentation and moves <description> text to its own line to match site.xml formatting and avoid leading-space rendering.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

khatchad added a commit that referenced this pull request Jun 18, 2026
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015krtPy49YGqBERvq4yDjCa
khatchad added a commit that referenced this pull request Jun 18, 2026
…52)

* Prototype: CI-published p2 update site via GitHub Pages composite repo

Replaces the in-repo, cumulative, hand-assembled update site with a
CI-built, Pages-published p2 composite repository (no binaries in
master). See docs/RELEASING.md for the comparison.

- Add updatesite/category.xml so Tycho's eclipse-repository build
  produces a complete per-version p2 repo (fixes the empty-build quirk;
  no GUI / p2 publisher / -append needed).
- Add tools/p2-composite.sh to generate p2 composite indexes; verified
  the Eclipse p2 director loads the composite and resolves the feature.
- Add .github/workflows/release.yml: manual-dispatch release pipeline
  (set-version, build/test, tag + GitHub Release with the p2 repo zip,
  publish to gh-pages as a composite, next-dev bump).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015krtPy49YGqBERvq4yDjCa

* Restyle RELEASING.md: title-case headers, no-space em-dashes, no line wrapping

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015krtPy49YGqBERvq4yDjCa

* Drop category.xml from prototype (merged separately via #53/#54)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015krtPy49YGqBERvq4yDjCa

* Commit the release version before tagging in release.yml

The tag must point at the release-version sources, and master needs a
"Release vX.Y.Z." commit, so commit the version bump and push master
before tagging (mirrors release.sh).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015krtPy49YGqBERvq4yDjCa

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants