From fec9804dad83ad58440b0c9326631364a1c4a5f3 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 10 Oct 2023 12:08:44 -0700
Subject: [PATCH] Don't create .gradle folder early

See gh-37450
---
 ci/images/setup.sh   | 6 ------
 ci/scripts/common.sh | 6 ++----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index 7cc0c6744d..c073702de9 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -51,9 +51,3 @@ curl -L https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_VERSI
 chmod +x entrykit && \
 mv entrykit /bin/entrykit && \
 entrykit --symlink
-
-###########################################################
-# GRADLE ENTERPRISE
-###########################################################
-mkdir ~/.gradle
-echo 'systemProp.user.name=concourse' > ~/.gradle/gradle.properties
\ No newline at end of file
diff --git a/ci/scripts/common.sh b/ci/scripts/common.sh
index d24b0551dc..52fe719787 100644
--- a/ci/scripts/common.sh
+++ b/ci/scripts/common.sh
@@ -1,12 +1,10 @@
 source /opt/concourse-java.sh
 
-if [[ -d $PWD/gradle ]]; then
-	export GRADLE_USER_HOME=`pwd`/gradle
-fi
-
 setup_symlinks
 if [[ -d $PWD/embedmongo && ! -d $HOME/.embedmongo ]]; then
 	ln -s "$PWD/embedmongo" "$HOME/.embedmongo"
 fi
 
 cleanup_maven_repo "org.springframework.boot"
+
+echo 'systemProp.user.name=concourse' > ~/.gradle/gradle.properties