X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=8acdb498fe93c6acc7280a8d5e67062c6c9e2f82;hb=f0a648cc89cb870a4053d47a06fe2a4a54cc3f1c;hp=83bc1d06e204ff1173eec789ca944c99dea2b034;hpb=876d1a49367b4614680954913590372d773ec8ec;p=clamp.git
diff --git a/pom.xml b/pom.xml
index 83bc1d06..8acdb498 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
@@ -84,18 +81,17 @@
jacoco
${project.build.directory}/surefire-reports
- ${project.build.directory}/coverage-reports/jacoco.exec
- ${project.build.directory}/coverage-reports/jacoco-it.exec
+ ${project.build.directory}/jacoco-html-xml-reports/jacoco.xml
true
${project.version}
-
-
-
+ DEBUG
+ ${project.build.directory}/${ui.react.src}/node/node
+ true
src/main,${project.build.directory}/${ui.react.src}/src
- ${project.build.directory}/${ui.react.src}/coverage/lcov.info
-
src/main/resources/**
- src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js,src/main/docker/kibana/*.py
+ 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
localhost:5000
nexus3.onap.org:10001
true
@@ -105,10 +101,12 @@
9.0.27
ui-react
- https://nexus3.onap.org/repository/npm.release/
+ ui-react-lib
+ https://nexus3.onap.org/repository/npm.snapshot/
+
without-test
@@ -148,6 +146,7 @@
true
+
docker
@@ -259,16 +258,34 @@
org.apache.xmlgraphics
batik-svggen
1.11
+
+
+ xml-apis
+ xml-apis
+
+
org.apache.xmlgraphics
batik-svg-dom
1.11
+
+
+ xml-apis
+ xml-apis
+
+
org.apache.xmlgraphics
batik-transcoder
1.11
+
+
+ xml-apis
+ xml-apis
+
+
com.att.eelf
@@ -544,6 +561,20 @@
clamp
+
+ src/main/resources
+ true
+
+ clds/aaf/**
+
+
+
+ src/main/resources
+ false
+
+ clds/aaf/**
+
+
src/test/resources
@@ -570,7 +601,7 @@
-
src/main/resources
@@ -588,6 +619,9 @@
${ui.react.src}
+
+ node_modules
+
src/**
public/**
@@ -597,13 +631,37 @@
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}
+
- de.jpdigital
- hibernate52-ddl-maven-plugin
- 2.2.0
+ de.jpdigital
+ hibernate52-ddl-maven-plugin
+ 2.2.0
javax.xml.bind
@@ -619,7 +677,7 @@
- org.onap.clamp.dao.model
+ org.onap.clamp
MARIADB53
@@ -633,7 +691,7 @@
-
io.github.swagger2markup
@@ -668,7 +726,7 @@
-
org.asciidoctor
@@ -858,7 +916,7 @@
**/*ItCase.java
- 1
+ 1C
true
false
${failsafeArgLine}
@@ -956,7 +1014,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
backend/Dockerfile
@@ -978,7 +1036,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
frontend/Dockerfile
@@ -987,38 +1045,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
-
-
@@ -1062,7 +1088,7 @@
true
true
- org.onap.clamp.*
+ org/onap/clamp/**
@@ -1104,7 +1130,18 @@
- ${project.build.directory}/jacoco-dev.exec
+ ${project.build.directory}/jacoco.exec
+
+
+
+ report-xml
+
+ report
+
+
+
+ ${project.build.directory}/jacoco.exec
+ ${project.build.directory}/jacoco-html-xml-reports
@@ -1123,7 +1160,6 @@
1.8.0
${project.build.directory}/${ui.react.src}
- ${project.build.directory}/${ui.react.src}
@@ -1133,8 +1169,8 @@
generate-sources
- v12.13.0
- 6.13.0
+ v12.13.0
+ 6.13.0
@@ -1144,6 +1180,7 @@
compile
+ ${project.build.directory}/${ui.react.src}
install
@@ -1155,6 +1192,29 @@
test
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
@@ -1164,6 +1224,7 @@
deploy
+ ${project.build.directory}/${ui.react.lib.src}
publish