Merge pull request #1441 from grails/extractProjectVersion

Simplify project version property

Author: puneetbehl

build.gradle

@@ -13,20 +13,9 @@ buildscript {
 
 project.ext {
     isTravisBuild = System.getenv().get("TRAVIS") == 'true'
-
-    projectMajorVersion = "7"
-    projectMinorVersion = "0"
-    projectPatchVersion = "9"
-//    releaseType = "RELEASE"
-//    releaseType = "M2"
-//    releaseType = "RC1"
-    releaseType = "-TEST"
-
     // overall project version
-    projectVersion = "${projectMajorVersion}.${projectMinorVersion}.${projectPatchVersion}"
-    releaseVersion = "${projectVersion}.${releaseType}"
     isCiBuild = project.hasProperty("isCiBuild")
-    isBuildSnapshot = releaseType == "BUILD-SNAPSHOT"
+    isBuildSnapshot = version.endsWith("-SNAPSHOT")
 
     nexusUsername = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : ''
     nexusPassword = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
@@ -42,7 +31,7 @@ configurations {
    all*.exclude group: "commons-logging"
 }
 
-version = "${projectVersion}.${releaseType}"
+version = project.projectVersion
 group = "org.grails"
 
 apply plugin: 'idea'
@@ -78,14 +67,14 @@ subprojects {
     configurations {
         documentation
     }
-   version = "${projectVersion}.${releaseType}"
+   version = project.projectVersion
    group = "org.grails"
 
    afterEvaluate { project ->
         if (isGroovyProject(project)) {
             def hasSnapshotVersion = project.version.endsWith("-SNAPSHOT")
             if(isBuildSnapshot != hasSnapshotVersion) {
-                throw new StopExecutionException("${project.name} has version \"${project.version}\" which is${isBuildSnapshot ? 'n\'t' : ''} a snapshot version. Current release type is ${releaseType}")
+                throw new StopExecutionException("${project.name} has version \"${project.version}\" which is${isBuildSnapshot ? 'n\'t' : ''} a snapshot version.")
             }
         }
     }

gradle.properties

@@ -10,6 +10,7 @@ javaAnnotationApiVersion=1.3.2
 elVersion=3.0.0
 commonsValidatorVersion=1.6
 hibernateVersion=5.4.10
+projectVersion=7.0.9.BUILD-SNAPSHOT
 servletApiVersion=4.0.1
 springVersion=5.1.11.RELEASE
 caffeineVersion=2.6.2
@@ -18,4 +19,4 @@ grailsAsyncVersion=3.3.2
 slf4jVersion=1.7.29
 junitVersion=4.12
 javassistVersion=3.21.0-GA
-groovyVersion=2.5.6
+groovyVersion=2.5.6