X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=812bfb8587eeb3694fbbe074f3e89b92e5c46dde;hb=refs%2Fheads%2Fcasablanca;hp=5348062f798494b5b8390caf84a9d2b33d423bfd;hpb=f0f51b3047ea290e2280af64b39ca0983f3377f5;p=appc.git

diff --git a/pom.xml b/pom.xml
index 5348062f7..812bfb858 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2017-2018 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.onap.oparent</groupId>
-        <artifactId>oparent</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.1.0-SNAPSHOT</version>
-    <name>APP-C</name>
+    <version>1.4.4-SNAPSHOT</version>
+    <name>appc</name>
     <description>Construct the Application Controller component for the ECOMP project.</description>
     <inceptionYear>2015-07-20</inceptionYear>
     <organization>
@@ -26,37 +47,12 @@
     <!-- ================================================================================== -->
     <properties>
         <!-- VERSIONS -->
-        <!-- OpenDaylight Versions -->
-        <odl.version>1.7.1-Boron-SR1</odl.version>
-        <odl.dlux.version>0.4.1-Boron-SR1</odl.dlux.version>
-        <odl.yangtools.version>1.0.1-Boron-SR1</odl.yangtools.version>
-        <odl.mdsal.version>1.4.1-Boron-SR1</odl.mdsal.version>
-        <odl.mdsal.features.version>2.1.1-Boron-SR1</odl.mdsal.features.version>
-        <odl.controller.mdsal.features.version>1.4.1-Boron-SR1</odl.controller.mdsal.features.version>
-        <odl.mdsal.model.version>0.9.1-Boron-SR1</odl.mdsal.model.version>
-        <odl.mdsal.yang.binding.version>0.9.1-Boron-SR1</odl.mdsal.yang.binding.version>
-        <odl.restconf.version>1.4.1-Boron-SR1</odl.restconf.version>
-        <odl.controller.model.version>${odl.mdsal.model.version}</odl.controller.model.version>
-        <odl.controller.config.api.version>0.5.1-Boron-SR1</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.9.1-Boron-SR1</odl.ietf-inet-types.version>
-        <odl.ietf-yang-types.version>2010.09.24.9.1-Boron-SR1</odl.ietf-yang-types.version>
-        <odl.yang.jmx.generator.version>0.5.1-Boron-SR1</odl.yang.jmx.generator.version>
-        <odl.yangtools.yang.maven.plugin.version>${odl.yangtools.version}</odl.yangtools.yang.maven.plugin.version>
-        <odl.sal.api.gen.plugin.version>0.9.1-Boron-SR1</odl.sal.api.gen.plugin.version>
-        <broker-mdsal.version>1.4.1-Boron-SR1</broker-mdsal.version>
 
-        <!-- OPENECOMP SDNC versions -->
-        <sdnctl.sli.version>1.1.2-SNAPSHOT</sdnctl.sli.version>
-        <sdnctl.dblib.version>1.1.2-SNAPSHOT</sdnctl.dblib.version>
-        <sdnctl.aai.service.version>1.1.2-SNAPSHOT</sdnctl.aai.service.version>
-        <openecomp.sdnc.sql-resource.version>1.1.2-SNAPSHOT</openecomp.sdnc.sql-resource.version>
 
-        <cdp.pal.version>1.1.7-oss</cdp.pal.version>
-        <dmaap.client.version>0.2.12</dmaap.client.version>
-        <eelf.version>0.0.1</eelf.version>
-        <eelf.maven.plugin.version>0.0.1</eelf.maven.plugin.version>
+        <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>
@@ -66,10 +62,9 @@
         <apache.httpcomponents.version>4.4</apache.httpcomponents.version>
         <commons.lang3.version>3.4</commons.lang3.version>
         <antlr.version>4.5.1</antlr.version>
-        <mysql.connector.version>5.1.39</mysql.connector.version>
-        <logback.version>1.1.1</logback.version>
+        <logback.version>1.2.0</logback.version>
         <toscalib.version>1.1.0</toscalib.version>
-        <sdc-client.version>1.1.13-SNAPSHOT</sdc-client.version>
+        <sdc-client.version>1.3.0</sdc-client.version>
         <jackson.yml.version>2.3.2</jackson.yml.version>
 
         <!-- SONAR -->
@@ -88,6 +83,24 @@
         <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>2010.09.24.11.1</odl.ietf-yang-types.version>
+        <odl.ietf-inet-types.version>2010.09.24.11.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>
+        <odl.karaf.empty.distro.version>1.8.3-Carbon</odl.karaf.empty.distro.version>
+
     </properties>
 
 
@@ -101,7 +114,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <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>
@@ -124,8 +137,18 @@
         <!-- This site is used for Javadocs -->
         <site>
             <id>ecomp-site</id>
-            <url>dav:${onap.nexus.url}/sites/site/org/onap/appc/${project.version}</url>
+            <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>
 
 
@@ -175,14 +198,17 @@
     <!-- ================================================================================== -->
     <dependencyManagement>
         <dependencies>
-            <!-- ODL -->
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odlparent</artifactId>
-                <version>1.7.1-Boron-SR1</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
+              <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>
@@ -203,11 +229,6 @@
                 <artifactId>sal-test-model</artifactId>
                 <version>${odl.mdsal.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>sal-rest-connector</artifactId>
-                <version>${odl.mdsal.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-broker-impl</artifactId>
@@ -231,7 +252,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>features-mdsal</artifactId>
-                <version>${odl.controller.mdsal.features.version}</version>
+                <version>${odl.mdsal.features.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
@@ -277,50 +298,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 
+            <!-- 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>
@@ -341,16 +362,28 @@
                 <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> -->
@@ -366,7 +399,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>org.apache.sshd</groupId>
+                <artifactId>sshd-scp</artifactId>
+                <version>2.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
@@ -395,8 +438,20 @@
                 <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>
 
 
     <!-- ================================================================================== -->
@@ -431,7 +486,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 -->
@@ -550,10 +605,10 @@
             </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> 
+            <!-- <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
@@ -578,7 +633,7 @@
     <!-- The modules we build every time -->
     <!-- ================================================================================== -->
     <modules>
-        <module>appc-common</module>
+        <module>appc-core</module>
     </modules>
     <!-- Adding profiles for testing -->
     <profiles>
@@ -596,11 +651,10 @@
                 <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>
@@ -608,6 +662,8 @@
                 <module>appc-outbound</module>
                 <module>appc-inbound</module>
                 <module>appc-sequence-generator</module>
+                <module>appc-client</module>
+                <module>appc-test-dependencies</module>
             </modules>
         </profile>
         <profile>