X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=0757734ea43fd80d676bfd417f8fb7b23c416490;hb=caf78ac9ef48e7afacbfbd14f7b6dc1c9cecc992;hp=4d8357500c90eb3fc10657a18eb8e15f566488f0;hpb=1274833bdb3ef9eac728564bd9b1b687bf9f1727;p=clamp.git
diff --git a/pom.xml b/pom.xml
index 4d835750..0757734e 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,28 +76,22 @@
UTF-8
1.0.0
- 2.24.0
- 2.2.0.RELEASE
+ 2.25.2
+ 2.2.9.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
@@ -108,12 +99,14 @@
true
false
- 9.0.27
+ 9.0.37
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
@@ -260,39 +254,6 @@
-
- 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
@@ -366,12 +327,13 @@
org.slf4j
slf4j-ext
-
- com.fasterxml.jackson.core
- jackson-databind
-
+
+ javax.xml.ws
+ jaxws-api
+ 2.3.1
+
javax.xml.bind
jaxb-api
@@ -434,6 +396,10 @@
javax.servlet
servlet-api
+
+ log4j
+ log4j
+
@@ -466,10 +432,6 @@
commons-vfs2
2.2
-
- joda-time
- joda-time
-
org.slf4j
slf4j-api
@@ -493,12 +455,12 @@
persistence-api
1.0.2
+
- org.apache.commons
- commons-csv
- 1.3
+ org.springframework.security
+ spring-security-web
+ 5.2.3.RELEASE
-
org.codehaus.plexus
plexus-utils
@@ -514,11 +476,7 @@
guava
27.0-jre
-
- commons-codec
- commons-codec
- 1.13
-
+
org.mariadb.jdbc
@@ -535,7 +493,24 @@
org.onap.sdc.sdc-tosca
sdc-tosca
1.5.1
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+
+
+ org.yaml
+ snakeyaml
+ 1.26
+
+
+ org.dom4j
+ dom4j
+ 2.1.3
+
org.assertj
@@ -561,12 +536,44 @@
2.0.4
test
+
+ com.github.docker-java
+ docker-java-core
+ 3.2.1
+ test
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+
+
+ 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
@@ -593,7 +600,7 @@
-
src/main/resources
@@ -611,6 +618,9 @@
${ui.react.src}
+
+ node_modules
+
src/**
public/**
@@ -620,6 +630,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}
+
@@ -656,7 +690,7 @@
-
io.github.swagger2markup
@@ -691,7 +725,7 @@
-
org.asciidoctor
@@ -751,6 +785,7 @@
1.0
+ docker-tags
validate
execute
@@ -759,14 +794,8 @@
-
-
-
- org.codehaus.groovy.maven
- gmaven-plugin
- 1.0
-
+ npm-repos-selection
validate
execute
@@ -828,6 +857,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
@@ -839,9 +869,7 @@
org.springframework.boot
spring-boot-maven-plugin
-
- 1.5.13.RELEASE
-
+ ${springboot.version}
@@ -905,7 +933,7 @@
1.35
- library/mariadb:10.3.12
+ docker.io/mariadb:10.5.4
mariadb
@@ -919,8 +947,8 @@
- socket: '/var/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution
-
+ socket: '/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution
+
/docker-entrypoint-initdb.d/dump/backup-data-only.sh
@@ -934,7 +962,7 @@
- library/python:2-slim
+ docker.io/python:2-slim
python
python
@@ -979,7 +1007,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
backend/Dockerfile
@@ -1001,7 +1029,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
frontend/Dockerfile
@@ -1010,38 +1038,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
-
-
@@ -1157,7 +1153,6 @@
1.8.0
${project.build.directory}/${ui.react.src}
- ${project.build.directory}/${ui.react.src}
@@ -1167,8 +1162,8 @@
generate-sources
- v12.13.0
- 6.13.0
+ v12.13.0
+ 6.13.0
@@ -1178,6 +1173,7 @@
compile
+ ${project.build.directory}/${ui.react.src}
install
@@ -1188,7 +1184,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
@@ -1198,6 +1218,7 @@
deploy
+ ${project.build.directory}/${ui.react.lib.src}
publish
@@ -1217,6 +1238,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
+
+
+