Jackson3 update

Author: jonesbusy

integrations/pom.xml

@@ -82,6 +82,11 @@
       <artifactId>gitlab-branch-source</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>jackson3-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>joda-time-api</artifactId>
@@ -194,11 +199,6 @@
       <artifactId>gitlab-plugin</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>jackson2-api</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>jdk-tool</artifactId>

pom.xml

@@ -39,11 +39,10 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/configuration-as-code-plugin</gitHubRepo>
-    <jenkins.baseline>2.528</jenkins.baseline>
-    <!-- TODO change back to baseline once next bom version is out -->
-    <jenkins.version>2.541.1</jenkins.version>
+    <jenkins.baseline>2.541</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <tagNameFormat>configuration-as-code-@{project.version}</tagNameFormat>
-    <plugin-bom.version>6077.v303e2d08985d</plugin-bom.version>
+    <plugin-bom.version>6098.v29a_dff8a_0c19</plugin-bom.version>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
 

test-harness/pom.xml

@@ -25,6 +25,12 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!-- TODO Remove when on bom -->
+      <dependency>
+        <groupId>io.jenkins.plugins</groupId>
+        <artifactId>jackson3-api</artifactId>
+        <version>3.1.0-64.v37e742c35905</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -62,12 +68,12 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jenkins-ci.main</groupId>
-      <artifactId>jenkins-test-harness</artifactId>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>jackson3-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>jackson2-api</artifactId>
+      <groupId>org.jenkins-ci.main</groupId>
+      <artifactId>jenkins-test-harness</artifactId>
     </dependency>
   </dependencies>
 

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);
     }
 
     /**