Upgraded SDk version

[portal.git] / portal-FE-os / pom.xml

diff --git a/portal-FE-os/pom.xml b/portal-FE-os/pom.xml
index 21bdd50..469f3de 100644 (file)
--- 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.1.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>
@@ -18,6 +19,9 @@
                <sonar.test.inclusions>**/*.spec.ts</sonar.test.inclusions>
                <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</epsdk.version>
+
        </properties>
 
        <build>
@@ -42,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>
@@ -69,7 +179,7 @@
 
                                </executions>
                        </plugin>
-
+                       
                        <plugin>
                                <groupId>com.github.eirslett</groupId>
                                <artifactId>frontend-maven-plugin</artifactId>
@@ -105,7 +215,7 @@
                                                        <arguments>install</arguments>
                                                </configuration>
                                        </execution>
-                                       
+                                         
                                        <execution>
                                                <id>npm run test</id>
                                                <goals>
@@ -116,6 +226,7 @@
 
                                                <configuration>
                                                        <arguments>run-script test</arguments>
+                                                       <skip>${skipTests}</skip>
                                                </configuration>
                                        </execution>
 
@@ -134,6 +245,7 @@
 
                                </executions>
                        </plugin>
+                       
                </plugins>
        </build>
 </project>