Merge branch '3.1.x'

This commit is contained in:
Phillip Webb
2023-10-10 12:31:44 -07:00
5 changed files with 9 additions and 11 deletions

View File

@@ -58,7 +58,7 @@ task buildSignedJarApp(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
@@ -68,7 +68,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/"
}