X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=0b78217e347caaf817ad3e27ca2a5b9ee2a3bda8;hb=refs%2Fheads%2Fguilin;hp=5d0c767d8fd3bfbb843368f09f89a3ad3f5d1052;hpb=fdfde2175da045760b356548203131480ae9d601;p=clamp.git
diff --git a/pom.xml b/pom.xml
index 5d0c767d..0b78217e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,34 +26,31 @@
4.0.0
org.onap.clamp
clds
- 4.1.2-SNAPSHOT
+ 5.1.5-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.2
+ 2.2.10.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/**
-
+ 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.37
ui-react
+ ui-react-lib
https://nexus3.onap.org/repository/npm.snapshot/
+
without-test
@@ -150,6 +146,7 @@
true
+
docker
@@ -257,25 +254,20 @@
-
- org.apache.xmlgraphics
- batik-svggen
- 1.11
-
-
- org.apache.xmlgraphics
- batik-svg-dom
- 1.11
-
-
- org.apache.xmlgraphics
- batik-transcoder
- 1.11
-
com.att.eelf
eelf-core
${eelf.core.version}
+
+
+ org.powermock
+ powermock-module-junit4
+
+
+ org.powermock
+ powermock-api-mockito
+
+
org.codehaus.janino
@@ -335,22 +327,8 @@
org.slf4j
slf4j-ext
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
- javax.xml.bind
- jaxb-api
- 2.3.0
-
-
- org.glassfish.jersey.core
- jersey-common
- 2.27
-
org.springframework.boot
@@ -394,15 +372,25 @@
spring-boot-starter-data-jpa
+
+
+ javax.xml.ws
+ jaxws-api
+ 2.3.1
+
org.onap.aaf.authz
aaf-cadi-aaf
- 2.1.10
+ 2.1.15
javax.servlet
servlet-api
+
+ log4j
+ log4j
+
@@ -415,11 +403,6 @@
logback-classic
1.2.3
-
- commons-dbcp
- commons-dbcp
- 1.4
-
commons-io
commons-io
@@ -435,23 +418,10 @@
commons-vfs2
2.2
-
- joda-time
- joda-time
-
org.slf4j
slf4j-api
-
- javax.ws.rs
- javax.ws.rs-api
- 2.0
-
-
- junit
- junit
-
javax.transaction
jta
@@ -462,155 +432,17 @@
persistence-api
1.0.2
+
- org.onap.policy.engine
- PolicyEngineAPI
- 1.3.3
-
-
- com.google.guava
- guava
-
-
- log4j
- log4j
-
-
- org.slf4j
- slf4j-log4j12
-
-
- apache-log4j-extras
- log4j
-
-
- mysql
- mysql-connector-java
-
-
- commons-io
- commons-io
-
-
- grizzly-http-server
- org.glassfish.grizzly
-
-
- org.onap.dmaap.messagerouter.dmaapclient
- dmaapClient
-
-
- org.onap.policy.common
- integrity-monitor
-
-
- org.onap.policy.common
- integrity-audit
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
- org.onap.aaf.cadi
- cadi-aaf
-
-
- javax.jms
- jms
-
-
- commons-fileupload
- commons-fileupload
-
-
- com.att.research.xacml
- xacml
-
-
-
-
- org.onap.policy.common
- ONAP-Logging
- 1.2.3
-
-
- log4j
- log4j
-
-
- org.slf4j
- slf4j-log4j12
-
-
- apache-log4j-extras
- log4j
-
-
-
-
- org.onap.policy.drools-applications.controlloop.common
- policy-yaml
- 1.2.3
-
-
- log4j
- log4j
-
-
- org.slf4j
- slf4j-log4j12
-
-
- apache-log4j-extras
- log4j
-
-
-
-
- org.onap.policy.drools-applications.controlloop.common.model-impl
- sdc
- 1.2.3
-
-
- log4j
- log4j
-
-
- org.slf4j
- slf4j-log4j12
-
-
- apache-log4j-extras
- log4j
-
-
-
-
- org.onap.policy.drools-applications.controlloop.common.model-impl
- aai
- 1.2.3
-
-
- log4j
- log4j
-
-
- org.slf4j
- slf4j-log4j12
-
-
- apache-log4j-extras
- log4j
-
-
+ commons-codec
+ commons-codec
+ 1.14
- org.apache.commons
- commons-csv
- 1.3
+ org.springframework.security
+ spring-security-web
+ 5.2.3.RELEASE
-
org.codehaus.plexus
plexus-utils
@@ -626,29 +458,47 @@
guava
27.0-jre
-
- commons-codec
- commons-codec
- 1.13
-
+
org.mariadb.jdbc
mariadb-java-client
- 2.2.1
+ 2.6.2
org.onap.sdc.sdc-distribution-client
sdc-distribution-client
- 1.3.0
+ 1.4.1
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
+
+
+
+ junit
+ junit
+ test
+
org.assertj
assertj-core
@@ -658,7 +508,37 @@
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
+
+
+ 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
@@ -667,6 +547,20 @@
clamp
+
+ src/main/resources
+ true
+
+ clds/aaf/**
+
+
+
+ src/main/resources
+ false
+
+ clds/aaf/**
+
+
src/test/resources
@@ -693,7 +587,7 @@
-
src/main/resources
@@ -711,6 +605,9 @@
${ui.react.src}
+
+ node_modules
+
src/**
public/**
@@ -720,13 +617,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
@@ -742,7 +663,7 @@
- org.onap.clamp.dao.model
+ org.onap.clamp
MARIADB53
@@ -756,7 +677,7 @@
-
io.github.swagger2markup
@@ -791,7 +712,7 @@
-
org.asciidoctor
@@ -851,6 +772,7 @@
1.0
+ docker-tags
validate
execute
@@ -859,6 +781,16 @@
+
+ npm-repos-selection
+ validate
+
+ execute
+
+
+
+
+
@@ -912,6 +844,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
@@ -923,9 +856,7 @@
org.springframework.boot
spring-boot-maven-plugin
-
- 1.5.13.RELEASE
-
+ ${springboot.version}
@@ -938,7 +869,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.22.1
+ 2.22.2
1C
true
@@ -950,7 +881,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
- 2.22.1
+ 2.22.2
integration-tests
@@ -965,19 +896,18 @@
**/*ItCase.java
- 1
+ 1C
true
false
${failsafeArgLine}
-
io.fabric8
docker-maven-plugin
- 0.27.2
+ 0.31.0
org.apache.httpcomponents
@@ -990,7 +920,7 @@
1.35
- library/mariadb:10.3.12
+ docker.io/mariadb:10.5.4
mariadb
@@ -1004,8 +934,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
@@ -1013,10 +943,13 @@
${docker.mariadb.port.host}:3306
+
+ bridge
+
- library/python:2-slim
+ docker.io/python:2-slim
python
python
@@ -1043,6 +976,9 @@
./start_http_cache.sh ${python.http.proxy.param}
--python_proxyaddress=localhost:${docker.http-cache.port.host}
+
+ bridge
+
@@ -1058,7 +994,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
backend/Dockerfile
@@ -1080,7 +1016,7 @@
${project.docker.latesttagtimestamp.version}
${project.docker.latesttag.version}
-
frontend/Dockerfile
@@ -1089,54 +1025,6 @@
-
- onap/clamp-dashboard-elasticsearch
- onap-clamp-dashboard-elasticsearch
-
- true
-
-
- true
-
- latest
- ${project.docker.latesttagtimestamp.version}
- ${project.docker.latesttag.version}
-
- elasticsearch/Dockerfile
-
-
-
- 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
-
-
@@ -1175,12 +1063,12 @@
org.jacoco
jacoco-maven-plugin
- 0.8.2
+ 0.8.5
true
true
- org.onap.clamp.*
+ org/onap/clamp/**
@@ -1222,7 +1110,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
@@ -1241,7 +1140,6 @@
1.8.0
${project.build.directory}/${ui.react.src}
- ${project.build.directory}/${ui.react.src}
@@ -1251,8 +1149,8 @@
generate-sources
- v12.10.0
- 6.10.3
+ v12.13.0
+ 6.13.0
@@ -1262,6 +1160,7 @@
compile
+ ${project.build.directory}/${ui.react.src}
install
@@ -1272,7 +1171,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
@@ -1282,12 +1205,46 @@
deploy
- true
- publish --registry ${npm.publish.url}
+ ${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
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.3.2
+
+
+ libIndexCheck
+ validate
+
+ exec
+
+
+
+
+ bash
+
+ ${project.basedir}/src/main/script/checkLibIndex.sh
+
+
+