From 8429bcdf93e653061e972689774bbab3966742e2 Mon Sep 17 00:00:00 2001
From: statta <statta@research.att.com>
Date: Fri, 16 Aug 2019 12:14:10 -0400
Subject: Migrating screens to Angular 7

Issue-ID: PORTAL-706


Change-Id: Ic3feb4019923040aafe6e9a97a60b41165be8b40
Signed-off-by: statta <statta@research.att.com>
---
 ecomp-sdk/epsdk-app-os/pom.xml | 112 ++++++++++++++++++++++++++++-------------
 1 file changed, 77 insertions(+), 35 deletions(-)

(limited to 'ecomp-sdk/epsdk-app-os/pom.xml')

diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index 71c07fdc..74981f8e 100644
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.6.0-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- GroupId is inherited from parent -->
@@ -52,6 +52,7 @@
 					</filesets>
 				</configuration>
 			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -131,25 +132,11 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!--
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.5</version>
 				<executions>
-					<execution>
-						<id>copy-angular-final-step2</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/target/epsdk-app-os/app</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${basedir}/ngapp/dist</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>				
 					<execution>
 						<id>copy-angularjs-step1</id>
 						<phase>process-resources</phase>
@@ -165,22 +152,6 @@
 							</resources>
 						</configuration>
 					</execution>
-					<!--  This is for Development purposes -->
-					<execution>
-						<id>copy-angular-final-step3</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/webapp/app</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${basedir}/ngapp/dist</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>	
 				</executions>
 			</plugin>
 					
@@ -190,7 +161,7 @@
                 <version>1.6</version>
 
                 <configuration>
-				    <nodeVersion>v8.11.3</nodeVersion>
+				    <nodeVersion>v10.13.0</nodeVersion>
 					<npmVersion>5.6.0</npmVersion>
 					<workingDirectory>${basedir}/ngapp</workingDirectory>
                 </configuration>
@@ -225,7 +196,47 @@
                     </execution>
 
                 </executions>
-            </plugin>			
+            </plugin>			 
+            -->
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.5</version>
+				<executions>
+				    <!--  This is for Deployment purposes -->
+					<execution>
+						<id>copy-angular-final-step2</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/target/epsdk-app-att</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${basedir}/ngapp/dist</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<!--  This is for Development purposes -->
+					<execution>
+						<id>copy-angular-final-step3</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/src/main/webapp</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${basedir}/ngapp/dist</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>				
+				
+				</executions>
+			</plugin>
 			
 			<!--			
 			<plugin>
@@ -248,7 +259,38 @@
 				  </execution>
 				</executions>
 			</plugin>
-			-->			
+			-->		
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+        		<artifactId>maven-dependency-plugin</artifactId>
+        			<executions>
+						<execution>
+							<id>unpack</id>
+							<phase>process-resources</phase>
+							<goals>
+							<goal>unpack</goal>
+							</goals>
+						</execution>
+						</executions>
+						<configuration>
+						<artifactItems>
+							<artifactItem>
+							<groupId>org.onap.portal.sdk</groupId>
+							<artifactId>epsdk-app-overlay</artifactId>
+							<version>${project.version}</version>
+							<type>war</type>
+							<overWrite>false</overWrite>
+						</artifactItem>
+						</artifactItems>
+						<includes>ngapp/**</includes>
+						<outputDirectory>${basedir}</outputDirectory>
+						<markersDirectory>${basedir}</markersDirectory>
+						<overWriteReleases>false</overWriteReleases>
+						<overWriteSnapshots>false</overWriteSnapshots>
+						</configuration>
+        			
+    		</plugin>	
+			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-- 
cgit 1.2.3-korg