From 1900d1d1efe098da305ce287703f72a4283bbc67 Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Sat, 4 May 2019 08:48:56 +0530
Subject: [PATCH] Add frontend-maven-plugin

---
 .gitignore                                    |  2 +
 .../mgt/handler/util/HandlerConstants.java    |  2 +-
 .../pom.xml                                   | 92 ++++++++++++++-----
 .../pom.xml                                   | 92 ++++++++++++++-----
 pom.xml                                       |  3 +
 5 files changed, 142 insertions(+), 49 deletions(-)

diff --git a/.gitignore b/.gitignore
index 206f9cee2d..5f3192e51f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,9 @@ components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/r
 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package-lock.json
 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/npm-debug.log
 components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/dist/
+components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/tmp/
 components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/node_modules/
 components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/dist/
 components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/package-lock.json
+components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/tmp/
 
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.handler/src/main/java/org/wso2/carbon/device/application/mgt/handler/util/HandlerConstants.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.handler/src/main/java/org/wso2/carbon/device/application/mgt/handler/util/HandlerConstants.java
index 4ff23c4077..d8804ca834 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.handler/src/main/java/org/wso2/carbon/device/application/mgt/handler/util/HandlerConstants.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.handler/src/main/java/org/wso2/carbon/device/application/mgt/handler/util/HandlerConstants.java
@@ -40,5 +40,5 @@ public class HandlerConstants {
     public static final String TOKEN_IS_EXPIRED = "ACCESS_TOKEN_IS_EXPIRED";
 
     public static final int INTERNAL_ERROR_CODE = 500;
-    public static final long TIMEOUT = 300;
+    public static final long TIMEOUT = 1200;
 }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/pom.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/pom.xml
index 4f0db31d01..e20c85c95b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/pom.xml
@@ -51,45 +51,88 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>${frontend.mave.version}</version>
+                <configuration>
+                    <workingDirectory>${npm.working.dir}</workingDirectory>
+                    <!-- where to install npm -->
+                    <installDirectory>${npm.install.dir}</installDirectory>
+                </configuration>
                 <executions>
                     <execution>
-                        <id>npm install (initialize)</id>
+                        <id>install node and npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <nodeVersion>${node.version}</nodeVersion>
+                            <npmVersion>${npm.version}</npmVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm install</id>
                         <goals>
-                            <goal>exec</goal>
+                            <goal>npm</goal>
                         </goals>
-                        <phase>initialize</phase>
+                        <!-- Optional configuration which provides for running any npm command -->
                         <configuration>
-                            <workingDirectory>react-app</workingDirectory>
-                            <executable>${npm.executable}</executable>
-                            <arguments>
-                                <argument>install</argument>
-                                <argument>--silent</argument>
-                            </arguments>
+                            <arguments>install</arguments>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>npm run build (compile)</id>
+                        <id>prod</id>
                         <goals>
-                            <goal>exec</goal>
+                            <goal>npm</goal>
                         </goals>
-                        <phase>compile</phase>
                         <configuration>
-                            <workingDirectory>react-app</workingDirectory>
-                            <executable>${npm.executable}</executable>
-                            <arguments>
-                                <argument>run</argument>
-                                <argument>${npm.build.command}</argument>
-                            </arguments>
+                            <arguments>run-script ${npm.build.command}</arguments>
                         </configuration>
+                        <phase>generate-resources</phase>
                     </execution>
                 </executions>
-                <configuration>
-                    <workingDirectory>${npm.working.dir}</workingDirectory>
-                </configuration>
             </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.codehaus.mojo</groupId>-->
+<!--                <artifactId>exec-maven-plugin</artifactId>-->
+<!--                <version>1.5.0</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>npm install (initialize)</id>-->
+<!--                        <goals>-->
+<!--                            <goal>exec</goal>-->
+<!--                        </goals>-->
+<!--                        <phase>initialize</phase>-->
+<!--                        <configuration>-->
+<!--                            <workingDirectory>react-app</workingDirectory>-->
+<!--                            <executable>${npm.executable}</executable>-->
+<!--                            <arguments>-->
+<!--                                <argument>install</argument>-->
+<!--                                <argument>&#45;&#45;silent</argument>-->
+<!--                            </arguments>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>npm run build (compile)</id>-->
+<!--                        <goals>-->
+<!--                            <goal>exec</goal>-->
+<!--                        </goals>-->
+<!--                        <phase>compile</phase>-->
+<!--                        <configuration>-->
+<!--                            <workingDirectory>react-app</workingDirectory>-->
+<!--                            <executable>${npm.executable}</executable>-->
+<!--                            <arguments>-->
+<!--                                <argument>run</argument>-->
+<!--                                <argument>${npm.build.command}</argument>-->
+<!--                            </arguments>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <workingDirectory>${npm.working.dir}</workingDirectory>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
     <profiles>
