X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=633109bc0d7cebb62a7fca39dff54fe88be9ff49;hb=afac3121bfacc4d81903b1d8492613b0b77d3298;hp=94598acfc937e7335bd16ae9ee3b4b05492ee5b3;hpb=f2d71ebde9dcd13d3181ba343ad82e728b30bf73;p=clamp.git

diff --git a/pom.xml b/pom.xml
index 94598acf..633109bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.clamp</groupId>
 	<artifactId>clds</artifactId>
-	<version>4.2.0-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<name>clamp</name>
 
 
@@ -39,21 +39,18 @@
 	<description>
 	       This is the MAVEN project that builds everything for ONAP CLAMP.
 	       Docker engine is normally requires to perfom all possible tasks (including integration tests)
-	       
+
            It can build:
            - The ONAP CLAMP JAR that contains CLAMP back-end code.
            - The DOCKER images for:
                 * CLAMP backend (Java Spring)
                 * CLAMP frontend (Javscript React)
-                * The dashboard - Elastic search
-                * The dashboard - Logstash
-                * The dashboard - Kibana
 
            It can test:
             - The CLAMP backend, JAVA unit testing
             - The CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae emulator written in python)
             - The CLAMP frontend, Javascrip tests (NodeJS(NPM) + JEST + Enzyme fro React)
-           
+
            The test coverage for dev's can be found after a "clean install" build in:
             - Clamp backend: target/jacoco-dev.exec (unit tests + integration tests merged)
                 or separately target/coverage-reports/jacoco.exec and target/coverage-reports/jacoco-it.exec
@@ -94,7 +91,7 @@
 		<sonar.exclusions>src/main/resources/**</sonar.exclusions>
 		<sonar.scm.exclusions.disabled>true</sonar.scm.exclusions.disabled>
 		<sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
-		<sonar.coverage.exclusions>src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js,src/main/docker/kibana/*.py</sonar.coverage.exclusions>
+		<sonar.coverage.exclusions>src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js</sonar.coverage.exclusions>
 		<docker.push.registry>localhost:5000</docker.push.registry>
 		<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
 		<docker.skip.build>true</docker.skip.build>
@@ -104,7 +101,8 @@
 		<python.http.proxy.param />
 		<tomcat.version>9.0.27</tomcat.version>
 		<ui.react.src>ui-react</ui.react.src>
-		<npm.publish.url>https://nexus3.onap.org/repository/npm.release/</npm.publish.url>
+		<ui.react.lib.src>ui-react-lib</ui.react.lib.src>
+		<npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
 	</properties>
 
 	<profiles>
@@ -563,6 +561,20 @@
 		<finalName>clamp</finalName>
 
 		<testResources>
+			<testResource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<excludes>
+					<exclude>clds/aaf/**</exclude>
+				</excludes>
+			</testResource>
+			<testResource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>clds/aaf/**</include>
+				</includes>
+			</testResource>
 			<testResource>
 				<directory>src/test/resources</directory>
 				<excludes>
@@ -589,7 +601,7 @@
 			</testResource>
 		</testResources>
 		<resources>
-			<!-- For AAF folder maven should not try to filter Keystores/Truststores ... Otherwise 
+			<!-- For AAF folder maven should not try to filter Keystores/Truststores ... Otherwise
 				they will be broken and unreadable -->
 			<resource>
 				<directory>src/main/resources</directory>
@@ -607,6 +619,9 @@
 			</resource>
 			<resource>
 				<directory>${ui.react.src}</directory>
+				<excludes>
+					<exclude>node_modules</exclude>
+				</excludes>
 				<includes>
 					<include>src/**</include>
 					<include>public/**</include>
@@ -616,6 +631,30 @@
 				<filtering>true</filtering>
 				<targetPath>${project.build.directory}/${ui.react.src}</targetPath>
 			</resource>
+			<resource>
+				<directory>${ui.react.src}</directory>
+				<includes>
+					<include>src/**</include>
+				</includes>
+				<excludes>
+					<exclude>**/__snapshots__/**</exclude>
+					<exclude>**/**.test.js</exclude>
+				</excludes>
+				<filtering>true</filtering>
+				<targetPath>${project.build.directory}/${ui.react.lib.src}</targetPath>
+			</resource>
+			<resource>
+				<directory>${ui.react.lib.src}</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>node_modules/**</exclude>
+					<exclude>package-lock.json</exclude>
+				</excludes>
+				<filtering>true</filtering>
+				<targetPath>${project.build.directory}/${ui.react.lib.src}</targetPath>
+			</resource>
 		</resources>
 
 		<plugins>
@@ -652,7 +691,7 @@
 				</executions>
 
 			</plugin>
-			<!-- Read the swagger.json file and the definition from SwaggerConfig.java; generate 
+			<!-- Read the swagger.json file and the definition from SwaggerConfig.java; generate
 				a list of .adoc files containing the APIs info in more structured way -->
 			<plugin>
 				<groupId>io.github.swagger2markup</groupId>
@@ -687,7 +726,7 @@
 				</executions>
 			</plugin>
 
-			<!-- Run the generated asciidoc through Asciidoctor to generate other documentation 
+			<!-- Run the generated asciidoc through Asciidoctor to generate other documentation
 				types, such as PDFs or HTML5 -->
 			<plugin>
 				<groupId>org.asciidoctor</groupId>
@@ -877,7 +916,7 @@
 							<includes>
 								<include>**/*ItCase.java</include>
 							</includes>
