2 files changed, 62 insertions, 1 deletions
diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index 9db329a..0c2e45a 100644
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -43,12 +43,17 @@
 	
 	<groupId>org.onap.optf.cmso</groupId>
 	<artifactId>cmso-service</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>cmso</name>
 
 	<properties>
+		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+	
+		<cmso.project.version>${project.version}</cmso.project.version>
+		<cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>
+		
 		<service.name>cmso</service.name>
 		<release-tag>Casablanca</release-tag>
 		<name.space>org.onap.optf.cmso</name.space>
@@ -354,6 +359,22 @@
 				</executions>
 			</plugin>
 			<plugin>
+				<groupId>org.codehaus.groovy.maven</groupId>
+				<artifactId>gmaven-plugin</artifactId>
+				<version>1.0</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>execute</goal>
+						</goals>
+						<configuration>
+							<source>${project.basedir}/src/main/script/TagVersion.groovy</source>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>			
+			<plugin>
 				<artifactId>exec-maven-plugin</artifactId>
 				<groupId>org.codehaus.mojo</groupId>
 			</plugin>
diff --git a/cmso-service/src/main/script/TagVersion.groovy b/cmso-service/src/main/script/TagVersion.groovy
new file mode 100644
index 0000000..c682f7f
--- /dev/null
+++ b/cmso-service/src/main/script/TagVersion.groovy
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CMSO
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * 
+ */
+
+package org.onap.cmso.maven.scripts
+
+println project.properties['cmso.project.version']; 
+def versionArray; 
+if ( project.properties['cmso.project.version'] != null ) { 
+    versionArray = project.properties['cmso.project.version'].split('\\.'); 
+} 
+
+if ( project.properties['cmso.project.version'].endsWith("-SNAPSHOT") ) { 
+    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+    project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-"+project.properties['cmso.build.timestamp']; 
+} else { 
+    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+    project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-"+project.properties['cmso.build.timestamp'];
+} 
+
+println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
+\ No newline at end of file