Updating the version.gradle to fix an issue with auto-versioning on the

master branch. (On master we want to default to the gradle.properties
version and not the latest tag for non-specific-commit tags.)
Updated gradle.properties to set master to be 3.4.0 for further development.

gradle.properties

@@ -1,14 +1,14 @@
 # Version number: Major.Minor.SubMinor (e.g. 3.3.0)
-jmeVersion = 3.3.0
+jmeVersion = 3.4.0
 
 # Leave empty  to autogenerate
 # (use -PjmeVersionName="myVersion" from commandline to specify a custom version name )
-jmeVersionName = 
+jmeVersionName =
 
 # If true, the version name will contain the commit hash
 useCommitHashAsVersionName = false
 
-# Set to true if a non-master branch name should be included in the automatically 
+# Set to true if a non-master branch name should be included in the automatically
 # generated version.
 includeBranchInVersion = false
 

version.gradle

@@ -81,8 +81,8 @@ task configureVersionInfo {
 
         // Parse out just the base version part.  -SNAPSHOT versions
         // shouldn't really include our release suffixes
-        def baseVersion = (tagVersion =~/(\d+\.\d+.\d+)/)
+        def baseVersion = (jmeVersion =~/(\d+\.\d+.\d+)/)
-        baseVersion = baseVersion.size() > 0 ? baseVersion[0][0] : tagVersion
+        baseVersion = baseVersion.size() > 0 ? baseVersion[0][0] : jmeVersion
 
         if( !jmeVersionName ) {
             // If there is a specific tag for the top commit then we always