X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=f97a33c223d0edde95b140ecf0dcfa6bc1110efa;hb=8044ef486d554873e0272b43233b4c4832f5f30d;hp=a733f3236a7abce62d66827ce3550eedd4bb526d;hpb=05733ab5105f440e44eb56dc37e6d14615c36454;p=externalapi%2Fnbi.git diff --git a/pom.xml b/pom.xml index a733f32..f97a33c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,21 @@ + + org.onap.oparent + oparent + 3.2.0 UTF-8 UTF-8 + org.onap.nbi.Application + https://nexus.onap.org https://nexus.onap.org content/repositories/snapshots/ content/repositories/releases/ @@ -42,36 +60,33 @@ ${project.version}-latest java - jacoco - ${project.build.directory}/surefire-reports - - ${project.build.directory}/coverage-reports/jacoco.exec - - ${project.build.directory}/coverage-reports/jacoco-it.exec - - true + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml ${project.version} - **/model/**/* - - - maven2-repository.java.net - Java.net Repository for Maven - http://download.java.net/maven/2/ - default - - - ecomp-snapshots - Snapshot Repository - https://nexus.onap.org/content/repositories/releases/ - - - ecomp-staging - Staging Repository - https://nexus.onap.org/content/repositories/staging/ - - + + + + + + + + + + + + + + + + + + + + + + + @@ -93,60 +108,40 @@ + + + + org.springframework.boot + spring-boot-dependencies + 2.2.2.RELEASE + pom + import + + + + org.springframework.boot spring-boot-starter-web - - ch.qos.logback - logback-classic - org.apache.tomcat.embed tomcat-embed-core - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-databind - 2.8.11.2 - - org.apache.tomcat.embed tomcat-embed-core - 8.5.32 - - - - ch.qos.logback - logback-classic - 1.2.3 + 9.0.36 org.springframework.boot spring-boot-starter-data-jpa - - - org.springframework.data - spring-data-commons - - - - - - org.springframework.data - spring-data-commons - 1.13.14.RELEASE @@ -155,27 +150,24 @@ - org.apache.commons + commons-io commons-io - 1.3.2 + 2.6 commons-beanutils commons-beanutils - 1.9.3 javax.validation validation-api - 2.0.1.Final org.apache.commons commons-lang3 - 3.4 @@ -190,7 +182,6 @@ org.mariadb.jdbc mariadb-java-client - 1.1.7 @@ -198,15 +189,27 @@ io.swagger swagger-annotations - 1.5.18 + 1.5.23 + + + + + io.swagger + swagger-core + 1.5.23 + + + com.fasterxml.jackson.core + jackson-databind + 2.10.1 + com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.9.6 @@ -214,7 +217,23 @@ org.onap.sdc.sdc-tosca sdc-tosca - 1.4.6 + 1.6.0 + + + com.google.guava + guava + + + commons-codec + commons-codec + + + + + + commons-codec + commons-codec + 1.13 @@ -222,7 +241,7 @@ com.bazaarvoice.jolt jolt-core - 0.1.0 + 0.1.1 com.fasterxml.jackson.core @@ -234,7 +253,7 @@ com.bazaarvoice.jolt json-utils - 0.1.0 + 0.1.1 com.fasterxml.jackson.core @@ -248,7 +267,7 @@ org.springframework.boot spring-boot-starter-test - test + test @@ -262,7 +281,6 @@ de.flapdoodle.embed de.flapdoodle.embed.mongo - ${embedded-mongo.version} test @@ -271,13 +289,17 @@ org.springframework.cloud spring-cloud-contract-wiremock - 1.2.6.RELEASE + 1.2.7.RELEASE test com.fasterxml.jackson.core jackson-databind + + commons-codec + commons-codec + @@ -305,31 +327,56 @@ org.onap.msb.java-sdk msb-java-sdk - 1.1.1 + 1.2.5 - com.fasterxml.jackson.core - jackson-databind + com.google.guava + guava + + + com.squareup.okhttp3 + okhttp + + com.squareup.retrofit2 + retrofit + + + com.squareup.okhttp3 + okhttp + 4.3.1 + + + + com.google.guava + guava + + + + com.squareup.retrofit2 + retrofit + 2.7.1 + + com.intuit.karate karate-junit4 - 0.9.0 + 0.9.4 test + com.intuit.karate karate-apache - 0.9.0 + 0.9.4 test - @@ -340,39 +387,45 @@ **/*.java + + src/test/resources + org.springframework.boot spring-boot-maven-plugin + 2.2.1.RELEASE + + + + repackage + + + org.onap.nbi.Application + + + org.apache.maven.plugins maven-surefire-plugin + 2.22.2 + + + org/onap/nbi/test/KarateApiTest.java - org/onap/nbi/test/ExecutionTaskTest.java + org/onap/nbi/test/ExecutionTaskTest.java org/onap/nbi/test/ServiceOrderRepositoryTest.java - + org/onap/nbi/apis/servicecatalog/ToscaInfosProcessorTest.java - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - org.apache.maven.plugins maven-site-plugin - 3.6 org.apache.maven.wagon @@ -390,20 +443,29 @@ restclient/** src/** - ./**/*.xml - ./**/*.xml - ./**/*.yml - ./**/*.yaml + **/*.xml + **/*.xsd + **/*.yml + **/*.yaml + **/*.plantuml src/test/java/karate-config.js + releases/**/*.yaml + docs/conf.yaml + .readthedocs.yaml true false SCRIPT_STYLE + XML_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE @@ -421,63 +483,49 @@ sonar-maven-plugin 3.2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + org.jacoco + jacoco-maven-plugin + 0.8.5 + + + default-prepare-agent + + prepare-agent + + + + default-report + prepare-package + + report + + + + default-check + + check + + + + + PACKAGE + + + COMPLEXITY + COVEREDRATIO + 0.0 + + + + + + + + maven-source-plugin + 3.2.0 attach-sources @@ -491,7 +539,6 @@ - docker @@ -500,7 +547,7 @@ io.fabric8 docker-maven-plugin - 0.26.1 + 0.28.0 true 1.23 @@ -553,6 +600,119 @@ + + onap-settings + + https://nexus.onap.org + https://nexus.onap.org/content/sites/raw + + + https://nexus.onap.org/service/local/repositories/raw/content + + ecomp-raw + + + nexus3.onap.org:10003 + nexus3.onap.org:10002 + nexus3.onap.org:10001 + nexus3.onap.org:10003 + + + + onap-snapshots + + + onap-snapshots + onap-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + false + + + true + + + + + + onap-snapshots + onap-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + false + + + true + + + + + + onap-releases + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + true + + + false + + + + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + true + + + false + + + + + + onap-public + + + 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/ + + + onap-public + onap-public + https://nexus.onap.org/content/repositories/public/ + + true + + + false + + + +