From 06a211f8fa88757a62bf9c50edcfe8e96720fcee Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 22 Sep 2024 14:50:03 -0700
Subject: [PATCH] [JENKINS-71021] Lint failures do not print proper error
 message in local builds (regression in 2.359) (#9761)

---
 pom.xml | 126 +++++++++++++++++++++++++-------------------------------
 1 file changed, 57 insertions(+), 69 deletions(-)

diff --git a/pom.xml b/pom.xml
index a38d98f12e5b..56c71c9fee33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -421,70 +421,6 @@ THE SOFTWARE.
         <changelog.url>https://www.jenkins.io/changelog-stable</changelog.url>
       </properties>
     </profile>
-    <profile>
-      <id>yarn-ci-lint</id>
-      <activation>
-        <property>
-          <name>env.CI</name>
-        </property>
-        <file>
-          <exists>package.json</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.github.eirslett</groupId>
-            <artifactId>frontend-maven-plugin</artifactId>
-            <version>1.15.1</version>
-            <executions>
-              <execution>
-                <id>yarn lint:ci</id>
-                <goals>
-                  <goal>yarn</goal>
-                </goals>
-                <configuration>
-                  <arguments>lint:ci</arguments>
-                  <skip>${yarn.lint.skip}</skip>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>yarn-lint</id>
-      <activation>
-        <property>
-          <name>!env.CI</name>
-        </property>
-        <file>
-          <exists>package.json</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.github.eirslett</groupId>
-            <artifactId>frontend-maven-plugin</artifactId>
-            <version>1.15.1</version>
-            <executions>
-              <execution>
-                <id>yarn lint</id>
-                <goals>
-                  <goal>yarn</goal>
-                </goals>
-                <configuration>
-                  <arguments>lint</arguments>
-                  <skip>${yarn.lint.skip}</skip>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>yarn-execution</id>
       <activation>
@@ -526,7 +462,6 @@ THE SOFTWARE.
             <artifactId>frontend-maven-plugin</artifactId>
             <version>1.15.1</version>
             <executions>
-
               <execution>
                 <id>install node and yarn</id>
                 <goals>
@@ -540,7 +475,6 @@ THE SOFTWARE.
                   <!-- tried to create a mirror for yarnDownloadRoot but it did not work -->
                 </configuration>
               </execution>
-
               <execution>
                 <id>yarn install</id>
                 <goals>
@@ -548,7 +482,6 @@ THE SOFTWARE.
                 </goals>
                 <phase>initialize</phase>
               </execution>
-
               <execution>
                 <id>yarn build</id>
                 <goals>
@@ -559,12 +492,34 @@ THE SOFTWARE.
                   <arguments>build</arguments>
                 </configuration>
               </execution>
-
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>yarn-ci-lint</id>
+      <activation>
+        <property>
+          <name>env.CI</name>
+        </property>
+        <file>
+          <exists>package.json</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.eirslett</groupId>
+            <artifactId>frontend-maven-plugin</artifactId>
+            <version>1.15.1</version>
+            <executions>
               <execution>
-                <id>yarn lint</id>
+                <id>yarn lint:ci</id>
                 <goals>
                   <goal>yarn</goal>
                 </goals>
+                <phase>test</phase>
                 <configuration>
                   <arguments>lint:ci</arguments>
                   <skip>${yarn.lint.skip}</skip>
@@ -575,6 +530,39 @@ THE SOFTWARE.
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>yarn-lint</id>
+      <activation>
+        <property>
+          <name>!env.CI</name>
+        </property>
+        <file>
+          <exists>package.json</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.eirslett</groupId>
+            <artifactId>frontend-maven-plugin</artifactId>
+            <version>1.15.1</version>
+            <executions>
+              <execution>
+                <id>yarn lint</id>
+                <goals>
+                  <goal>yarn</goal>
+                </goals>
+                <phase>test</phase>
+                <configuration>
+                  <arguments>lint</arguments>
+                  <skip>${yarn.lint.skip}</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
     <profile>
       <id>clean-node</id>