Fix docker tags

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

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 28e26b3..1bd3168 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -1,18 +1,17 @@
 <?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"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.2.1-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>installation-sdnc</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
 
        <name>sdnc-oam :: installation :: ${project.artifactId}</name>
        <description>Creates SDN Controller Docker container</description>
@@ -20,7 +19,9 @@
        <properties>
                <image.name>onap/sdnc-image</image.name>
                <sdnc.project.version>${project.version}</sdnc.project.version>
-               <sdnc.northbound.version>1.4.1-SNAPSHOT</sdnc.northbound.version>
+        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+               <sdnc.northbound.version>1.5.0-SNAPSHOT</sdnc.northbound.version>
+        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
                <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
                <docker.push.phase>deploy</docker.push.phase>
                <docker.verbose>true</docker.verbose>
@@ -72,21 +73,7 @@
                                                        <goal>execute</goal>
                                                </goals>
                                                <configuration>
-                                                       <source>
-                                                               println project.properties['sdnc.project.version'];
-                                                               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";
-                                                               } else {
-                                                                   project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-                                                               }
-
-                                                               println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
-                                                       </source>
+                            <source>${basedir}/../TagVersion.groovy</source>
                                                </configuration>
                                        </execution>
                                </executions>
@@ -95,7 +82,7 @@
                        <plugin>
                                <groupId>io.fabric8</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.16.5</version>
+                               <version>0.28.0</version>
                                <inherited>false</inherited>
                                <configuration>
                                        <images>
@@ -104,11 +91,11 @@
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                                               <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                                               <dockerFile>Dockerfile</dockerFile>
                                                                <tags>
-                                                                       <tag>${project.version}</tag>
-                                                                       <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-                                                                       <tag>${project.docker.latesttag.version}</tag>
+                                    <tag>${project.docker.latestminortag.version}</tag>
+                                    <tag>${project.docker.latestfulltag.version}</tag>
+                                    <tag>${project.docker.latesttagtimestamp.version}</tag>
                                                                </tags>
                                                        </build>
                                                </image>