Upgrade bundled version of snakeyaml

openrewrite · Jun 10, 2024 · 5a4b688 · 5a4b688
1 parent f624d4e
commit 5a4b688
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ description = "Enforce logging best practices and migrate between logging framew
 def rewriteVersion = rewriteRecipe.rewriteVersion.get()
 
 recipeDependencies {
-    parserClasspath("org.yaml:snakeyaml:1.33")
+    parserClasspath("org.yaml:snakeyaml:2.2")
     parserClasspath("com.fasterxml.jackson.core:jackson-core:2.13.+")
     parserClasspath("com.fasterxml.jackson.core:jackson-databind:2.13.+")
     parserClasspath("org.springframework:spring-context:5.+")

diff --git a/src/main/java/org/openrewrite/java/security/marshalling/SecureSnakeYamlConstructor.java b/src/main/java/org/openrewrite/java/security/marshalling/SecureSnakeYamlConstructor.java
@@ -63,7 +63,7 @@ public J visitMemberReference(J.MemberReference memberRef, ExecutionContext ctx)
                             .imports("org.yaml.snakeyaml.Yaml")
                             .imports("org.yaml.snakeyaml.constructor.SafeConstructor")
                             .javaParser(JavaParser.fromJavaVersion()
-                                    .classpathFromResources(ctx, "snakeyaml-1.33"))
+                                    .classpathFromResources(ctx, "snakeyaml"))
                             .build()
                             .apply(getCursor(), memberRef.getCoordinates().replace());
                 }
@@ -86,7 +86,7 @@ public J visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
                             .imports("org.yaml.snakeyaml.Yaml")
                             .imports("org.yaml.snakeyaml.constructor.SafeConstructor")
                             .javaParser(JavaParser.fromJavaVersion()
-                                    .classpathFromResources(ctx, "snakeyaml-1.33"))
+                                    .classpathFromResources(ctx, "snakeyaml"))
                             .build()
                             .apply(getCursor(), newClass.getCoordinates().replace());
                 } else if (snakeYamlRepresenterArgumentConstructor.matches(newClass)) {
@@ -104,7 +104,7 @@ public J visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
                                     "org.yaml.snakeyaml.representer.Representer"
                             )
                             .javaParser(JavaParser.fromJavaVersion()
-                                    .classpathFromResources(ctx, "snakeyaml-1.33"))
+                                    .classpathFromResources(ctx, "snakeyaml"))
                             .build()
                             .apply(getCursor(), newClass.getCoordinates().replace(), newClass.getArguments().get(0));
                 } else if (snakeYamlDumperArgumentConstructor.matches(newClass)) {
@@ -122,7 +122,7 @@ public J visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
                                     "org.yaml.snakeyaml.representer.Representer"
                             )
                             .javaParser(JavaParser.fromJavaVersion()
-                                    .classpathFromResources(ctx, "snakeyaml-1.33"))
+                                    .classpathFromResources(ctx, "snakeyaml"))
                             .build()
                             .apply(getCursor(), newClass.getCoordinates().replace(), newClass.getArguments().get(0));
                 }

diff --git a/src/main/resources/META-INF/rewrite/classpath/snakeyaml-1.33.jar b/src/main/resources/META-INF/rewrite/classpath/snakeyaml-1.33.jar
diff --git a/src/main/resources/META-INF/rewrite/classpath/snakeyaml-2.2.jar b/src/main/resources/META-INF/rewrite/classpath/snakeyaml-2.2.jar
diff --git a/...write/classpath/spring-context-5.3.33.jar → ...write/classpath/spring-context-5.3.36.jar b/...write/classpath/spring-context-5.3.33.jar → ...write/classpath/spring-context-5.3.36.jar
diff --git a/...asspath/spring-security-config-5.8.11.jar → ...asspath/spring-security-config-5.8.12.jar b/...asspath/spring-security-config-5.8.11.jar → ...asspath/spring-security-config-5.8.12.jar
diff --git a/src/test/java/org/openrewrite/java/security/marshalling/SecureSnakeYamlConstructorTest.java b/src/test/java/org/openrewrite/java/security/marshalling/SecureSnakeYamlConstructorTest.java
@@ -31,7 +31,7 @@ class SecureSnakeYamlConstructorTest implements RewriteTest {
     public void defaults(RecipeSpec spec) {
         spec.recipe(new SecureSnakeYamlConstructor())
           .parser(JavaParser.fromJavaVersion()
-            .classpathFromResources(new InMemoryExecutionContext(), "snakeyaml-1.33"));
+            .classpathFromResources(new InMemoryExecutionContext(), "snakeyaml"));
     }
 
     @DocumentExample