From 7d5f2ee04f7a85d3d56509180f2fb0e3486988c1 Mon Sep 17 00:00:00 2001
From: teleivo <teleivo@users.noreply.github.com>
Date: Thu, 19 Sep 2024 13:10:46 +0200
Subject: [PATCH 1/2] ci: use existing node installation on CI (#18612)

---
 dhis-2/dhis-web/dhis-web-apps/pom.xml | 141 ++++++++++++++++++--------
 dhis-2/pom.xml                        |  14 ++-
 2 files changed, 106 insertions(+), 49 deletions(-)

diff --git a/dhis-2/dhis-web/dhis-web-apps/pom.xml b/dhis-2/dhis-web/dhis-web-apps/pom.xml
index 86219ce61309..0c2c941d4aa6 100644
--- a/dhis-2/dhis-web/dhis-web-apps/pom.xml
+++ b/dhis-2/dhis-web/dhis-web-apps/pom.xml
@@ -18,56 +18,107 @@
 
   <build>
     <finalName>dhis-web-apps</finalName>
+  </build>
 
-    <plugins>
-      <plugin>
-        <groupId>com.github.eirslett</groupId>
-        <artifactId>frontend-maven-plugin</artifactId>
-        <version>1.6</version>
-        <configuration>
-          <installDirectory>target</installDirectory>
-          <environmentVariables>
-            <BUILD_DIR>${project.build.directory}</BUILD_DIR>
-            <ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID>
-            <APPS>./apps-to-bundle.json</APPS>
-            <DEFAULT_BRANCH>master</DEFAULT_BRANCH>
-          </environmentVariables>
-        </configuration>
-        <executions>
-
-          <execution>
-            <id>install node and npm</id>
-            <goals>
-              <goal>install-node-and-npm</goal>
-            </goals>
-            <phase>generate-resources</phase>
+  <profiles>
+    <!-- nodejs is downloaded locally to clone bundled apps -->
+    <profile>
+      <id>local</id>
+      <activation>
+        <property>
+          <name>env.CI</name>
+          <value>false</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.eirslett</groupId>
+            <artifactId>frontend-maven-plugin</artifactId>
+            <version>1.15.0</version>
             <configuration>
-              <nodeVersion>v16.13.2</nodeVersion>
+              <installDirectory>target</installDirectory>
+              <environmentVariables>
+                <BUILD_DIR>${project.build.directory}</BUILD_DIR>
+                <ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID>
+                <APPS>./apps-to-bundle.json</APPS>
+                <DEFAULT_BRANCH>master</DEFAULT_BRANCH>
+              </environmentVariables>
             </configuration>
-          </execution>
+            <executions>
+              <execution>
+                <id>install node and npm</id>
+                <goals>
+                  <goal>install-node-and-npm</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <nodeVersion>v20.17.0</nodeVersion>
+                </configuration>
+              </execution>
 
-          <execution>
-            <id>npm install</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
+              <execution>
+                <id>npm install</id>
+                <goals>
+                  <goal>npm</goal>
+                </goals>
+                <phase>generate-resources</phase>
+              </execution>
 
-          <execution>
-            <id>clone apps</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-            <phase>generate-resources</phase>
+              <execution>
+                <id>bundle-apps</id>
+                <goals>
+                  <goal>npm</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <arguments>run bundle-apps</arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- nodejs is present on CI (GitHub, Jenkins) to clone bundled apps -->
+    <profile>
+      <id>ci</id>
+      <activation>
+        <property>
+          <name>env.CI</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
             <configuration>
-              <arguments>run bundle-apps</arguments>
+              <executable>npm</executable>
+              <arguments>
+                <argument>run</argument>
+                <argument>bundle-apps</argument>
+              </arguments>
+              <environmentVariables>
+                <BUILD_DIR>${project.build.directory}</BUILD_DIR>
+                <ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID>
+                <APPS>./apps-to-bundle.json</APPS>
+                <DEFAULT_BRANCH>master</DEFAULT_BRANCH>
+              </environmentVariables>
             </configuration>
-          </execution>
-
-        </executions>
-      </plugin>
-
-    </plugins>
-  </build>
+            <executions>
+              <execution>
+                <id>bundle-apps</id>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
index 722f97407742..2b10a730f7a8 100644
--- a/dhis-2/pom.xml
+++ b/dhis-2/pom.xml
@@ -64,7 +64,7 @@
   <properties>
     <!-- Build Properties -->
     <rootDir/>
-    <!-- Custom source directory property, as <build><sourceDirectory> cannot 
+    <!-- Custom source directory property, as <build><sourceDirectory> cannot
       be set in a profile. See https://github.com/awhitford/lombok.maven/issues/17#issuecomment-136606104 -->
     <sourceDir>${project.basedir}/src/main/java</sourceDir>
 
@@ -79,7 +79,7 @@
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     <surefireArgLine>-Xmx2024m --illegal-access=permit</surefireArgLine>
 
-    <!-- Needed so we can disable running tests when the default profile 
+    <!-- Needed so we can disable running tests when the default profile
       is used (activated by default). It does not honor -DskipTests otherwise https://maven.apache.org/surefire/maven-surefire-plugin/examples/skipping-tests.html -->
     <skipTests>false</skipTests>
 
@@ -229,6 +229,7 @@
     <!-- Maven plugin versions -->
     <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
     <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+    <maven-exec-plugin.version>3.4.1</maven-exec-plugin.version>
     <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
     <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
     <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
@@ -1642,8 +1643,8 @@
         <version>${mockito.version}</version>
         <scope>test</scope>
       </dependency>
-      <!-- Depend only on mockito-inline (includes mockito-core already) 
-        if you must use mockStatic (can you rewrite your code, so it's not necessary 
+      <!-- Depend only on mockito-inline (includes mockito-core already)
+        if you must use mockStatic (can you rewrite your code, so it's not necessary
         ;)), otherwise depend on mockito-core only -->
       <dependency>
         <groupId>org.mockito</groupId>
@@ -1888,6 +1889,11 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${maven-surefire-plugin.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>${maven-exec-plugin.version}</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>

From 492bd875b5fb582b9a4b6f9c4ad5b9e667277052 Mon Sep 17 00:00:00 2001
From: teleivo <teleivo@users.noreply.github.com>
Date: Thu, 19 Sep 2024 14:22:53 +0200
Subject: [PATCH 2/2] ci: activate the local profile when CI=false and absent
 (#18617)

---
 dhis-2/dhis-web/dhis-web-apps/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dhis-2/dhis-web/dhis-web-apps/pom.xml b/dhis-2/dhis-web/dhis-web-apps/pom.xml
index 0c2c941d4aa6..314a0f3141a4 100644
--- a/dhis-2/dhis-web/dhis-web-apps/pom.xml
+++ b/dhis-2/dhis-web/dhis-web-apps/pom.xml
@@ -26,8 +26,8 @@
       <id>local</id>
       <activation>
         <property>
-          <name>env.CI</name>
-          <value>false</value>
+          <name>!env.CI</name>
+          <!-- Activates when CI is not defined -->
         </property>
       </activation>
       <build>