Support Jackson 3.x release line

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

Author: reta

build.gradle

@@ -483,7 +483,10 @@ 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}"
             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 +600,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 +710,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 +819,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}"
 
 }

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
 

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()));

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

@@ -18,7 +18,6 @@
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.ClassRule;
 import org.junit.Test;
 
@@ -30,6 +29,8 @@
 import org.opensearch.test.framework.cluster.LocalOpenSearchCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
 
+import tools.jackson.databind.JsonNode;
+
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;

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

@@ -12,7 +12,6 @@
 
 import java.util.StringJoiner;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.ClassRule;
 import org.junit.Test;
 
@@ -22,6 +21,8 @@
 import org.opensearch.test.framework.cluster.LocalCluster;
 import org.opensearch.test.framework.cluster.TestRestClient;
 
+import tools.jackson.databind.node.ObjectNode;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.opensearch.security.api.PatchPayloadHelper.patch;
 import static org.opensearch.security.api.PatchPayloadHelper.replaceOp;

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

@@ -23,7 +23,6 @@
 import java.util.concurrent.Future;
 
 import com.google.common.collect.ImmutableMap;
-import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.http.HttpStatus;
 import org.junit.Assert;
 import org.junit.ClassRule;
@@ -39,6 +38,8 @@
 import org.opensearch.test.framework.cluster.TestRestClient;
 import org.opensearch.test.framework.cluster.TestRestClient.HttpResponse;
 
+import tools.jackson.databind.JsonNode;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;