This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 434f10caca2 HDDS-13658. Bump snakeyaml to 2.5 (#9014)
434f10caca2 is described below
commit 434f10caca2e1d32cedd499da47927e0d94cc098
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Oct 9 13:45:59 2025 +0200
HDDS-13658. Bump snakeyaml to 2.5 (#9014)
---
.../src/main/java/org/apache/hadoop/hdds/server/YamlUtils.java | 6 ++----
pom.xml | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/YamlUtils.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/YamlUtils.java
index 5699978e324..51bcd772a15 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/YamlUtils.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/YamlUtils.java
@@ -23,13 +23,11 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
import org.apache.ratis.util.AtomicFileOutputStream;
import org.slf4j.Logger;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.inspector.TagInspector;
-import org.yaml.snakeyaml.inspector.TrustedPrefixesTagInspector;
/**
* YAML utilities.
@@ -47,8 +45,8 @@ public static <T> T loadAs(InputStream input, Class<? super
T> type) {
}
private static Yaml getYamlForLoad() {
- TagInspector tags = new TrustedPrefixesTagInspector(Arrays.asList(
- "org.apache.hadoop.ozone.", "org.apache.hadoop.hdds."));
+ TagInspector tags = tag ->
tag.getClassName().startsWith("org.apache.hadoop.hdds.")
+ || tag.getClassName().startsWith("org.apache.hadoop.ozone.");
LoaderOptions loaderOptions = new LoaderOptions();
loaderOptions.setTagInspector(tags);
return new Yaml(loaderOptions);
diff --git a/pom.xml b/pom.xml
index 5d17a1736bd..fd3f159124c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,7 +212,7 @@
<servlet-api.version>3.1.0</servlet-api.version>
<shell-executable>bash</shell-executable>
<slf4j.version>2.0.17</slf4j.version>
- <snakeyaml.version>2.0</snakeyaml.version>
+ <snakeyaml.version>2.5</snakeyaml.version>
<snappy-java.version>1.1.10.8</snappy-java.version>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.java.binaries>${basedir}/target/classes</sonar.java.binaries>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
