Root pom parent and other cleanup

Change-Id: I61deff5cffeb0a3730066ca83f86a98b647acd03
Signed-off-by: Patrick Brady <pb071s@att.com>

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 @@
 			</exclusions>
 		</dependency>
 
-		<!-- DMaaP Client -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>com.att.nsa</groupId> -->
-<!-- 			<artifactId>dmaapClient</artifactId> -->
-<!-- 			<version>${dmaap.client.version}</version> -->
-<!-- 		</dependency> -->
-
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>			
@@ -150,7 +143,7 @@
 						<Bundle-Activator>org.openecomp.appc.adapter.dmaap.AppcDmaapAdapterActivator</Bundle-Activator>				
 						<Export-Package>org.openecomp.appc.adapter.dmaap.*</Export-Package>
 						<Export-Serice>org.openecomp.appc.adapter.dmaap.EventSender</Export-Serice>
-						<Import-Package>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</Import-Package>
+						<Import-Package>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</Import-Package>
 						<Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis|pax-*</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 						<Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint>
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
@@ -130,12 +130,6 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.1</version>
-		</dependency>
-
-		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
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
@@ -72,14 +72,6 @@
 			<artifactId>logback-classic</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.att.nsa</groupId>
-			<artifactId>saClientLibrary</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.att.nsa</groupId>
-			<artifactId>cambriaClient</artifactId>
-		</dependency>
-		<dependency>
 			<groupId>org.functionaljava</groupId>
 			<artifactId>functionaljava</artifactId>
 			<version>4.2</version>
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 @@
 			<groupId>org.opendaylight.yangtools</groupId>
 			<artifactId>yang-common</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.opendaylight.mdsal.model</groupId>
-			<artifactId>ietf-inet-types</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.opendaylight.mdsal.model</groupId>
-			<artifactId>ietf-yang-types</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 3405736f7..86a1f9872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>org.openecomp.sdnc.core</groupId>
-        <artifactId>root</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.6.2-Beryllium-SR2</version>
+        <relativePath>../../../../../opendaylight/odlparent</relativePath>
     </parent>
+
+
+    <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.openecomp.appc</groupId>
     <artifactId>appc</artifactId>
@@ -16,118 +20,64 @@
     <organization>
         <name>OpenECOMP</name>
     </organization>
+
+
     <!-- ================================================================================== -->
     <!-- Configuration properties -->
     <!-- ================================================================================== -->
     <properties>
+        <!-- VERSIONS -->
+        <!-- OpenDaylight Versions -->
         <features-mdsal.version>2.0.2-Beryllium-SR2</features-mdsal.version>
         <broker-mdsal.version>1.3.2-Beryllium-SR2</broker-mdsal.version>
-        <!-- Properties from parent pom -->
-        <!-- <release-tag>R17.01</release-tag> -->
-        <!-- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -->
-        <!-- <bundle.plugin.version>2.5.0</bundle.plugin.version> -->
-        <!-- <java.version.source>1.7</java.version.source> -->
-        <!-- <java.version.target>1.7</java.version.target> -->
-        <!-- <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> -->
-        <!-- <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version> -->
-        <!-- <jackson-annotations-version>${jackson.version}</jackson-annotations-version> -->
-        <!-- <jettison.version>1.3.7</jettison.version> -->
-        <!-- <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version> -->
-        <!-- <apache.httpcomponents.version>4.4</apache.httpcomponents.version> -->
-        <!-- <antlr.version>4.5.1</antlr.version> -->
-        <!-- <mysql.connector.version>5.1.39</mysql.connector.version> -->
-        <!-- <odl.version>1.6.2-Beryllium-SR2</odl.version> -->
-        <!-- <odl.dlux.version>0.3.2-Beryllium-SR2</odl.dlux.version> -->
+        <odl.controller.config.api.version>0.4.2-Beryllium-SR2</odl.controller.config.api.version>
+        <odl.karaf.empty.distro.version>${odl.version}</odl.karaf.empty.distro.version>
+        <odl.ietf-inet-types.version>2010.09.24.8.2-Beryllium-SR2</odl.ietf-inet-types.version>
+        <odl.ietf-yang-types.version>2010.09.24.8.2-Beryllium-SR2</odl.ietf-yang-types.version>
+        <odl.yang.jmx.generator.version>0.4.2-Beryllium-SR2</odl.yang.jmx.generator.version>
+        <odl.version>1.6.2-Beryllium-SR2</odl.version>
         <odl.yangtools.version>0.8.2-Beryllium-SR2</odl.yangtools.version>
