X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=72f62f03dd44cfad4006c5cc290729e38b746e79;hb=ac4958ae6d30e60c5cf0bd66ce8f3c79191c6726;hp=95be6766af19708c846205402180309c1d6080c9;hpb=c2af4a578fb3e13af7a00778d9fec78ca67a1506;p=clamp.git diff --git a/pom.xml b/pom.xml index 95be6766..72f62f03 100644 --- a/pom.xml +++ b/pom.xml @@ -20,19 +20,17 @@ ============LICENSE_END============================================ =================================================================== --> - - + 4.0.0 org.onap.clamp clds - 3.0.0-SNAPSHOT + 3.0.3-SNAPSHOT clamp org.onap.oparent oparent - 1.1.0 + 1.2.0 @@ -67,19 +65,23 @@ git-server 1.8 - 2.0.0-rc4 - 20.0 1.0.0 - 2.20.1 - 1.5.12.RELEASE - - java + 2.22.0 + 2.0.6.RELEASE + jacoco ${project.build.directory}/surefire-reports ${project.build.directory}/coverage-reports/jacoco.exec ${project.build.directory}/coverage-reports/jacoco-it.exec true ${project.version} + + java + + src/main/resources/**,**/clamp-ui/designer/lib/* localhost:5000 nexus3.onap.org:10001 @@ -87,8 +89,8 @@ true true false - - 8.5.28 + + 8.5.34 @@ -102,6 +104,7 @@ true + true @@ -114,6 +117,7 @@ true + true @@ -126,6 +130,7 @@ true + true @@ -135,23 +140,24 @@ false false false + false - ecomp-releases + onap-releases Clamp Release Repository https://nexus.onap.org/content/repositories/releases/ - ecomp-snapshots + onap-snapshots Clamp Snapshot Repository https://nexus.onap.org/content/repositories/snapshots/ - ecomp-site + onap-site dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version} @@ -163,17 +169,17 @@ http://repo2.maven.org/maven2/ - ecomp-releases + onap-releases ONAP Release Repository https://nexus.onap.org/content/repositories/releases/ - ecomp-staging + onap-staging ONAP Staging Repository https://nexus.onap.org/content/repositories/staging/ - ecomp-snapshots + onap-snapshots ONAP Snapshot Repository https://nexus.onap.org/content/repositories/snapshots/ @@ -193,14 +199,6 @@ JBoss.org Maven repository https://repository.jboss.org/nexus/content/groups/public - - jcentral - bintray - http://jcenter.bintray.com - - false - - @@ -230,6 +228,11 @@ eelf-core ${eelf.core.version} + + org.codehaus.janino + janino + 3.0.8 + org.apache.tomcat.embed tomcat-embed-core @@ -263,11 +266,34 @@ org.apache.camel camel-servlet-starter + + org.apache.camel + camel-jackson-starter + + + org.apache.camel + camel-swagger-java-starter + + + javax.ws.rs + jsr311-api + + + org.slf4j + slf4j-ext + + + javax.xml.bind jaxb-api 2.3.0 + + org.glassfish.jersey.core + jersey-common + 2.27 + org.springframework.boot @@ -277,11 +303,6 @@ org.springframework.boot spring-boot-starter-tomcat - - com.paypal.springboot - resteasy-spring-boot-starter - 2.3.4-RELEASE - org.springframework spring-jdbc @@ -292,7 +313,7 @@ org.springframework.boot - spring-boot-starter-actuator + spring-boot-autoconfigure org.springframework.boot @@ -373,20 +394,10 @@ persistence-api 1.0.2 - - org.hibernate - hibernate-annotations - 3.5.6-Final - - - dom4j - dom4j - - org.onap.policy.engine PolicyEngineAPI - 1.2.0 + 1.3.1 com.google.guava @@ -413,34 +424,43 @@ commons-io - grizzly-http + grizzly-http-server org.glassfish.grizzly - - - - org.onap.policy.common - ONAP-Logging - 1.1.3 - - log4j - log4j + org.onap.dmaap.messagerouter.dmaapclient + dmaapClient - org.slf4j - slf4j-log4j12 + org.onap.policy.common + integrity-monitor - apache-log4j-extras - log4j + org.onap.policy.common + integrity-audit + + + org.onap.aaf.cadi + cadi-aaf + + + javax.jms + jms + + + commons-fileupload + commons-fileupload + + + com.att.research.xacml + xacml - org.onap.policy.engine - PolicyEngineUtils - 1.1.3 + org.onap.policy.common + ONAP-Logging + 1.2.3 log4j @@ -454,28 +474,12 @@ apache-log4j-extras log4j - - mysql - mysql-connector-java - - - org.mariadb.jdbc - mariadb-java-client - - - com.att.nsa - dmaapClient - - - com.h2database - h2 - - org.onap.policy.drools-applications + org.onap.policy.drools-applications.controlloop.common policy-yaml - 1.1.3 + 1.2.3 log4j @@ -492,9 +496,9 @@ - org.onap.policy.drools-applications + org.onap.policy.drools-applications.controlloop.common.model-impl sdc - 1.1.3 + 1.2.3 log4j @@ -511,9 +515,9 @@ - org.onap.policy.drools-applications + org.onap.policy.drools-applications.controlloop.common.model-impl aai - 1.1.3 + 1.2.3 log4j @@ -534,32 +538,21 @@ commons-csv 1.3 - - com.sun.faces - jsf-api - 2.1.7 - - - com.sun.faces - jsf-impl - 2.1.7 - org.codehaus.plexus plexus-utils 3.0.24 - - commons-fileupload - commons-fileupload - 1.3.3 - org.jboss.spec.javax.ws.rs jboss-jaxrs-api_2.0_spec 1.0.1.Final + + com.google.guava + guava + org.mariadb.jdbc @@ -575,34 +568,33 @@ org.onap.sdc.sdc-tosca sdc-tosca - 1.3.0 + 1.4.1 - + - io.springfox - springfox-swagger2 - 2.4.0 + org.assertj + assertj-core + 3.10.0 test - io.github.robwin - assertj-swagger - 0.2.0 - test - - - io.github.swagger2markup - swagger2markup-spring-restdocs-ext - 1.2.0 - test + org.mockito + mockito-core + 1.10.19 + test + + central-for-plugins + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + false - jcenter-releases + jcenter-releases-for-plugins jcenter http://jcenter.bintray.com @@ -635,11 +627,39 @@ false example/sdc + + + + src/test/javascript + + **/**.json + + true + ${project.build.directory}/clamp-ui + + + src/main/resources/META-INF/resources/designer + false + ${project.build.directory}/clamp-ui/designer + + src/main/resources true + + clds/aaf/** + + + + src/main/resources + false + + clds/aaf/** + src/main/docker @@ -651,43 +671,23 @@ - - - com.sebastian-daschner - jaxrs-analyzer-maven-plugin - 0.14 - - - test - - analyze-jaxrs - - - swagger - ../docs/swagger/ - - - - - + generate a list of .adoc files containing the APIs info in more structured + way --> io.github.swagger2markup swagger2markup-maven-plugin - 1.3.1 + 1.3.3 io.github.swagger2markup swagger2markup-import-files-ext - 1.3.1 + 1.3.3 io.github.swagger2markup swagger2markup-spring-restdocs-ext - 1.3.1 + 1.3.3 @@ -699,7 +699,7 @@ - test + post-integration-test convertSwagger2markup @@ -712,7 +712,7 @@ org.asciidoctor asciidoctor-maven-plugin - 1.5.3 + 1.5.6 org.asciidoctor @@ -732,10 +732,10 @@ book left 3 - - - - + + + + ${project.build.directory}/asciidoc/generated @@ -743,7 +743,7 @@ output-html - test + post-integration-test process-asciidoc @@ -755,7 +755,7 @@ output-pdf - test + post-integration-test process-asciidoc @@ -828,7 +828,9 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} + + 1.5.13.RELEASE + @@ -882,6 +884,7 @@ + io.fabric8 @@ -946,6 +949,9 @@ onap/clamp onap-clamp + + true + true @@ -962,8 +968,41 @@ + + onap/clamp-dashboard-logstash + onap-clamp-dashboard-logstash + + true + + + true + + latest + ${project.docker.latesttagtimestamp.version} + ${project.docker.latesttag.version} + + logstash/Dockerfile.logstash + + + + onap/clamp-dashboard-kibana + onap-clamp-dashboard-kibana + + true + + + true + + latest + ${project.docker.latesttagtimestamp.version} + ${project.docker.latesttag.version} + + kibana/Dockerfile.kibana + + + generate-images @@ -1054,6 +1093,52 @@ versions-maven-plugin 1.3.1 + + + com.github.eirslett + frontend-maven-plugin + 1.6 + + ${project.build.directory}/clamp-ui + ${project.build.directory}/clamp-ui + ${maven.test.skip} + + + + + install_node_and_npm + + install-node-and-npm + + test + + v8.11.1 + 5.6.0 + + + + npm_install + + npm + + test + + install + + + + npm_test + + npm + + test + + run-script test:coverage + + + + +