Merge branch '3.0.x' into 3.1.x

ci/images/setup.sh

@@ -37,6 +37,7 @@ if [[ $# -eq 2 ]]; then
 	test -f /opt/openjdk-toolchain/bin/javac
 fi
 
+
 ###########################################################
 # DOCKER
 ###########################################################
@@ -52,6 +53,7 @@ chmod +x entrykit && \
 mv entrykit /bin/entrykit && \
 entrykit --symlink
 
+
 ###########################################################
 # DOCKER COMPOSE
 ###########################################################
@@ -59,9 +61,3 @@ mkdir -p /usr/local/lib/docker/cli-plugins
 DOCKER_COMPOSE_URL=$( ./get-docker-compose-url.sh )
 curl -L ${DOCKER_COMPOSE_URL} -o /usr/local/lib/docker/cli-plugins/docker-compose
 chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
-
-###########################################################
-# GRADLE ENTERPRISE
-###########################################################
-mkdir ~/.gradle
-echo 'systemProp.user.name=concourse' > ~/.gradle/gradle.properties

ci/scripts/common.sh

@@ -3,3 +3,5 @@ source /opt/concourse-java.sh
 setup_symlinks
 
 cleanup_maven_repo "org.springframework.boot"
+
+echo 'systemProp.user.name=concourse' > ~/.gradle/gradle.properties

ci/tasks/build-project.yml

@@ -7,7 +7,7 @@ outputs:
 - name: git-repo
 caches:
 - path: gradle
-- path: build/downloads
+- path: maven
 params:
   BRANCH:
   CI: true

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle

@@ -43,7 +43,7 @@ task buildApp(type: GradleBuild) {
 }
 
 task downloadJdk(type: Download) {
-	def destFolder = new File(rootProject.buildDir, "downloads/jdk/bellsoft")
+	def destFolder = new File(project.gradle.gradleUserHomeDir, "caches/springboot/downloads/jdk/bellsoft")
 	destFolder.mkdirs()
 	src "https://download.bell-sw.com/java/${jdkVersion}/bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
 	dest destFolder
@@ -53,7 +53,7 @@ task downloadJdk(type: Download) {
 
 task syncJdkDownloads(type: Sync) {
 	dependsOn downloadJdk
-	from "${rootProject.buildDir}/downloads/jdk/bellsoft/"
+	from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/bellsoft/"
 	include "bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
 	into "${project.buildDir}/downloads/jdk/bellsoft/"
 }

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle

@@ -44,7 +44,7 @@ task buildApp(type: GradleBuild) {
 }
 
 task downloadJdk(type: Download) {
-	def destFolder = new File(rootProject.buildDir, "downloads/jdk/oracle")
+	def destFolder = new File(project.gradle.gradleUserHomeDir, "caches/springboot/downloads/jdk/oracle")
 	destFolder.mkdirs()
 	src "https://download.oracle.com/java/17/archive/jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
 	dest destFolder
@@ -54,7 +54,7 @@ task downloadJdk(type: Download) {
 
 task syncJdkDownloads(type: Sync) {
 	dependsOn downloadJdk
-	from "${rootProject.buildDir}/downloads/jdk/oracle/"
+	from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/oracle/"
 	include "jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
 	into "${project.buildDir}/downloads/jdk/oracle/"
 }