From 1f9fe5cc9b4932ddb36fab564d90ca811f7d75d7 Mon Sep 17 00:00:00 2001
From: mrizzi <mrizzi@redhat.com>
Date: Tue, 8 Mar 2022 18:17:28 +0100
Subject: [PATCH 1/5] Fabric8 d-m-p for containerized build

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

diff --git a/pom.xml b/pom.xml
index e5d247458..647b92fb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
         <version.hibernate>5.3.20.Final</version.hibernate>
         <version.undertow>2.2.5.Final</version.undertow>
         <version.httpcomponents>4.5.13</version.httpcomponents>
+        <build.args>clean install -DskipTests</build.args>
     </properties>
 
     <scm>
@@ -247,6 +248,38 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.39.1</version>
+                <inherited>false</inherited>
+                <configuration>
+<!--                    <dockerHost>unix:///run/user/1000/podman/podman.sock</dockerHost>-->
+                    <images>
+                        <image>
+                            <name>quay.io/mrizzi/windup-builder:20220307182148CET</name>
+                            <run>
+                                <volumes>
+                                    <bind>
+                                        <volume>./:/${project.artifactId}:Z</volume>
+                                        <volume>${user.home}/.m2:${user.home}/.m2:Z</volume>
+                                    </bind>
+                                </volumes>
+                                <log>
+                                    <prefix>Container build::</prefix>
+                                    <color>blue</color>
+                                </log>
+                                <user>root</user>
+                                <cmd>mvn --settings ${user.home}/.m2/settings.xml -Dmaven.repo.local=${user.home}/.m2/repository ${build.args} -f /${project.artifactId}</cmd>
+                                <wait>
+                                    <log>Finished at:</log>
+                                    <time>7200000</time>
+                                </wait>
+                            </run>
+                        </image>
+                    </images>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

From 0ed05c451442c16243c3c3e71a4d377eef3a7e69 Mon Sep 17 00:00:00 2001
From: mrizzi <mrizzi@redhat.com>
Date: Tue, 8 Mar 2022 18:38:23 +0100
Subject: [PATCH 2/5] Moved to provided 'settings.xml' file

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 647b92fb4..68648e78f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,7 +270,7 @@
                                     <color>blue</color>
                                 </log>
                                 <user>root</user>
-                                <cmd>mvn --settings ${user.home}/.m2/settings.xml -Dmaven.repo.local=${user.home}/.m2/repository ${build.args} -f /${project.artifactId}</cmd>
+                                <cmd>mvn --settings /${project.artifactId}/settings.xml -Dmaven.repo.local=${user.home}/.m2/repository ${build.args} -f /${project.artifactId}</cmd>
                                 <wait>
                                     <log>Finished at:</log>
                                     <time>7200000</time>

From 40eeeadbd066d081c78ed0283ae3a00df23d9ac2 Mon Sep 17 00:00:00 2001
From: mrizzi <mrizzi@redhat.com>
Date: Wed, 9 Mar 2022 12:23:50 +0100
Subject: [PATCH 3/5] Added Maven 2 'user-settings' property for Furnace
 compatibility

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 68648e78f..1acc3a937 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,7 +270,7 @@
                                     <color>blue</color>
                                 </log>
                                 <user>root</user>
-                                <cmd>mvn --settings /${project.artifactId}/settings.xml -Dmaven.repo.local=${user.home}/.m2/repository ${build.args} -f /${project.artifactId}</cmd>
+                                <cmd>mvn --settings /${project.artifactId}/settings.xml -Dorg.apache.maven.user-settings=/${project.artifactId}/settings.xml -Dmaven.repo.local=${user.home}/.m2/repository ${build.args} -f /${project.artifactId}</cmd>
                                 <wait>
                                     <log>Finished at:</log>
                                     <time>7200000</time>

