Fix CCSDK docker version

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

diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index a8b2ee1..44870fa 100644 (file)
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/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>
@@ -14,12 +15,13 @@
        <artifactId>installation-dgbuilder</artifactId>
        <version>1.3.2-SNAPSHOT</version>
 
-    <name>sdnc-oam :: installation :: ${project.artifactId}</name>
+       <name>sdnc-oam :: installation :: ${project.artifactId}</name>
        <description>Creates docker container for dgbuilder</description>
 
        <properties>
                <image.name>onap/dgbuilder-sdnc-image</image.name>
                <sdnc.project.version>${project.version}</sdnc.project.version>
+               <ccsdk.docker.version>0.3-STAGING-latest</ccsdk.docker.version>
        </properties>
 
 
@@ -39,19 +41,26 @@
                                                <configuration>
                                                        <source>
                                                                println project.properties['sdnc.project.version'];
-                                                               def versionArray;
-                                                               if ( project.properties['sdnc.project.version'] != null ) {
-                                                                       versionArray =
-                                                                       project.properties['sdnc.project.version'].split('\\.');
+                                                               def
+                                                               versionArray;
+                                                               if ( project.properties['sdnc.project.version'] !=
+                                                               null ) {
+                                                               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:' +
+                                                               println 'New Tag
+                                                               for docker:' +
                                                                project.properties['project.docker.latesttag.version'];
                                                        </source>
                                                </configuration>
@@ -131,35 +140,35 @@
                                <groupId>org.codehaus.mojo</groupId>
                                <version>1.5.0</version>
                                <executions>
-                                       <execution>
-                                               <id>Make-stage-dir</id>
-                                               <phase>generate-sources</phase>
-                                               <goals>
-                                                       <goal>exec</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <executable>/bin/mkdir</executable>
-                                                       <arguments>
-                                                       <argument>-p</argument>
-                                                       <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
-                                                       </arguments>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>Unzip dgbuilder</id>
-                                               <phase>generate-sources</phase>
-                                               <goals>
-                                                       <goal>exec</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <executable>/usr/bin/unzip</executable>
-                                                       <arguments>
-                                                       <argument>-d</argument>
-                                                       <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
-                                                       <argument>../../dgbuilder/target/*.zip</argument>
-                                                       </arguments>
-                                               </configuration>
-                                       </execution>
+                                       <execution>
+                                               <id>Make-stage-dir</id>
+                                               <phase>generate-sources</phase>
+                                               <goals>
+                                                       <goal>exec</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <executable>/bin/mkdir</executable>
+                                                       <arguments>
+                                                               <argument>-p</argument>
+                                                               <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
+                                                       </arguments>
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <id>Unzip dgbuilder</id>
+                                               <phase>generate-sources</phase>
+                                               <goals>
+                                                       <goal>exec</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <executable>/usr/bin/unzip</executable>
+                                                       <arguments>
+                                                               <argument>-d</argument>
+                                                               <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
+                                                               <argument>../../dgbuilder/target/*.zip</argument>
+                                                       </arguments>
+                                               </configuration>
+                                       </execution>
                                        <execution>
                                                <id>Copy dgbuilder</id>
                                                <phase>generate-sources</phase>
@@ -195,7 +204,7 @@
 
                                        <execution>
                                                <id>change shell permissions</id>
-                                               <phase>process-sources</phase>
+                                               <phase>process-sources</phase>
                                                <goals>
                                                        <goal>exec</goal>
                                                </goals>