From 55c714a89af8714e7269b6ff8d3aab1b80664d41 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Tue, 10 Dec 2024 11:07:02 +0100
Subject: [PATCH] Update custom Maven build cache configuration for `js`
 directory

Closes #35669

Signed-off-by: Jon Koops <jonkoops@gmail.com>
Signed-off-by: Alexander Schwartz <aschwart@redhat.com>
Co-authored-by: Alexander Schwartz <aschwart@redhat.com>
---
 .mvn/maven-build-cache-config.xml |  2 ++
 js/apps/account-ui/pom.xml        | 27 +++++----------------------
 js/apps/admin-ui/pom.xml          | 27 +++++----------------------
 js/pom.xml                        |  4 +++-
 4 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/.mvn/maven-build-cache-config.xml b/.mvn/maven-build-cache-config.xml
index 9840b2446c7..fc667dca1ad 100644
--- a/.mvn/maven-build-cache-config.xml
+++ b/.mvn/maven-build-cache-config.xml
@@ -41,6 +41,8 @@
         <runAlways>
             <plugins>
                 <plugin artifactId="maven-failsafe-plugin"/>
+                <!-- The Maven Frontend plugin will build all JS parts in the subfolders, and has its own caching, therefore, run it always -->
+                <plugin groupId="com.github.eirslett" artifactId="frontend-maven-plugin"/>
             </plugins>
             <goalsLists>
                 <goalsList artifactId="maven-install-plugin">
diff --git a/js/apps/account-ui/pom.xml b/js/apps/account-ui/pom.xml
index 82379674225..855adaa460d 100644
--- a/js/apps/account-ui/pom.xml
+++ b/js/apps/account-ui/pom.xml
@@ -25,28 +25,11 @@
                 </property>
             </activation>
             <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-resources</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>maven-resources-community</directory>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
+                <resources>
+                    <resource>
+                        <directory>maven-resources-community</directory>
+                    </resource>
+                </resources>
             </build>
         </profile>
         <profile>
diff --git a/js/apps/admin-ui/pom.xml b/js/apps/admin-ui/pom.xml
index e2f209d4615..c595c33f8e0 100644
--- a/js/apps/admin-ui/pom.xml
+++ b/js/apps/admin-ui/pom.xml
@@ -25,28 +25,11 @@
                 </property>
             </activation>
             <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-resources</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>maven-resources-community</directory>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
+                <resources>
+                    <resource>
+                        <directory>maven-resources-community</directory>
+                    </resource>
+                </resources>
             </build>
         </profile>
         <profile>
diff --git a/js/pom.xml b/js/pom.xml
index 759478d51c5..70bbeeee75d 100644
--- a/js/pom.xml
+++ b/js/pom.xml
@@ -27,8 +27,10 @@
     <properties>
         <node.version>v22.11.0</node.version>
         <pnpm.version>9.14.4</pnpm.version>
-        <!-- The JavaScript projects use the non-standard 'src' folder for their sources, therefore, name it here explicitly -->
+        <!-- The JavaScript projects use non-standard folders for their sources, therefore, name it here explicitly -->
         <maven.build.cache.input.1>src</maven.build.cache.input.1>
+        <maven.build.cache.input.2>public</maven.build.cache.input.2>
+        <maven.build.cache.input.3>scripts</maven.build.cache.input.3>
     </properties>
 
     <build>