From 2be6d6f50f5b3a81a6babda0e194201589af1fab Mon Sep 17 00:00:00 2001
From: Raffi Khatchadourian <khatchad@hunter.cuny.edu>
Date: Wed, 3 Jun 2026 19:39:34 -0400
Subject: [PATCH 1/2] Match Spotless POM self-closing style to
 `maven-release-plugin` output.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`maven-release-plugin` re-serializes POMs with the spaced self-closing form
(`<tag />`) during `release:prepare`, but Spotless's `sortPom` enforced the
spaceless form (`<tag/>`). Every release commit was therefore Spotless-dirty on
the root POM. Pre-wala/ML#349 this was harmless (artifactId-prefixed tags failed
the semver deploy gate and skipped deploy); after #349 pinned plain `X.Y.Z`
tags, the tag-push `build` job fails at `spotless:check` and silently skips the
deploy — 0.47.0 had to be deployed manually.

Set `sortPom`'s `spaceBeforeCloseEmptyElement=true` so Spotless enforces the
same spaced form the release plugin emits. Release commits are now clean from
the start, with no post-release `spotless:apply` or manual deploy. Only POMs
adopt the spaced form; the summary XMLs (`tensorflow.xml`, etc.) stay spaceless
via the separate `replaceRegex` step (wala/ML#535), since nothing rewrites them.

This was not, as wala/ML#351 assumed, the same conflict #351 addressed: POMs are
already excluded from #351's `replaceRegex`. The POM conflict is `sortPom`'s.

Fixes wala/ML#566.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 pom.xml | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2f46f9a88..c19d6b065 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -228,8 +228,8 @@
                   <exclude>IDE/</exclude>
                   <exclude>jython3/</exclude>
                 </excludes>
-                <trimTrailingWhitespace/>
-                <endWithNewline/>
+                <trimTrailingWhitespace />
+                <endWithNewline />
               </format>
               <format>
                 <includes>
@@ -239,8 +239,8 @@
                 <excludes>
                   <exclude>**/target/</exclude>
                 </excludes>
-                <trimTrailingWhitespace/>
-                <endWithNewline/>
+                <trimTrailingWhitespace />
+                <endWithNewline />
                 <indent>
                   <tabs>true</tabs>
                   <spacesPerTab>4</spacesPerTab>
@@ -251,7 +251,7 @@
                   <include>**/*.xml</include>
                   <include>**/.pydevproject</include>
                 </includes>
-                <toggleOffOn/>
+                <toggleOffOn />
                 <excludes>
                   <exclude>**/plugin.xml</exclude>
                   <exclude>**/pom.xml</exclude>
@@ -280,8 +280,8 @@
                   <searchRegex>[ \t]+/&gt;</searchRegex>
                   <replacement>/&gt;</replacement>
                 </replaceRegex>
-                <trimTrailingWhitespace/>
-                <endWithNewline/>
+                <trimTrailingWhitespace />
+                <endWithNewline />
               </format>
             </formats>
             <java>
@@ -289,12 +289,23 @@
                 <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>

From 391b36b6d06b3b9a7980fa7c30039c0e18e96f57 Mon Sep 17 00:00:00 2001
From: Raffi Khatchadourian <khatchad@hunter.cuny.edu>
Date: Wed, 3 Jun 2026 19:50:55 -0400
Subject: [PATCH 2/2] Update stale self-closing-tag comment for the POM
 spaced-form change.

The `replaceRegex` comment claimed the spaceless form matches the POM sortpom
style and `maven-release-plugin` output. With this PR, POMs use the spaced form;
the spaceless rule applies only to the summary XMLs. Flagged by Copilot.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 pom.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index c19d6b065..13df6b78d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -269,12 +269,15 @@
                   </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>