From 60ff87155f89f67b82910b77c23da23c0ffb714c Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 26 Jun 2020 17:57:44 +0100
Subject: [PATCH] Polish "Add Gradle Enterprise Extension"

See gh-22089
---
 .mvn/gradle-enterprise.xml | 32 ++++++++++++++++++++++----------
 ci/scripts/stage.sh        |  8 ++++----
 pom.xml                    |  2 +-
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml
index 978dcbbd2fc..dd73b916766 100644
--- a/.mvn/gradle-enterprise.xml
+++ b/.mvn/gradle-enterprise.xml
@@ -1,13 +1,25 @@
 <gradleEnterprise
         xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
-    <server>
-        <url>https://ge.spring.io</url>
-    </server>
-    <buildScan>
-        <publishIfAuthenticated>true</publishIfAuthenticated>
-    </buildScan>
-    <buildCache>
-        <local><enabled>true</enabled></local>
-    </buildCache>
-</gradleEnterprise>
\ No newline at end of file
+	<server>
+		<url>https://ge.spring.io</url>
+	</server>
+	<buildScan>
+		<publishIfAuthenticated>true</publishIfAuthenticated>
+	</buildScan>
+	<buildCache>
+		<local>
+			<enabled>true</enabled>
+		</local>
+		<remote>
+			<enabled>true</enabled>
+			<storeEnabled><![CDATA[#{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null && env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null}]]></storeEnabled>
+			<server>
+				<credentials>
+					<username>${env.GRADLE_ENTERPRISE_CACHE_USERNAME}</username>
+					<password>${env.GRADLE_ENTERPRISE_CACHE_PASSWORD}</password>
+				</credentials>
+			</server>
+		</remote>
+	</buildCache>
+</gradleEnterprise>
diff --git a/ci/scripts/stage.sh b/ci/scripts/stage.sh
index b8ecc4f625d..59c24e6a2e1 100755
--- a/ci/scripts/stage.sh
+++ b/ci/scripts/stage.sh
@@ -35,10 +35,10 @@ git add pom.xml > /dev/null
 git commit -m"Release v$stageVersion" > /dev/null
 git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
 
-run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository}
-run_maven -f spring-boot-samples/pom.xml clean install -U -Dfull -Drepository=file://${repository}
-run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
-run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
+run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false
+run_maven -f spring-boot-samples/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false
+run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false
+run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false
 
 git reset --hard HEAD^ > /dev/null
 if [[ $nextVersion != $snapshotVersion ]]; then
diff --git a/pom.xml b/pom.xml
index 96d333d2fae..f74508bb8dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
 			<plugin>
 				<groupId>com.gradle</groupId>
 				<artifactId>gradle-enterprise-maven-extension</artifactId>
-				<!-- There is a build warning because we don't specify the version here. We do this instead of specifying the verison number twice -->
+				<version>1.5.2</version>
 				<configuration>
 					<gradleEnterprise>
 						<plugins>