From d0972665181dcff3472c8a1e92dc4e76fae308ab Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Mon, 20 May 2024 11:11:14 +0200
Subject: [PATCH 1/2] Fix SpotBugs processing.

Reuse the same activation ID as in parent POM.
Deactivate flattening when tests are ignored.
---
 pom.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00476c19..57b235ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -493,8 +493,8 @@
               <includeTests>false</includeTests>
               <language>javascript</language>
               <compileSourceRoots>
-                <compileSourceRoot>${basedir}/src/main/resources</compileSourceRoot>
-                <compileSourceRoot>${basedir}/src/main/webapp/js</compileSourceRoot>
+                <compileSourceRoot>src/main/resources</compileSourceRoot>
+                <compileSourceRoot>src/main/webapp/js</compileSourceRoot>
               </compileSourceRoots>
               <includes>
                 <include>**/*.js</include>
@@ -592,7 +592,7 @@
         </dependencies>
         <executions>
           <execution>
-            <id>run-spotbugs</id>
+            <id>spotbugs</id>
             <goals>
               <goal>check</goal>
             </goals>
@@ -736,11 +736,18 @@
     </profile>
     <profile>
       <id>ci</id>
+      <activation>
+        <property>
+          <name>maven.test.failure.ignore</name>
+          <value>true</value>
+        </property>
+      </activation>
       <properties>
         <maven.test.failure.ignore>true</maven.test.failure.ignore>
         <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
         <pmd.failOnViolation>false</pmd.failOnViolation>
         <spotbugs.failOnError>false</spotbugs.failOnError>
+        <flatten.flatten.skip>true</flatten.flatten.skip>
       </properties>
     </profile>
     <profile>

From f538b455b3ef04c426b33a5b23b63ec0c4b124b8 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Mon, 20 May 2024 11:20:11 +0200
Subject: [PATCH 2/2] Add sort-pom configuration.

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 57b235ca..05341f08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,6 +256,11 @@
           <groupId>com.github.ekryd.sortpom</groupId>
           <artifactId>sortpom-maven-plugin</artifactId>
           <version>${sortpom-maven-plugin.version}</version>
+          <configuration>
+            <expandEmptyElements>false</expandEmptyElements>
+            <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+            <createBackupFile>false</createBackupFile>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>