X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=catalog-ui%2Fpom.xml;h=6e85d65d2fc66010f2511e7244e1279e6d5fc535;hb=8c814c644cbcdd27e45bad595abe971983d3a850;hp=737ed33a418f97e3c6047fb606610bb43849b1ad;hpb=75aacbbe1acf78fa53378f07f0a8c7769449a17e;p=sdc.git

diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml
index 737ed33a41..6e85d65d2f 100644
--- a/catalog-ui/pom.xml
+++ b/catalog-ui/pom.xml
@@ -1,30 +1,28 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.openecomp.sdc</groupId>
-	<artifactId>catalog-ui</artifactId>
+    <artifactId>catalog-ui</artifactId>
     <packaging>pom</packaging>
 
+    <parent>
+        <groupId>org.openecomp.sdc</groupId>
+        <artifactId>sdc-main</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+    </parent>
 
-	<parent>
-		<groupId>org.openecomp.sdc</groupId>
-		<artifactId>sdc-main</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-	</parent>
+    <properties>
+        <sonar.nodejs.executable>${project.basedir}/node/node</sonar.nodejs.executable>
+        <sonar.sources>src/app/ng2</sonar.sources>
+    </properties>
 
-
-
-	<build>
-		<plugins>
-
-			<!--  ============================================= -->
-			<!--  Clean webapps folder                          -->
-			<!--  ============================================= -->
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.6.1</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>clean.fe.webapp.folder</id>
@@ -33,7 +31,6 @@
                             <goal>clean</goal>
                         </goals>
                         <configuration>
-
                             <filesets>
                                 <fileset>
                                     <directory>${project.parent.basedir}/catalog-fe/src/main/webapp</directory>
@@ -50,57 +47,38 @@
                             </filesets>
                         </configuration>
                     </execution>
-                    <!-- <execution>
-                        <id>clean.dist.folder</id>
-                        <phase>clean</phase>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
                         <goals>
-                            <goal>clean</goal>
+                            <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>${basedir}/node_modules</directory>
-                                </fileset>
-                                <fileset>
-                                    <directory>${basedir}/dist</directory>
-                                </fileset>
-                            </filesets>
+                            <outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp
+                            </outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.basedir}/dist</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
                         </configuration>
-                    </execution> -->
+                    </execution>
                 </executions>
-			</plugin>
-
-
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.7</version>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${project.basedir}/dist</directory>
-									<filtering>false</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+            </plugin>
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.4</version>
-
                 <configuration>
-        			<installDirectory>${project.parent.basedir}</installDirectory>
-   				</configuration>
+                    <installDirectory>${project.basedir}</installDirectory>
+                    <npmDownloadRoot>${npm.registry}</npmDownloadRoot>
+                </configuration>
 
                 <executions>
                     <execution>
@@ -110,19 +88,19 @@
                         </goals>
                         <configuration>
                             <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
-                            <nodeVersion>v6.9.5</nodeVersion>
-                            <npmVersion>3.10.10</npmVersion>
+                            <nodeVersion>v14.16.1</nodeVersion>
+                            <npmVersion>6.14.12</npmVersion>
                         </configuration>
                     </execution>
 
                     <execution>
-                    	<id>npm set progress off</id>
-                    	<goals>
-                    		<goal>npm</goal>
-                    	</goals>
-                    	<configuration>
-                    		<arguments>set progress=false</arguments>
-                    	</configuration>
+                        <id>npm set progress off</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>set progress=false</arguments>
+                        </configuration>
                     </execution>
 
                     <execution>
@@ -145,186 +123,51 @@
                             <arguments>run build:prod</arguments>
                         </configuration>
                     </execution>
+
+                    <execution>
+                        <id>npm_test</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>test</phase>
+                        <configuration>
+                            <arguments>test</arguments>
+                            <skip>${skipTests}</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.sylvainlaurent.maven</groupId>
+                <artifactId>yaml-json-validator-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>validate</goal>
+                        </goals>
+                        <configuration>
+                            <validationSets>
+                                <validationSet>
+                                    <includes>
+                                        <include>src/main/resources/**/*.y*ml</include>
+                                        <include>src/test/resources/**/*.y*ml</include>
+                                    </includes>
+                                </validationSet>
+                                <validationSet>
+                                    <includes>
+                                        <include>src/main/resources/**/*.json</include>
+                                        <include>src/test/resources/**/*.json</include>
+                                    </includes>
+                                </validationSet>
+                            </validationSets>
+                            <skip>${skipYamlJsonValidator}</skip>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 
-		</plugins>
-	</build>
-
-
-
-	<profiles>
-		<profile>
-			<id>CI</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-resources-plugin</artifactId>
-						<version>2.7</version>
-						<executions>
-							<execution>
-								<id>copy-resources</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-resources</goal>
-								</goals>
-
-								<configuration>
-									<outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp</outputDirectory>
-									<resources>
-										<resource>
-											<directory>${project.basedir}/dist</directory>
-											<filtering>false</filtering>
-										</resource>
-									</resources>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-
-
-
-					<!--  ============================================= -->
-					<!--  Build the UI module node code                 -->
-					<!--  ============================================= -->
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.4.0</version>
-						<executions>
-
-							<!-- Set execution permissions for the build script -->
-							<execution>
-								<id>set.script.permissions</id>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-
-								<configuration>
-									<workingDirectory>${project.basedir}</workingDirectory>
-									<executable>/bin/chmod</executable>
-									<arguments>
-										<argument>755</argument>
-										<argument>./build_catalog_ui.sh</argument>
-									</arguments>
-								</configuration>
-							</execution>
-
-							<!-- Run the build script -->
-							<execution>
-								<id>execute grant build</id>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-
-								<configuration>
-									<workingDirectory>${project.basedir}</workingDirectory>
-									<executable>./build_catalog_ui.sh</executable>
-								</configuration>
-							</execution>
-
-							<!-- Undo checkout the build script -->
-							<execution>
-								<id>undo.checkout.script</id>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-
-								<configuration>
-									<workingDirectory>${project.basedir}</workingDirectory>
-									<executable>/usr/bin/git</executable>
-									<arguments>
-										<argument>checkout</argument>
-										<argument>--</argument>
-										<argument>./build_catalog_ui.sh</argument>
-									</arguments>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.parent.artifactId}</buildId>
-							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-        <profile>
-            <id>not-minified</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>2.7</version>
-                        <executions>
-                            <execution>
-                                <id>copy-resources</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.basedir}/app</directory>
-                                            <includes>
-                                                <include>languages/**</include>
-                                                <include>scripts/**</include>
-                                                <include>styles/**</include>
-                                                <include>third-party/**</include>
-                                                <include>index.html</include>
-                                                <include>robots.txt</include>
-                                                <include>favicon.png</include>
-                                            </includes>
-                                            <filtering>false</filtering>
-                                        </resource>
-                                        <resource>
-                                            <directory>${project.basedir}</directory>
-                                            <includes>
-                                                <include>bower_components/**</include>
-                                            </includes>
-                                            <filtering>false</filtering>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-	</profiles>
+        </plugins>
+    </build>
 </project>
-