From a20e5618978e263f6a4b5037b4f182c63a928d9a Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@pivotal.io>
Date: Wed, 29 Apr 2020 10:51:17 +0200
Subject: [PATCH] Upgrade to Gradle Enterprise 3.2

Also use the "io.spring.gradle-enterprise-conventions" plugin for
configuring Gradle Enterprise Cache support.
---
 buildSrc/settings.gradle           |  1 -
 gradle/build-cache-settings.gradle | 18 ------------------
 settings.gradle                    |  5 ++---
 3 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 gradle/build-cache-settings.gradle

diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
index ec93f39d06..e69de29bb2 100644
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -1 +0,0 @@
-apply from: "../gradle/build-cache-settings.gradle"
diff --git a/gradle/build-cache-settings.gradle b/gradle/build-cache-settings.gradle
deleted file mode 100644
index 5684b4942b..0000000000
--- a/gradle/build-cache-settings.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-buildCache {
-	local {
-		enabled = true
-	}
-	remote(HttpBuildCache) {
-		enabled = true
-		url = 'https://ge.spring.io/cache/'
-		def cacheUsername = System.getenv('GRADLE_ENTERPRISE_CACHE_USERNAME')
-		def cachePassword = System.getenv('GRADLE_ENTERPRISE_CACHE_PASSWORD')
-		if (cacheUsername && cachePassword) {
-			push = true
-			credentials {
-				username = cacheUsername
-				password = cachePassword
-			}
-		}
-	}
-}
diff --git a/settings.gradle b/settings.gradle
index 996a10b47c..c563a6cfff 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,11 +6,10 @@ pluginManagement {
 }
 
 plugins {
-	id("com.gradle.enterprise").version("3.1.1")
+	id "com.gradle.enterprise" version "3.2"
+	id "io.spring.gradle-enterprise-conventions" version "0.0.2"
 }
 
-apply from: "$rootDir/gradle/build-cache-settings.gradle"
-
 include "spring-aop"
 include "spring-aspects"
 include "spring-beans"