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

diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml
index 1825fd3f2c..6e85d65d2f 100644
--- a/catalog-ui/pom.xml
+++ b/catalog-ui/pom.xml
@@ -1,266 +1,173 @@
-<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>
-
-	<groupId>org.openecomp.sdc</groupId>
-	<artifactId>catalog-ui</artifactId>
-	<packaging>pom</packaging>
-
-
-	<parent>
-		<groupId>org.openecomp.sdc</groupId>
-		<artifactId>sdc-main</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-	</parent>
-
-
-
-	<build>
-		<plugins>
-
-			<!--  ============================================= -->
-			<!--  Clean webapps folder                          -->
-			<!--  ============================================= -->
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.6.1</version>
-				<executions>
-					<execution>
-						<id>clean.fe.webapp.folder</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-						<configuration>
-
-							<filesets>
-								<fileset>
-									<directory>${project.parent.basedir}/catalog-fe/src/main/webapp</directory>
-									<includes>
-										<include>**/*</include>
-										<include>*</include>
-									</includes>
-									<excludes>
-										<exclude>META-INF/*</exclude>
-										<exclude>WEB-INF/*</exclude>
-									</excludes>
-									<followSymlinks>false</followSymlinks>
-								</fileset>
-							</filesets>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-
-			<plugin>
-				<groupId>io.wcm.maven.plugins</groupId>
-				<artifactId>nodejs-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<tasks>
-						<npmInstallTask>
-							<workingDirectory>${project.basedir}</workingDirectory>
-						</npmInstallTask>
-						<nodeJsTask>
-							<workingDirectory>${project.basedir}</workingDirectory>
-							<moduleName>bower</moduleName>
-							<arguments>
-								<argument>install</argument>
-							</arguments>
-						</nodeJsTask>
-						<nodeJsTask>
-							<workingDirectory>${project.basedir}</workingDirectory>
-							<moduleName>grunt</moduleName>
-							<arguments>
-								<argument>build</argument>
-							</arguments>
-						</nodeJsTask>
-						<!-- <npmInstallTask>
-							<workingDirectory>${project.basedir}</workingDirectory>
-						</npmInstallTask>
-						<nodeJsTask>
-							<workingDirectory>${project.basedir}</workingDirectory>
-							<moduleName>gulp</moduleName>
-							<arguments>
-								<argument>build</argument>
-							</arguments>
-						</nodeJsTask> -->
-					</tasks>
-				</configuration>
-			</plugin>
-
-
-			<!-- <plugin>
-				<groupId>com.github.eirslett</groupId>
-				<artifactId>frontend-maven-plugin</artifactId>
-				<version>1.3</version>
-				<configuration>
-					<nodeVersion>v7.5.0</nodeVersion>
-					<nodeDownloadRoot>https://nodejs.org/dist/</nodeDownloadRoot>
-					<npmDownloadRoot>https://nodejs.org/dist/npm/</npmDownloadRoot>
-					<installDirectory>./</installDirectory>
-				</configuration>
-				<executions>
-					<execution>
-						<id>install node and npm</id>
-						<goals>
-							<goal>install-node-and-npm</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-
-					<execution>
-						<id>npm install bower</id>
-						<goals>
-							<goal>npm</goal>
-						</goals>
-
-						<phase>generate-resources</phase>
-
-						<configuration>
-							<arguments>install bower</arguments>
-						</configuration>
-					</execution>
-					
-					<execution>
-						<id>npm install grunt-cli</id>
-						<goals>
-							<goal>npm</goal>
-						</goals>
-
-						<phase>generate-resources</phase>
-
-						<configuration>
-							<arguments>install grunt-cli</arguments>
-						</configuration>
-					</execution>
-					
-					<execution>
-						<id>npm install</id>
-						<goals>
-							<goal>npm</goal>
-						</goals>
-
-						<phase>generate-resources</phase>
-
-						<configuration>
-							<arguments>install</arguments>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>bower install</id>
-						<goals>
-							<goal>bower</goal>
-						</goals>
-
-						<configuration>
-							<arguments>install</arguments>
-						</configuration>
-					</execution>
-					
-					<execution>
-						<id>grunt build</id>
-						<goals>
-							<goal>grunt</goal>
-						</goals>
-
-						<phase>generate-resources</phase>
-
-						<configuration>
-							<arguments>build</arguments>
-						</configuration>
-					</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}/app/dist</directory>
-									<filtering>false</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-
-
-		<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>
+<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>
+
+    <artifactId>catalog-ui</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.openecomp.sdc</groupId>
+        <artifactId>sdc-main</artifactId>
+        <version>1.9.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>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>clean.fe.webapp.folder</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>${project.parent.basedir}/catalog-fe/src/main/webapp</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                        <include>*</include>
+                                    </includes>
+                                    <excludes>
+                                        <exclude>META-INF/*</exclude>
+                                        <exclude>WEB-INF/*</exclude>
+                                    </excludes>
+                                    <followSymlinks>false</followSymlinks>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </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>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>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <configuration>
+                    <installDirectory>${project.basedir}</installDirectory>
+                    <npmDownloadRoot>${npm.registry}</npmDownloadRoot>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>install node and npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <configuration>
+                            <!-- See https://nodejs.org/en/download/ for latest node and npm (lts) versions -->
+                            <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>
+                    </execution>
+
+                    <execution>
+                        <id>npm install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <!-- Optional configuration which provides for running any npm command -->
+                        <configuration>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>npm run build</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <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>
 </project>
-