X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=02ac6dddbd62988c6171904b6d3ee18a5624943f;hb=3d4559c3c9f2245927bfe127525ff976ebdbb025;hp=5d0c767d8fd3bfbb843368f09f89a3ad3f5d1052;hpb=fdfde2175da045760b356548203131480ae9d601;p=clamp.git diff --git a/pom.xml b/pom.xml index 5d0c767d..02ac6ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -26,34 +26,31 @@ 4.0.0 org.onap.clamp clds - 4.1.2-SNAPSHOT + 5.0.0-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.2.0.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.33 ui-react + 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 @@ -397,12 +422,16 @@ org.onap.aaf.authz aaf-cadi-aaf - 2.1.10 + 2.1.15 javax.servlet servlet-api + + log4j + log4j + @@ -462,149 +491,6 @@ 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 - - - org.apache.commons commons-csv @@ -658,7 +544,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 @@ -667,6 +565,20 @@ clamp + + src/main/resources + true + + clds/aaf/** + + + + src/main/resources + false + + clds/aaf/** + + src/test/resources @@ -693,7 +605,7 @@ - src/main/resources @@ -711,6 +623,9 @@ ${ui.react.src} + + node_modules + src/** public/** @@ -720,13 +635,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 +681,7 @@ - org.onap.clamp.dao.model + org.onap.clamp MARIADB53 @@ -756,7 +695,7 @@ - io.github.swagger2markup @@ -791,7 +730,7 @@ - org.asciidoctor @@ -861,6 +800,22 @@ + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${project.basedir}/src/main/script/SelectNpmRepo.groovy + + + + org.apache.maven.plugins maven-jar-plugin @@ -938,7 +893,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.1 + 2.22.2 1C true @@ -950,7 +905,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.22.1 + 2.22.2 integration-tests @@ -965,19 +920,18 @@ **/*ItCase.java - 1 + 1C true false ${failsafeArgLine} - io.fabric8 docker-maven-plugin - 0.27.2 + 0.31.0 org.apache.httpcomponents @@ -1013,6 +967,9 @@ ${docker.mariadb.port.host}:3306 + + bridge + @@ -1043,6 +1000,9 @@ ./start_http_cache.sh ${python.http.proxy.param} --python_proxyaddress=localhost:${docker.http-cache.port.host} + + bridge + @@ -1058,7 +1018,7 @@ ${project.docker.latesttagtimestamp.version} ${project.docker.latesttag.version} - backend/Dockerfile @@ -1080,7 +1040,7 @@ ${project.docker.latesttagtimestamp.version} ${project.docker.latesttag.version} - frontend/Dockerfile @@ -1089,54 +1049,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 +1087,12 @@ org.jacoco jacoco-maven-plugin - 0.8.2 + 0.8.5 true true - org.onap.clamp.* + org/onap/clamp/** @@ -1222,7 +1134,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 +1164,6 @@ 1.8.0 ${project.build.directory}/${ui.react.src} - ${project.build.directory}/${ui.react.src} @@ -1251,8 +1173,8 @@ generate-sources - v12.10.0 - 6.10.3 + v12.13.0 + 6.13.0 @@ -1262,6 +1184,7 @@ compile + ${project.build.directory}/${ui.react.src} install @@ -1272,7 +1195,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 +1229,26 @@ 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 + 11 + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.7.0.1746 +