From 80e3241025db5028298050babb4a9fa5013da3d8 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 25 Oct 2018 09:29:35 -0400
Subject: Fix CCSDK docker version

Update CCSDK docker versions used to build SDNC docker containers.

Change-Id: I927eefc2fe24fec88039548123a253d14c73b9a7
Issue-ID: SDNC-486
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

Former-commit-id: 6594205cdf4cad435a0d37d90820e83e14f5ccd5
---
 installation/admportal/pom.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'installation/admportal/pom.xml')

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 1edf61ec..0b0959c3 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
@@ -20,7 +21,8 @@
 	<properties>
 		<image.name>onap/admportal-sdnc-image</image.name>
 		<sdnc.project.version>${project.version}</sdnc.project.version>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+		<ccsdk.docker.version>0.3-STAGING-latest</ccsdk.docker.version>
+		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 	</properties>
 
 
@@ -41,18 +43,18 @@
 								println project.properties['sdnc.project.version'];
 								def versionArray;
 								if ( project.properties['sdnc.project.version'] != null ) {
-									versionArray =
-									project.properties['sdnc.project.version'].split('\\.');
+								    versionArray =
+								    project.properties['sdnc.project.version'].split('\\.');
 								}
 
-								if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
-									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+								if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT"))
+								{
+								    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 								} else {
-									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+								    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 								}
 
-								println 'New Tag for docker:' +
-								project.properties['project.docker.latesttag.version'];
+								println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
 							</source>
 						</configuration>
 					</execution>
-- 
cgit 1.2.3-korg