From f0ef4d13fd7db2a8c87c0ac92913b89caa8bb033 Mon Sep 17 00:00:00 2001 From: Valentin Delaye Date: Sun, 1 Mar 2026 16:13:29 +0100 Subject: [PATCH] Jackson3 update --- integrations/pom.xml | 10 +++++----- test-harness/pom.xml | 8 ++++---- .../java/io/jenkins/plugins/casc/misc/Util.java | 17 ++++++----------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/integrations/pom.xml b/integrations/pom.xml index 27cd412bd5..acdd094ece 100644 --- a/integrations/pom.xml +++ b/integrations/pom.xml @@ -82,6 +82,11 @@ gitlab-branch-source test + + io.jenkins.plugins + jackson3-api + test + io.jenkins.plugins joda-time-api @@ -194,11 +199,6 @@ gitlab-plugin test - - org.jenkins-ci.plugins - jackson2-api - test - org.jenkins-ci.plugins jdk-tool diff --git a/test-harness/pom.xml b/test-harness/pom.xml index 37e1022d6b..a27cdcafb6 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -62,12 +62,12 @@ ${project.version} - org.jenkins-ci.main - jenkins-test-harness + io.jenkins.plugins + jackson3-api - org.jenkins-ci.plugins - jackson2-api + org.jenkins-ci.main + jenkins-test-harness com.google.code.findbugs diff --git a/test-harness/src/main/java/io/jenkins/plugins/casc/misc/Util.java b/test-harness/src/main/java/io/jenkins/plugins/casc/misc/Util.java index fd169d918c..c38ca5c446 100644 --- a/test-harness/src/main/java/io/jenkins/plugins/casc/misc/Util.java +++ b/test-harness/src/main/java/io/jenkins/plugins/casc/misc/Util.java @@ -7,9 +7,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import hudson.ExtensionList; import io.jenkins.plugins.casc.ConfigurationAsCode; import io.jenkins.plugins.casc.ConfigurationContext; @@ -40,6 +37,8 @@ import org.jvnet.hudson.test.LogRecorder; import org.jvnet.hudson.test.LoggerRule; import org.yaml.snakeyaml.nodes.Node; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.dataformat.yaml.YAMLMapper; public class Util { @@ -252,15 +251,11 @@ public static void assertLogContains(LogRecorder logging, String expectedText) { * @return the json conversion of the yaml string. */ public static String convertToJson(String yamlString) { - try { - ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory()); - Object obj = yamlReader.readValue(yamlString, Object.class); + ObjectMapper yamlReader = new YAMLMapper(); + Object obj = yamlReader.readValue(yamlString, Object.class); - ObjectMapper jsonWriter = new ObjectMapper(); - return jsonWriter.writeValueAsString(obj); - } catch (JsonProcessingException e) { - throw new UncheckedIOException(e); - } + ObjectMapper jsonWriter = new ObjectMapper(); + return jsonWriter.writeValueAsString(obj); } /**