From 0649e652577e96db0efc80bafec0bdd21518d0b8 Mon Sep 17 00:00:00 2001
From: ml636r <ml636r@att.com>
Date: Mon, 20 Feb 2017 21:10:54 +0200
Subject: Fix UI and docker

Change-Id: I5ac193d7382a59df64a1e56e5b0388915e3f9a13
Signed-off-by: ml636r <ml636r@att.com>
---
 catalog-ui/pom.xml | 79 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 32 deletions(-)

(limited to 'catalog-ui')

diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml
index 101537e4c2..09d42d539d 100644
--- a/catalog-ui/pom.xml
+++ b/catalog-ui/pom.xml
@@ -53,7 +53,53 @@
 				</executions>
 			</plugin>
 
+
 			<plugin>
+				<groupId>io.wcm.maven.plugins</groupId>
+				<artifactId>nodejs-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<tasks>
+						<npmInstallTask>
+							<workingDirectory>${project.basedir}</workingDirectory>
+						</npmInstallTask>
+						<nodeJsTask>
+							<workingDirectory>${project.basedir}</workingDirectory>
+							<moduleName>bower</moduleName>
+							<arguments>
+								<argument>install</argument>
+							</arguments>
+						</nodeJsTask>
+						<nodeJsTask>
+							<workingDirectory>${project.basedir}</workingDirectory>
+							<moduleName>grunt</moduleName>
+							<arguments>
+								<argument>build</argument>
+							</arguments>
+						</nodeJsTask>
+						<!-- <npmInstallTask>
+							<workingDirectory>${project.basedir}</workingDirectory>
+						</npmInstallTask>
+						<nodeJsTask>
+							<workingDirectory>${project.basedir}</workingDirectory>
+							<moduleName>gulp</moduleName>
+							<arguments>
+								<argument>build</argument>
+							</arguments>
+						</nodeJsTask> -->
+					</tasks>
+				</configuration>
+			</plugin>
+
+
+			<!-- <plugin>
 				<groupId>com.github.eirslett</groupId>
 				<artifactId>frontend-maven-plugin</artifactId>
 				<version>1.3</version>
@@ -137,7 +183,7 @@
 
 				</executions>
 			</plugin>
-
+ -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.7</version>
@@ -164,37 +210,6 @@
 	</build>
 
 	<profiles>
-		<profile>
-			<id>WINDOWS_ONLY</id>
-			<activation>
-				<os>
-					<family>Windows</family>
-				</os>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
-						<groupId>org.codehaus.mojo</groupId>
-						<version>1.4.0</version>
-						<executions>
-							<execution>
-								<id>execute grant build</id>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<configuration>
-									<executable>build_catalog_ui.bat</executable>
-									<workingDirectory>${basedir}</workingDirectory>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 
 
 		<profile>
-- 
cgit 1.2.3-korg