Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Phillip Webb 2023-10-10 12:31:44 -07:00
commit 927ece3bfc
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/images/setup.sh
View File

@ -38,6 +38,7 @@ if [[ $# -eq 2 ]]; then
test -f /opt/openjdk-toolchain/bin/javac test -f /opt/openjdk-toolchain/bin/javac
fi fi
########################################################### ###########################################################
# DOCKER # DOCKER
########################################################### ###########################################################
@ -53,6 +54,7 @@ chmod +x entrykit && \
mv entrykit /bin/entrykit && \ mv entrykit /bin/entrykit && \
entrykit --symlink entrykit --symlink
########################################################### ###########################################################
# DOCKER COMPOSE # DOCKER COMPOSE
########################################################### ###########################################################
@ -60,9 +62,3 @@ mkdir -p /usr/local/lib/docker/cli-plugins
DOCKER_COMPOSE_URL=$( ./get-docker-compose-url.sh ) DOCKER_COMPOSE_URL=$( ./get-docker-compose-url.sh )
curl -L ${DOCKER_COMPOSE_URL} -o /usr/local/lib/docker/cli-plugins/docker-compose curl -L ${DOCKER_COMPOSE_URL} -o /usr/local/lib/docker/cli-plugins/docker-compose
chmod +x /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

2
ci/scripts/common.sh
View File

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

2
ci/tasks/build-project.yml
View File

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

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
View File

@ -43,7 +43,7 @@ task buildApp(type: GradleBuild) {
} }
task downloadJdk(type: Download) { 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() destFolder.mkdirs()
src "https://download.bell-sw.com/java/${jdkVersion}/bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz" src "https://download.bell-sw.com/java/${jdkVersion}/bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
dest destFolder dest destFolder
@ -53,7 +53,7 @@ task downloadJdk(type: Download) {
task syncJdkDownloads(type: Sync) { task syncJdkDownloads(type: Sync) {
dependsOn downloadJdk 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" include "bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
into "${project.buildDir}/downloads/jdk/bellsoft/" into "${project.buildDir}/downloads/jdk/bellsoft/"
} }

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
View File

@ -58,7 +58,7 @@ task buildSignedJarApp(type: GradleBuild) {
} }
task downloadJdk(type: Download) { 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() destFolder.mkdirs()
src "https://download.oracle.com/java/17/archive/jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz" src "https://download.oracle.com/java/17/archive/jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
dest destFolder dest destFolder
@ -68,7 +68,7 @@ task downloadJdk(type: Download) {
task syncJdkDownloads(type: Sync) { task syncJdkDownloads(type: Sync) {
dependsOn downloadJdk 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" include "jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
into "${project.buildDir}/downloads/jdk/oracle/" into "${project.buildDir}/downloads/jdk/oracle/"
} }