X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=02ac6dddbd62988c6171904b6d3ee18a5624943f;hb=98bade58e0ab9b74378e4e3214700e7b00e10d7d;hp=94598acfc937e7335bd16ae9ee3b4b05492ee5b3;hpb=f2d71ebde9dcd13d3181ba343ad82e728b30bf73;p=clamp.git
diff --git a/pom.xml b/pom.xml
index 94598acf..02ac6ddd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
4.0.0
org.onap.clamp
clds
- 4.2.0-SNAPSHOT
+ 5.0.0-SNAPSHOT
clamp
@@ -39,21 +39,18 @@
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 @@
src/main/resources/**
true
${project.build.directory}/${ui.react.src}/coverage/lcov.info
- src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js,src/main/docker/kibana/*.py
+ src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js
localhost:5000
nexus3.onap.org:10001
true
@@ -102,9 +99,10 @@
true
false
- 9.0.27
+ 9.0.33
ui-react
- https://nexus3.onap.org/repository/npm.release/
+ ui-react-lib
+ https://nexus3.onap.org/repository/npm.snapshot/
@@ -430,6 +428,10 @@
javax.servlet
servlet-api
+
+ log4j
+ log4j
+
@@ -563,6 +565,20 @@
clamp
+
+ src/main/resources
+ true
+
+ clds/aaf/**
+
+
+
+ src/main/resources
+ false
+
+ clds/aaf/**
+
+
src/test/resources
@@ -589,7 +605,7 @@
-
src/main/resources
@@ -607,6 +623,9 @@
${ui.react.src}
+
+ node_modules
+
src/**
public/**
@@ -616,6 +635,30 @@
true
${project.build.directory}/${ui.react.src}
+
+ ${ui.react.src}
+
+ src/**
+
+
+ **/__snapshots__/**
+ **/**.test.js
+
+ true
+ ${project.build.directory}/${ui.react.lib.src}
+
+
+ ${ui.react.lib.src}
+
+ **
+
+
+ node_modules/**
+ package-lock.json
+
+ true
+ ${project.build.directory}/${ui.react.lib.src}
+
@@ -652,7 +695,7 @@
-
io.github.swagger2markup
@@ -687,7 +730,7 @@
-
org.asciidoctor
@@ -877,7 +920,7 @@
**/*ItCase.java
- 1
+ 1C
true
false
${failsafeArgLine}
@@ -975,7 +1018,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
backend/Dockerfile
@@ -997,7 +1040,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
frontend/Dockerfile
@@ -1006,38 +1049,6 @@
-
- onap/clamp-dashboard-logstash
- onap-clamp-dashboard-logstash
-
- true
-
-
- true
-
- latest
- ${project.docker.latesttagtimestamp.version}
- ${project.docker.latesttag.version}
-
- logstash/Dockerfile
-
-
-
- onap/clamp-dashboard-kibana
- onap-clamp-dashboard-kibana
-
- true
-
-
- true
-
- latest
- ${project.docker.latesttagtimestamp.version}
- ${project.docker.latesttag.version}
-
- kibana/Dockerfile
-
-
@@ -1153,7 +1164,6 @@
1.8.0
${project.build.directory}/${ui.react.src}
- ${project.build.directory}/${ui.react.src}
@@ -1163,8 +1173,8 @@
generate-sources
- v12.13.0
- 6.13.0
+ v12.13.0
+ 6.13.0
@@ -1174,6 +1184,7 @@
compile
+ ${project.build.directory}/${ui.react.src}
install
@@ -1184,7 +1195,31 @@
test
+ ${maven.test.skip}
run-script test:coverage
+ ${project.build.directory}/${ui.react.src}
+
+
+
+ npm_install_lib
+
+ npm
+
+ deploy
+
+ ${project.build.directory}/${ui.react.lib.src}
+ install
+
+
+
+ npm_build_lib
+
+ npm
+
+ deploy
+
+ ${project.build.directory}/${ui.react.lib.src}
+ run build
@@ -1194,6 +1229,7 @@
deploy
+ ${project.build.directory}/${ui.react.lib.src}
publish