From 54f3f451057cfc2392cf42f149564b0100c6fa95 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar Date: Mon, 12 Jun 2023 08:25:23 -0500 Subject: [PATCH 1/2] upgrade snakeyaml from 1.33 to 2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 926d30bad..53753ea89 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 2.13.4 - 1.33 + 2.0 1.3.1 3.0.3 9.0.64 From c3a6f008bdad95ee1407fdec510cf66a2236b10c Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar Date: Wed, 14 Jun 2023 07:27:50 -0500 Subject: [PATCH 2/2] minor update --- .../java/com/okta/idx/sdk/api/config/YAMLPropertiesSource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/okta/idx/sdk/api/config/YAMLPropertiesSource.java b/api/src/main/java/com/okta/idx/sdk/api/config/YAMLPropertiesSource.java index a2999a0c2..738dc3c37 100644 --- a/api/src/main/java/com/okta/idx/sdk/api/config/YAMLPropertiesSource.java +++ b/api/src/main/java/com/okta/idx/sdk/api/config/YAMLPropertiesSource.java @@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; +import org.yaml.snakeyaml.LoaderOptions; import java.io.IOException; import java.io.InputStream; @@ -49,7 +50,7 @@ public Map getProperties() { // check to see if file exists if (in != null) { // if we have a yaml file. if (Classes.isAvailable("org.yaml.snakeyaml.Yaml")) { - Yaml yaml = new Yaml(new SafeConstructor()); + Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions())); Map config = yaml.load(in); return getFlattenedMap(config); } else {