Support Jackson 3.x release line

Signed-off-by: Andriy Redko <drreta@gmail.com>

Author: reta

build.gradle

@@ -483,7 +483,11 @@ configurations {
             force 'commons-logging:commons-logging:1.3.6'
             force 'org.slf4j:slf4j-api:1.7.36'
             force 'org.scala-lang:scala-library:2.13.18'
-            force "com.fasterxml.jackson:jackson-bom:${versions.jackson}"
+            force "tools.jackson:jackson-bom:${versions.jackson3}"
+            force "tools.jackson.core:jackson-core:${versions.jackson3}"
+            force "tools.jackson.datatype:jackson-datatype-jdk8:${versions.jackson3}"
+            force "tools.jackson.core:jackson-databind:${versions.jackson3_databind}"
+            // Keeping Jackson 2.x since Kafka clients and etc still need it
             force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
             force "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${versions.jackson}"
             force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
@@ -597,10 +601,10 @@ allprojects {
                 integrationTestImplementation "com.password4j:password4j:${versions.password4j}"
                 integrationTestImplementation "com.google.guava:guava:${guava_version}"
                 integrationTestImplementation "org.apache.commons:commons-lang3:${versions.commonslang}"
-                integrationTestImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+                integrationTestImplementation "tools.jackson.core:jackson-databind:${versions.jackson3_databind}"
                 integrationTestImplementation 'org.greenrobot:eventbus-java:3.3.1'
                 integrationTestImplementation "org.apache.commons:commons-collections4:${versions.commonscollections4}"
-                integrationTestImplementation('com.flipkart.zjsonpatch:zjsonpatch:0.4.16'){
+                integrationTestImplementation('io.github.vishwakarma:zjsonpatch:0.6.2'){
                     exclude(group:'com.fasterxml.jackson.core')
                     exclude(group: 'org.apache.commons', module: 'commons-collections4')
                 }
@@ -707,7 +711,7 @@ dependencies {
     implementation "io.jsonwebtoken:jjwt-impl:${jjwt_version}"
     implementation "io.jsonwebtoken:jjwt-jackson:${jjwt_version}"
     // JSON patch
-    implementation 'com.flipkart.zjsonpatch:zjsonpatch:0.4.16'
+    implementation 'io.github.vishwakarma:zjsonpatch:0.6.2'
     implementation "org.apache.commons:commons-collections4:${versions.commonscollections4}"
 
     //Password generation
@@ -816,7 +820,7 @@ dependencies {
     testRuntimeOnly "org.apache.kafka:kafka-storage:${kafka_version}"
 
     implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson_annotations}"
-    implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+    implementation "tools.jackson.core:jackson-databind:${versions.jackson3_databind}"
 
     compileOnly "org.opensearch:opensearch:${opensearch_version}"
 

bwc-test/build.gradle

@@ -74,7 +74,7 @@ dependencies {
     testImplementation "org.opensearch.test:framework:${opensearch_version}"
     testImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"
     testImplementation "org.opensearch:common-utils:${common_utils_version}"
-    testImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+    testImplementation "tools.jackson.core:jackson-databind:${versions.jackson3_databind}"
     testImplementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson_annotations}"
 
 }

bwc-test/src/test/java/org/opensearch/security/bwc/SecurityBackwardsCompatibilityIT.java

@@ -21,7 +21,6 @@
 import java.util.stream.Collectors;
 import javax.net.ssl.SSLContext;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
@@ -55,6 +54,8 @@
 import org.opensearch.security.bwc.helper.RestHelper;
 import org.opensearch.test.rest.OpenSearchRestTestCase;
 
+import tools.jackson.databind.ObjectMapper;
+
 import static org.apache.hc.core5.http.ContentType.APPLICATION_NDJSON;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.anyOf;

bwc-test/src/test/java/org/opensearch/security/bwc/Song.java

@@ -13,11 +13,10 @@
 import java.util.Objects;
 import java.util.UUID;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.opensearch.common.Randomness;
 
+import tools.jackson.databind.ObjectMapper;
+
 public class Song {
 
     public static final String FIELD_TITLE = "title";
@@ -104,7 +103,7 @@ public Map<String, Object> asMap() {
         return Map.of(FIELD_ARTIST, artist, FIELD_TITLE, title, FIELD_LYRICS, lyrics, FIELD_STARS, stars, FIELD_GENRE, genre);
     }
 
-    public String asJson() throws JsonProcessingException {
+    public String asJson() {
         return new ObjectMapper().writeValueAsString(this.asMap());
     }
 

libs/opensaml/build.gradle

@@ -31,7 +31,7 @@ configurations.all {
         force "org.bouncycastle:bcpkix-jdk18on:1.83"
         force "org.bouncycastle:bcprov-jdk18on:1.83"
         force "org.apache.commons:commons-lang3:${versions.commonslang}"
-        force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
+        force "tools.jackson.core:jackson-core:${versions.jackson3}"
     }
 }
 

sample-resource-plugin/build.gradle

@@ -93,7 +93,7 @@ dependencies {
 
     implementation "org.opensearch:common-utils:${common_utils_version}"
     implementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
-    implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+    implementation "tools.jackson.core:jackson-databind:${versions.jackson3_databind}"
 
     integrationTestImplementation 'org.ldaptive:ldaptive:1.2.3' // for running multinode tests
 

sample-resource-plugin/src/integrationTest/java/org/opensearch/sample/resource/securityapis/MigrateApiTests.java

@@ -16,9 +16,6 @@
 import java.util.Map;
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.http.HttpStatus;
 import org.awaitility.Awaitility;
 import org.junit.After;
@@ -36,6 +33,10 @@
 import org.opensearch.test.framework.cluster.TestRestClient;
 import org.opensearch.test.framework.matcher.RestMatchers;
 
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.ObjectNode;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
@@ -653,10 +654,10 @@ public void testMigrateAPI_withGarbageParentId() {
             ArrayNode hitsNode = (ArrayNode) sharingResponse.bodyAsJsonNode().get("hits").get("hits");
             assertThat(hitsNode.size(), equalTo(1));
 
-            com.fasterxml.jackson.databind.JsonNode source = hitsNode.get(0).get("_source");
-            assertThat(source.get("resource_id").asText(), equalTo(resourceId));
-            assertThat(source.get("parent_id").asText(), equalTo(garbageGroupId));
-            assertThat(source.get("parent_type").asText(), equalTo(RESOURCE_GROUP_TYPE));
+            tools.jackson.databind.JsonNode source = hitsNode.get(0).get("_source");
+            assertThat(source.get("resource_id").asString(), equalTo(resourceId));
+            assertThat(source.get("parent_id").asString(), equalTo(garbageGroupId));
+            assertThat(source.get("parent_type").asString(), equalTo(RESOURCE_GROUP_TYPE));
 
             // Access check for the owner should still work gracefully — the nonexistent parent
             // simply contributes no additional resource IDs, so the resource remains owner-accessible
@@ -690,18 +691,18 @@ public void testMigrateAPI_withParentHierarchy() {
             assertThat(hitsNode.size(), equalTo(2));
 
             // Find the resource hit (not the group) and verify parent fields
-            com.fasterxml.jackson.databind.JsonNode resourceSource = null;
-            for (com.fasterxml.jackson.databind.JsonNode hit : hitsNode) {
-                com.fasterxml.jackson.databind.JsonNode src = hit.get("_source");
-                if (RESOURCE_TYPE.equals(src.get("resource_type").asText())) {
+            tools.jackson.databind.JsonNode resourceSource = null;
+            for (tools.jackson.databind.JsonNode hit : hitsNode) {
+                tools.jackson.databind.JsonNode src = hit.get("_source");
+                if (RESOURCE_TYPE.equals(src.get("resource_type").asString())) {
                     resourceSource = src;
                     break;
                 }
             }
             assertThat("Expected a sharing record for resource type " + RESOURCE_TYPE, resourceSource != null);
-            assertThat(resourceSource.get("resource_id").asText(), equalTo(resourceId));
-            assertThat(resourceSource.get("parent_type").asText(), equalTo(RESOURCE_GROUP_TYPE));
-            assertThat(resourceSource.get("parent_id").asText(), equalTo(groupId));
+            assertThat(resourceSource.get("resource_id").asString(), equalTo(resourceId));
+            assertThat(resourceSource.get("parent_type").asString(), equalTo(RESOURCE_GROUP_TYPE));
+            assertThat(resourceSource.get("parent_id").asString(), equalTo(groupId));
         }
     }
 

src/integrationTest/java/org/opensearch/security/AbstractDefaultConfigurationTests.java

@@ -14,7 +14,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.http.HttpStatus;
 import org.awaitility.Awaitility;
 import org.junit.Test;
@@ -23,6 +22,8 @@
 import org.opensearch.test.framework.cluster.LocalCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
 
+import tools.jackson.databind.JsonNode;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.aMapWithSize;
 import static org.hamcrest.Matchers.allOf;
@@ -226,7 +227,7 @@ public void securityRolesUpgradeSpecifyingRoles() throws Exception {
 
     private Set<String> extractFieldNames(final JsonNode json) {
         final var set = new HashSet<String>();
-        json.fieldNames().forEachRemaining(set::add);
+        json.propertyNames().spliterator().forEachRemaining(set::add);
         return set;
     }
 

src/integrationTest/java/org/opensearch/security/ParentChildRelationTests.java

@@ -12,7 +12,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -28,6 +27,8 @@
 import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
 import org.opensearch.transport.client.Client;
 
+import tools.jackson.databind.JsonNode;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;

src/integrationTest/java/org/opensearch/security/api/AbstractConfigEntityApiIntegrationTest.java

@@ -174,7 +174,7 @@ void verifyNoHiddenEntities(final CheckedSupplier<TestRestClient.HttpResponse, E
         assertThat(resp, isOk());
         final var body = resp.bodyAsJsonNode();
         final var pretty = body.toPrettyString();
-        final var it = body.elements();
+        final var it = body.values().iterator();
         while (it.hasNext()) {
             final var e = it.next();
             assertThat(pretty, not(e.get("hidden").asBoolean()));