From 5aacc3b19ac398a33a6eb1a7f217fef8a7380627 Mon Sep 17 00:00:00 2001 From: Chris McCarroll-Gilbert Date: Wed, 10 Apr 2024 12:55:49 -0700 Subject: [PATCH] Update core package used and remove yamlbean dependeny --- build.gradle | 1 - src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index d80a54a..5e459de 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,6 @@ dependencies { pluginLibs group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14' pluginLibs group: 'com.google.code.gson', name: 'gson', version:'2.10.1' - pluginLibs group: 'com.esotericsoftware.yamlbeans', name: 'yamlbeans', version:'1.13' testImplementation group: 'com.github.tomakehurst', name: 'wiremock-standalone', version:'2.23.2' testImplementation group: 'junit', name: 'junit', version:'4.13.1' diff --git a/src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java b/src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java index 00ae451..bbd6655 100644 --- a/src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java +++ b/src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java @@ -6,7 +6,6 @@ import com.dtolabs.rundeck.core.storage.ResourceMeta; import com.dtolabs.rundeck.plugins.PluginLogger; import com.dtolabs.rundeck.plugins.step.PluginStepContext; -import com.esotericsoftware.yamlbeans.YamlReader; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParser; @@ -28,6 +27,8 @@ import org.dom4j.DocumentHelper; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; +import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.constructor.Constructor; import java.io.*; import java.security.GeneralSecurityException; @@ -438,9 +439,8 @@ public void setHeaders(String headers, RequestBuilder request){ map = new HashMap<>(); Object object = null; try { - YamlReader reader = new YamlReader(headers); - object = reader.read(); - map = (Map) object; + Yaml yaml = new Yaml(new Constructor(Map.class)); + map = yaml.load(headers); } catch (Exception e) { map = null; }