From: Dan Timoney <dtimoney@att.com>
Date: Wed, 12 Aug 2020 11:54:49 +0000 (+0000)
Subject: Merge "Fix dependencies to use released Guilin artifacts"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=580834ea5b603cb93444fe8d5576e3cf961c6e8b;hp=baa9f5741d65d515b13dbeeda13501711d32dff4;p=sdnc%2Foam.git

Merge "Fix dependencies to use released Guilin artifacts"
---

diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index f91ddfcd..e068aae5 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -23,7 +23,7 @@
         <image.name>onap/sdnc-ansible-server-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <ccsdk.docker.version>0.7-STAGING-latest</ccsdk.docker.version>
+        <ccsdk.docker.version>1.0-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index aa72d422..cd2057c5 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -23,7 +23,7 @@
         <image.name>onap/sdnc-dmaap-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <ccsdk.docker.version>0.7-STAGING-latest</ccsdk.docker.version>
+        <ccsdk.docker.version>1.0-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index abc69283..691404e8 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -25,7 +25,7 @@
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
         <sdnc.northbound.version>2.0.0</sdnc.northbound.version>
-        <ccsdk.docker.version>1.0.0-STAGING-latest</ccsdk.docker.version>
+        <ccsdk.docker.version>1.0-STAGING-latest</ccsdk.docker.version>
         <ccsdk.features.version>1.0.0</ccsdk.features.version>
         <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
         <sdnc.keypass><![CDATA[ff^G9D]yf&r}Ktum@BJ0YB?N]]></sdnc.keypass>
@@ -44,13 +44,6 @@
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>vnfapi-installer</artifactId>
-            <version>${sdnc.northbound.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-       </dependency>
        <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>optical-service-installer</artifactId>
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index eabd44b1..54ea830f 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -23,7 +23,7 @@
         <image.name>onap/sdnc-ueb-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <ccsdk.docker.version>0.7-STAGING-latest</ccsdk.docker.version>
+        <ccsdk.docker.version>1.0-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <docker.push.phase>deploy</docker.push.phase>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>