Release ccsdk/apps

[ccsdk/apps.git] / ms / vlantag-api / pom.xml

diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml
index ea46105..842d2ad 100644 (file)
--- a/ms/vlantag-api/pom.xml
+++ b/ms/vlantag-api/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.onap.ccsdk.apps.ms.vlantagapi</groupId>
     <artifactId>vlantag-api</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.6.1</version>
     <packaging>jar</packaging>
 
     <name>Vlantag API</name>
@@ -34,12 +34,13 @@
         <docker.push.phase>deploy</docker.push.phase>
         <docker.verbose>true</docker.verbose>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
+        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
     </properties>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.4.1</version>
         <relativePath/>
     </parent>
 
@@ -67,7 +68,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
-            <version>2.0.1.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -91,13 +91,11 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>${mariadb.connector.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.5.8</version>
         </dependency>
     </dependencies>
 
@@ -116,22 +114,7 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>
-                                println project.properties['ccsdk.project.version'];
-                                def versionArray;
-                                if (project.properties['ccsdk.project.version'] != null ) {
-                                    versionArray = project.properties['ccsdk.project.version'].split('\\.');
-                                }
-
-                                if (project.properties['ccsdk.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>
@@ -152,7 +135,7 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
                 <executions>
-                    <!-- Prepares the property pointing to the JaCoCo runtime agent which
+                    <!-- Prepares the property pointing to the JaCoCo runtime agent which 
                         is passed as VM argument when Maven the Surefire plugin is executed. -->
                     <execution>
                         <id>pre-unit-test</id>
@@ -165,7 +148,7 @@
                             <propertyName>surefireArgLine</propertyName>
                         </configuration>
                     </execution>
-                    <!-- Ensures that the code coverage report for unit tests is created
+                    <!-- Ensures that the code coverage report for unit tests is created 
                         after unit tests have been run. -->
                     <execution>
                         <id>post-unit-test</id>
@@ -234,8 +217,9 @@
                     <serverId>docker-hub</serverId>
                     <registryUrl>https://${docker.registry}</registryUrl>
                     <imageTags>
-                        <imageTag>${project.version}</imageTag>
-                        <imageTag>latest</imageTag>
+                        <imageTag>${project.docker.latestminortag.version}</imageTag>
+                        <imageTag>${project.docker.latestfulltag.version}</imageTag>
+                        <imageTag>${project.docker.latesttagtimestamp.version}</imageTag>
                     </imageTags>
                     <forceTags>true</forceTags>
                     <resources>