X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=34054da021b98ebe4252c4efe862321363381689;hb=1d3051a02c45eb99cc69af3844d1ba0a0eba840c;hp=17e76f64aea370e18f6b6dcb826d47a3f428317a;hpb=f04d3755f4b15b877dc291a0824ffc257ced2b61;p=clamp.git
diff --git a/pom.xml b/pom.xml
index 17e76f64..34054da0 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
@@ -79,28 +76,22 @@
UTF-8
1.0.0
- 2.24.0
- 2.2.0.RELEASE
+ 2.25.0
+ 2.2.5.RELEASE
jacoco
${project.build.directory}/surefire-reports
-
${project.build.directory}/jacoco-html-xml-reports/jacoco.xml
-
true
${project.version}
-
-
-
DEBUG
- ${project.build.directory}/${ui.react.src}/node/node
- true
+ ${project.build.directory}/${ui.react.src}/node/node
+ true
src/main,${project.build.directory}/${ui.react.src}/src
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
@@ -110,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
@@ -153,6 +146,7 @@
true
+
docker
@@ -275,11 +269,23 @@
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
@@ -524,6 +530,11 @@
sdc-tosca
1.5.1
+
+ org.yaml
+ snakeyaml
+ 1.26
+
org.assertj
@@ -555,6 +566,20 @@
clamp
+
+ src/main/resources
+ true
+
+ clds/aaf/**
+
+
+
+ src/main/resources
+ false
+
+ clds/aaf/**
+
+
src/test/resources
@@ -581,7 +606,7 @@
-
src/main/resources
@@ -599,6 +624,9 @@
${ui.react.src}
+
+ node_modules
+
src/**
public/**
@@ -608,6 +636,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}
+
@@ -644,7 +696,7 @@
-
io.github.swagger2markup
@@ -679,7 +731,7 @@
-
org.asciidoctor
@@ -827,9 +879,7 @@
org.springframework.boot
spring-boot-maven-plugin
-
- 1.5.13.RELEASE
-
+ ${springboot.version}
@@ -869,7 +919,7 @@
**/*ItCase.java
- 1
+ 1C
true
false
${failsafeArgLine}
@@ -967,7 +1017,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
backend/Dockerfile
@@ -989,7 +1039,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
frontend/Dockerfile
@@ -998,38 +1048,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
-
-
@@ -1145,7 +1163,6 @@
1.8.0
${project.build.directory}/${ui.react.src}
- ${project.build.directory}/${ui.react.src}
@@ -1155,8 +1172,8 @@
generate-sources
- v12.13.0
- 6.13.0
+ v12.13.0
+ 6.13.0
@@ -1166,6 +1183,7 @@
compile
+ ${project.build.directory}/${ui.react.src}
install
@@ -1176,7 +1194,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
@@ -1186,6 +1228,7 @@
deploy
+ ${project.build.directory}/${ui.react.lib.src}
publish