Migrate to Jackson3

jonesbusy · jonesbusy · commit a8b31af96dab · 2026-03-07T07:23:29.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
         <gitHubRepo>jenkinsci/bitbucket-branch-source-plugin</gitHubRepo>
         <hpi.bundledArtifacts>scribejava-core,scribejava-java8</hpi.bundledArtifacts>
         <hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
-        <jenkins.baseline>2.504</jenkins.baseline>
+        <jenkins.baseline>2.516</jenkins.baseline>
         <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <ban-junit4-imports.skip>false</ban-junit4-imports.skip>
         <hpi.compatibleSinceVersion>937.0.0</hpi.compatibleSinceVersion>
@@ -71,16 +71,10 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>5804.v80587a_38d937</version>
+                <version>6128.v8e4ce4620a_2b_</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <!-- TODO until in BOM -->
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>credentials</artifactId>
-                <version>1480.v2246fd131e83</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -96,10 +90,15 @@
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>commons-collections4-api</artifactId>
         </dependency>
+        <!-- Needed by scribejava-core -->
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jackson2-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.jenkins.plugins</groupId>
+            <artifactId>jackson3-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>structs</artifactId>
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/BitbucketCloudWorkspace.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/BitbucketCloudWorkspace.java
@@ -24,9 +24,9 @@
 package com.cloudbees.jenkins.plugins.bitbucket.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.util.List;
 import java.util.Map;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 public class BitbucketCloudWorkspace implements BitbucketWorkspace {
     @JsonProperty("uuid")
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/BitbucketHref.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/BitbucketHref.java
@@ -23,16 +23,14 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket.api;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
+import tools.jackson.core.JsonParser;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ValueDeserializer;
 
 /**
  * A Href for something on bitbucket.
@@ -71,20 +69,18 @@ public void setHref(String href) {
         this.href = href;
     }
 
-    public static class Deserializer extends JsonDeserializer<List<BitbucketHref>> {
+    public static class Deserializer extends ValueDeserializer<List<BitbucketHref>> {
 
         @Override
-        public List<BitbucketHref> deserialize(JsonParser p, DeserializationContext ctx)
-                throws IOException {
+        public List<BitbucketHref> deserialize(JsonParser p, DeserializationContext ctx) {
             List<BitbucketHref> result = new ArrayList<>();
-            ObjectCodec codec = p.getCodec();
-            JsonNode node = codec.readTree(p);
+            JsonNode node = ctx.readTree(p);
             if (node.isArray()) {
                 for (JsonNode n : node) {
-                    result.add(codec.treeToValue(n, BitbucketHref.class));
+                    result.add(ctx.readTreeAsValue(n, BitbucketHref.class));
                 }
             } else {
-                result.add(codec.treeToValue(node, BitbucketHref.class));
+                result.add(ctx.readTreeAsValue(node, BitbucketHref.class));
             }
             return result;
         }
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/BitbucketProject.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/BitbucketProject.java
@@ -23,9 +23,9 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket.api;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.util.List;
 import java.util.Map;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 public class BitbucketProject implements BitbucketTeam {
 
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java
@@ -55,8 +55,6 @@
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.JsonParser;
 import com.damnhandy.uri.template.UriTemplate;
 import com.damnhandy.uri.template.impl.Operator;
-import com.fasterxml.jackson.core.JacksonException;
-import com.fasterxml.jackson.core.type.TypeReference;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -85,6 +83,8 @@
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
+import tools.jackson.core.JacksonException;
+import tools.jackson.core.type.TypeReference;
 
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MINUTES;
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/repository/BitbucketCloudRepository.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/repository/BitbucketCloudRepository.java
@@ -28,12 +28,12 @@
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 public class BitbucketCloudRepository implements BitbucketRepository {
 
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/util/DateUtils.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/util/DateUtils.java
@@ -23,14 +23,14 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket.impl.util;
 
-import com.fasterxml.jackson.databind.util.StdDateFormat;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
+import tools.jackson.databind.util.StdDateFormat;
 
 public final class DateUtils {
 
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/util/JsonParser.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/util/JsonParser.java
@@ -24,11 +24,6 @@
 package com.cloudbees.jenkins.plugins.bitbucket.impl.util;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -37,6 +32,11 @@
 import java.nio.charset.StandardCharsets;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.util.StdDateFormat;
 
 /**
  * Jackson based JSON parser
@@ -73,8 +73,8 @@ public static JsonNode toJson(String value) throws IOException {
     private static JsonMapper createMapper(){
         return JsonMapper.builder()
                 .defaultDateFormat(new StdDateFormat())
-                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-                .serializationInclusion(Include.NON_NULL)
+                .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES) // Jackson 3 fail on unknown primitives by default
+                .changeDefaultPropertyInclusion(incl -> incl.withContentInclusion(Include.NON_NULL).withValueInclusion(Include.NON_NULL))
                 .build();
     }
 }
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/cloud/CloudWebhookManager.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/cloud/CloudWebhookManager.java
@@ -38,7 +38,6 @@
 import com.cloudbees.jenkins.plugins.bitbucket.impl.webhook.AbstractWebhookManager;
 import com.cloudbees.jenkins.plugins.bitbucket.util.BitbucketCredentialsUtils;
 import com.damnhandy.uri.template.UriTemplate;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Objects;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
@@ -58,6 +57,7 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.Strings;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
+import tools.jackson.core.type.TypeReference;
 
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MINUTES;
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/server/ServerWebhookManager.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/server/ServerWebhookManager.java
@@ -38,7 +38,6 @@
 import com.cloudbees.jenkins.plugins.bitbucket.server.client.repository.BitbucketServerWebhook;
 import com.cloudbees.jenkins.plugins.bitbucket.util.BitbucketCredentialsUtils;
 import com.damnhandy.uri.template.UriTemplate;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Objects;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
@@ -57,6 +56,7 @@
 import jenkins.model.Jenkins;
 import org.apache.commons.collections.CollectionUtils;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
+import tools.jackson.core.type.TypeReference;
 
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MINUTES;
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java
@@ -55,9 +55,6 @@
 import com.cloudbees.jenkins.plugins.bitbucket.server.client.repository.BitbucketServerRepository;
 import com.damnhandy.uri.template.UriTemplate;
 import com.damnhandy.uri.template.impl.Operator;
-import com.fasterxml.jackson.core.JacksonException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -89,6 +86,9 @@
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
+import tools.jackson.core.JacksonException;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.JsonNode;
 
 /**
  * Bitbucket API client.
@@ -931,7 +931,7 @@ public SCMFile getFile(@NonNull BitbucketSCMFile file) throws IOException {
             String response = getRequest(url);
             JsonNode typeNode = JsonParser.toJson(response).path("type");
             if (!typeNode.isMissingNode() && !typeNode.isNull()) {
-                String responseType = typeNode.asText();
+                String responseType = typeNode.asString();
                 if ("FILE".equals(responseType)) {
                     type = Type.REGULAR_FILE;
                     // type = Type.LINK; does not matter if getFileContent on the linked file/directory returns the content
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/branch/BitbucketServerCommit.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/branch/BitbucketServerCommit.java
@@ -109,6 +109,11 @@ public void setHash(String hash) {
         this.hash = hash;
     }
 
+    @JsonProperty("hash")
+    public void setAlternateHash(String hash) {
+        setHash(hash);
+    }
+
     @Deprecated(since = "936.1.0", forRemoval = true)
     @Override
     public String getDate() {
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/pullrequest/BitbucketServerPullRequest.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/pullrequest/BitbucketServerPullRequest.java
@@ -29,12 +29,12 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 public class BitbucketServerPullRequest implements BitbucketPullRequest {
 
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/repository/BitbucketServerProject.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/repository/BitbucketServerProject.java
@@ -26,9 +26,9 @@
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketHref;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketTeam;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.util.List;
 import java.util.Map;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 public class BitbucketServerProject implements BitbucketTeam {
 
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/repository/BitbucketServerRepository.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/repository/BitbucketServerRepository.java
@@ -29,11 +29,11 @@
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepositoryOwner;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 public class BitbucketServerRepository implements BitbucketRepository {
 
