From: Dan Timoney Date: Wed, 25 Oct 2017 00:08:51 +0000 (-0400) Subject: Flatten parent directory X-Git-Tag: v0.1.0~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F20467%2F1;p=ccsdk%2Fparent.git Flatten parent directory CCSDK parent only has one parent pom, so move it to top-most level. Having it in sublevel would require special treatment for release builds. Change-Id: Id894c144aada80c1a970adc2616ec485e4554391 Issue-ID: CCSDK-80 Signed-off-by: Dan Timoney --- diff --git a/odlparent-boron-sr3/pom.xml b/odlparent-boron-sr3/pom.xml deleted file mode 100755 index 87b237ae..00000000 --- a/odlparent-boron-sr3/pom.xml +++ /dev/null @@ -1,712 +0,0 @@ - - - - - org.opendaylight.odlparent - odlparent - 1.7.3-Boron-SR3 - - - - 4.0.0 - pom - org.onap.ccsdk.parent - odlparent-boron-sr3 - 0.0.2-SNAPSHOT - - - - - - nexus.onap.org - 443 - https - ${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/groups/public - ${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/repositories/releases - ${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/repositories/snapshots - ecomp-staging - 176c31dfe190a - - - - https://nexus.opendaylight.org/content/repositories/public/ - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - - 1.7.3-Boron-SR3 - 0.4.3-Boron-SR3 - 1.0.3-Boron-SR3 - 1.4.3-Boron-SR3 - 2.1.3-Boron-SR3 - 0.9.3-Boron-SR3 - 0.9.3-Boron-SR3 - 1.4.3-Boron-SR3 - ${odl.mdsal.model.version} - 0.5.3-Boron-SR3 - ${odl.version} - ${odl.version} - 2010.09.24.9.3-Boron-SR3 - 2010.09.24.9.3-Boron-SR3 - 0.5.3-Boron-SR3 - ${odl.yangtools.version} - 0.9.3-Boron-SR3 - - UTF-8 - 1.8 - 1.8 - 2.5.0 - 2.5.1 - features.xml - src/main/yang-gen-config - src/main/yang-gen-sal - true - - - java - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - true - ${project.version} - - - - - - (,0.0.1] - (,0.0.1] - (,0.0.1] - (,0.0.1] - ${ccsdk.sli.core.version} - ${ccsdk.sli.adaptors.version} - ${ccsdk.sli.core.version} - ${ccsdk.sli.adaptors.version} - ${ccsdk.sli.core.version} - - - - 1.10 - - 3.4 - - 2.6 - - 3.5 - - 2.6.2 - - 4.3.0 - - 2.3.1 - - 18.0 - - 1.3 - - 2.3.2 - - 3.20.0-GA - - - - 1.17 - - 1.17 - - - - - 20131018 - - - 1.3.7 - - 3.0.0 - - - 4.11 - - 1.1.7 - - 1.10.19 - - 4.0.44.Final - - 1.7.21 - - 3.2.14.RELEASE - - - - - 3.8.1.v20120830-144521 - ${jackson.version} - 0.6.4 - 4.3.2 - 4.3.3 - 4.5.1 - 5.1.39 - 1.4.186 - - 8.5.14 - - - - - - - org.opendaylight.odlparent - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - org.onap.sdnc.core - sli-common - ${sdnctl.sli.version} - - - - org.onap.sdnc.core - sli-provider - ${sdnctl.sli.version} - - - - org.onap.sdnc.core - aai-service-provider - ${sdnctl.aai.service.version} - - - - org.onap.sdnc.core - dblib-provider - ${sdnctl.dblib.version} - - - - - - - CCSDK Parent POM : ODL project, Boron SR3 - http://wiki.onap.org - Root POM to be used for all Boron SR3 Based CCSDK projects - - - - JIRA - https://jira.onap.org/ - - - - - - maven-javadoc-plugin - 2.10.4 - - false - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -views - true - org.opendaylight.* - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.antlr - antlr4 - ${antlr.version} - - - org.antlr - antlr4-runtime - ${antlr.version} - - - - com.sun.jersey - jersey-client - ${jersey.json.version} - - - com.sun.jersey - jersey-core - ${jersey.json.version} - - - org.apache.httpcomponents - httpcore-osgi - ${apache.httpcomponents.core.version} - - - org.apache.httpcomponents - httpclient-osgi - ${apache.httpcomponents.client.version} - - - com.fasterxml.jackson.core - jackson-databind - ${fasterxml.jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${fasterxml.jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${fasterxml.jackson.version} - - - commons-lang - commons-lang - ${commons.lang.version} - - - org.opendaylight.mdsal - yang-binding - ${odl.mdsal.yang.binding.version} - - - org.opendaylight.yangtools - yang-common - ${odl.yangtools.version} - - - org.opendaylight.mdsal.model - ietf-inet-types - ${odl.ietf-inet-types.version} - - - org.opendaylight.mdsal.model - ietf-yang-types - ${odl.ietf-yang-types.version} - - - - - - - javadoc-no-fork - test-javadoc-no-fork - - - - aggregate - - aggregate - test-aggregate - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - aggregate - - aggregate - test-aggregate - - - - - - - maven-surefire-plugin - 2.17 - - - org.apache.maven.plugins - maven-changelog-plugin - 2.3 - - - dual-report - - range - 30 - - - changelog - file-activity - - - - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - - - - - - onap-public - ${onap.nexus.public-url} - - true - - - true - - - - opendaylight-mirror - opendaylight-mirror - ${opendaylight.nexus.public-url} - - true - never - - - false - - - - opendaylight-snapshot - opendaylight-snapshot - ${opendaylight.nexus.snapshot-url} - - false - - - true - - - - - JCenter - JCenter Repository - http://jcenter.bintray.com - - - - Restlet - Restlet Repository - http://maven.restlet.com - - - - - - - onap-public - ${onap.nexus.public-url} - - true - - never - - - true - always - - - - - ecomp-release - onap-repository-releases - ${onap.nexus.release-url} - - true - never - - - false - - - - ecomp-snapshot - onap-repository-snapshots - ${onap.nexus.snapshot-url} - - false - - - true - - - - opendaylight-mirror - opendaylight-mirror - ${opendaylight.nexus.public-url} - - true - never - - - false - - - - opendaylight-snapshot - opendaylight-snapshot - ${opendaylight.nexus.snapshot-url} - - false - - - true - - - - - - - - ecomp-releases - onap-repository-releases - ${onap.nexus.release-url} - - - ecomp-snapshots - onap-repository-snapshots - ${onap.nexus.snapshot-url} - - - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - org.apache.maven.doxia - doxia-core - 1.7 - - - org.apache.maven.doxia - doxia-sink-api - 1.7 - - - org.apache.maven.doxia - doxia-logging-api - 1.7 - - - - - attach-descriptor - - attach-descriptor - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compile.plugin.version} - - ${java.version.source} - ${java.version.target} - - - - org.codehaus.mojo - sonar-maven-plugin - 3.2 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10 - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.antlr - antlr4 - ${antlr.version} - - - org.antlr - antlr4-runtime - ${antlr.version} - - - - com.sun.jersey - jersey-client - ${jersey.client.version} - - - com.sun.jersey - jersey-core - ${jersey.version} - - - org.apache.httpcomponents - httpcore-osgi - ${apache.httpcomponents.core.version} - - - org.apache.httpcomponents - httpclient-osgi - ${apache.httpcomponents.client.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - commons-lang - commons-lang - ${commons.lang.version} - - - org.opendaylight.mdsal - yang-binding - ${odl.mdsal.yang.binding.version} - - - org.opendaylight.yangtools - yang-common - ${odl.yangtools.version} - - - org.opendaylight.mdsal.model - ietf-inet-types - ${odl.ietf-inet-types.version} - - - org.opendaylight.mdsal.model - ietf-yang-types - ${odl.ietf-yang-types.version} - - - - - - - aggregate - - aggregate - - site - - - - - - maven-source-plugin - 2.1.1 - - - bundle-sources - package - - - jar-no-fork - - - test-jar-no-fork - - - - - - - - - - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - - set-system-properties - - - - - maven.wagon.http.ssl.allowall - ${ssl.allowall} - - - maven.wagon.http.ssl.insecure - ${ssl.insecure} - - - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.3 - - - maven-scm-plugin - 1.8.1 - - ${project.artifactId}-${project.version} - - - - - - ONAP - - diff --git a/pom.xml b/pom.xml index 2a4f3a81..43f99b4b 100755 --- a/pom.xml +++ b/pom.xml @@ -2,47 +2,441 @@ + 4.0.0 pom org.onap.ccsdk.parent - parent + odlparent-carbon-sr1 0.1.0-SNAPSHOT - ccsdk-parent - http://wiki.onap.org - Parent POMs to be used by clients of CCSDK + nexus.onap.org 443 https - https://nexus.onap.org - ${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/groups/public - ${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/groups/staging - ${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/repositories/releases - ${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/repositories/snapshots + https://nexus.onap.org/content/groups/public + https://nexus.onap.org/content/groups/staging + https://nexus.onap.org/content/repositories/releases + https://nexus.onap.org/content/repositories/snapshots ecomp-staging 176c31dfe190a + + + https://nexus.opendaylight.org/content/repositories/public/ + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + + 1.8.1-Carbon + 0.5.1-Carbon + 1.1.1-Carbon + 1.5.1-Carbon + 2.2.1-Carbon + 0.10.1-Carbon + 0.10.1-Carbon + 1.5.1-Carbon + ${odl.mdsal.model.version} + 0.6.1-Carbon + ${odl.version} + ${odl.version} + 2010.09.24.10.1-Carbon + 2010.09.24.10.1-Carbon + 0.6.1-Carbon + ${odl.yangtools.version} + 0.10.1-Carbon + + UTF-8 + 1.8 + 1.8 + 2.5.0 + 2.5.1 + features.xml + src/main/yang-gen-config + src/main/yang-gen-sal + true + + + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + true + ${project.version} + + + + + + 0.1.0 + 0.1.0 + 0.1.0 + 0.1.0 + ${ccsdk.sli.core.version} + ${ccsdk.sli.adaptors.version} + ${ccsdk.sli.core.version} + ${ccsdk.sli.adaptors.version} + ${ccsdk.sli.core.version} + + + + 1.10 + + 3.4 + + 2.6 + + 3.5 + + 2.6.2 + + 4.3.0 + + 2.3.1 + + 18.0 + + 1.3 + + 2.3.2 + + 3.20.0-GA + + + + 1.17 + + 1.17 + + + + + 20131018 + + + 1.3.6 + + 3.0.0 + + + 4.11 + + 1.1.7 + + 1.10.19 + + 4.0.44.Final + + 1.7.21 + + 3.2.14.RELEASE + + + + + 3.8.1.v20120830-144521 + ${jackson.version} + 0.6.4 + 4.3.2 + 4.3.3 + 4.5.1 + 5.1.39 + 2.1.1 + 1.4.186 + + 8.5.14 + + org.onap.oparent + oparent-odlparent + 1.0.0 + + + + + + org.opendaylight.odlparent + opendaylight-karaf-empty + ${odl.karaf.empty.distro.version} + zip + + + + + org.onap.sdnc.core + sli-common + ${sdnctl.sli.version} + + + + org.onap.sdnc.core + sli-provider + ${sdnctl.sli.version} + + + + org.onap.sdnc.core + aai-service-provider + ${sdnctl.aai.service.version} + + + + org.onap.sdnc.core + dblib-provider + ${sdnctl.dblib.version} + + + + + + + CCSDK Parent POM : ODL project, Carbon SR1 + http://wiki.onap.org + Root POM to be used for all Carbon SR1 based CCSDK projects + + + + JIRA + https://jira.onap.org/ + + + + + + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + org.opendaylight.* + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.antlr + antlr4 + ${antlr.version} + + + org.antlr + antlr4-runtime + ${antlr.version} + + + + com.sun.jersey + jersey-client + ${jersey.json.version} + + + com.sun.jersey + jersey-core + ${jersey.json.version} + + + org.apache.httpcomponents + httpcore-osgi + ${apache.httpcomponents.core.version} + + + org.apache.httpcomponents + httpclient-osgi + ${apache.httpcomponents.client.version} + + + com.fasterxml.jackson.core + jackson-databind + ${fasterxml.jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${fasterxml.jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${fasterxml.jackson.version} + + + commons-lang + commons-lang + ${commons.lang.version} + + + org.opendaylight.mdsal + yang-binding + ${odl.mdsal.yang.binding.version} + + + org.opendaylight.yangtools + yang-common + ${odl.yangtools.version} + + + org.opendaylight.mdsal.model + ietf-inet-types + ${odl.ietf-inet-types.version} + + + org.opendaylight.mdsal.model + ietf-yang-types + ${odl.ietf-yang-types.version} + + + + + + + javadoc-no-fork + test-javadoc-no-fork + + + + aggregate + + aggregate + test-aggregate + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + aggregate + + aggregate + test-aggregate + + + + + + + maven-surefire-plugin + 2.17 + + + org.apache.maven.plugins + maven-changelog-plugin + 2.3 + + + dual-report + + range + 30 + + + changelog + file-activity + + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + + + + + onap-public + ${onap.nexus.public-url} + + true + + + true + + + + onap-snapshot + ${onap.nexus.snapshot-url} + + false + + + true + + + + opendaylight-mirror + opendaylight-mirror + ${opendaylight.nexus.public-url} + + true + never + + + false + + + + opendaylight-snapshot + opendaylight-snapshot + ${opendaylight.nexus.snapshot-url} + + false + + + true + + + + + JCenter + JCenter Repository + http://jcenter.bintray.com + + + + Restlet + Restlet Repository + http://maven.restlet.com + + + + onap-public ${onap.nexus.public-url} true - never true always - @@ -50,15 +444,11 @@ ${onap.nexus.staging-url} true - never true always - @@ -164,7 +554,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.5.1 + ${maven.compile.plugin.version} ${java.version.source} ${java.version.target} @@ -175,6 +565,102 @@ sonar-maven-plugin 3.2 + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10 + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.antlr + antlr4 + ${antlr.version} + + + org.antlr + antlr4-runtime + ${antlr.version} + + + + com.sun.jersey + jersey-client + ${jersey.client.version} + + + com.sun.jersey + jersey-core + ${jersey.version} + + + org.apache.httpcomponents + httpcore-osgi + ${apache.httpcomponents.core.version} + + + org.apache.httpcomponents + httpclient-osgi + ${apache.httpcomponents.client.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + commons-lang + commons-lang + ${commons.lang.version} + + + org.opendaylight.mdsal + yang-binding + ${odl.mdsal.yang.binding.version} + + + org.opendaylight.yangtools + yang-common + ${odl.yangtools.version} + + + org.opendaylight.mdsal.model + ietf-inet-types + ${odl.ietf-inet-types.version} + + + org.opendaylight.mdsal.model + ietf-yang-types + ${odl.ietf-yang-types.version} + + + + + + + aggregate + + aggregate + + site + + + + maven-source-plugin 2.1.1 @@ -201,17 +687,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - org.codehaus.mojo @@ -254,8 +729,4 @@ ONAP - - - odlparent-carbon-sr1 -