From 8edf2c41fb666a4c98015d0ab2b868cbf3997563 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Fri, 3 Mar 2023 16:26:00 +0100 Subject: [PATCH] Upgrade to SnakeYaml 2.0 --- bom/application/pom.xml | 2 +- .../java/io/quarkus/docs/generation/QuarkusBuildItemDoc.java | 3 ++- .../vertx/http/deployment/devmode/console/DevConsole.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 28d104f9ff75a..cd49c4517fd72 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -168,7 +168,7 @@ 9.15.2 3.0.2 4.20.0 - 1.33 + 2.0 6.0.0 4.9.0 1.7.1 diff --git a/docs/src/main/java/io/quarkus/docs/generation/QuarkusBuildItemDoc.java b/docs/src/main/java/io/quarkus/docs/generation/QuarkusBuildItemDoc.java index 8f75260bdcafa..141a144fd2dc8 100644 --- a/docs/src/main/java/io/quarkus/docs/generation/QuarkusBuildItemDoc.java +++ b/docs/src/main/java/io/quarkus/docs/generation/QuarkusBuildItemDoc.java @@ -25,6 +25,7 @@ import org.jboss.forge.roaster.model.JavaDocCapable; import org.jboss.forge.roaster.model.source.FieldSource; import org.jboss.forge.roaster.model.source.JavaClassSource; +import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; @@ -154,7 +155,7 @@ private Path findPom(Path path) { private Map extractNames(Path root, Iterable extensionDirs) throws IOException { Map names = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); - Yaml yaml = new Yaml(new SafeConstructor()); + Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions())); for (String extension : extensionDirs) { Path yamlPath = root .resolve("extensions/" + extension + "/runtime/src/main/resources/META-INF/quarkus-extension.yaml"); diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java index e6fd108955bbd..55c22afcde627 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java @@ -17,6 +17,7 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; +import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; @@ -75,7 +76,7 @@ private void initLazyState() { synchronized (extensions) { if (extensions.isEmpty()) { try { - final Yaml yaml = new Yaml(new SafeConstructor()); + final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions())); ClassPathUtils.consumeAsPaths("/META-INF/quarkus-extension.yaml", p -> { try { final String desc;