From 8e2c970b36e8af68a5e1259ef1e1bc5eef9d1546 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 7 Aug 2017 10:07:09 -0400 Subject: Rename root poms by ODL release Change artifactIds of root poms to identify which ODL release it aligns to. Update sdnc-core to compile against boron-sr1, as was done before build broke Issue: SDNC-42 Change-Id: Ib9365706152dfdcd159aa56088b2d47eb5e88e34 Signed-off-by: Dan Timoney --- rootpom/boron-sr1/pom.xml | 17 +- rootpom/boron-sr3/pom.xml | 18 +- rootpom/pom.xml | 5 +- rootpom/root/pom.xml | 783 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 803 insertions(+), 20 deletions(-) create mode 100644 rootpom/root/pom.xml diff --git a/rootpom/boron-sr1/pom.xml b/rootpom/boron-sr1/pom.xml index 126a0d3..00d76d7 100644 --- a/rootpom/boron-sr1/pom.xml +++ b/rootpom/boron-sr1/pom.xml @@ -8,6 +8,14 @@ 1.7.1-Boron-SR1 + 4.0.0 + pom + org.openecomp.sdnc.core + root-boron-sr1 + 1.1.0 + SDNC Root - Boron SR1 + http://wiki.onap.org + Root POM to be used for all SDNC projects @@ -153,12 +161,6 @@ 8.5.14 - 4.0.0 - pom - org.openecomp.sdnc.core - root - 1.1.0 - @@ -198,9 +200,6 @@ - SDNC Root - Boron SR1 - http://wiki.onap.org - Root POM to be used for all SDNC projects diff --git a/rootpom/boron-sr3/pom.xml b/rootpom/boron-sr3/pom.xml index 931cfa5..e4372b7 100644 --- a/rootpom/boron-sr3/pom.xml +++ b/rootpom/boron-sr3/pom.xml @@ -8,6 +8,15 @@ 1.7.3-Boron-SR3 + 4.0.0 + pom + org.openecomp.sdnc.core + root-boron-sr3 + 1.1.0 + + SDNC Root - Boron SR3 + http://wiki.onap.org + Root POM to be used for all SDNC projects @@ -153,12 +162,6 @@ 8.5.14 - 4.0.0 - pom - org.openecomp.sdnc.core - root - 1.2.0 - @@ -198,9 +201,6 @@ - SDNC Root - Boron SR3 - http://wiki.onap.org - Root POM to be used for all SDNC projects diff --git a/rootpom/pom.xml b/rootpom/pom.xml index e0f709a..7045309 100644 --- a/rootpom/pom.xml +++ b/rootpom/pom.xml @@ -5,8 +5,8 @@ 4.0.0 pom org.openecomp.sdnc.core - root - 1.1.1 + rootpom + 1.1.0 SDNC Root @@ -734,6 +734,7 @@ OpenECOMP + root boron-sr1 boron-sr3 diff --git a/rootpom/root/pom.xml b/rootpom/root/pom.xml new file mode 100644 index 0000000..d90fc06 --- /dev/null +++ b/rootpom/root/pom.xml @@ -0,0 +1,783 @@ + + + + + org.opendaylight.odlparent + odlparent + 1.7.1-Boron-SR1 + + + + 4.0.0 + pom + org.openecomp.sdnc.core + root + 1.1.0 + + SDNC Root - original + http://wiki.onap.org + Original root POM to be used for all SDNC projects - should no longer be used. ODL release specific POMs is preferred + + + + nexus.onap.org + 443 + https://nexus.onap.org/content/repositories/releases/ + https://nexus.onap.org/content/repositories/snapshots/ + https://nexus.onap.org/content/groups/public/ + ecomp-staging + 176c31dfe190a + gerrit.onap.org + 443 + sdnc + https + + https://nexus.opendaylight.org/content/repositories/public/ + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + R17.07 + 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} + + + 1.7.1-Boron-SR1 + 0.4.1-Boron-SR1 + 1.0.1-Boron-SR1 + 1.4.1-Boron-SR1 + 2.1.1-Boron-SR1 + 0.9.1-Boron-SR1 + 0.9.1-Boron-SR1 + 1.4.1-Boron-SR1 + ${odl.mdsal.model.version} + 0.5.1-Boron-SR1 + ${odl.version} + ${odl.version} + 2010.09.24.9.1-Boron-SR1 + 2010.09.24.9.1-Boron-SR1 + 0.5.1-Boron-SR1 + ${odl.yangtools.version} + 0.9.1-Boron-SR1 + + + + + (1.0.999,1.1.999) + (1.0.999,1.1.999) + (1.0.999,1.1.999) + (1.0.999,1.1.999) + (1.0.999,1.1.999) + ${sdnc.core.version} + ${sdnc.adaptors.version} + ${sdnc.core.version} + ${sdnc.adaptors.version} + ${sdnc.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.37.Final + + 1.7.21 + + 3.2.14.RELEASE + + + + + 3.8.1.v20120830-144521 + ${jackson.version} + 1.3.7 + 0.6.4 + 4.4 + 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.openecomp.sdnc.core + sli-common + ${sdnctl.sli.version} + + + + org.openecomp.sdnc.core + sli-provider + ${sdnctl.sli.version} + + + + org.openecomp.sdnc.core + aai-service-provider + ${sdnctl.aai.service.version} + + + + org.openecomp.sdnc.core + dblib-provider + ${sdnctl.dblib.version} + + + + + + + + + + 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.version} + + + org.apache.httpcomponents + httpclient-osgi + ${apache.httpcomponents.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 + + + + + + + + openecomp-public + ${openecomp.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 + + + + + + + openecomp-public + ${openecomp.nexus.public-url} + + true + + never + + + true + always + + + + + openecomp-release + openecomp-repository-releases + ${openecomp.nexus.release-url} + + true + never + + + false + + + + openecomp-snapshot + openecomp-repository-snapshots + ${openecomp.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 + openecomp-repository-releases + ${openecomp.nexus.release-url} + + + ecomp-snapshots + openecomp-repository-snapshots + ${openecomp.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.version} + + + org.apache.httpcomponents + httpclient-osgi + ${apache.httpcomponents.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 + + license-maven-plugin + + 1.10 + + + + false + + ============LICENSE_START======================================================= + + ============LICENSE_END========================================================= + + ================================================================================ + + apache_v2 + + 2017 + + AT&T Intellectual Property. All rights + reserved. + + openECOMP : SDN-C + + true + + true + + true + + true + + **/*.png + **/*.json + + + + + + + + + first + + + + update-file-header + + + + process-sources + + + + + + + + + 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} + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://${openecomp.nexus.host} + ${openecomp.nexus.staging.profile-id} + ${openecomp.nexus.staging.server-id} + + + + + + OpenECOMP + + -- cgit 1.2.3-korg