From f62a8603b90c2bd3a84b7897bc8798615d6c62a7 Mon Sep 17 00:00:00 2001
From: Alpar Torok <alpar.torok@elastic.co>
Date: Mon, 14 May 2018 15:56:57 +0300
Subject: [PATCH 1/3] Accept Gradle build scan argreement

Scans will be produced only when passing
`--scan`
---
 build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build.gradle b/build.gradle
index 395e1f600c9cc..ad4a52cb697e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,13 @@ import org.gradle.util.DistributionLocator
 import java.nio.file.Files
 import java.nio.file.Path
 import java.security.MessageDigest
+plugins {
+    id 'com.gradle.build-scan' version '1.13.2'
+}
+buildScan {
+    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+    termsOfServiceAgree = 'yes'
+}
 
 // common maven publishing configuration
 subprojects {

From cbed215cb7c351e45fa18f12fb9902dbb0397713 Mon Sep 17 00:00:00 2001
From: Alpar Torok <torokalpar@gmail.com>
Date: Fri, 18 May 2018 14:39:42 +0300
Subject: [PATCH 2/3] Condition TOS acceptance with property

---
 build.gradle | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index ad4a52cb697e8..00b46dcfa52d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,12 +35,15 @@ import org.gradle.util.DistributionLocator
 import java.nio.file.Files
 import java.nio.file.Path
 import java.security.MessageDigest
+
 plugins {
     id 'com.gradle.build-scan' version '1.13.2'
 }
-buildScan {
-    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-    termsOfServiceAgree = 'yes'
+if (properties.get("org.elasticsearch.scanTOS", "no") == "agree") {
+    buildScan {
+        termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+        termsOfServiceAgree = 'yes'
+    }
 }
 
 // common maven publishing configuration

From b29f345e48ccf00f3eb39ec2fe1fcedb68560939 Mon Sep 17 00:00:00 2001
From: Alpar Torok <torokalpar@gmail.com>
Date: Mon, 21 May 2018 09:37:32 +0300
Subject: [PATCH 3/3] Switch to boolean flags

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 00b46dcfa52d5..05ad5479e8dea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ import java.security.MessageDigest
 plugins {
     id 'com.gradle.build-scan' version '1.13.2'
 }
-if (properties.get("org.elasticsearch.scanTOS", "no") == "agree") {
+if (properties.get("org.elasticsearch.acceptScanTOS", "false") == "true") {
     buildScan {
         termsOfServiceUrl = 'https://gradle.com/terms-of-service'
         termsOfServiceAgree = 'yes'