From 35d028274a61ce8e77a9fa409877d93d0fce05a8 Mon Sep 17 00:00:00 2001
From: Muni Mohan Kunchi <munmohan@att.com>
Date: Thu, 6 Feb 2020 13:15:17 -0500
Subject: pushing tgz file change

pushing tgz file change

Issue-ID: PORTAL-830
Signed-off-by: Muni Mohan Kunchi <munmohan@att.com>
Change-Id: Id5d57ef804059094dd7b9671a6d8ee3949727dae
---
 ecomp-sdk/epsdk-app-os/pom.xml | 144 +++++++++++++++++++++++------------------
 1 file changed, 80 insertions(+), 64 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 52690916..7287fe1a 100644
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -132,29 +132,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!--
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.5</version>
-				<executions>
-					<execution>
-						<id>copy-angularjs-step1</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/ngapp</outputDirectory>
-							<resources>
-								<resource>
-									<directory>../epsdk-app-overlay/src/main/webapp/ngapp</directory>
-								</resource>		
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-            -->
+					
 			<plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
@@ -162,7 +140,6 @@
 
                 <configuration>
 				    <nodeVersion>v10.13.0</nodeVersion>
-					<npmVersion>5.6.0</npmVersion>
 					<workingDirectory>${basedir}/ngapp</workingDirectory>
                 </configuration>
 
@@ -196,20 +173,88 @@
                     </execution>
 
                 </executions>
-            </plugin>			 
+
+            </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}/ngappoverlay</outputDirectory>
+						<overWriteReleases>true</overWriteReleases>
+						<overWriteSnapshots>true</overWriteSnapshots>
+						</configuration>
+        			
+    		</plugin>			 
+            
+
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.5</version>
 				<executions>
-				    <!--  This is for Deployment purposes -->
+
+					<execution>
+						<id>copy-angular-final-step1</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/ngapp</outputDirectory>
+							<overwrite>true</overwrite>
+							<resources>
+								<resource>
+									<directory>${basedir}/ngappoverlay/ngapp</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				
 					<execution>
 						<id>copy-angular-final-step2</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/ngapp</outputDirectory>
+							<overwrite>true</overwrite>
+							<resources>
+								<resource>
+									<directory>${basedir}/ngappsrc</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+
+				    <!--  This is for Deployment purposes -->
+					<execution>
+						<id>copy-angular-final-step3</id>
 						<phase>prepare-package</phase>
 						<goals>
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/target/epsdk-app-att</outputDirectory>
+							<outputDirectory>${basedir}/target/epsdk-app-os</outputDirectory>
 							<resources>
 								<resource>
 									<directory>${basedir}/ngapp/dist</directory>
@@ -219,7 +264,7 @@
 					</execution>
 					<!--  This is for Development purposes -->
 					<execution>
-						<id>copy-angular-final-step3</id>
+						<id>copy-angular-final-step4</id>
 						<phase>prepare-package</phase>
 						<goals>
 							<goal>copy-resources</goal>
@@ -259,36 +304,7 @@
 				</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>
@@ -423,23 +439,23 @@
 		<dependency>
 			<groupId>com.att.eelf</groupId>
 			<artifactId>eelf-core</artifactId>
-			<version>1.0.0-oss</version>
+			<version>1.0.0</version>
 		</dependency>
 		<!-- Mapper -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.10</version>
+			<version>2.9.8</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.8.10</version>
+			<version>2.9.8</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.8.10</version>
+			<version>2.9.8</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mchange</groupId>
@@ -471,7 +487,7 @@
 		<dependency>
 			<groupId>org.elasticsearch</groupId>
 			<artifactId>elasticsearch</artifactId>
-			<version>6.8.2</version>
+			<version>7.1.1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.lucene</groupId>
@@ -487,7 +503,7 @@
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
-			<version>2.2.1</version>
+			<version>2.3.2</version>
 			<exclusions>
 				<!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
 				<exclusion>
-- 
cgit 1.2.3-korg