X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=3344f8072672e8d0d49fdcc2feeaaed8570e08f7;hb=1eafc9448d24f5b0eda40f62566bdf93cc4f5a6e;hp=76a0e4f1dc08ec4d32ec75ddffb9c906ab631d7a;hpb=2901ca9fec4a88db325b90bda2103ffc5e921681;p=clamp.git
diff --git a/pom.xml b/pom.xml
index 76a0e4f1..3344f807 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,34 +26,31 @@
4.0.0
org.onap.clamp
clds
- 4.2.0-SNAPSHOT
+ 5.0.2-SNAPSHOT
clamp
org.onap.oparent
oparent
- 2.0.0
+ 2.1.0
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
@@ -75,29 +72,26 @@
yyyyMMdd'T'HHmmss'Z'
${project.version}
${maven.build.timestamp}
- 1.8
- 1.8
UTF-8
UTF-8
1.0.0
- 2.24.0
- 2.1.5.RELEASE
+ 2.25.0
+ 2.2.5.RELEASE
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,12 +99,14 @@
true
false
- 9.0.20
+ 9.0.33
ui-react
- https://nexus3.onap.org/repository/npm.release/
+ ui-react-lib
+ https://nexus3.onap.org/repository/npm.snapshot/
+
without-test
@@ -150,6 +146,7 @@
true
+
docker
@@ -261,21 +258,49 @@
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
eelf-core
${eelf.core.version}
+
+
+ org.powermock
+ powermock-module-junit4
+
+
+ org.powermock
+ powermock-api-mockito
+
+
org.codehaus.janino
@@ -341,6 +366,11 @@
+
+ javax.xml.ws
+ jaxws-api
+ 2.3.1
+
javax.xml.bind
jaxb-api
@@ -403,6 +433,10 @@
javax.servlet
servlet-api
+
+ log4j
+ log4j
+
@@ -505,6 +539,11 @@
sdc-tosca
1.5.1
+
+ org.yaml
+ snakeyaml
+ 1.26
+
org.assertj
@@ -515,7 +554,19 @@
org.mockito
mockito-core
- 1.10.19
+ 2.28.2
+ test
+
+
+ org.powermock
+ powermock-api-mockito2
+ 2.0.4
+ test
+
+
+ org.powermock
+ powermock-module-junit4
+ 2.0.4
test
@@ -524,6 +575,20 @@
clamp
+
+ src/main/resources
+ true
+
+ clds/aaf/**
+
+
+
+ src/main/resources
+ false
+
+ clds/aaf/**
+
+
src/test/resources
@@ -550,7 +615,7 @@
-
src/main/resources
@@ -568,6 +633,9 @@
${ui.react.src}
+
+ node_modules
+
src/**
public/**
@@ -577,13 +645,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
@@ -599,7 +691,7 @@
- org.onap.clamp.dao.model
+ org.onap.clamp
MARIADB53
@@ -613,7 +705,7 @@
-
io.github.swagger2markup
@@ -648,7 +740,7 @@
-
org.asciidoctor
@@ -708,6 +800,7 @@
1.0
+ docker-tags
validate
execute
@@ -716,6 +809,16 @@
+
+ npm-repos-selection
+ validate
+
+ execute
+
+
+
+
+
@@ -780,9 +883,7 @@
org.springframework.boot
spring-boot-maven-plugin
-
- 1.5.13.RELEASE
-
+ ${springboot.version}
@@ -795,7 +896,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.22.1
+ 2.22.2
1C
true
@@ -807,7 +908,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
- 2.22.1
+ 2.22.2
integration-tests
@@ -822,7 +923,7 @@
**/*ItCase.java
- 1
+ 1C
true
false
${failsafeArgLine}
@@ -833,7 +934,7 @@
io.fabric8
docker-maven-plugin
- 0.27.2
+ 0.31.0
org.apache.httpcomponents
@@ -869,6 +970,9 @@
${docker.mariadb.port.host}:3306
+
+ bridge
+
@@ -899,6 +1003,9 @@
./start_http_cache.sh ${python.http.proxy.param}
--python_proxyaddress=localhost:${docker.http-cache.port.host}
+
+ bridge
+
@@ -914,7 +1021,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
backend/Dockerfile
@@ -936,7 +1043,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
frontend/Dockerfile
@@ -945,38 +1052,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
-
-
@@ -1015,12 +1090,12 @@
org.jacoco
jacoco-maven-plugin
- 0.8.2
+ 0.8.5
true
true
- org.onap.clamp.*
+ org/onap/clamp/**
@@ -1062,7 +1137,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
@@ -1081,7 +1167,6 @@
1.8.0
${project.build.directory}/${ui.react.src}
- ${project.build.directory}/${ui.react.src}
@@ -1091,8 +1176,8 @@
generate-sources
- v12.10.0
- 6.10.3
+ v12.13.0
+ 6.13.0
@@ -1102,6 +1187,7 @@
compile
+ ${project.build.directory}/${ui.react.src}
install
@@ -1112,7 +1198,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
@@ -1122,11 +1232,27 @@
deploy
- run-script publish
+ true
+ ${project.build.directory}/${ui.react.lib.src}
+ publish
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.1
+
+
+ 11
+
+
+
+ org.sonarsource.scanner.maven
+ sonar-maven-plugin
+ 3.7.0.1746
+