Added groovy step and set version 1.0.0

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

diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml
index 1b4833a..1cae77e 100644 (file)
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -41,12 +41,17 @@
  \r
        <groupId>org.onap.optf.cmso</groupId>\r
        <artifactId>liquibase</artifactId>\r
-       <version>3.0.0-SNAPSHOT</version>\r
+       <version>1.0.0-SNAPSHOT</version>\r
 \r
        <name>liquibase</name>\r
        <description>Liquibase project for Spring Boot</description>\r
 \r
        <properties>\r
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>\r
+       \r
+               <cmso.project.version>${project.version}</cmso.project.version>\r
+               <cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>\r
+\r
                <service.name>liquibase</service.name>\r
                <release-tag>Casablanca</release-tag>\r
                <name.space>org.onap.optf</name.space>\r
@@ -130,6 +135,22 @@
                                        <propertyFile>etc/config/liquibase.properties</propertyFile>\r
                                </configuration>\r
                        </plugin>\r
+                       <plugin>\r
+                               <groupId>org.codehaus.groovy.maven</groupId>\r
+                               <artifactId>gmaven-plugin</artifactId>\r
+                               <version>1.0</version>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <phase>validate</phase>\r
+                                               <goals>\r
+                                                       <goal>execute</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <source>${project.basedir}/src/main/script/TagVersion.groovy</source>\r
+                                               </configuration>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>                       \r
                        <plugin>\r
                                <groupId>io.fabric8</groupId>\r
                                <artifactId>docker-maven-plugin</artifactId>\r

diff --git a/cmso-database/src/main/script/TagVersion.groovy b/cmso-database/src/main/script/TagVersion.groovy
new file mode 100644 (file)
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 (file)
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -43,12 +43,17 @@
        \r
        <groupId>org.onap.optf.cmso</groupId>\r
        <artifactId>cmso-service</artifactId>\r
-       <version>3.0.0-SNAPSHOT</version>\r
+       <version>1.0.0-SNAPSHOT</version>\r
        <packaging>jar</packaging>\r
 \r
        <name>cmso</name>\r
 \r
        <properties>\r
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>\r
+       \r
+               <cmso.project.version>${project.version}</cmso.project.version>\r
+               <cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>\r
+               \r
                <service.name>cmso</service.name>\r
                <release-tag>Casablanca</release-tag>\r
                <name.space>org.onap.optf.cmso</name.space>\r
@@ -353,6 +358,22 @@
                                        </execution>\r
                                </executions>\r
                        </plugin>\r
+                       <plugin>\r
+                               <groupId>org.codehaus.groovy.maven</groupId>\r
+                               <artifactId>gmaven-plugin</artifactId>\r
+                               <version>1.0</version>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <phase>validate</phase>\r
+                                               <goals>\r
+                                                       <goal>execute</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <source>${project.basedir}/src/main/script/TagVersion.groovy</source>\r
+                                               </configuration>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>                       \r
                        <plugin>\r
                                <artifactId>exec-maven-plugin</artifactId>\r
                                <groupId>org.codehaus.mojo</groupId>\r

diff --git a/cmso-service/src/main/script/TagVersion.groovy b/cmso-service/src/main/script/TagVersion.groovy
new file mode 100644 (file)
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 (file)
--- 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