Skip to content

Commit d3f527c

Browse files
authored
Merge pull request #31594 from gsmet/snakeyaml-2.0
Upgrade to SnakeYaml 2.0
2 parents c6c19fc + 8edf2c4 commit d3f527c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

bom/application/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
<flyway.version>9.15.2</flyway.version>
169169
<yasson.version>3.0.2</yasson.version>
170170
<liquibase.version>4.20.0</liquibase.version>
171-
<snakeyaml.version>1.33</snakeyaml.version>
171+
<snakeyaml.version>2.0</snakeyaml.version>
172172
<osgi.version>6.0.0</osgi.version>
173173
<mongo-client.version>4.9.0</mongo-client.version>
174174
<mongo-crypt.version>1.7.1</mongo-crypt.version>

docs/src/main/java/io/quarkus/docs/generation/QuarkusBuildItemDoc.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.jboss.forge.roaster.model.JavaDocCapable;
2626
import org.jboss.forge.roaster.model.source.FieldSource;
2727
import org.jboss.forge.roaster.model.source.JavaClassSource;
28+
import org.yaml.snakeyaml.LoaderOptions;
2829
import org.yaml.snakeyaml.Yaml;
2930
import org.yaml.snakeyaml.constructor.SafeConstructor;
3031

@@ -154,7 +155,7 @@ private Path findPom(Path path) {
154155

155156
private Map<String, String> extractNames(Path root, Iterable<String> extensionDirs) throws IOException {
156157
Map<String, String> names = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
157-
Yaml yaml = new Yaml(new SafeConstructor());
158+
Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
158159
for (String extension : extensionDirs) {
159160
Path yamlPath = root
160161
.resolve("extensions/" + extension + "/runtime/src/main/resources/META-INF/quarkus-extension.yaml");

extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.eclipse.microprofile.config.Config;
1818
import org.eclipse.microprofile.config.ConfigProvider;
1919
import org.jboss.logging.Logger;
20+
import org.yaml.snakeyaml.LoaderOptions;
2021
import org.yaml.snakeyaml.Yaml;
2122
import org.yaml.snakeyaml.constructor.SafeConstructor;
2223

@@ -75,7 +76,7 @@ private void initLazyState() {
7576
synchronized (extensions) {
7677
if (extensions.isEmpty()) {
7778
try {
78-
final Yaml yaml = new Yaml(new SafeConstructor());
79+
final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
7980
ClassPathUtils.consumeAsPaths("/META-INF/quarkus-extension.yaml", p -> {
8081
try {
8182
final String desc;

0 commit comments

Comments
 (0)