X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlparent%2Fodlparent%2Fpom.xml;h=c3560cf521eadd4a30f8cb2febe3d352e9f895d1;hb=8c76c9880d88085d28fc33da582ff63d93d1e467;hp=c6a50a27f566d06631d86f0c20c907f58b5b9eec;hpb=94fcbc29eca4b30da5dc259e5b14d26cda8d8373;p=ccsdk%2Fparent.git diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index c6a50a27..c3560cf5 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent odlparent - 1.5.1-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -31,15 +31,26 @@ 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 @@ -49,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 @@ -88,18 +92,16 @@ 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 + 0.7.1-SNAPSHOT + 0.7.1-SNAPSHOT + 0.7.1-SNAPSHOT + 0.7.1-SNAPSHOT + 0.7.1-SNAPSHOT + 0.7.1-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -136,10 +138,8 @@ 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -157,12 +157,10 @@ 1.10.19 4.1.34.Final - + 1.7.25 - - 4.3.24.RELEASE + + 4.3.25.RELEASE 0.6.4 @@ -171,97 +169,55 @@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true - direct-dependencies.txt - org.onap.ccsdk.parent dependencies-odl-bom - 1.5.1-SNAPSHOT + 2.0.0-SNAPSHOT pom import - - - - - com.google.protobuf - protobuf-java - 3.6.1 - - io.netty - netty-transport - 4.1.34.Final + org.onap.logging-analytics + logging-slf4j + ${logging-analytics.version} - io.netty - netty-all - 4.1.34.Final - + org.onap.logging-analytics + logging-filter-base + ${logging-analytics.version} junit junit - 4.12 + ${junit.version} test - - org.eclipse.jetty - jetty-server - 9.4.12.v20180830 - - - org.eclipse.jetty - jetty-servlets - 9.4.12.v20180830 - - - org.glassfish.jersey.bundles.repackaged - jersey-guava - 2.25.1 - - - org.codehaus.jettison - jettison - 1.3.8 - - - org.onap.logging-analytics - logging-slf4j - 1.6.1 - - - org.onap.logging-analytics - logging-filter-base - 1.6.1 - - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true never @@ -273,7 +229,7 @@ onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true never @@ -286,7 +242,7 @@ ecomp-release onap-repository-releases - https://nexus.onap.org/content/repositories/releases + ${onap.nexus.release-url} true never @@ -298,7 +254,7 @@ ecomp-snapshot onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + ${onap.nexus.snapshot-url} false @@ -309,7 +265,7 @@ opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + ${opendaylight.nexus.public-url} true never @@ -321,7 +277,7 @@ opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${opendaylight.nexus.snapshot-url} false @@ -402,9 +358,7 @@ - - org.apache.maven.plugins maven-deploy-plugin @@ -469,88 +423,11 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 3.6.0.1398 + ${sonar.scanner.version} - - - 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 @@ -636,6 +513,7 @@ ${project.basedir} * true + true @@ -697,8 +575,7 @@ onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -720,6 +597,95 @@ 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 @@ -759,6 +725,19 @@ -Xdoclint:none + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + + report + + + + @@ -873,8 +852,7 @@ true - + @@ -884,31 +862,19 @@ - - + - - - + - - + @@ -1074,6 +1040,7 @@ + binding generate-sources @@ -1097,6 +1064,5 @@ -