X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=245bae022999887a59cd506190245818a2c21e86;hb=c29567afad53e62908abcffcfcc5e6b221102925;hp=5f6d203b93a6a5230221863831d82677964c26b3;hpb=9abd198502815fe6f54db06bb84a31fc36cb43e1;p=clamp.git
diff --git a/pom.xml b/pom.xml
index 5f6d203b..245bae02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
4.0.0
org.onap.clamp
clds
- 4.2.0-SNAPSHOT
+ 5.1.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,29 +76,22 @@
UTF-8
1.0.0
- 2.24.0
- 2.2.0.RELEASE
+ 2.25.0
+ 2.2.6.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
- .
- src/main/**,${ui.react.src}/src/**
+ ${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
@@ -109,12 +99,14 @@
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/
+
without-test
@@ -154,6 +146,7 @@
true
+
docker
@@ -261,27 +254,6 @@
-
- org.apache.xmlgraphics
- batik-svggen
- 1.11
-
-
- xml-apis
- xml-apis
-
-
-
-
- org.apache.xmlgraphics
- batik-svg-dom
- 1.11
-
-
- org.apache.xmlgraphics
- batik-transcoder
- 1.11
-
com.att.eelf
eelf-core
@@ -361,6 +333,11 @@
+
+ javax.xml.ws
+ jaxws-api
+ 2.3.1
+
javax.xml.bind
jaxb-api
@@ -423,6 +400,10 @@
javax.servlet
servlet-api
+
+ log4j
+ log4j
+
@@ -488,6 +469,11 @@
1.3
+
+ org.springframework.security
+ spring-security-web
+ 5.2.3.RELEASE
+
org.codehaus.plexus
plexus-utils
@@ -525,6 +511,17 @@
sdc-tosca
1.5.1
+
+ org.yaml
+ snakeyaml
+ 1.26
+
+
+ org.dom4j
+ dom4j
+ 2.1.3
+
+
org.assertj
@@ -550,12 +547,38 @@
2.0.4
test
+
+ com.github.docker-java
+ docker-java-core
+ 3.2.1
+ test
+
+
+ com.github.docker-java
+ docker-java
+ 3.2.1
+ test
+
clamp
+
+ src/main/resources
+ true
+
+ clds/aaf/**
+
+
+
+ src/main/resources
+ false
+
+ clds/aaf/**
+
+
src/test/resources
@@ -582,7 +605,7 @@
-
src/main/resources
@@ -600,6 +623,9 @@
${ui.react.src}
+
+ node_modules
+
src/**
public/**
@@ -609,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}
+
@@ -645,7 +695,7 @@
-
io.github.swagger2markup
@@ -680,7 +730,7 @@
-
org.asciidoctor
@@ -740,6 +790,7 @@
1.0
+ docker-tags
validate
execute
@@ -748,14 +799,8 @@
-
-
-
- org.codehaus.groovy.maven
- gmaven-plugin
- 1.0
-
+ npm-repos-selection
validate
execute
@@ -817,6 +862,7 @@
docker.mariadb.port.host
docker.http-cache.port.host
clamp.it.tests.http-redirected
+ clamp.it.tests.robotframework.http
clamp.it.tests.https
clamp.it.tests.http
@@ -828,9 +874,7 @@
org.springframework.boot
spring-boot-maven-plugin
-
- 1.5.13.RELEASE
-
+ ${springboot.version}
@@ -870,8 +914,8 @@
**/*ItCase.java
- 1
- true
+ 1C
+ false
false
${failsafeArgLine}
@@ -968,7 +1012,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
backend/Dockerfile
@@ -990,7 +1034,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
frontend/Dockerfile
@@ -999,38 +1043,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
-
-
@@ -1146,7 +1158,6 @@
1.8.0
${project.build.directory}/${ui.react.src}
- ${project.build.directory}/${ui.react.src}
@@ -1156,8 +1167,8 @@
generate-sources
- v12.13.0
- 6.13.0
+ v12.13.0
+ 6.13.0
@@ -1167,6 +1178,7 @@
compile
+ ${project.build.directory}/${ui.react.src}
install
@@ -1177,7 +1189,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
@@ -1187,6 +1223,7 @@
deploy
+ ${project.build.directory}/${ui.react.lib.src}
publish
@@ -1206,6 +1243,26 @@
sonar-maven-plugin
3.7.0.1746
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.3.2
+
+
+ libIndexCheck
+ validate
+
+ exec
+
+
+
+
+ bash
+
+ ${project.basedir}/src/main/script/checkLibIndex.sh
+
+
+