X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=d2f4521812c782ad6677eda748236914096e5156;hb=648f099dd6c0a4b6d91f194258e646204441dc0c;hp=be85a0afd1480f02f7ca026b3b785c4b899bba56;hpb=e2659ad0e1b2625640ae0088555f9ed35ee84187;p=clamp.git diff --git a/pom.xml b/pom.xml index be85a0af..d2f45218 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP CLAMP ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights + Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,19 +20,17 @@ ============LICENSE_END============================================ =================================================================== --> - - + 4.0.0 org.onap.clamp clds - 3.0.0-SNAPSHOT + 3.0.4-SNAPSHOT clamp org.onap.oparent oparent - 1.1.0 + 1.2.0 @@ -67,18 +65,23 @@ git-server 1.8 - 2.0.0-rc4 1.0.0 - 2.20.1 - 1.5.14.RELEASE + 2.22.0 + 2.0.6.RELEASE - java 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 @@ -86,8 +89,8 @@ true true false - - 8.5.28 + + 8.5.34 @@ -161,9 +164,15 @@ - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ + onap-public + onap-public + https://nexus.onap.org/content/repositories/public/ + + true + + + false + ecomp-releases @@ -187,24 +196,27 @@ - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - - jcentral - bintray - http://jcenter.bintray.com - - false - + central + http://repo1.maven.org/maven2/ + + + onap-public + onap-public + https://nexus.onap.org/content/repositories/public/ + + true + + + false + + + + central + http://repo1.maven.org/maven2/ + + @@ -233,6 +245,11 @@ eelf-core ${eelf.core.version} + + org.codehaus.janino + janino + 3.0.8 + org.apache.tomcat.embed tomcat-embed-core @@ -266,11 +283,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 @@ -280,11 +320,6 @@ org.springframework.boot spring-boot-starter-tomcat - - com.paypal.springboot - resteasy-spring-boot-starter - 2.3.4-RELEASE - org.springframework spring-jdbc @@ -295,7 +330,7 @@ org.springframework.boot - spring-boot-starter-actuator + spring-boot-autoconfigure org.springframework.boot @@ -379,7 +414,7 @@ org.onap.policy.engine PolicyEngineAPI - 1.2.0 + 1.3.1 com.google.guava @@ -429,12 +464,20 @@ javax.jms jms + + commons-fileupload + commons-fileupload + + + com.att.research.xacml + xacml + org.onap.policy.common ONAP-Logging - 1.1.3 + 1.2.3 log4j @@ -451,9 +494,9 @@ - org.onap.policy.drools-applications + org.onap.policy.drools-applications.controlloop.common policy-yaml - 1.1.3 + 1.2.3 log4j @@ -470,9 +513,9 @@ - org.onap.policy.drools-applications + org.onap.policy.drools-applications.controlloop.common.model-impl sdc - 1.1.3 + 1.2.3 log4j @@ -489,9 +532,9 @@ - org.onap.policy.drools-applications + org.onap.policy.drools-applications.controlloop.common.model-impl aai - 1.1.3 + 1.2.3 log4j @@ -518,11 +561,6 @@ plexus-utils 3.0.24 - - commons-fileupload - commons-fileupload - 1.3.3 - org.jboss.spec.javax.ws.rs jboss-jaxrs-api_2.0_spec @@ -531,7 +569,6 @@ com.google.guava guava - 25.1-jre @@ -548,26 +585,7 @@ org.onap.sdc.sdc-tosca sdc-tosca - 1.3.0 - - - - io.springfox - springfox-swagger2 - 2.4.0 - test - - - io.github.robwin - assertj-swagger - 0.2.0 - test - - - io.github.swagger2markup - swagger2markup-spring-restdocs-ext - 1.2.0 - test + 1.4.1 @@ -576,17 +594,14 @@ 3.10.0 test + + org.mockito + mockito-core + 1.10.19 + test + - - - - false - - jcenter-releases - jcenter - http://jcenter.bintray.com - - + clamp @@ -615,11 +630,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 @@ -631,43 +674,23 @@ - - - com.sebastian-daschner - jaxrs-analyzer-maven-plugin - 0.14 - - - test - - analyze-jaxrs - - - swagger - ../docs/swagger/ - - - - - - + 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 @@ -679,7 +702,7 @@ - test + post-integration-test convertSwagger2markup @@ -687,23 +710,18 @@ - org.asciidoctor asciidoctor-maven-plugin - 1.5.3 + 1.5.7.1 org.asciidoctor asciidoctorj-pdf 1.5.0-alpha.10.1 - - org.jruby - jruby-complete - 1.7.21 - ${project.basedir}/src/main/resources/asciidoc @@ -712,10 +730,10 @@ book left 3 - - - - + + + + ${project.build.directory}/asciidoc/generated @@ -723,7 +741,7 @@ output-html - test + post-integration-test process-asciidoc @@ -735,7 +753,7 @@ output-pdf - test + post-integration-test process-asciidoc @@ -836,18 +854,19 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 2.22.1 - 1 - false + 1C + true + false + ${surefireArgLine} org.apache.maven.plugins maven-failsafe-plugin - 2.17 - + 2.22.1 integration-tests @@ -856,11 +875,16 @@ verify + + ${project.build.directory}/classes + **/*ItCase.java 1 - false + true + false + ${failsafeArgLine} @@ -869,10 +893,17 @@ io.fabric8 docker-maven-plugin - 0.26.0 + 0.27.2 + + + org.apache.httpcomponents + httpclient + 4.5.5 + + true - 1.23 + 1.35 library/mariadb:10.1.11 @@ -939,7 +970,7 @@ ${project.docker.latesttagtimestamp.version} ${project.docker.latesttag.version} - Dockerfile @@ -948,6 +979,38 @@ + + 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 + + @@ -986,9 +1049,10 @@ org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + 0.8.2 true + true org.onap.clamp.* @@ -1001,6 +1065,7 @@ ${project.build.directory}/coverage-reports/jacoco.exec + surefireArgLine @@ -1012,6 +1077,7 @@ ${project.build.directory}/coverage-reports/jacoco-it.exec + failsafeArgLine @@ -1041,6 +1107,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 + + + + +