Separate snapshot tag var names from original

[ccsdk/distribution.git] / odlsli / odlsli-alpine / pom.xml

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 86b92eb..847a4e6 100644 (file)
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli-alpine</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli-alpine</name>
@@ -24,7 +24,8 @@
         <base.image.name>onap/ccsdk-odl-sodium-alpine-image</base.image.name>
         <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+       <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+       <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <opendaylight.root>opt/opendaylight</opendaylight.root>
@@ -38,14 +39,14 @@
         </ccsdk.odl.features>
         <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
 
-        <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.oran.a1adapter.version>1.1.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <ccsdk.features.version>1.1.0</ccsdk.features.version>
+        <ccsdk.sli.core.version>1.1.0</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>1.1.0</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>1.1.0</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>1.1.0</ccsdk.sli.plugins.version>
+        <ccsdk.oran.a1adapter.version>1.1.0</ccsdk.oran.a1adapter.version>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
-    </properties>
+</properties>
 
     <dependencies>
         <dependency>
@@ -333,7 +334,7 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
+                            <source>${basedir}/../../src/main/scripts/TagSnapshotVersion.groovy</source>
                         </configuration>
                     </execution>
                 </executions>
@@ -605,10 +606,11 @@
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${project.docker.latestminortag.version}</tag>
-                                            <tag>${project.docker.latestfulltag.version}</tag>
-                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                        </tags>
+                                            <tag>${project.docker.latestminortag.snapshot.version}</tag>
+                                            <tag>${project.docker.latestfulltag.snapshot.version}</tag>
+                                            <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag>
+                                            <tag>${project.docker.uniquedockertag.snapshot.version}</tag>
+                                   </tags>
                                     </build>
                                 </image>
                             </images>
@@ -655,7 +657,7 @@
                                             </run>
                                         </image>
                                         <image>
-                                            <name>${image.name}:${project.docker.latesttagtimestamp.version}</name>
+                                            <name>${image.name}:${project.docker.latesttagtimestamp.snapshot.version}</name>
                                             <alias>odlsli-container</alias>
                                             <run>
                                                 <env>
@@ -673,7 +675,7 @@
                                                     <mode>custom</mode>
                                                     <name>onap</name>
                                                     <alias>odlsli</alias>
-                                                </network>>
+                                                </network>&gt;
                                                 <ports>
                                                     <port>odlsli.port:8181</port>
                                                 </ports>