From: Dan Timoney Date: Tue, 25 Apr 2017 15:37:31 +0000 (+0000) Subject: Merge "Fix sdnc core build failure" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bf3bd9b1c6db917939ee9f406ef381dc447f8bee;hp=-c;p=sdnc%2Fcore.git Merge "Fix sdnc core build failure" --- bf3bd9b1c6db917939ee9f406ef381dc447f8bee diff --combined rootpom/pom.xml index a5a5a3a,53ae554..b2d08fa --- a/rootpom/pom.xml +++ b/rootpom/pom.xml @@@ -6,7 -6,6 +6,6 @@@ org.opendaylight.odlparent odlparent 1.7.1-Boron-SR1 - ../../../../../opendaylight/odlparent @@@ -39,7 -38,6 +38,7 @@@ src/main/yang-gen-sal true + java jacoco ${project.build.directory}/surefire-reports @@@ -69,11 -67,11 +68,11 @@@ - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT + (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} @@@ -157,79 -155,399 +156,79 @@@ pom org.openecomp.sdnc.core root - 1.1.1-SNAPSHOT - - - - - - org.opendaylight.controller - 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} - - - - - - - SDNC Root - http://wiki.onap.org - Root POM to be used for all SDNC 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.opendaylight.odlparent - odlparent - 1.7.1-Boron-SR1 - - - 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-site - dav:https://${openecomp.nexus.host}/content/sites/site/org/onap/sdnc/${project.version} - - - ecomp-releases - openecomp-repository-releases - ${openecomp.nexus.release-url} - - - ecomp-snapshots - openecomp-repository-snapshots - ${openecomp.nexus.snapshot-url} - - - - - + 1.1.0 + + + + + + org.opendaylight.controller + 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} + + + + + + + SDNC Root + http://wiki.onap.org + Root POM to be used for all SDNC projects + + + + JIRA + https://jira.onap.org/ + + + - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-ssh - 1.0 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - 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 + 2.10.4 + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + org.opendaylight.* + + org.opendaylight.odlparent + odlparent + 1.7.1-Boron-SR1 + org.slf4j slf4j-api @@@ -249,12 -567,12 +248,12 @@@ com.sun.jersey jersey-client - ${jersey.client.version} + ${jersey.json.version} com.sun.jersey jersey-core - ${jersey.version} + ${jersey.json.version} org.apache.httpcomponents @@@ -269,17 -587,17 +268,17 @@@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} + ${fasterxml.jackson.version} com.fasterxml.jackson.core jackson-annotations - ${jackson.version} + ${fasterxml.jackson.version} com.fasterxml.jackson.core jackson-core - ${jackson.version} + ${fasterxml.jackson.version} commons-lang @@@ -308,475 -626,155 +307,475 @@@ - - - + + + + javadoc-no-fork + test-javadoc-no-fork + + + aggregate - - aggregate - - site - - - + + aggregate + test-aggregate + + + - maven-source-plugin - 2.1.1 - - - bundle-sources - package - - - jar-no-fork - - - test-jar-no-fork - - - + 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-site + dav:https://${openecomp.nexus.host}/content/sites/site/org/onap/sdnc/${project.version} + + + 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-ssh + 1.0 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + + 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 + org.codehaus.mojo - license-maven-plugin + license-maven-plugin - 1.10 + 1.10 - + - false + false - ============LICENSE_START======================================================= + ============LICENSE_START======================================================= - ============LICENSE_END========================================================= + ============LICENSE_END========================================================= - ================================================================================ + ================================================================================ - apache_v2 + apache_v2 - 2017 + 2017 - AT&T Intellectual Property. All rights - reserved. + AT&T Intellectual Property. All rights + reserved. - openECOMP : SDN-C + openECOMP : SDN-C - true + true - true + true - true + true - true - - **/*.png - **/*.json - + true + + **/*.png + **/*.json + - + - + - + - first + first - + - update-file-header + update-file-header - + - process-sources + 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 - + + 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 +