Merge branch '3.1.x' into 3.2.x

Closes gh-40416
This commit is contained in:
Moritz Halbritter 2024-04-19 09:24:35 +02:00
commit 01c26ef84e
3 changed files with 4 additions and 4 deletions

View File

@ -1,3 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=17.0.10-librca
java=17.0.11-librca

View File

@ -3,7 +3,7 @@ set -e
case "$1" in
java17)
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.10+13/bellsoft-jdk17.0.10+13-linux-amd64.tar.gz"
echo "https://github.com/bell-sw/Liberica/releases/download/17.0.11+10/bellsoft-jdk17.0.11+10-linux-amd64.tar.gz"
;;
java21)
echo "https://github.com/bell-sw/Liberica/releases/download/21.0.2+14/bellsoft-jdk21.0.2+14-linux-amd64.tar.gz"

View File

@ -7,7 +7,7 @@ plugins {
description = "Spring Boot Launch Script Integration Tests"
def jdkVersion = "17.0.10+13"
def jdkVersion = "17.0.11+10"
def jdkArch = "aarch64".equalsIgnoreCase(System.getProperty("os.arch")) ? "aarch64" : "amd64"
configurations {
@ -65,4 +65,4 @@ processIntTestResources {
intTest {
dependsOn buildApp
}
}