-        <!-- <odl.mdsal.version>1.3.2-Beryllium-SR2</odl.mdsal.version> -->
-        <!-- <odl.mdsal.features.version>2.0.2-Beryllium-SR2</odl.mdsal.features.version> -->
-        <!-- <odl.mdsal.model.version>0.8.2-Beryllium-SR2</odl.mdsal.model.version> -->
-        <!-- <odl.restconf.version>1.3.2-Beryllium-SR2</odl.restconf.version> -->
-        <!-- <odl.yangtools.version>0.8.2-Beryllium-SR2</odl.yangtools.version> -->
-        <!-- <odl.controller.model.version>${odl.mdsal.model.version}</odl.controller.model.version> -->
-        <!-- <odl.controller.config.api.version>0.4.2-Beryllium-SR2</odl.controller.config.api.version> -->
-        <!-- <odl.karaf.empty.distro.version>${odl.version}</odl.karaf.empty.distro.version> -->
-        <!-- <odl.commons.opendaylight.version>${odl.version}</odl.commons.opendaylight.version> -->
-        <!-- <odl.ietf-inet-types.version>2010.09.24.8.2-Beryllium-SR2</odl.ietf-inet-types.version> -->
-        <!-- <odl.ietf-yang-types.version>2010.09.24.8.2-Beryllium-SR2</odl.ietf-yang-types.version> -->
-        <!-- <odl.yang.jmx.generator.version>0.4.2-Beryllium-SR2</odl.yang.jmx.generator.version> -->
-        <!-- <odl.yangtools.yang.maven.plugin.version>${odl.yangtools.version}</odl.yangtools.yang.maven.plugin.version> -->
-        <!-- <features.file>features.xml</features.file> -->
-        <!-- <h2database.version>1.4.186</h2database.version> -->
-        <!-- <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath> -->
-        <!-- <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath> -->
-        <!-- <checkstyle.skip>true</checkstyle.skip> -->
-        <!--<sdnc.core.version>(0.0.1,1.9.9]</sdnc.core.version> -->
-        <!-- <sdnc.adaptors.version>(0.0.1,1.9.9]</sdnc.adaptors.version> -->
-        <!-- <sdnctl.aai.service.version>${sdnc.adaptors.version}</sdnctl.aai.service.version> -->
-        <!-- <sdnctl.dblib.version>${sdnc.core.version}</sdnctl.dblib.version> -->
-        <!-- <sdnctl.mdsal.resource.version>${sdnc.adaptors.version}</sdnctl.mdsal.resource.version> -->
-        <!-- <sdnctl.slipluginutils.version>${sdnc.core.version}</sdnctl.slipluginutils.version> -->
-        <!-- Sonar Properties -->
-        <sonar.language>java</sonar.language>
-        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-        <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
-        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-        <sonar.projectVersion>${project.version}</sonar.projectVersion>
+        <odl.mdsal.version>1.3.2-Beryllium-SR2</odl.mdsal.version>
+
+        <!-- OPENECOMP SDNC versions -->
+        <sdnctl.sli.version>1.0.0-SNAPSHOT</sdnctl.sli.version>
+        <sdnctl.dblib.version>1.0.0-SNAPSHOT</sdnctl.dblib.version>
+        <sdnctl.aai.service.version>1.0.0-SNAPSHOT</sdnctl.aai.service.version>
+
         <cdp.pal.version>0.0.1</cdp.pal.version>
         <eelf.version>0.0.1</eelf.version>
         <eelf.maven.plugin.version>0.0.1</eelf.maven.plugin.version>
         <cadi-version>1.3.0</cadi-version>
         <inno-version>1.2.11</inno-version>
         <dme2-version>3.1.200</dme2-version>
