X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=520f7058e5c998b908a27644d9948a1879a2a653;hb=4d1e6b94e2fad7e2bf5fc039e7aec8ee11d26a53;hp=9149dbf891a3a1d06e44c0e0008ac383d8db2e4d;hpb=50fbbca6bd81cd03ea54b29ac948522dc1f71bb1;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 9149dbf8..520f7058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,14 +24,14 @@
 		<modelVersion>4.0.0</modelVersion>
 		<groupId>org.onap.clamp</groupId>
 		<artifactId>clds</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.1-SNAPSHOT</version>
 		<name>clamp</name>
 
-<!-- 		<parent> -->
-<!-- 				<groupId>org.onap.oparent</groupId> -->
-<!-- 				<artifactId>oparent</artifactId> -->
-<!-- 				<version>1.2.0</version> -->
-<!-- 		</parent> -->
+		<parent>
+				<groupId>org.onap.oparent</groupId>
+				<artifactId>oparent</artifactId>
+				<version>1.2.0</version>
+		</parent>
 
 		<description>
            This project build the ONAP CLAMP JAR that contains CLAMP back-end code and its UI part.
@@ -67,15 +67,17 @@
 
 				<eelf.core.version>1.0.0</eelf.core.version>
 				<camel.version>2.22.0</camel.version>
-				<springboot.version>2.0.3.RELEASE</springboot.version>
+				<springboot.version>2.0.6.RELEASE</springboot.version>
 
-				<sonar.language>java</sonar.language>
 				<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 				<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 				<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
 				<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
 				<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+				<sonar.javascript.lcov.reportPaths>${project.build.directory}/clamp-ui/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
 				<sonar.projectVersion>${project.version}</sonar.projectVersion>
+				<sonar.sources>src/main,${project.build.directory}/clamp-ui/designer</sonar.sources>
+				<sonar.exclusions>src/main/resources/**,**/clamp-ui/designer/lib/*</sonar.exclusions>
 
 				<docker.push.registry>localhost:5000</docker.push.registry>
 				<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
@@ -141,17 +143,17 @@
 
 		<distributionManagement>
 				<repository>
-						<id>ecomp-releases</id>
+						<id>onap-releases</id>
 						<name>Clamp Release Repository</name>
 						<url>https://nexus.onap.org/content/repositories/releases/</url>
 				</repository>
 				<snapshotRepository>
-						<id>ecomp-snapshots</id>
+						<id>onap-snapshots</id>
 						<name>Clamp Snapshot Repository</name>
 						<url>https://nexus.onap.org/content/repositories/snapshots/</url>
 				</snapshotRepository>
 				<site>
-						<id>ecomp-site</id>
+						<id>onap-site</id>
 						<url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
 				</site>
 		</distributionManagement>
@@ -163,17 +165,17 @@
 						<url>http://repo2.maven.org/maven2/</url>
 				</repository>
 				<repository>
-						<id>ecomp-releases</id>
+						<id>onap-releases</id>
 						<name>ONAP Release Repository</name>
 						<url>https://nexus.onap.org/content/repositories/releases/</url>
 				</repository>
 				<repository>
-						<id>ecomp-staging</id>
+						<id>onap-staging</id>
 						<name>ONAP Staging Repository</name>
 						<url>https://nexus.onap.org/content/repositories/staging/</url>
 				</repository>
 				<repository>
-						<id>ecomp-snapshots</id>
+						<id>onap-snapshots</id>
 						<name>ONAP Snapshot Repository</name>
 						<url>https://nexus.onap.org/content/repositories/snapshots/</url>
 						<snapshots>
@@ -391,7 +393,7 @@
 				<dependency>
 						<groupId>org.onap.policy.engine</groupId>
 						<artifactId>PolicyEngineAPI</artifactId>
-						<version>1.3.0-SNAPSHOT</version>
+						<version>1.3.0</version>
 						<exclusions>
 								<exclusion>
 										<groupId>com.google.guava</groupId>
@@ -441,6 +443,10 @@
 										<groupId>javax.jms</groupId>
 										<artifactId>jms</artifactId>
 								</exclusion>
+								<exclusion>
+										<groupId>commons-fileupload</groupId>
+										<artifactId>commons-fileupload</artifactId>
+								</exclusion>
 						</exclusions>
 				</dependency>
 				<dependency>
@@ -530,11 +536,6 @@
 						<artifactId>plexus-utils</artifactId>
 						<version>3.0.24</version>
 				</dependency>
-				<dependency>
-						<groupId>commons-fileupload</groupId>
-						<artifactId>commons-fileupload</artifactId>
-						<version>1.3.3</version>
-				</dependency>
 				<dependency>
 						<groupId>org.jboss.spec.javax.ws.rs</groupId>
 						<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
@@ -543,7 +544,6 @@
 				<dependency>
 						<groupId>com.google.guava</groupId>
 						<artifactId>guava</artifactId>
-						<version>25.1-jre</version>
 				</dependency>
 				<!-- Remove the MYSQL connector and replace it by Mariadb -->
 				<dependency>
@@ -619,6 +619,21 @@
 								<filtering>false</filtering>
 								<targetPath>example/sdc</targetPath>
 						</testResource>
+
+						<!-- Copy the NPM package.json for CLAMP UI javascript testing framework -->
+						<testResource>
+								<directory>src/test/javascript</directory>
+								<includes>
+										<include>**/**.json</include>
+								</includes>
+								<filtering>true</filtering>
+								<targetPath>${project.build.directory}/clamp-ui</targetPath>
+						</testResource>
+						<testResource>
+								<directory>src/main/resources/META-INF/resources/designer</directory>
+								<filtering>false</filtering>
+								<targetPath>${project.build.directory}/clamp-ui/designer</targetPath>
+						</testResource>
 				</testResources>
 				<resources>
 						<!--  For AAF folder maven should not try to filter Keystores/Truststores ... 
