From 7a638b6147aec1a56d5ba748c395905e1532147a Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Thu, 30 Mar 2017 11:04:22 -0700 Subject: Root pom parent and other cleanup Change-Id: I61deff5cffeb0a3730066ca83f86a98b647acd03 Signed-off-by: Patrick Brady --- .../appc-dmaap-adapter-bundle/pom.xml | 9 +- .../appc-rest-adapter-bundle/pom.xml | 6 - .../appc-asdc-listener-bundle/pom.xml | 8 - appc-provider/appc-provider-model/pom.xml | 8 - pom.xml | 257 ++++++--------------- 5 files changed, 67 insertions(+), 221 deletions(-) diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml index 0a4c8b816..44ca150d1 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml @@ -119,13 +119,6 @@ - - - - - - - org.json json @@ -150,7 +143,7 @@ org.openecomp.appc.adapter.dmaap.AppcDmaapAdapterActivator org.openecomp.appc.adapter.dmaap.* org.openecomp.appc.adapter.dmaap.EventSender - org.openecomp.appc.metricservice.*,com.att.nsa.*,org.openecomp.sdnc.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets + org.openecomp.appc.metricservice.*,org.openecomp.sdnc.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets *;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis|pax-* true OSGI-INF/blueprint/blueprint.xml diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml index 6a0f1c899..b3d24f1fe 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml @@ -129,12 +129,6 @@ commons-codec - - org.apache.httpcomponents - httpclient - 4.5.1 - - junit junit diff --git a/appc-asdc-listener/appc-asdc-listener-bundle/pom.xml b/appc-asdc-listener/appc-asdc-listener-bundle/pom.xml index b68cf05d1..1c5e7dd75 100644 --- a/appc-asdc-listener/appc-asdc-listener-bundle/pom.xml +++ b/appc-asdc-listener/appc-asdc-listener-bundle/pom.xml @@ -71,14 +71,6 @@ ch.qos.logback logback-classic - - com.att.nsa - saClientLibrary - - - com.att.nsa - cambriaClient - org.functionaljava functionaljava diff --git a/appc-provider/appc-provider-model/pom.xml b/appc-provider/appc-provider-model/pom.xml index cb8c60243..cb7e911dd 100644 --- a/appc-provider/appc-provider-model/pom.xml +++ b/appc-provider/appc-provider-model/pom.xml @@ -84,13 +84,5 @@ org.opendaylight.yangtools yang-common - - org.opendaylight.mdsal.model - ietf-inet-types - - - org.opendaylight.mdsal.model - ietf-yang-types - diff --git a/pom.xml b/pom.xml index 3405736f7..86a1f9872 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,15 @@ - - 4.0.0 + - org.openecomp.sdnc.core - root - 1.0.0-SNAPSHOT + org.opendaylight.odlparent + odlparent + 1.6.2-Beryllium-SR2 + ../../../../../opendaylight/odlparent + + + 4.0.0 pom org.openecomp.appc appc @@ -16,118 +20,64 @@ OpenECOMP + + + + 2.0.2-Beryllium-SR2 1.3.2-Beryllium-SR2 - - - - - - - - - - - - - - - - + 0.4.2-Beryllium-SR2 + ${odl.version} + 2010.09.24.8.2-Beryllium-SR2 + 2010.09.24.8.2-Beryllium-SR2 + 0.4.2-Beryllium-SR2 + 1.6.2-Beryllium-SR2 0.8.2-Beryllium-SR2 - - - - - - - - - - - - - - - - - - - - - - - - - - java - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - true - ${project.version} + 1.3.2-Beryllium-SR2 + + + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 0.0.1 0.0.1 0.0.1 1.3.0 1.2.11 3.1.200 - 0.0.1 - - 1.0.0-SNAPSHOT - - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT - + 2.5.0 + 1.7 + 1.7 + 2.5.1 + 3.8.1.v20120830-144521 + 4.4 + 4.5.1 + 5.1.39 + + + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + true + ${project.version} + target/generated-sources/yang-gen-sal - - - ${commons.lang3.version} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - + src/main/yang + features.xml + src/main/yang-gen-config + src/main/yang-gen-sal + true + + @@ -152,25 +102,20 @@ + + - + - app-c-javadoc - dav:https://nexus.onap.org/repository/app-c-javadoc/${project.version} + ecomp-site + dav:https://nexus.onap.org/content/sites/site/org/onap/appc/${project.version} - - - - + + @@ -210,6 +155,8 @@ http://maven.restlet.com + + @@ -224,38 +171,32 @@ org.opendaylight.controller sal-binding-config - ${odl.mdsal.version} org.opendaylight.controller sal-binding-api ${odl.mdsal.version} - org.opendaylight.controller sal-test-model - ${odl.mdsal.version} org.opendaylight.netconf sal-rest-connector - ${odl.mdsal.version} org.opendaylight.controller sal-binding-broker-impl - ${odl.mdsal.version} org.opendaylight.controller sal-common-util ${odl.mdsal.version} - org.opendaylight.mdsal @@ -267,16 +208,6 @@ 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} - org.opendaylight.controller features-mdsal @@ -305,6 +236,7 @@ + org.opendaylight.yangtools @@ -330,8 +262,8 @@ dblib-provider ${sdnctl.dblib.version} - + org.openecomp.sdnc.adaptors aai-service-provider @@ -406,28 +338,12 @@ sshd-core 0.12.0 - - javax.jms - jms - 1.1 - org.mockito mockito-core 1.10.19 test - - com.att.nsa - cambriaClient - ${cambriaClient-version} - - - com.att.nsa - saClientLibrary - ${cambriaClient-version} - - com.att.cdp cdp-pal-common @@ -438,55 +354,10 @@ cdp-pal-openstack ${cdp.pal.version} - - - - - - - - com.att.cadi - cadi-aaf - ${cadi-version} - - - com.att.cadi - cadi-client - ${cadi-version} - - - com.att.cadi - cadi-core - ${cadi-version} - - - com.att.inno - env - ${inno-version} - - - com.att.inno - rosetta - ${inno-version} - - - com.att.aft.discovery - discovery-clt - 5.1.3-01 - - - com.att.aft - dme2 - ${dme2-version} - com.att.authz authz-client 2.3 - - - @@ -496,6 +367,8 @@ + + @@ -703,6 +576,8 @@ --> + + -- cgit 1.2.3-korg