Added groovy step and set version 1.0.0

Issue-ID: OPTFRA-373
Change-Id: I6c024328689cee15da193a9712dd1dfd09df15ef
Signed-off-by: Jerry Flood <jflood@att.com>

5 files changed, 125 insertions, 3 deletions

diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml
index 1b4833a..1cae77e 100644
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -41,12 +41,17 @@
  

 	<groupId>org.onap.optf.cmso</groupId>

 	<artifactId>liquibase</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

+	<version>1.0.0-SNAPSHOT</version>

 

 	<name>liquibase</name>

 	<description>Liquibase project for Spring Boot</description>

 

 	<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>liquibase</service.name>

 		<release-tag>Casablanca</release-tag>

 		<name.space>org.onap.optf</name.space>

@@ -131,6 +136,22 @@
 				</configuration>

 			</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>

 			        <groupId>io.fabric8</groupId>

 			        <artifactId>docker-maven-plugin</artifactId>

 			        <version>0.26.0</version>

diff --git a/cmso-database/src/main/script/TagVersion.groovy b/cmso-database/src/main/script/TagVersion.groovy
new file mode 100644
index 0000000..c682f7f
--- /dev/null
+++ b/cmso-database/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
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
diff --git a/version.properties b/version.properties
index 22353f7..3e0ea3f 100644
--- a/version.properties
+++ b/version.properties
@@ -25,7 +25,7 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major=3
+major=1
 minor=0
 patch=0