X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=springboot%2Fspringboot1%2Fpom.xml;h=bf0e4aace332f453368b6fec60eaf9fc40c0f0ec;hb=e1d0e25da4f0d49adcd6d2bc2dc5f4f0bef4adfd;hp=c6c2aea8a3e72d6e004b9659ab89be2e85c44a65;hpb=008b52bffbe2bcb4cffd441ea6ac6693a353cf68;p=ccsdk%2Fparent.git diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml old mode 100755 new mode 100644 index c6c2aea8..bf0e4aac --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -2,6 +2,9 @@ 4.0.0 + org.springframework.boot spring-boot-starter-parent @@ -11,11 +14,11 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.5.1-SNAPSHOT + 2.1.1-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} - Root POM to be used in place of odlparent for CCSDK based projects + Root POM to be used in place of spring-boot parent for CCSDK based projects http://wiki.onap.org ONAP @@ -28,17 +31,28 @@ ecomp-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} + + 3.7.0.1746 + 3.2 + jacoco + + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + 0.8.5 + 1.8 1.8 UTF-8 @@ -46,14 +60,7 @@ https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - 0.7.7.201606060606 - 3.2 - jacoco - - target/code-coverage/jacoco-ut.exec,target/code-coverage/jacoco-it.exec - - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + ${basedir}/src/main/resources/swagger.properties @@ -80,34 +87,65 @@ src/main/yang-gen-sal true - java - jacoco - ${project.build.directory}/surefire-reports - true - ${project.version} + + 1.6.5 - 0.7.0-SNAPSHOT - 0.7.0-SNAPSHOT - 0.7.0-SNAPSHOT - 0.7.0-SNAPSHOT - 0.7.0-SNAPSHOT - ${ccsdk.sli.core.version} - ${ccsdk.sli.adaptors.version} - ${ccsdk.sli.core.version} - ${ccsdk.sli.adaptors.version} - ${ccsdk.sli.core.version} + 1.1.1-SNAPSHOT + 1.1.1-SNAPSHOT + 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT + ${ccsdk.sli.version} + ${ccsdk.sli.version} + ${ccsdk.sli.version} + ${ccsdk.sli.version} - 2.1.1 + + 1.5.22.RELEASE + 4.3.25.RELEASE + + 1.8 + 1.3.61 + 1.3.61 + 1.3.3 + 1.5.0 + 0.5.0 + 2.6.6 + 2.2.3 + 1.9.3 + + + 4.7.2 + 2.6 + 4.4.12 + 4.5.10 + 10.14.2.0 + 1.0.0 + 1.25.0 + 3.10.0 + 3.10.0 + 2.25.1 + 2.25.1 + 1.3.8 + 1.2.3 + 2.4.4 + 2.4.0 + 1.7.25 + 6.14.3 + 9.0.30 + direct-dependencies.txt + org.onap.ccsdk.parent dependencies-bom - 1.5.1-SNAPSHOT + 2.1.1-SNAPSHOT pom import @@ -116,7 +154,6 @@ sli-common ${ccsdk.sli.core.version} - org.onap.ccsdk.sli.core sli-provider @@ -129,26 +166,33 @@ xml features + + org.onap.ccsdk.sli.core + dblib-provider + ${ccsdk.sli.core.version} + org.onap.ccsdk.sli.adaptors aai-service-provider - ${sdnctl.aai.service.version} + ${ccsdk.sli.adaptors.version} - - org.onap.ccsdk.sli.core - dblib-provider - ${sdnctl.dblib.version} + org.onap.logging-analytics + logging-slf4j + ${logging-analytics.version} + + + org.onap.logging-analytics + logging-filter-base + ${logging-analytics.version} - - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -160,7 +204,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -173,7 +217,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -185,30 +229,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots - - false - - - true - - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${onap.nexus.snapshot-url} false @@ -216,7 +237,6 @@ true - @@ -249,29 +269,6 @@ true - - opendaylight-mirror - opendaylight-mirror - ${opendaylight.nexus.public-url} - - true - never - - - false - - - - opendaylight-snapshot - opendaylight-snapshot - ${opendaylight.nexus.snapshot-url} - - false - - - true - - JCenter @@ -289,7 +286,6 @@ - org.apache.maven.plugins @@ -298,9 +294,9 @@ 2.8 + true - org.apache.maven.plugins maven-site-plugin @@ -376,8 +372,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -390,82 +385,7 @@ - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - **/gen/** - **/generated-sources/** - **/yang-gen/** - **/pax/** - - - - - - pre-unit-test - - prepare-agent - - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - - surefireArgLine - - - - - post-unit-test - test - - report - - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - - ${project.reporting.outputDirectory}/jacoco-ut - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - - ${project.build.directory}/code-coverage/jacoco-it.exec - - failsafeArgLine - - - - - post-integration-test - post-integration-test - - report - - - - ${project.build.directory}/code-coverage/jacoco-it.exec - - ${project.reporting.outputDirectory}/jacoco-it - - - - + org.apache.maven.plugins maven-surefire-plugin @@ -484,8 +404,7 @@ maven-failsafe-plugin 2.19.1 - + integration-tests @@ -519,7 +438,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10 + 3.2.0 @@ -537,7 +456,6 @@ antlr4-runtime ${antlr.version} - com.sun.jersey jersey-client @@ -564,8 +482,8 @@ ${commons.lang.version} + false - aggregate @@ -573,16 +491,124 @@ aggregate site - - + + com.github.ferstl + depgraph-maven-plugin + 3.3.0 + + text + ${dependency-list.file} + ${project.basedir} + * + true + true + + - + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + pre-unit-test + + prepare-agent + + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + + surefireArgLine + + + + + post-unit-test + test + + report + + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + + ${project.reporting.outputDirectory}/jacoco-ut + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + + ${project.build.directory}/code-coverage/jacoco-it.exec + + failsafeArgLine + + + + + post-integration-test + post-integration-test + + report + + + + ${project.build.directory}/code-coverage/jacoco-it.exec + + ${project.reporting.outputDirectory}/jacoco-it + + + + default-prepare-agent + + prepare-agent + + + + default-report + prepare-package + + report + + + + default-check + + check + + + + + PACKAGE + + + COMPLEXITY + COVEREDRATIO + 0.0 + + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + maven-checkstyle-plugin @@ -592,10 +618,6 @@ 1.12 - - org.jacoco - jacoco-maven-plugin - org.apache.maven.plugins maven-surefire-plugin @@ -645,6 +667,18 @@ ${project.artifactId}-${project.version} + + pl.project13.maven + git-commit-id-plugin + 4.0.0 + + full + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + + @@ -695,7 +729,6 @@ - maven-surefire-plugin 2.17 @@ -837,7 +870,6 @@ true - @@ -955,6 +987,49 @@ + + + q + + true + true + true + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + sonar-jacoco-aggregate @@ -992,6 +1067,5 @@ -