Merge branch '2.7.x' into 3.0.x

Author: wilkinsona

ci/images/ci-image-jdk21/Dockerfile

@@ -3,7 +3,6 @@ FROM ubuntu:jammy-20230816
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
 ADD get-docker-url.sh /get-docker-url.sh
-ADD get-docker-compose-url.sh /get-docker-compose-url.sh
 RUN ./setup.sh java17 java21
 
 ENV JAVA_HOME /opt/openjdk