Harden git version tag parsing

Author: 8Keep

version.gradle

@@ -55,14 +55,14 @@ try {
             // If the commit is an exact match then this returns just the tag
             // name, else it returns tagName-commitCount-abbreviatedId.
             def describe = gitOutput(['describe', '--tags', '--abbrev=7', 'HEAD'])
-            def fullDescribe = (describe =~/(.*?)-(\d+)-g$jmeShortGitHash/)
+            def fullDescribe = (describe =~/(.*?)-(\d+)-g${jmeShortGitHash}[0-9a-f]*/)
             latestTag = fullDescribe ? fullDescribe[0][1] : describe
             println "Latest tag:" + latestTag
         }
 
         // We could enhance this with some more regex if we wanted to sanity
         // check that it was formatted like our versions.
-        def tagVersion = latestTag ? (latestTag =~/v?(.*)/)[0][1] : jmeVersion;
+        def tagVersion = latestTag ? latestTag.replaceFirst(/^v/, "") : jmeVersion;
         // If the branch is not master then use the tag.
         if( jmeBranchName != "master" && latestTag ) {
             jmeVersion = tagVersion