X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=fb6a0d90fff1bd87fbde38997189375737b85134;hb=32eeb6048b6fbf61f9326207c14e3aeb1c347668;hp=1c5673e95945095ebc529f36832616edb1c451de;hpb=41144ddcdb130de4685896a6c1ba49a790ca5cb4;p=appc.git

diff --git a/pom.xml b/pom.xml
index 1c5673e95..fb6a0d90f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,133 +1,108 @@
 <?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>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Copyright (C) 2017 Amdocs
+=============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
+-->
+<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.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.0.3</version>
     </parent>
+
+
+    <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
-    <groupId>org.openecomp.appc</groupId>
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>APP-C</name>
+    <version>1.6.0</version>
+    <name>appc</name>
     <description>Construct the Application Controller component for the ECOMP project.</description>
     <inceptionYear>2015-07-20</inceptionYear>
     <organization>
         <name>OpenECOMP</name>
     </organization>
+
+
     <!-- ================================================================================== -->
     <!-- Configuration properties -->
     <!-- ================================================================================== -->
     <properties>
-        <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.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 -->
+        <!-- VERSIONS -->
+
+
+        <cdp.pal.version>1.1.25.8-oss</cdp.pal.version>
+        <dmaap.client.version>1.1.5</dmaap.client.version>
+        <eelf.version>1.0.0</eelf.version>
+        <eelf.maven.plugin.version>1.0.0</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>
+        <bundle.plugin.version>2.5.0</bundle.plugin.version>
+        <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>
+        <commons.lang3.version>3.4</commons.lang3.version>
+        <antlr.version>4.5.1</antlr.version>
+        <logback.version>1.2.0</logback.version>
+        <toscalib.version>1.1.0</toscalib.version>
+        <sdc-client.version>1.3.0</sdc-client.version>
+        <jackson.yml.version>2.3.2</jackson.yml.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.reportPath>${project.build.directory}/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
         <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
-        <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> -->
+
         <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>target/generated-sources/yang-gen-config</jmxGeneratorPath>
+        <!-- <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath> -->
+
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        
+        <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
+        <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
+        <!-- <ccsdk.sli.adaptors.version>${ccsdk.sli.adaptors.version}</ccsdk.sli.adaptors.version> -->
+        <commons.collections.version>3.2.2</commons.collections.version>
+        <odl.sal.api.gen.plugin.version>0.11.1</odl.sal.api.gen.plugin.version>
+        <odl.yangtools.version>1.2.1</odl.yangtools.version>
+        <odl.mdsal.yang.binding.version>0.11.1</odl.mdsal.yang.binding.version>
+        <odl.mdsal.version>1.6.1</odl.mdsal.version>
+        <odl.mdsal.features.version>2.3.1</odl.mdsal.features.version>
+        <odl.yang.jmx.generator.version>0.7.1</odl.yang.jmx.generator.version>
+        <odl.ietf-yang-types.version>2013.07.15.13.1</odl.ietf-yang-types.version>
+        <odl.ietf-inet-types.version>1.5.1</odl.ietf-inet-types.version>
+        <odl.controller.config.api.version>0.7.1</odl.controller.config.api.version>
+        <odl.commons.opendaylight.version>2.0.5</odl.commons.opendaylight.version>
+
     </properties>
+
+
     <!-- ================================================================================== -->
     <!-- Javadoc Generation Plugin -->
     <!-- ================================================================================== -->
@@ -136,9 +111,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
+                <version>2.10</version>
                 <configuration>
-                    <excludePackageNames>org.openecomp.sdnc</excludePackageNames>
+                    <excludePackageNames>org.onap.ccsdk.sli</excludePackageNames>
                     <failOnError>false</failOnError>
                     <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
                     <docletArtifact>
@@ -152,25 +127,30 @@
             </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.openecomp.org/repository/app-c-javadoc/${project.version}</url>
+            <id>ecomp-site</id>
+            <url>dav:${onap.nexus.url}/content/sites/site/org/onap/appc/${project.version}</url>
         </site>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>openecomp-repository-releases</name>
+            <url>${onap.nexus.url}/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>openecomp-repository-snapshots</name>
+            <url>${onap.nexus.url}/content/repositories/snapshots</url>
+        </snapshotRepository>
     </distributionManagement>
-    <!-- ================================================================================== -->
-    <!-- The SCM repository we are using -->
-    <!-- ================================================================================== -->
-    <!-- <scm>
-		<connection></connection>
-		<developerConnection></developerConnection>
-		<url></url>
-		<tag></tag>
-	</scm> -->
+
+
     <!-- ================================================================================== -->
     <!-- Define plugin repositories -->
     <!-- ================================================================================== -->
