X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=caba0b2e3677544e6c631b0da43491679f49717f;hb=2d0e9d3450ceac0afdf0cd721ef65d87e94e456e;hp=09d51dadeb7d72a8593da0a9d012897a0821d5d5;hpb=df1c3a5b0862a881a1159e5c350eae7982bb9663;p=appc.git

diff --git a/pom.xml b/pom.xml
index 09d51dade..caba0b2e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 ============LICENSE_START=======================================================
 ONAP : APPC
 ================================================================================
-Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
 ================================================================================
 Copyright (C) 2017 Amdocs
 =============================================================================
@@ -25,7 +25,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.3.2</version>
     </parent>
 
 
@@ -33,7 +33,7 @@ limitations under the License.
     <packaging>pom</packaging>
     <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.6.3</version>
     <name>appc</name>
     <description>Construct the Application Controller component for the ECOMP project.</description>
     <inceptionYear>2015-07-20</inceptionYear>
@@ -49,7 +49,7 @@ limitations under the License.
         <!-- VERSIONS -->
 
 
-        <cdp.pal.version>1.1.25.6-oss</cdp.pal.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>
@@ -85,9 +85,9 @@ limitations under the License.
 
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         
-        <sdnctl.dblib.version>0.2.1-SNAPSHOT</sdnctl.dblib.version>
-        <sdnctl.sli.version>0.2.1-SNAPSHOT</sdnctl.sli.version>
-        <ccsdk.sli.adaptors.version>0.2.1-SNAPSHOT</ccsdk.sli.adaptors.version>
+        <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>
@@ -95,11 +95,10 @@ limitations under the License.
         <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.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>
-        <odl.karaf.empty.distro.version>1.8.3-Carbon</odl.karaf.empty.distro.version>
 
     </properties>
 
@@ -219,21 +218,11 @@ limitations under the License.
                 <artifactId>sal-binding-config</artifactId>
                 <version>${odl.mdsal.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-api</artifactId>
-                <version>${odl.mdsal.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <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>
@@ -268,20 +257,14 @@ limitations under the License.
                 <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>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-inet-types</artifactId>
+                <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</artifactId>
+                <artifactId>ietf-yang-types-20130715</artifactId>
                 <version>${odl.ietf-yang-types.version}</version>
             </dependency>
             <!-- CURRENTLY DOES NOT EXIST IN 3.0. Replacement? -->
@@ -289,7 +272,6 @@ limitations under the License.
             <!-- <dependency> -->
             <!-- <groupId>org.opendaylight.yangtools</groupId> -->
             <!-- <artifactId>features-test</artifactId> -->
-            <!-- <version>${odl.yangtools.version}</version> -->
             <!-- <scope>test</scope> -->
             <!-- </dependency> -->
 
@@ -382,7 +364,7 @@ limitations under the License.
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
-				<version>${logback.version}</version>
+		<version>${logback.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
@@ -404,7 +386,17 @@ limitations under the License.
             <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>
@@ -437,7 +429,7 @@ limitations under the License.
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
-                <version>1.2.3</version>
+                <version>2.1.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -549,18 +541,6 @@ limitations under the License.
             </plugins>
         </pluginManagement>
         <plugins>
-            <!--maven staging plugin -->
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>${onap.nexus.url}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
-                </configuration>
-            </plugin>
             <!-- Javadocs Plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -628,7 +608,7 @@ limitations under the License.
     <!-- The modules we build every time -->
     <!-- ================================================================================== -->
     <modules>
-        <module>appc-common</module>
+        <module>appc-core</module>
     </modules>
     <!-- Adding profiles for testing -->
     <profiles>
@@ -646,7 +626,6 @@ limitations under the License.
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>appc-common</module>
                 <module>appc-adapters</module>
                 <module>appc-provider</module>
                 <module>appc-event-listener</module>
@@ -658,8 +637,7 @@ limitations under the License.
                 <module>appc-outbound</module>
                 <module>appc-inbound</module>
                 <module>appc-sequence-generator</module>
-                <module>appc-client</module>
-                <module>appc-test-dependencies</module>
+<!--                 <module>appc-client</module> -->
             </modules>
         </profile>
         <profile>