Fix CCSDK docker version

[sdnc/oam.git] / installation / admportal / pom.xml

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 1edf61e..0b0959c 100644 (file)
--- 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>