From 2e8a4da68b26ffb5bf812fce9ebdace4b39d1c50 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Tue, 1 Oct 2019 22:31:50 -0400 Subject: Restructuring POM's and Template Running mvn tidy:pom to format/restructure pom's content. Removig plugin to format pom as all child poms are not having reference to root as parent pom and maven-tidy-plugin is not being executed to format pom Issue-ID: CCSDK-1764 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I18fd59ae94fdded11f3cb62647d5b3518bfe051a --- odlparent/single-feature-parent/pom.xml | 897 ++++++++++++++++---------------- 1 file changed, 439 insertions(+), 458 deletions(-) (limited to 'odlparent/single-feature-parent') diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index ae2bb75a..a55c60a2 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -1,35 +1,44 @@ - - - - + 4.0.0 - pom - org.onap.ccsdk.parent - single-feature-parent - 1.5.0-SNAPSHOT + + org.opendaylight.odlparent single-feature-parent 4.0.10 - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.0-SNAPSHOT + pom ONAP :: ${project.groupId} :: ${project.artifactId} - http://wiki.onap.org Root POM to be used in place of odlparent for CCSDK based projects - + http://wiki.onap.org + + ONAP + JIRA https://jira.onap.org/ + + + ecomp-releases + https://nexus.onap.org/content/repositories/releases + + + ecomp-snapshots + https://nexus.onap.org/content/repositories/snapshots + + @@ -46,8 +55,8 @@ 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 @@ -66,12 +75,10 @@ ecomp-staging 176c31dfe190a - https://nexus.opendaylight.org/content/repositories/public/ https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - UTF-8 1.8 1.8 @@ -82,16 +89,12 @@ src/main/yang-gen-sal true - java jacoco ${project.build.directory}/surefire-reports true ${project.version} - - - 0.7.0-SNAPSHOT 0.7.0-SNAPSHOT @@ -104,7 +107,6 @@ ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} - 1.9.1 3.0.8 @@ -129,17 +131,17 @@ 2.8.5 25.1-jre - + 2.9.8 2.9.8 3.24.1-GA - - + + 2.25.1 2.25.1 @@ -149,8 +151,6 @@ 20131018 - - 4.12 @@ -159,15 +159,13 @@ 1.10.19 4.1.34.Final - + 1.7.25 - + 4.3.24.RELEASE - - ${jackson.version} 0.6.4 @@ -175,7 +173,6 @@ 1.0.0 - 4.4.4 4.5.2 @@ -190,316 +187,12 @@ true - - - - generate-json - - - ${swagger-properties} - - - swagger-sdk.generate-json - - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - initialize - - read-project-properties - - - - ${basedir}/src/main/resources/swagger.properties - - - - - - - com.github.kongchen - swagger-maven-plugin - 3.1.4 - - - - ${api-rest-package} - http,https - ${api-host-ip}:${api-host-port} - ${api-base-path} - - ${api-title} - ${api-version} - ${api-description} - - ${api-license} - - - ${basedir}/src/main/resources - - - - - - compile - - generate - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.3.1 - - - install-file-id - install - - install-file - - - ${basedir}/src/main/resources/swagger.json - ${project.groupId} - ${project.artifactId}-swagger-schema - ${project.version} - json - - - - - - - - - generate-sdk - - - ${swagger-json} - - - swagger-sdk.generate-java-sdk - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - initialize - ant-create-script - - true - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - - - io.swagger - swagger-codegen-maven-plugin - 2.2.1 - - - - generate - - - ${basedir}/src/main/resources/swagger.json - ${project.build.directory}/generated-sources - java - - joda - - jersey2 - ${project.groupId} - ${project.artifactId}-java-sdk - ${project.version} - ${project.groupId}.${project.artifactId}.client.model - ${project.groupId}.${project.artifactId}.client.api - ${project.groupId}.${project.artifactId}.client.invoker - - - - - - exec-maven-plugin - org.codehaus.mojo - 1.5.0 - - - swagger-generate-sources - generate-sources - - exec - - - ${project.build.directory}${file.separator}${swagger.sdk.script.file} - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.0.0 - - - clean-generated-files - generate-sources - - clean - - - - - ${project.build.directory}/generated-sources - - - - - - - - - - - org.onap.msb.swagger-sdk - swagger-sdk - 1.0.0 - - - - - - - - yang-compile - - - src/main/yang - - - - - - org.opendaylight.yangtools - yang-maven-plugin - 2.1.8 - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${odl.mdsal.model.version} - jar - - - org.opendaylight.netconf - sal-rest-docgen-maven - ${odl.netconf.sal.rest.docgen.version} - jar - - - - - - generate-sources - - - ${yang.file.directory} - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator - target/swagger - - - true - - - - - - - - - - - + parent pom, inherited value takes precedence. This seems more like + a bug than a feature, but this is how maven 3.6 works --> org.onap.ccsdk.parent dependencies-odl-bom @@ -556,41 +249,58 @@ - - + + onap-public - ${onap.nexus.public-url} + https://nexus.onap.org/content/groups/public true + never true + always - - + + onap-staging - ${onap.nexus.staging-url} + https://nexus.onap.org/content/groups/staging true + never true + always - - - onap-snapshot - ${onap.nexus.snapshot-url} + + + ecomp-release + onap-repository-releases + https://nexus.onap.org/content/repositories/releases + + true + never + + + false + + + + ecomp-snapshot + onap-repository-snapshots + https://nexus.onap.org/content/repositories/snapshots false true - - + + opendaylight-mirror opendaylight-mirror - ${opendaylight.nexus.public-url} + https://nexus.opendaylight.org/content/repositories/public/ true never @@ -598,85 +308,55 @@ false - - + + opendaylight-snapshot opendaylight-snapshot - ${opendaylight.nexus.snapshot-url} + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ false true - - - - JCenter - JCenter Repository - http://jcenter.bintray.com - + + + - Restlet - Restlet Repository - http://maven.restlet.com - - - - - - onap-public - https://nexus.onap.org/content/groups/public + ${onap.nexus.public-url} true - never true - always - - + + onap-staging - https://nexus.onap.org/content/groups/staging + ${onap.nexus.staging-url} true - never true - always - - - ecomp-release - onap-repository-releases - https://nexus.onap.org/content/repositories/releases - - true - never - - - false - - - - ecomp-snapshot - onap-repository-snapshots - https://nexus.onap.org/content/repositories/snapshots + + + onap-snapshot + ${onap.nexus.snapshot-url} false true - - + + opendaylight-mirror opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ + ${opendaylight.nexus.public-url} true never @@ -684,31 +364,31 @@ false - - + + opendaylight-snapshot opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + ${opendaylight.nexus.snapshot-url} false true - - - + + + + JCenter + JCenter Repository + http://jcenter.bintray.com + - - - ecomp-releases - https://nexus.onap.org/content/repositories/releases - - - ecomp-snapshots - https://nexus.onap.org/content/repositories/snapshots - - + + Restlet + Restlet Repository + http://maven.restlet.com + + @@ -722,7 +402,7 @@ 2.8 - + @@ -790,8 +470,8 @@ jacoco-maven-plugin ${jacoco.version} - + **/gen/** **/generated-sources/** @@ -800,8 +480,8 @@ - + pre-unit-test @@ -810,13 +490,13 @@ ${project.build.directory}/code-coverage/jacoco-ut.exec - + surefireArgLine - + post-unit-test test @@ -839,13 +519,13 @@ ${project.build.directory}/code-coverage/jacoco-it.exec - + failsafeArgLine - + post-integration-test post-integration-test @@ -879,8 +559,8 @@ maven-failsafe-plugin 2.22.0 - + integration-tests @@ -992,11 +672,11 @@ process-sources - + onap-checkstyle/onap-java-style.xml - + ${project.build.sourceDirectory}/src/main/java true true @@ -1029,24 +709,25 @@ - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - -Xdoclint:none - - - + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + -Xdoclint:none + + + - + + maven-javadoc-plugin @@ -1058,7 +739,307 @@ - - ONAP - + + + + + generate-json + + + ${swagger-properties} + + + swagger-sdk.generate-json + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + ${basedir}/src/main/resources/swagger.properties + + + + + + + com.github.kongchen + swagger-maven-plugin + 3.1.4 + + + + ${api-rest-package} + http,https + ${api-host-ip}:${api-host-port} + ${api-base-path} + + ${api-title} + ${api-version} + ${api-description} + + ${api-license} + + + ${basedir}/src/main/resources + + + + + + compile + + generate + + + + + + org.apache.maven.plugins + maven-install-plugin + 2.3.1 + + + install-file-id + install + + install-file + + + ${basedir}/src/main/resources/swagger.json + ${project.groupId} + ${project.artifactId}-swagger-schema + ${project.version} + json + + + + + + + + + generate-sdk + + + ${swagger-json} + + + swagger-sdk.generate-java-sdk + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + initialize + ant-create-script + + true + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + + + io.swagger + swagger-codegen-maven-plugin + 2.2.1 + + + + generate + + + ${basedir}/src/main/resources/swagger.json + ${project.build.directory}/generated-sources + java + + joda + + jersey2 + ${project.groupId} + ${project.artifactId}-java-sdk + ${project.version} + ${project.groupId}.${project.artifactId}.client.model + ${project.groupId}.${project.artifactId}.client.api + ${project.groupId}.${project.artifactId}.client.invoker + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + swagger-generate-sources + generate-sources + + exec + + + ${project.build.directory}${file.separator}${swagger.sdk.script.file} + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.0.0 + + + clean-generated-files + generate-sources + + clean + + + + + ${project.build.directory}/generated-sources + + + + + + + + + + + org.onap.msb.swagger-sdk + swagger-sdk + 1.0.0 + + + + + + + + yang-compile + + + src/main/yang + + + + + + org.opendaylight.yangtools + yang-maven-plugin + 2.1.8 + + + org.opendaylight.mdsal + maven-sal-api-gen-plugin + ${odl.mdsal.model.version} + jar + + + org.opendaylight.netconf + sal-rest-docgen-maven + ${odl.netconf.sal.rest.docgen.version} + jar + + + + + + generate-sources + + + ${yang.file.directory} + + + org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator + target/swagger + + + true + + + + + + + + + -- cgit 1.2.3-korg