@@ -210,12 +190,24 @@
             <url>http://maven.restlet.com</url>
         </pluginRepository>
     </pluginRepositories>
+
+
     <!-- ================================================================================== -->
     <!-- Define project-wide dependencies -->
     <!-- ================================================================================== -->
     <dependencyManagement>
         <dependencies>
-            <!-- ODL -->
+              <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>22.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-testlib</artifactId>
+        <version>22.0</version>
+        <scope>test</scope>
+      </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>config-api</artifactId>
@@ -224,87 +216,70 @@
             <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>
                 <artifactId>yang-binding</artifactId>
-                <version>${odl.yangtools.version}</version>
+                <version>${odl.mdsal.yang.binding.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-common</artifactId>
                 <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>
+                <version>${odl.mdsal.features.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>features-mdsal</artifactId>
-                <version>2.0.2-Beryllium-SR2</version>
+                <version>${odl.mdsal.features.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>opendaylight-karaf-empty</artifactId>
-                <version>${odl.karaf.empty.distro.version}</version>
-                <type>zip</type>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-inet-types-2013-07-15</artifactId>
+                <version>${odl.ietf-inet-types.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>ietf-yang-types-20130715</artifactId>
+                <version>${odl.ietf-yang-types.version}</version>
             </dependency>
             <!-- CURRENTLY DOES NOT EXIST IN 3.0. Replacement? -->
             <!-- Required for launching the feature tests -->
             <!-- <dependency> -->
             <!-- <groupId>org.opendaylight.yangtools</groupId> -->
             <!-- <artifactId>features-test</artifactId> -->
-            <!-- <version>${odl.yangtools.version}</version> -->
             <!-- <scope>test</scope> -->
             <!-- </dependency> -->
+
             <!-- YANG tools -->
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
@@ -315,50 +290,50 @@
             </dependency>
             <!-- SDNC -->
             <dependency>
-                <groupId>org.openecomp.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-common</artifactId>
                 <version>${sdnctl.sli.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-provider</artifactId>
                 <version>${sdnctl.sli.version}</version>
             </dependency>
             <!-- dblib -->
             <dependency>
-                <groupId>org.openecomp.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <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>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>aai-service-provider</artifactId>
                 <version>${sdnctl.aai.service.version}</version>
             </dependency>
             <!-- APPC -->
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-features</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-model</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-bundle</artifactId>
                 <version>${project.version}</version>
                 <classifier>config</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
-                <groupId>org.openecomp.appc</groupId>
+                <groupId>org.onap.appc</groupId>
                 <artifactId>appc-controller-bundle</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -379,23 +354,35 @@
                 <version>4.12</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>3.9.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-guava</artifactId>
+                <version>3.1.0</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
-                <version>1.1.1</version>
+		<version>${logback.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.1.1</version>
+                <version>${logback.version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.12</version>
-            </dependency>
+            <!-- <dependency> -->
+            <!-- <groupId>org.slf4j</groupId> -->
+            <!-- <artifactId>slf4j-api</artifactId> -->
+            <!-- <version>1.7.12</version> -->
+            <!-- </dependency> -->
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
@@ -404,12 +391,17 @@
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-core</artifactId>
-                <version>0.12.0</version>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-sftp</artifactId>
+                <version>2.0.0</version>
             </dependency>
             <dependency>
-                <groupId>javax.jms</groupId>
-                <artifactId>jms</artifactId>
-                <version>1.1</version>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-scp</artifactId>
+                <version>2.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
@@ -417,17 +409,6 @@
                 <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>
@@ -438,55 +419,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>
@@ -494,8 +430,22 @@
                 <artifactId>eelf-core</artifactId>
                 <version>${eelf.version}</version>
             </dependency>
+            <!-- Maria DB -->
+            <dependency>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>2.1.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+    </dependencies>
+
+
     <!-- ================================================================================== -->
     <!-- Define common plugins and make them available for all modules -->
     <!-- ================================================================================== -->
@@ -521,10 +471,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${maven.compile.plugin.version}</version>
-                    <configuration>
-                        <source>${java.version.source}</source>
-                        <target>${java.version.target}</target>
-                    </configuration>
                 </plugin>
                 <!-- Define the javadoc plugin -->
                 <plugin>
@@ -532,7 +478,7 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>2.10</version>
                     <configuration>
-                        <excludePackageNames>org.opendaylight.*:org.openecomp.sdnc</excludePackageNames>
+                        <excludePackageNames>org.opendaylight.*:org.onap.ccsdk.sli</excludePackageNames>
                     </configuration>
                 </plugin>
                 <!-- Define the source plugin -->
@@ -592,11 +538,10 @@
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>1.9.1</version>
                 </plugin>
-                <!-- SonarQube plugin -->
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.2</version>
+                  <groupId>org.sonarsource.scanner.maven</groupId>
+                  <artifactId>sonar-maven-plugin</artifactId>
+                  <version>3.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -614,36 +559,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <!-- license plugin -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>1.10</version>
-                <configuration>
-                    <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-                    <processStartTag>============LICENSE_START=======================================================</processStartTag>
-                    <processEndTag>============LICENSE_END=========================================================</processEndTag>
-                    <sectionDelimiter>================================================================================</sectionDelimiter>
-                    <licenseName>apache_v2</licenseName>
-                    <inceptionYear>2017</inceptionYear>
-                    <organizationName>AT&amp;T Intellectual Property. All rights
-						reserved.</organizationName>
-                    <projectName>openECOMP : APP-C</projectName>
-                    <canUpdateCopyright>true</canUpdateCopyright>
-                    <canUpdateDescription>true</canUpdateDescription>
-                    <canUpdateLicense>true</canUpdateLicense>
-                    <emptyLineAfterHeader>true</emptyLineAfterHeader>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>first</id>
-                        <goals>
-                            <goal>update-file-header</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
@@ -666,36 +581,39 @@
                         </configuration>
                     </execution>
                 </executions>
+
             </plugin>
+
             <!-- blackduck maven plugin -->
-            <!--
+            <!-- <plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId>
+                <version>2.0.0</version> <inherited>false</inherited> <configuration> <hubProjectName>${project.name}</hubProjectName>
+                <outputDirectory>${project.basedir}</outputDirectory> <deployHubBdio>false</deployHubBdio>
+                </configuration> <executions> <execution> <id>create-bdio-file</id> <phase>package</phase>
+                <goals> <goal>build-bom</goal> </goals> </execution> </executions> </plugin> -->
+
+            <!-- force Eclipse to skip the additional-install step specified in the
+                org.opendaylight.odlparent:odlparent-lite:1.7.1-Boron-SR1.pom profile -->
             <plugin>
-                <groupId>com.blackducksoftware.integration</groupId>
-                <artifactId>hub-maven-plugin</artifactId>
-                <version>1.4.0</version>
-                <inherited>false</inherited>
-                <configuration>
-                    <hubProjectName>${project.name}</hubProjectName>
-                    <outputDirectory>${project.basedir}</outputDirectory>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>create-bdio-file</id>
-                        <phase>package</phase>
+                        <id>additional-install</id>
                         <goals>
-                            <goal>createHubOutput</goal>
+                            <goal>install-file</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
-            -->
         </plugins>
     </build>
+
+
     <!-- ================================================================================== -->
     <!-- The modules we build every time -->
     <!-- ================================================================================== -->
     <modules>
-        <module>appc-common</module>
+        <module>appc-core</module>
     </modules>
     <!-- Adding profiles for testing -->
     <profiles>
@@ -704,9 +622,6 @@
             <properties>
                 <ssl.allowall>true</ssl.allowall>
                 <ssl.insecure>true</ssl.insecure>
-                <openecomp.nexus.host>nexus.openecomp.org</openecomp.nexus.host>
-                <openecomp.nexus.release-url>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.release-url>
-                <openecomp.nexus.snapshot-url>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshot-url>
                 <openecomp.git.port>7999</openecomp.git.port>
                 <openecomp.git.project>st_osecomp</openecomp.git.project>
                 <openecomp.git.protocol>http</openecomp.git.protocol>
@@ -716,11 +631,18 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>appc-common</module>
                 <module>appc-adapters</module>
                 <module>appc-provider</module>
                 <module>appc-event-listener</module>
-                <module>appc-asdc-listener</module>
+                <module>appc-sdc-listener</module>
+                <module>appc-lifecycle-management</module>
+                <module>appc-oam</module>
+                <module>appc-config</module>
+                <module>appc-directed-graph</module>
+                <module>appc-outbound</module>
+                <module>appc-inbound</module>
+                <module>appc-sequence-generator</module>
+                <module>appc-client</module>
             </modules>
         </profile>
         <profile>