Updated version number handling

Author: rsenden

.travis.yml

@@ -13,8 +13,17 @@ cache:
 
 stages:
   - name: build
+  - name: snapshotBranch
+    if: tag IS blank AND branch =~ /^(\d+.)+\d+-SNAPSHOT$/
+  - name: releaseTag
+    if: tag IS present
 
 jobs:
   include:
     - stage: build
-      script: /bin/sh ./gradlew build bintrayUpload -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER
+      script: /bin/sh ./gradlew build
+    - stage: snapshotBranch
+      script: /bin/sh ./gradlew "-PoverrideVersion=$TRAVIS_BRANCH" build publish bintrayUpload -x test -Dbuild.number=$TRAVIS_BUILD_NUMBER
+    - stage: releaseTag
+      script: /bin/sh ./gradlew "-PoverrideVersion=$TRAVIS_TAG" build publish bintrayUpload -x test -Dbuild.number=$TRAVIS_BUILD_NUMBER
+      

build.gradle

@@ -1,57 +1,24 @@
 plugins {
   id "io.freefair.lombok" version "4.1.2"
   id "com.jfrog.bintray" version "1.8.4"
-  id 'com.intershop.gradle.scmversion' version '6.0.0'
+  id 'org.ajoberstar.grgit' version "4.0.0"
 }
 
+apply from: "https://raw.githubusercontent.com/fortify-ps/gradle-helpers/master/version-helper.gradle"
+
 group 'com.fortify.ssc.parser.owasp.dependencycheck'
 
 apply plugin: 'java'
 sourceCompatibility = 1.8
 
-scm {
-    version {
-        type = 'threeDigits'
-        initialVersion = '1.0.0'
-        increment = 'MINOR'
-    }
-}
-
 ext {
     versionRegex = '(\\d+)(\\.\\d+)*'
     jacksonVersion = "2.8.4"
 }
 
-def getDateTime() {
-    new Date().format('yyyyMMddHHmmssSSS')
-}
-
-// Get the SSC plugin version based on current SCM version.
-// Due to SSC plugin version length restrictions, we cannot 
-// use the full date/time as part of the version number for
-// snapshot versions. As such, we use the number of hours 
-// since Epoch.
-def getPluginVersion() {
-    def time = System.currentTimeMillis().intdiv(1000)
-    def hours = time.intdiv(3600)
-    return scm.version.version \
-        .replaceFirst(/^(\d+\.)(\d+).+?(-SNAPSHOT)?$/, '$1$2$3') \
-        .replaceFirst(/-SNAPSHOT/, ".${hours}")
-}
-
-// Get the project version; this is used for both the jar file
-// name and the version on Bintray. As Bintray version needs to 
-// be unique, we can't use getPluginVersion() defined above 
-// (since uploading multiple versions within a single hour would fail). 
-def getProjectVersion() {
-	return scm.version.version \
-        .replaceFirst(/^(\d+\.)(\d+).+?(-SNAPSHOT)?$/, '$1$2$3-release') \
-        .replaceFirst(/-SNAPSHOT-release/, "-beta-${getDateTime()}")
-}
-
 // Project and plugin version based on SCM information
-version = getProjectVersion()
-def sscPluginVersion = getPluginVersion()
+version = getProjectVersionAsBetaOrRelease()
+def sscPluginVersion = getProjectVersionAsPlainVersionNumber()
 
 repositories {
 	mavenLocal()