Skip to content

Match Spotless POM self-closing style to maven-release-plugin output #356

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.

Sign up for GitHub

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

Merged
khatchad merged 2 commits into from
Jun 4, 2026
Merged

Match Spotless POM self-closing style to maven-release-plugin output #356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2be6d6f
Match Spotless POM self-closing style to `maven-release-plugin` output.
khatchad Jun 3, 2026
391b36b
Update stale self-closing-tag comment for the POM spaced-form change.
khatchad Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 30 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<parallel>both</parallel>
<logging.config.file>./logging.properties</logging.config.file>
<jacoco-version>0.8.14</jacoco-version>
<argLine/>
<argLine />
<junit.4.version>4.13.2</junit.4.version>
</properties>
<dependencyManagement>
Expand Down Expand Up @@ -228,8 +228,8 @@
<exclude>IDE/</exclude>
<exclude>jython3/</exclude>
</excludes>
<trimTrailingWhitespace/>
<endWithNewline/>
<trimTrailingWhitespace />
<endWithNewline />
</format>
<format>
<includes>
Expand All @@ -239,8 +239,8 @@
<excludes>
<exclude>**/target/</exclude>
</excludes>
<trimTrailingWhitespace/>
<endWithNewline/>
<trimTrailingWhitespace />
<endWithNewline />
<indent>
<tabs>true</tabs>
<spacesPerTab>4</spacesPerTab>
Expand All @@ -251,7 +251,7 @@
<include>**/*.xml</include>
<include>**/.pydevproject</include>
</includes>
<toggleOffOn/>
<toggleOffOn />
<excludes>
<exclude>**/plugin.xml</exclude>
<exclude>**/pom.xml</exclude>
Expand All @@ -269,32 +269,46 @@
</files>
</eclipseWtp>
<!-- Normalize self-closing tag spacing to the spaceless form
(`<tag/>`), matching `pom.xml`'s sortpom style, the
`maven-release-plugin`'s native output, and Eclipse WTP's
default. The Eclipse WTP XML formatter above has no pref
that controls this; without explicit enforcement,
`tensorflow.xml` drifts to ~2135 spaced vs 5 spaceless.
See https://github.com/wala/ML/issues/535. -->
(`<tag/>`) for the summary XMLs (this format excludes POMs,
above). The Eclipse WTP XML formatter has no pref that controls
this; without explicit enforcement, `tensorflow.xml` drifts to
~2135 spaced vs 5 spaceless. See
https://github.com/wala/ML/issues/535. POMs deliberately use
the *spaced* form instead — via sortPom's
`spaceBeforeCloseEmptyElement` — to match the
`maven-release-plugin`'s output; see
https://github.com/wala/ML/issues/566. -->
<replaceRegex>
<name>Spaceless self-closing tags</name>
<searchRegex>[ \t]+/&gt;</searchRegex>
<replacement>/&gt;</replacement>
</replaceRegex>
<trimTrailingWhitespace/>
<endWithNewline/>
<trimTrailingWhitespace />
<endWithNewline />
Comment thread
khatchad marked this conversation as resolved.
</format>
</formats>
<java>
<googleJavaFormat>
<version>1.27.0</version>
<reflowLongStrings>true</reflowLongStrings>
</googleJavaFormat>
<trimTrailingWhitespace/>
<endWithNewline/>
<trimTrailingWhitespace />
<endWithNewline />
</java>
<pom>
<sortPom>
<expandEmptyElements>false</expandEmptyElements>
<!-- Emit `<tag />` (space before the self-closing slash) to match
the `maven-release-plugin`'s native POM serialization. Without
this, every `release:prepare` rewrites the POMs to the spaced
form, which `spotless:check` then rejects — failing the tag-push
`build` job and silently skipping the deploy (the root cause of
the 0.47.0 manual-deploy incident). See
https://github.com/wala/ML/issues/566. Only POMs use the spaced
form; the summary XMLs (`tensorflow.xml`, etc.) stay spaceless
via the separate `replaceRegex` step (wala/ML#535), since
nothing rewrites them. -->
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
</sortPom>
</pom>
</configuration>
Expand Down
Loading