Merge branch '3.1.x'

Closes gh-36542
2023-07-24 16:06:13 -05:00
parent 2452958f7b bb4226397a
commit c600be74ff
5 changed files with 3 additions and 16 deletions
--- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile
+++ b/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 && \