Merge branch '3.0.x' into 3.1.x

Closes gh-36541

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/JarLaunchScriptIntegrationTests.java

@@ -18,11 +18,9 @@ package org.springframework.boot.launchscript;
 
 import java.util.List;
 
-import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import org.springframework.boot.testsupport.junit.DisabledOnOs;
 import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -34,8 +32,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Andy Wilkinson
  */
 @DisabledIfDockerUnavailable
-@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
-		disabledReason = "The docker images have no ARM support")
 class JarLaunchScriptIntegrationTests extends AbstractLaunchScriptIntegrationTests {
 
 	JarLaunchScriptIntegrationTests() {

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/CentOS/7.9.2009/Dockerfile

@@ -1,5 +1,4 @@
-# CentOS 7.9 from 18/11/2020
-FROM centos@sha256:e4ca2ed0202e76be184e75fb26d14bf974193579039d5573fb2348664deef76e
+FROM centos:7.9.2009
 RUN mkdir -p /opt/openjdk && \
     cd /opt/openjdk && \
     curl -L https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz | tar zx --strip-components=1

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:trusty-20160914
+FROM ubuntu:jammy-20230624
 RUN apt-get update && \
     apt-get install -y software-properties-common curl && \
     mkdir -p /opt/openjdk && \

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/xenial-20160914/Dockerfile

@@ -1,8 +0,0 @@
-FROM ubuntu:xenial-20160914
-RUN apt-get update && \
-    apt-get install -y software-properties-common curl && \
-    mkdir -p /opt/openjdk && \
-    cd /opt/openjdk && \
-    curl -L https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz | tar zx --strip-components=1
-ENV JAVA_HOME /opt/openjdk
-ENV PATH $JAVA_HOME/bin:$PATH

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20211006
+FROM ubuntu:jammy-20230624
 RUN apt-get update && \
     apt-get install -y software-properties-common curl && \
     mkdir -p /opt/oraclejdk && \