@@ -958,7 +973,7 @@
 																		<tag>${project.docker.latesttagtimestamp.version}</tag>
 																		<tag>${project.docker.latesttag.version}</tag>
 																</tags>
-																<dockerFile>Dockerfile.logstash</dockerFile>
+																<dockerFile>logstash/Dockerfile.logstash</dockerFile>
 														</build>
 												</image>
 												<image>
@@ -1070,6 +1085,52 @@
 								<artifactId>versions-maven-plugin</artifactId>
 								<version>1.3.1</version>
 						</plugin>
+
+					<plugin>
+						<groupId>com.github.eirslett</groupId>
+						<artifactId>frontend-maven-plugin</artifactId>
+						<version>1.6</version>
+						<configuration>
+							<installDirectory>${project.build.directory}/clamp-ui</installDirectory>
+							<workingDirectory>${project.build.directory}/clamp-ui</workingDirectory>
+							<skip>${maven.test.skip}</skip>
+						</configuration>
+
+						<executions>
+							<execution>
+								<id>install_node_and_npm</id>
+								<goals>
+									<goal>install-node-and-npm</goal>
+								</goals>
+								<phase>test</phase>
+								<configuration>
+									<nodeVersion>v8.11.1</nodeVersion>
+									<npmVersion>5.6.0</npmVersion>
+								</configuration>
+							</execution>
+							<execution>
+								<id>npm_install</id>
+								<goals>
+									<goal>npm</goal>
+								</goals>
+								<phase>test</phase>
+								<configuration>
+									<arguments>install</arguments>
+								</configuration>
+							</execution>
+							<execution>
+								<id>npm_test</id>
+								<goals>
+									<goal>npm</goal>
+								</goals>
+								<phase>test</phase>
+								<configuration>
+									<arguments>run-script test:coverage</arguments>
+								</configuration>
+							</execution>
+
+						</executions>
+					</plugin>
 				</plugins>
 		</build>
 </project>