diff --git a/cli/pom.xml b/cli/pom.xml
index 0359c68404fa..731afeec3230 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -48,11 +48,6 @@
infinispan-core
true
-
- org.yaml
- snakeyaml
- compile
-
org.apache.logging.log4j
log4j-api
diff --git a/cli/src/main/java/org/infinispan/cli/commands/kubernetes/Kube.java b/cli/src/main/java/org/infinispan/cli/commands/kubernetes/Kube.java
index 7a53bb6cd236..e8e41606e6e2 100644
--- a/cli/src/main/java/org/infinispan/cli/commands/kubernetes/Kube.java
+++ b/cli/src/main/java/org/infinispan/cli/commands/kubernetes/Kube.java
@@ -1,11 +1,13 @@
package org.infinispan.cli.commands.kubernetes;
+import java.io.StringReader;
import java.util.Base64;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.Properties;
import org.aesh.command.Command;
import org.aesh.command.CommandResult;
@@ -13,7 +15,10 @@
import org.aesh.command.invocation.CommandInvocation;
import org.infinispan.cli.commands.Version;
import org.infinispan.cli.logging.Messages;
-import org.yaml.snakeyaml.Yaml;
+import org.infinispan.commons.configuration.io.NamingStrategy;
+import org.infinispan.commons.configuration.io.PropertyReplacer;
+import org.infinispan.commons.configuration.io.URLConfigurationResourceResolver;
+import org.infinispan.commons.configuration.io.yaml.YamlConfigurationReader;
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
import io.fabric8.kubernetes.api.model.Namespace;
@@ -127,10 +132,10 @@ static Map decodeOpaqueSecrets(Secret secret) {
return Collections.emptyMap();
}
String opaqueIdentities = secret.getData().get("identities.yaml");
- String identitiesYaml = new String(Base64.getDecoder().decode(opaqueIdentities));
- Yaml yaml = new Yaml();
- Map identities = yaml.load(identitiesYaml);
- List
-
- org.yaml
- snakeyaml
- ${versionx.org.yaml.snakeyaml}
- test
-
software.amazon.ion
ion-java
diff --git a/server/rest/pom.xml b/server/rest/pom.xml
index 1356cd795001..cd82007ffcf1 100644
--- a/server/rest/pom.xml
+++ b/server/rest/pom.xml
@@ -200,11 +200,6 @@
opentelemetry-sdk-testing
test
-
- org.yaml
- snakeyaml
- test
-
diff --git a/server/rest/src/test/java/org/infinispan/rest/resources/CacheResourceV2Test.java b/server/rest/src/test/java/org/infinispan/rest/resources/CacheResourceV2Test.java
index c1129b28fb17..fca5d9f9e80c 100644
--- a/server/rest/src/test/java/org/infinispan/rest/resources/CacheResourceV2Test.java
+++ b/server/rest/src/test/java/org/infinispan/rest/resources/CacheResourceV2Test.java
@@ -32,6 +32,7 @@
import java.io.ByteArrayInputStream;
import java.io.Closeable;
import java.io.IOException;
+import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;
import java.util.Collection;
@@ -39,6 +40,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
@@ -55,6 +57,10 @@
import org.infinispan.client.rest.RestEntity;
import org.infinispan.client.rest.RestRawClient;
import org.infinispan.client.rest.RestResponse;
+import org.infinispan.commons.configuration.io.NamingStrategy;
+import org.infinispan.commons.configuration.io.PropertyReplacer;
+import org.infinispan.commons.configuration.io.URLConfigurationResourceResolver;
+import org.infinispan.commons.configuration.io.yaml.YamlConfigurationReader;
import org.infinispan.commons.dataconversion.MediaType;
import org.infinispan.commons.dataconversion.internal.Json;
import org.infinispan.commons.marshall.ProtoStreamMarshaller;
@@ -80,7 +86,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import org.yaml.snakeyaml.Yaml;
@Test(groups = "functional", testName = "rest.CacheResourceV2Test")
public class CacheResourceV2Test extends AbstractRestResourceTest {
@@ -1051,11 +1056,12 @@ private void checkXML(CompletionStage response) throws Exception {
}
private void checkYaml(CompletionStage response, String name) {
- Yaml yaml = new Yaml();
- Map config = yaml.load(join(response).getBody());
- assertEquals("SYNC", getYamlProperty(config, name, "distributedCache", "mode"));
- assertEquals("OBJECT", getYamlProperty(config, name, "distributedCache", "memory", "storage"));
- assertEquals("20", getYamlProperty(config, name, "distributedCache", "memory", "maxCount"));
+ try (YamlConfigurationReader yaml = new YamlConfigurationReader(new StringReader(join(response).getBody()), new URLConfigurationResourceResolver(null), new Properties(), PropertyReplacer.DEFAULT, NamingStrategy.KEBAB_CASE)) {
+ Map config = yaml.asMap();
+ assertEquals("SYNC", getYamlProperty(config, name, "distributedCache", "mode"));
+ assertEquals("OBJECT", getYamlProperty(config, name, "distributedCache", "memory", "storage"));
+ assertEquals("20", getYamlProperty(config, name, "distributedCache", "memory", "maxCount"));
+ }
}
public static T getYamlProperty(Map yaml, String... names) {