@@ -111,6 +154,7 @@
         <npm.executable>npm</npm.executable>
         <npm.build.command>build_prod</npm.build.command>
         <npm.working.dir>./react-app</npm.working.dir>
+        <npm.install.dir>./react-app/tmp</npm.install.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <npm.output.directory>react-app</npm.output.directory>
     </properties>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/pom.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/pom.xml
index 1ca50ca6d3..7aa43d7f6a 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/pom.xml
@@ -54,45 +54,88 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>${frontend.mave.version}</version>
+                <configuration>
+                    <workingDirectory>${npm.working.dir}</workingDirectory>
+                    <!-- where to install npm -->
+                    <installDirectory>${npm.install.dir}</installDirectory>
+                </configuration>
                 <executions>
                     <execution>
-                        <id>npm install (initialize)</id>
+                        <id>install node and npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <nodeVersion>${node.version}</nodeVersion>
+                            <npmVersion>${npm.version}</npmVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm install</id>
                         <goals>
-                            <goal>exec</goal>
+                            <goal>npm</goal>
                         </goals>
-                        <phase>initialize</phase>
+                        <!-- Optional configuration which provides for running any npm command -->
                         <configuration>
-                            <workingDirectory>react-app</workingDirectory>
-                            <executable>${npm.executable}</executable>
-                            <arguments>
-                                <argument>install</argument>
-                                <argument>--silent</argument>
-                            </arguments>
+                            <arguments>install</arguments>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>npm run build (compile)</id>
+                        <id>prod</id>
                         <goals>
-                            <goal>exec</goal>
+                            <goal>npm</goal>
                         </goals>
-                        <phase>compile</phase>
                         <configuration>
-                            <workingDirectory>react-app</workingDirectory>
-                            <executable>${npm.executable}</executable>
-                            <arguments>
-                                <argument>run</argument>
-                                <argument>${npm.build.command}</argument>
-                            </arguments>
+                            <arguments>run-script ${npm.build.command}</arguments>
                         </configuration>
+                        <phase>generate-resources</phase>
                     </execution>
                 </executions>
-                <configuration>
-                    <workingDirectory>${npm.working.dir}</workingDirectory>
-                </configuration>
             </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.codehaus.mojo</groupId>-->
+<!--                <artifactId>exec-maven-plugin</artifactId>-->
+<!--                <version>1.5.0</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>npm install (initialize)</id>-->
+<!--                        <goals>-->
+<!--                            <goal>exec</goal>-->
+<!--                        </goals>-->
+<!--                        <phase>initialize</phase>-->
+<!--                        <configuration>-->
+<!--                            <workingDirectory>react-app</workingDirectory>-->
+<!--                            <executable>${npm.executable}</executable>-->
+<!--                            <arguments>-->
+<!--                                <argument>install</argument>-->
+<!--                                <argument>&#45;&#45;silent</argument>-->
+<!--                            </arguments>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>npm run build (compile)</id>-->
+<!--                        <goals>-->
+<!--                            <goal>exec</goal>-->
+<!--                        </goals>-->
+<!--                        <phase>compile</phase>-->
+<!--                        <configuration>-->
+<!--                            <workingDirectory>react-app</workingDirectory>-->
+<!--                            <executable>${npm.executable}</executable>-->
+<!--                            <arguments>-->
+<!--                                <argument>run</argument>-->
+<!--                                <argument>${npm.build.command}</argument>-->
+<!--                            </arguments>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <workingDirectory>${npm.working.dir}</workingDirectory>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
     <profiles>
@@ -114,6 +157,7 @@
         <npm.executable>npm</npm.executable>
         <npm.build.command>build_prod</npm.build.command>
         <npm.working.dir>./react-app</npm.working.dir>
+        <npm.install.dir>./react-app/tmp</npm.install.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <npm.output.directory>react-app</npm.output.directory>
     </properties>
diff --git a/pom.xml b/pom.xml
index 502fa2c3dd..e761f5ec6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2230,6 +2230,9 @@
         <!-- app management related versions -->
         <googlecode.plist.version>1.21</googlecode.plist.version>
         <net.dongliu.version>2.6.5</net.dongliu.version>
+        <frontend.mave.version>1.7.6</frontend.mave.version>
+        <node.version>v10.15.3</node.version>
+        <npm.version>6.9.0</npm.version>
         
         <!--websocket related lib versions-->
         <tomcat.websocket.version>7.0.85</tomcat.websocket.version>