Upgrade to SnakeYAML 2.0

Closes gh-35982
spring-projects · Jun 19, 2023 · 1f9ce50 · 1f9ce50
1 parent a94ac2f
commit 1f9ce50
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 32 deletions.
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1375,7 +1375,7 @@ bom {
 			]
 		}
 	}
-	library("SnakeYAML", "1.33") {
+	library("SnakeYAML", "2.0") {
 		group("org.yaml") {
 			modules = [
 				"snakeyaml"

diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
@@ -17,6 +17,17 @@ configurations {
 	remoteSpringApplicationExample
 	springApplicationExample
 	testSlices
+	asciidoctorExtensions {
+		resolutionStrategy {
+			eachDependency { dependency ->
+				// Downgrade SnakeYAML as Asciidoctor fails due to an incompatibility
+				// in the Pysch gem
+				if (dependency.requested.group.equals("org.yaml")) {
+					dependency.useVersion("1.33")
+				}
+			}
+		}
+	}
 }
 
 jar {

diff --git a/.../spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java b/.../spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java
@@ -23,7 +23,7 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.yaml.snakeyaml.constructor.ConstructorException;
+import org.yaml.snakeyaml.composer.ComposerException;
 
 import org.springframework.boot.origin.OriginTrackedValue;
 import org.springframework.boot.origin.TextResourceOrigin;
@@ -134,7 +134,7 @@ void unsupportedType() {
 		String yaml = "value: !!java.net.URL [!!java.lang.String [!!java.lang.StringBuilder [\"http://localhost:9000/\"]]]";
 		Resource resource = new ByteArrayResource(yaml.getBytes(StandardCharsets.UTF_8));
 		this.loader = new OriginTrackedYamlLoader(resource);
-		assertThatExceptionOfType(ConstructorException.class).isThrownBy(this.loader::load);
+		assertThatExceptionOfType(ComposerException.class).isThrownBy(this.loader::load);
 	}
 
 	@Test

diff --git a/.../src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml20Tests.java b/.../src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml20Tests.java