X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=4dca1892e9d93f53cb6faf0a700589101e8993e0;hb=refs%2Fchanges%2F49%2F82649%2F3;hp=cda2db0667aa92f0659baaadb4b21925a2842b6e;hpb=84d0a254bd9fd2779a116edc1901260bd2c7d11e;p=appc.git

diff --git a/pom.xml b/pom.xml
index cda2db066..4dca1892e 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.2-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
 
 
@@ -33,7 +33,7 @@ limitations under the License.
     <packaging>pom</packaging>
     <groupId>org.onap.appc</groupId>
     <artifactId>appc</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</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>
@@ -95,8 +95,8 @@ 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>
@@ -229,11 +229,6 @@ limitations under the License.
                 <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>
@@ -276,12 +271,12 @@ limitations under the License.
             </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 +284,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 +376,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 +398,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>
@@ -628,7 +632,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 +650,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>