From ad7b856f874007e383ba831ce5beafe47716f736 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Fri, 15 Nov 2019 15:34:11 -0500
Subject: [PATCH] Restore addGitMetadata; only publish failures

---
 gradle/build-scan-user-data.gradle |  4 ++--
 settings.gradle                    | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gradle/build-scan-user-data.gradle b/gradle/build-scan-user-data.gradle
index 419f39a6..ef813dfb 100644
--- a/gradle/build-scan-user-data.gradle
+++ b/gradle/build-scan-user-data.gradle
@@ -2,7 +2,7 @@ tagOs()
 tagIde()
 tagCiOrLocal()
 addCiMetadata()
-//addGitMetadata()
+addGitMetadata()
 //addTestTaskMetadata()
 
 void tagOs() {
@@ -82,7 +82,7 @@ String customValueSearchUrl(Map<String, String> search) {
 		"search.names=${encodeURL(name)}&search.values=${encodeURL(value)}"
 	}.join('&')
 
-	"$buildScan.server/scans?$query"
+	"$gradleEnterprise.buildScan.server/scans?$query"
 }
 
 String encodeURL(String url) {
diff --git a/settings.gradle b/settings.gradle
index 348a1b96..f2e4d2c2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,17 +3,17 @@ plugins {
 }
 
 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')
-    	}
-    }
+	gradleEnterprise {
+		apply from: "$rootDir/gradle/build-scan-user-data.gradle"
+		buildScan {
+			captureTaskInputFiles = true
+			obfuscation {
+				ipAddresses { addresses -> addresses.collect { address -> '0.0.0.0'} }
+			}
+			publishOnFailure()
+			server = System.getenv('GRADLE_ENTERPRISE_URL')
+		}
+	}
 }
 
 rootProject.name = 'spring-kafka-dist'