From a25c7cb4929e0bc7d3fed9aea7972fa993cdb660 Mon Sep 17 00:00:00 2001
From: mrizzi <mrizzi@redhat.com>
Date: Wed, 9 Mar 2022 19:09:44 +0100
Subject: [PATCH 4/5] Raised container build timeout to 8 hours

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1acc3a937..30e72c51f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,7 +273,7 @@
                                 <cmd>mvn --settings /${project.artifactId}/settings.xml -Dorg.apache.maven.user-settings=/${project.artifactId}/settings.xml -Dmaven.repo.local=${user.home}/.m2/repository ${build.args} -f /${project.artifactId}</cmd>
                                 <wait>
                                     <log>Finished at:</log>
-                                    <time>7200000</time>
+                                    <time>28800000</time>
                                 </wait>
                             </run>
                         </image>

From d5e3e2cf2fd982177fdedd87d88aec5637eae834 Mon Sep 17 00:00:00 2001
From: mrizzi <mrizzi@redhat.com>
Date: Fri, 11 Mar 2022 11:53:10 +0100
Subject: [PATCH 5/5] Adopted 'frontend-maven-plugin'

---
 ui-pf4/pom.xml | 80 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 30 deletions(-)

diff --git a/ui-pf4/pom.xml b/ui-pf4/pom.xml
index 758c68b42..d8fa63acb 100644
--- a/ui-pf4/pom.xml
+++ b/ui-pf4/pom.xml
@@ -14,6 +14,9 @@
 
     <properties>
         <webpack.environment>development</webpack.environment>
+        <node.version>v12.22.9</node.version>
+        <yarn.version>v1.22.17</yarn.version>
+        <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
     </properties>
 
     <dependencies>
@@ -205,62 +208,79 @@
             </plugin>
 
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>${frontend-maven-plugin.version}</version>
+                <configuration>
+                    <workingDirectory>src/main/webapp</workingDirectory>
+                    <installDirectory>${project.build.directory}</installDirectory>
+                </configuration>
                 <executions>
                     <execution>
-                        <id>npm-install</id>
-                        <phase>compile</phase>
+                        <id>install node and npm</id>
                         <goals>
-                            <goal>exec</goal>
+                            <goal>install-node-and-yarn</goal>
                         </goals>
-
                         <configuration>
-                            <executable>yarn</executable>
-                            <workingDirectory>src/main/webapp</workingDirectory>
-                            <arguments>
-                                <argument>install</argument>
-                            </arguments>
+                            <nodeVersion>${node.version}</nodeVersion>
+                            <yarnVersion>${yarn.version}</yarnVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>yarn install</id>
+                        <goals>
+                            <goal>yarn</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>yarn-install</id>
+                        <goals>
+                            <goal>yarn</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install</arguments>
                         </configuration>
                     </execution>
-
                     <execution>
                         <id>webpack-build</id>
-                        <phase>compile</phase>
                         <goals>
-                            <goal>exec</goal>
+                            <goal>yarn</goal>
                         </goals>
-
                         <configuration>
-                            <executable>yarn</executable>
-                            <workingDirectory>src/main/webapp</workingDirectory>
                             <environmentVariables>
                                 <NODE_ENV>production</NODE_ENV>
                             </environmentVariables>
-                            <arguments>
-                                <argument>build</argument>
-                                <argument>--profile</argument>
-                            </arguments>
+                            <arguments>build --profile</arguments>
                         </configuration>
                     </execution>
-
                     <execution>
                         <id>webpack-build-freemarker</id>
-                        <phase>compile</phase>
                         <goals>
-                            <goal>exec</goal>
+                            <goal>yarn</goal>
                         </goals>
-
                         <configuration>
-                            <executable>yarn</executable>
-                            <workingDirectory>src/main/webapp</workingDirectory>
-                            <arguments>
-                                <argument>build:freemarker</argument>
-                            </arguments>
+                            <arguments>build:freemarker</arguments>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>nodejs10</id>
+            <properties>
+                <node.version>v10.24.1</node.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>nodejs14</id>
+            <properties>
+                <node.version>v14.19.0</node.version>
+            </properties>
+        </profile>
+    </profiles>
 </project>