Fix SpotBugs processing.

Reuse the same activation ID as in parent POM. Deactivate flattening when tests are ignored.
jenkinsci · May 20, 2024 · d097266 · d097266
1 parent a792879
commit d097266
Showing 1 changed file with 10 additions and 3 deletions.
diff --git 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>