-        <cambriaClient-version>0.0.1</cambriaClient-version>
-        <!-- OPENECOMP SDNC versions -->
-        <sdnctl.sli.version>1.0.0-SNAPSHOT</sdnctl.sli.version>
-        <!--<sdnctl.sli.version>${sdnc.core.version}</sdnctl.sli.version> -->
-        <sdnctl.dblib.version>1.0.0-SNAPSHOT</sdnctl.dblib.version>
-        <sdnctl.aai.service.version>1.0.0-SNAPSHOT</sdnctl.aai.service.version>
-        <!-- <jmxGeneratorPath>target/generated-sources/yang-gen-config</jmxGeneratorPath> -->
+        <bundle.plugin.version>2.5.0</bundle.plugin.version>
+        <java.version.source>1.7</java.version.source>
+        <java.version.target>1.7</java.version.target>
+        <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
+        <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
+        <apache.httpcomponents.version>4.4</apache.httpcomponents.version>
+        <antlr.version>4.5.1</antlr.version>
+        <mysql.connector.version>5.1.39</mysql.connector.version>
+
+        <!-- SONAR -->
+        <sonar.language>java</sonar.language>
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
+
         <salGeneratorPath>target/generated-sources/yang-gen-sal</salGeneratorPath>
-        <!-- <OpenStack-API-version>3.3.4</OpenStack-API-version> -->
-        <!-- <commons.lang3.version>3.4</commons.lang3.version> -->
-        <commons.io.version>${commons.lang3.version}</commons.io.version>
-        <!-- <odl.aaa.version>0.3.2-Beryllium-SR2</odl.aaa.version> -->
-        <!-- <odl.bgpcep.version>0.5.2-Beryllium-SR2</odl.bgpcep.version> -->
-        <!-- <odl.branding.version>1.2.2-Beryllium-SR2</odl.branding.version> -->
-        <!-- <odl.commons.opendaylight.version>1.6.2-Beryllium-SR2</odl.commons.opendaylight.version> -->
-        <!-- <odl.config.parent.version>0.4.2-Beryllium-SR2</odl.config.parent.version> -->
-        <!-- <odl.config.version>0.4.2-Beryllium-SR2</odl.config.version> -->
-        <!-- <odl.controller.model.version>1.3.2-Beryllium-SR2</odl.controller.model.version> -->
-        <!-- <odl.dlux.version>0.3.2-Beryllium-SR2</odl.dlux.version> -->
-        <!-- <odl.features.protocol.framework.version>0.7.2-Beryllium-SR2</odl.features.protocol.framework.version> -->
-        <!-- <odl.ganymed.version>1.3.2-Beryllium-SR2</odl.ganymed.version> -->
-        <!-- <odl.ietf-inet-types.version>2010.09.24.8.2-Beryllium-SR2</odl.ietf-inet-types.version> -->
-        <!-- <odl.ietf-ted.version>2013.10.21.8.2-Beryllium-SR2</odl.ietf-ted.version> -->
-        <!-- <odl.ietf-topology-isis.version>2013.10.21.8.2-Beryllium-SR2</odl.ietf-topology-isis.version> -->
-        <!-- <odl.ietf-topology.version>2013.10.21.8.2-Beryllium-SR2</odl.ietf-topology.version> -->
-        <!-- <odl.ietf-yang-types.version>2010.09.24.8.2-Beryllium-SR2</odl.ietf-yang-types.version> -->
-        <!-- <odl.karaf.distro.empty.version>1.6.2-Beryllium-SR2</odl.karaf.distro.empty.version> -->
-        <!-- <odl.karaf.empty.distro.version>1.6.2-Beryllium-SR2</odl.karaf.empty.distro.version> -->
-        <!-- <odl.karaf.resources.version>1.6.2-Beryllium-SR2</odl.karaf.resources.version> -->
-        <!-- <odl.l2-types.model.version>2013.08.27.8.2-Beryllium-SR2</odl.l2-types.model.version> -->
-        <!-- <odl.l2switch.version>0.3.2-Beryllium-SR2</odl.l2switch.version> -->
-        <!-- <odl.controller.mdsal.version>1.3.2-Beryllium-SR2</odl.controller.mdsal.version> -->
-        <!-- <odl.mdsal.version>2.0.2-Beryllium-SR2</odl.mdsal.version> -->
-        <!-- <odl.mdsal.apidoc.version>1.3.2-Beryllium-SR2</odl.mdsal.apidoc.version> -->
-        <!-- <odl.sal.clustering.conf.version>1.3.2-Beryllium-SR2</odl.sal.clustering.conf.version> -->
-        <!-- <odl.net.sf.jung2.version>2.0.1</odl.net.sf.jung2.version> -->
-        <!-- <odl.netconf.parent.version>1.0.2-Beryllium-SR2</odl.netconf.parent.version> -->
-        <!-- <odl.neutron.version>0.6.2-Beryllium-SR2</odl.neutron.version> -->
-        <!-- <odl.openflowjava.version>0.7.2-Beryllium-SR2</odl.openflowjava.version> -->
-        <!-- <odl.openflowplugin.version>0.2.2-Beryllium-SR2</odl.openflowplugin.version> -->
-        <!-- <odl.pax.cdi.version>0.11.0</odl.pax.cdi.version> -->
-        <!-- <odl.restconf.version>1.3.2-Beryllium-SR2</odl.restconf.version> -->
-        <!-- <odl.sal.api.version>0.10.2-Beryllium-SR2</odl.sal.api.version> -->
-        <!-- <odl.sal.connection.api.version>0.3.2-Beryllium-SR2</odl.sal.connection.api.version> -->
-        <!-- <odl.sal.rest.docgen.version>1.3.2-Beryllium-SR2</odl.sal.rest.docgen.version> -->
-        <!-- <odl.yang.jmx.generator.version>0.4.2-Beryllium-SR2</odl.yang.jmx.generator.version> -->
-        <!-- <odl.yangtools.version>0.8.2-Beryllium-SR2</odl.yangtools.version> -->
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
-        <!-- ADDING TO SUPPORT APPC-PROVIDER-MODEL yang-gen-sal FOLDER 
-			GENERATION -->
+        <!-- ADDING TO SUPPORT APPC-PROVIDER-MODEL yang-gen-sal FOLDER GENERATION -->
         <yang.file.directory>src/main/yang</yang.file.directory>
