X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=3cf75ab008a412360c30c06f1892ee887cf932a5;hb=9f69f002bc27b24e849fb2048b0ee4a8224e1708;hp=4472c28ce07fa966fb3d636eeb5e7c657063855a;hpb=28da5021fad45b2c4da1bd1b7db794863e5ef7f3;p=appc.git

diff --git a/pom.xml b/pom.xml
index 4472c28ce..3cf75ab00 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
 =============================================================================
@@ -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.6.1</version>
     <name>appc</name>
     <description>Construct the Application Controller component for the ECOMP project.</description>
     <inceptionYear>2015-07-20</inceptionYear>
@@ -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>
 
@@ -263,20 +262,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? -->
@@ -284,7 +277,6 @@ limitations under the License.
             <!-- <dependency> -->
             <!-- <groupId>org.opendaylight.yangtools</groupId> -->
             <!-- <artifactId>features-test</artifactId> -->
-            <!-- <version>${odl.yangtools.version}</version> -->
             <!-- <scope>test</scope> -->
             <!-- </dependency> -->
 
@@ -554,18 +546,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>
@@ -633,7 +613,6 @@ limitations under the License.
     <!-- The modules we build every time -->
     <!-- ================================================================================== -->
     <modules>
-        <module>appc-parent</module>
         <module>appc-core</module>
     </modules>
     <!-- Adding profiles for testing -->
@@ -664,7 +643,6 @@ limitations under the License.
                 <module>appc-inbound</module>
                 <module>appc-sequence-generator</module>
                 <module>appc-client</module>
-                <module>appc-test-dependencies</module>
             </modules>
         </profile>
         <profile>