Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into mixer

build.gradle-template

@@ -131,17 +131,19 @@ if (project.hasProperty('mainClassName') && (mainClassName != null)) {
 
         destinationDir = buildDir
 
-        def fatMain = hasProperty('fatmain') ? fatmain : mainClassName
+        def fatMain
+        
+        if (this.hasProperty('fatmain')) {
+            fatMain = fatmain 
+            appendix = "fat-${fatMain}"
+        } else {
+            fatMain = mainClassName
+            appendix = "fat"
+        }
 
         applicationClass fatMain
 
-        def testJar = hasProperty('test')
-
-        if (hasProperty('fatmain')) {
-            appendix = "fat-${fatMain}"
-        } else {
-            appendix = "fat"
-        }
+        def testJar = this.hasProperty('test')
 
         if (testJar) {
             from sourceSets.test.output

gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
-distributionSha256Sum=43be380834a13e28e9504c21f67fe1a8895ab54f314a6596601896dca7213482
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
+distributionSha256Sum=0209696f1723f607c475109cf3ed8b51c8a91bb0cda05af0d4bd980bdefe75cd