Merge branch '2.6.x' into 2.7.x

Closes gh-32393

Author: wilkinsona

spring-boot-project/spring-boot-parent/build.gradle

@@ -164,7 +164,7 @@ bom {
 			]
 		}
 	}
-	library("SnakeYAML", "1.31") {
+	library("SnakeYAML", "1.32") {
 		group("org.yaml") {
 			modules = [
 				"snakeyaml"

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml130Tests.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2012-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.env;
+
+import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
+
+/**
+ * Tests for {@link YamlPropertySourceLoader} with SnakeYAML 1.30.
+ *
+ * @author Andy Wilkinson
+ */
+@ClassPathOverrides("org.yaml:snakeyaml:1.30")
+class YamlPropertySourceLoaderSnakeYaml130Tests extends YamlPropertySourceLoaderTests {
+
+}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml131Tests.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2012-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.env;
+
+import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
+
+/**
+ * Tests for {@link YamlPropertySourceLoader} with SnakeYAML 1.31.
+ *
+ * @author Andy Wilkinson
+ */
+@ClassPathOverrides("org.yaml:snakeyaml:1.31")
+class YamlPropertySourceLoaderSnakeYaml131Tests extends YamlPropertySourceLoaderTests {
+
+}