Merge branch '3.1.x' into 3.2.x

Closes spring-projectsgh-40568
scottfrederick · Apr 29, 2024 · f70a270 · f70a270
2 parents 7ac0d0c + 1591344
commit f70a270
Show file tree

Hide file tree

Showing 43 changed files with 4 additions and 1,552 deletions.
diff --git a/ci/README.adoc b/ci/README.adoc
diff --git a/ci/config/changelog-generator.yml b/ci/config/changelog-generator.yml
diff --git a/ci/config/gradle-plugin-publishing/build.gradle b/ci/config/gradle-plugin-publishing/build.gradle
diff --git a/ci/config/gradle-plugin-publishing/settings.gradle b/ci/config/gradle-plugin-publishing/settings.gradle
diff --git a/ci/config/release-scripts.yml b/ci/config/release-scripts.yml
diff --git a/ci/images/README.adoc b/ci/images/README.adoc
diff --git a/ci/images/ci-image-jdk21/Dockerfile b/ci/images/ci-image-jdk21/Dockerfile
diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
diff --git a/ci/images/docker-lib.sh b/ci/images/docker-lib.sh
diff --git a/ci/images/get-docker-compose-url.sh b/ci/images/get-docker-compose-url.sh
diff --git a/ci/images/get-docker-url.sh b/ci/images/get-docker-url.sh
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
diff --git a/ci/images/setup.sh b/ci/images/setup.sh
diff --git a/ci/parameters.yml b/ci/parameters.yml