-							<forkCount>1</forkCount>
+							<forkCount>1C</forkCount>
 							<reuseForks>true</reuseForks>
 							<useSystemClassLoader>false</useSystemClassLoader>
 							<argLine>${failsafeArgLine}</argLine>
@@ -975,7 +1014,7 @@
 									<tag>${project.docker.latesttagtimestamp.version}</tag>
 									<tag>${project.docker.latesttag.version}</tag>
 								</tags>
-								<!-- A relative path is looked up in ${project.basedir}/src/main/docker by 
+								<!-- A relative path is looked up in ${project.basedir}/src/main/docker by
 									default -->
 								<dockerFile>backend/Dockerfile</dockerFile>
 								<assembly>
@@ -997,7 +1036,7 @@
 									<tag>${project.docker.latesttagtimestamp.version}</tag>
 									<tag>${project.docker.latesttag.version}</tag>
 								</tags>
-								<!-- A relative path is looked up in ${project.basedir}/src/main/docker by 
+								<!-- A relative path is looked up in ${project.basedir}/src/main/docker by
 									default -->
 								<dockerFile>frontend/Dockerfile</dockerFile>
 								<assembly>
@@ -1006,38 +1045,6 @@
 								</assembly>
 							</build>
 						</image>
-						<image>
-							<name>onap/clamp-dashboard-logstash</name>
-							<alias>onap-clamp-dashboard-logstash</alias>
-							<run>
-								<skip>true</skip>
-							</run>
-							<build>
-								<cleanup>true</cleanup>
-								<tags>
-									<tag>latest</tag>
-									<tag>${project.docker.latesttagtimestamp.version}</tag>
-									<tag>${project.docker.latesttag.version}</tag>
-								</tags>
-								<dockerFile>logstash/Dockerfile</dockerFile>
-							</build>
-						</image>
-						<image>
-							<name>onap/clamp-dashboard-kibana</name>
-							<alias>onap-clamp-dashboard-kibana</alias>
-							<run>
-								<skip>true</skip>
-							</run>
-							<build>
-								<cleanup>true</cleanup>
-								<tags>
-									<tag>latest</tag>
-									<tag>${project.docker.latesttagtimestamp.version}</tag>
-									<tag>${project.docker.latesttag.version}</tag>
-								</tags>
-								<dockerFile>kibana/Dockerfile</dockerFile>
-							</build>
-						</image>
 					</images>
 				</configuration>
 
@@ -1153,7 +1160,6 @@
 				<version>1.8.0</version>
 				<configuration>
 					<installDirectory>${project.build.directory}/${ui.react.src}</installDirectory>
-					<workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
 				</configuration>
 				<executions>
 					<execution>
@@ -1163,8 +1169,8 @@
 						</goals>
 						<phase>generate-sources</phase>
 						<configuration>
-						<nodeVersion>v12.13.0</nodeVersion>
-						<npmVersion>6.13.0</npmVersion>
+							<nodeVersion>v12.13.0</nodeVersion>
+							<npmVersion>6.13.0</npmVersion>
 						</configuration>
 					</execution>
 					<execution>
@@ -1174,6 +1180,7 @@
 						</goals>
 						<phase>compile</phase>
 						<configuration>
+							<workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
 							<arguments>install</arguments>
 						</configuration>
 					</execution>
@@ -1184,7 +1191,31 @@
 						</goals>
 						<phase>test</phase>
 						<configuration>
+							<skip>${maven.test.skip}</skip>
 							<arguments>run-script test:coverage</arguments>
+							<workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm_install_lib</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>deploy</phase>
+						<configuration>
+							<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
+							<arguments>install</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm_build_lib</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>deploy</phase>
+						<configuration>
+							<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
+							<arguments>run build</arguments>
 						</configuration>
 					</execution>
 					<execution>
@@ -1194,6 +1225,7 @@
 						</goals>
 						<phase>deploy</phase>
 						<configuration>
+							<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
 							<arguments>publish</arguments>
 						</configuration>
 					</execution>