X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-FE-os%2Fpom.xml;h=a306c15ec363ffb6e8cafb01424e0a465d684de0;hb=0f6846175bb91b3e5c1fad2e62564534beb1a0e1;hp=a74e837ca9e3757685f74e212d1098bb4cabb1d7;hpb=aa0c9877eda0d96f0765c89c3e54a563ea583f52;p=portal.git

diff --git a/portal-FE-os/pom.xml b/portal-FE-os/pom.xml
index a74e837c..a306c15e 100644
--- a/portal-FE-os/pom.xml
+++ b/portal-FE-os/pom.xml
@@ -4,12 +4,13 @@
 
 	<groupId>org.onap.portal</groupId>
 	<artifactId>portal-FE-os</artifactId>
-	<version>3.3.0</version>
+	<version>3.5.0</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<skipnode>false</skipnode>
 		<skipcopy>false</skipcopy>
+		<skipTests>false</skipTests>
 		<sonar.typescript.lcov.reportPaths>coverage/lcov.info</sonar.typescript.lcov.reportPaths>
         <sonar.sources>src</sonar.sources>
 		<sonar.projectKey>portal-FE-os</sonar.projectKey>
@@ -19,6 +20,8 @@
 		<sonar.tests>src</sonar.tests>
 		<sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
 		<sonar.nodejs.executable>${project.basedir}\node\</sonar.nodejs.executable>
+        <epsdk.version>3.4.0-SNAPSHOT</epsdk.version>
+
 	</properties>
 
 	<build>
@@ -43,6 +46,112 @@
 					</filesets>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+        		<artifactId>maven-dependency-plugin</artifactId>
+        			<executions>
+						<execution>
+							<id>unpack</id>
+							<phase>initialize</phase>
+							<goals>
+							<goal>unpack</goal>
+							</goals>
+							<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.onap.portal.sdk</groupId>
+									<artifactId>epsdk-app-overlay</artifactId>
+									<version>${epsdk.version}</version>
+									<type>war</type>
+									<overWrite>false</overWrite>
+									<includes>ngapp/src/app/pages/analytics/**, ngapp/src/app/report-run/**, ngapp/src/app/modals/error-modal/**, ngapp/src/app/shared/services/cache.service.ts</includes>
+									<outputDirectory>${basedir}/</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+							<overWriteReleases>true</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
+							</configuration>
+						</execution>
+					</executions>
+						
+        			
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.0.2</version>
+				<executions>
+
+					<execution>
+						<id>copy-analytics</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/src/app/pages/</outputDirectory>
+							
+							<resources>
+								<resource>
+									<directory>${basedir}/ngapp/src/app/pages</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>copy-report-run</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/src/app/pages/</outputDirectory>
+							
+							<resources>
+								<resource>
+									<directory>${basedir}/ngapp/src/app/report-run</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>copy-error-modal</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/src/app/modals/</outputDirectory>
+							
+							<resources>
+								<resource>
+									<directory>${basedir}/ngapp/src/app/modals</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>copy-cache-service</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/src/app/shared/services/</outputDirectory>
+							
+							<resources>
+								<resource>
+									<directory>${basedir}/ngapp/src/app/shared/services</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+
+				</executions>
+			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -106,7 +215,7 @@
 							<arguments>install</arguments>
 						</configuration>
 					</execution>
-					
+					  
 					<execution>
 						<id>npm run test</id>
 						<goals>
@@ -117,6 +226,7 @@
 
 						<configuration>
 							<arguments>run-script test</arguments>
+							<skip>${skipTests}</skip>
 						</configuration>
 					</execution>