From 77f428498fb6d17f36eb1a956ac5e25ddebf1804 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 15 Sep 2022 11:55:44 +0100 Subject: [PATCH] Compile against SnakeYAML 1.32 and test against older versions Closes gh-32392 --- .../spring-boot-parent/build.gradle | 2 +- ...PropertySourceLoaderSnakeYaml129Tests.java | 29 +++++++++++++++++++ ...PropertySourceLoaderSnakeYaml130Tests.java | 29 +++++++++++++++++++ ...PropertySourceLoaderSnakeYaml131Tests.java | 29 +++++++++++++++++++ 4 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml129Tests.java create mode 100644 spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml130Tests.java create mode 100644 spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml131Tests.java diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index fa85a69df55..9a096d71603 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/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" diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml129Tests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml129Tests.java new file mode 100644 index 00000000000..715ff2e5429 --- /dev/null +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml129Tests.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.29. + * + * @author Andy Wilkinson + */ +@ClassPathOverrides("org.yaml:snakeyaml:1.29") +class YamlPropertySourceLoaderSnakeYaml129Tests extends YamlPropertySourceLoaderTests { + +} diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml130Tests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml130Tests.java new file mode 100644 index 00000000000..f632f013f7e --- /dev/null +++ b/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 { + +} diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml131Tests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml131Tests.java new file mode 100644 index 00000000000..24c269b44ee --- /dev/null +++ b/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 { + +}