+        <features.file>features.xml</features.file>
+        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
+        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+        <checkstyle.skip>true</checkstyle.skip>
     </properties>
+
+
     <!-- ================================================================================== -->
     <!-- Javadoc Generation Plugin -->
     <!-- ================================================================================== -->
@@ -152,25 +102,20 @@
             </plugin>
         </plugins>
     </reporting>
+
+
     <!-- ================================================================================== -->
-    <!-- Distribution Management Sites-->
+    <!-- Distribution Management Sites -->
     <!-- ================================================================================== -->
     <distributionManagement>
         <!-- This site is used for Javadocs -->
         <site>
-            <id>app-c-javadoc</id>
-            <url>dav:https://nexus.onap.org/repository/app-c-javadoc/${project.version}</url>
+            <id>ecomp-site</id>
+            <url>dav:https://nexus.onap.org/content/sites/site/org/onap/appc/${project.version}</url>
         </site>
     </distributionManagement>
-    <!-- ================================================================================== -->
-    <!-- The SCM repository we are using -->
-    <!-- ================================================================================== -->
-    <!-- <scm>
-		<connection></connection>
-		<developerConnection></developerConnection>
-		<url></url>
-		<tag></tag>
-	</scm> -->
+
+
     <!-- ================================================================================== -->
     <!-- Define plugin repositories -->
     <!-- ================================================================================== -->
@@ -210,6 +155,8 @@
             <url>http://maven.restlet.com</url>
         </pluginRepository>
     </pluginRepositories>
+
+
     <!-- ================================================================================== -->
     <!-- Define project-wide dependencies -->
     <!-- ================================================================================== -->
