diff --git a/build.gradle b/build.gradle
index 06f0dd76..9b761801 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,6 @@ plugins {
 	id 'base'
 	id 'project-report'
 	id 'idea'
-	id 'com.gradle.build-scan' version '2.4.2'
 	id 'org.sonarqube' version '2.7.1'
 	id 'org.asciidoctor.convert' version '1.6.1'
 	id 'org.ajoberstar.grgit' version '3.1.1'
@@ -22,18 +21,6 @@ plugins {
 	id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
 }
 
-if (System.getenv('GRADLE_ENTERPRISE_URL')) {
-	apply from: "$rootDir/gradle/build-scan-user-data.gradle"
-	buildScan {
-		captureTaskInputFiles = true
-		obfuscation {
-			ipAddresses { addresses -> addresses.collect { address -> '0.0.0.0'} }
-		}
-		publishAlways()
-		server = System.getenv('GRADLE_ENTERPRISE_URL')
-	}
-}
-
 apply plugin: 'io.spring.nohttp'
 
 description = 'Spring Kafka'
@@ -159,7 +146,6 @@ subprojects { subproject ->
 		logging.captureStandardOutput(LogLevel.INFO)
 		maxHeapSize = '1536m'
 		jacoco {
-			append = false
 			destinationFile = file("$buildDir/jacoco.exec")
 		}
 		useJUnitPlatform()
diff --git a/gradle/build-scan-user-data.gradle b/gradle/build-scan-user-data.gradle
index d4f483d6..419f39a6 100644
--- a/gradle/build-scan-user-data.gradle
+++ b/gradle/build-scan-user-data.gradle
@@ -2,27 +2,27 @@ tagOs()
 tagIde()
 tagCiOrLocal()
 addCiMetadata()
-addGitMetadata()
-addTestTaskMetadata()
+//addGitMetadata()
+//addTestTaskMetadata()
 
 void tagOs() {
-	buildScan.tag System.getProperty('os.name')
+	gradleEnterprise.buildScan.tag System.getProperty('os.name')
 }
 
 void tagIde() {
 	if (System.getProperty('idea.version')) {
-		buildScan.tag 'IntelliJ IDEA'
+		gradleEnterprise.buildScan.tag 'IntelliJ IDEA'
 	} else if (System.getProperty('eclipse.buildId')) {
-		buildScan.tag 'Eclipse'
+		gradleEnterprise.buildScan.tag 'Eclipse'
 	}
 }
 
 void tagCiOrLocal() {
-	buildScan.tag(isCi() ? 'CI' : 'LOCAL')
+	gradleEnterprise.buildScan.tag(isCi() ? 'CI' : 'LOCAL')
 }
 
 void addGitMetadata() {
-	buildScan.background {
+	gradleEnterprise.buildScan.background {
 		def gitCommitId = execAndGetStdout('git', 'rev-parse', '--short=8', '--verify', 'HEAD')
 		def gitBranchName = execAndGetStdout('git', 'rev-parse', '--abbrev-ref', 'HEAD')
 		def gitStatus = execAndGetStdout('git', 'status', '--porcelain')
@@ -46,7 +46,7 @@ void addGitMetadata() {
 void addCiMetadata() {
 	def ciBuild = 'CI BUILD'
 	if (isBamboo()) {
-		buildScan.link ciBuild, System.getenv('bamboo_resultsUrl')
+		gradleEnterprise.buildScan.link ciBuild, System.getenv('bamboo_resultsUrl')
 	}
 }
 
@@ -54,7 +54,7 @@ void addTestTaskMetadata() {
 	allprojects {
 		tasks.withType(Test) { test ->
 			doFirst {
-				buildScan.value "Test#maxParallelForks[${test.path}]", test.maxParallelForks.toString()
+				gradleEnterprise.buildScan.value "Test#maxParallelForks[${test.path}]", test.maxParallelForks.toString()
 			}
 		}
 	}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf0..cc4fdc29 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5028f28f..6ce793f2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acfd..2fe81a7d 100755
--- a/gradlew
+++ b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/settings.gradle b/settings.gradle
index d9471024..348a1b96 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,21 @@
+plugins {
+	id 'com.gradle.enterprise' version '3.0'
+}
+
+if (System.getenv('GRADLE_ENTERPRISE_URL')) {
+    gradleEnterprise {
+    	apply from: "$rootDir/gradle/build-scan-user-data.gradle"
+    	buildScan {
+    		captureTaskInputFiles = true
+    		obfuscation {
+    			ipAddresses { addresses -> addresses.collect { address -> '0.0.0.0'} }
+    		}
+    		publishAlways()
+    		server = System.getenv('GRADLE_ENTERPRISE_URL')
+    	}
+    }
+}
+
 rootProject.name = 'spring-kafka-dist'
 
 include 'spring-kafka'