@@ -224,38 +171,32 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-config</artifactId>
-                <!-- <version>1.3.2-Beryllium-SR2</version> -->
                 <version>${odl.mdsal.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-api</artifactId>
                 <version>${odl.mdsal.version}</version>
-                <!-- <version>1.3.2-Beryllium-SR2</version> -->
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-test-model</artifactId>
-                <!-- <version>1.3.2-Beryllium-SR2</version> -->
                 <version>${odl.mdsal.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>sal-rest-connector</artifactId>
-                <!-- <version>1.3.2-Beryllium-SR2</version> -->
                 <version>${odl.mdsal.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-broker-impl</artifactId>
-                <!-- <version>1.3.2-Beryllium-SR2</version> -->
                 <version>${odl.mdsal.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-common-util</artifactId>
                 <version>${odl.mdsal.version}</version>
-                <!-- <version>1.3.2-Beryllium-SR2</version> -->
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
@@ -268,16 +209,6 @@
                 <version>${odl.yangtools.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-inet-types</artifactId>
-                <version>${odl.ietf-inet-types.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-yang-types</artifactId>
-                <version>${odl.ietf-yang-types.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>features-mdsal</artifactId>
                 <version>1.3.2-Beryllium-SR2</version>
@@ -305,6 +236,7 @@
             <!-- <version>${odl.yangtools.version}</version> -->
             <!-- <scope>test</scope> -->
             <!-- </dependency> -->
+
             <!-- YANG tools -->
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
@@ -330,8 +262,8 @@
                 <artifactId>dblib-provider</artifactId>
                 <version>${sdnctl.dblib.version}</version>
             </dependency>
-            <!-- A&AI service provider dependency override in order to use a stable 
-				version -->
+            <!-- A&AI service provider dependency override in order to use 
+                a stable version -->
             <dependency>
                 <groupId>org.openecomp.sdnc.adaptors</groupId>
                 <artifactId>aai-service-provider</artifactId>
@@ -407,28 +339,12 @@
                 <version>0.12.0</version>
             </dependency>
             <dependency>
-                <groupId>javax.jms</groupId>
-                <artifactId>jms</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
                 <version>1.10.19</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>com.att.nsa</groupId>
-                <artifactId>cambriaClient</artifactId>
-                <version>${cambriaClient-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.att.nsa</groupId>
-                <artifactId>saClientLibrary</artifactId>
-                <version>${cambriaClient-version}</version>
-            </dependency>
-            <!-- CDP -->
-            <dependency>
                 <groupId>com.att.cdp</groupId>
                 <artifactId>cdp-pal-common</artifactId>
                 <version>${cdp.pal.version}</version>
@@ -438,55 +354,10 @@
                 <artifactId>cdp-pal-openstack</artifactId>
                 <version>${cdp.pal.version}</version>
             </dependency>
-            <!-- <dependency> -->
-            <!-- <groupId>com.att.cdp</groupId> -->
-            <!-- <artifactId>cdp-common</artifactId> -->
-            <!-- <version>${cdp.version}</version> -->
-            <!-- </dependency> -->
-            <!-- Cadi -->
-            <dependency>
-                <groupId>com.att.cadi</groupId>
-                <artifactId>cadi-aaf</artifactId>
-                <version>${cadi-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.att.cadi</groupId>
-                <artifactId>cadi-client</artifactId>
-                <version>${cadi-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.att.cadi</groupId>
-                <artifactId>cadi-core</artifactId>
-                <version>${cadi-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.att.inno</groupId>
-                <artifactId>env</artifactId>
-                <version>${inno-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.att.inno</groupId>
-                <artifactId>rosetta</artifactId>
-                <version>${inno-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.att.aft.discovery</groupId>
-                <artifactId>discovery-clt</artifactId>
-                <version>5.1.3-01</version>
-            </dependency>
-            <dependency>
-                <groupId>com.att.aft</groupId>
-                <artifactId>dme2</artifactId>
-                <version>${dme2-version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.att.authz</groupId>
                 <artifactId>authz-client</artifactId>
                 <version>2.3</version>
-                <!-- We need to supply a modified jar WITHOUT Example.class in the jar 
-					root for BND to build -->
-                <!-- <scope>system</scope> -->
-                <!-- <systemPath>${basedir}/lib/authz-client-2.3-modified.jar</systemPath> -->
             </dependency>
             <!-- EELF logging framework -->
             <dependency>
@@ -496,6 +367,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+
     <!-- ================================================================================== -->
     <!-- Define common plugins and make them available for all modules -->
     <!-- ================================================================================== -->
@@ -703,6 +576,8 @@
             -->
         </plugins>
     </build>
+
+
     <!-- ================================================================================== -->
     <!-- The modules we build every time -->
     <!-- ================================================================================== -->