Added jackson dependency to server

Signed-off-by: Ryan Bogan <[email protected]>
opensearch-project · Nov 23, 2022 · 5de4cb1 · 5de4cb1
1 parent 139c2cf
commit 5de4cb1
Show file tree

Hide file tree

Showing 24 changed files with 4 additions and 143 deletions.
diff --git a/modules/ingest-geoip/licenses/jackson-annotations-2.14.1.jar.sha1 b/modules/ingest-geoip/licenses/jackson-annotations-2.14.1.jar.sha1
diff --git a/modules/ingest-geoip/licenses/jackson-annotations-LICENSE b/modules/ingest-geoip/licenses/jackson-annotations-LICENSE
diff --git a/modules/ingest-geoip/licenses/jackson-annotations-NOTICE b/modules/ingest-geoip/licenses/jackson-annotations-NOTICE
diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.14.1.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.14.1.jar.sha1
diff --git a/modules/ingest-geoip/licenses/jackson-databind-LICENSE b/modules/ingest-geoip/licenses/jackson-databind-LICENSE
diff --git a/modules/ingest-geoip/licenses/jackson-databind-NOTICE b/modules/ingest-geoip/licenses/jackson-databind-NOTICE
diff --git a/plugins/discovery-ec2/licenses/jackson-LICENSE b/plugins/discovery-ec2/licenses/jackson-LICENSE
diff --git a/plugins/discovery-ec2/licenses/jackson-NOTICE b/plugins/discovery-ec2/licenses/jackson-NOTICE
diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.14.1.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.14.1.jar.sha1
diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.14.1.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.14.1.jar.sha1
diff --git a/plugins/repository-azure/licenses/jackson-annotations-2.14.1.jar.sha1 b/plugins/repository-azure/licenses/jackson-annotations-2.14.1.jar.sha1
diff --git a/plugins/repository-azure/licenses/jackson-databind-2.14.1.jar.sha1 b/plugins/repository-azure/licenses/jackson-databind-2.14.1.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/jackson-databind-2.14.1.jar.sha1 b/plugins/repository-hdfs/licenses/jackson-databind-2.14.1.jar.sha1
diff --git a/plugins/repository-s3/licenses/jackson-LICENSE b/plugins/repository-s3/licenses/jackson-LICENSE
diff --git a/plugins/repository-s3/licenses/jackson-NOTICE b/plugins/repository-s3/licenses/jackson-NOTICE
diff --git a/plugins/repository-s3/licenses/jackson-annotations-2.14.1.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.14.1.jar.sha1
diff --git a/plugins/repository-s3/licenses/jackson-databind-2.14.1.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.14.1.jar.sha1
diff --git a/server/build.gradle b/server/build.gradle
@@ -135,6 +135,10 @@ dependencies {
   // jna
   api "net.java.dev.jna:jna:${versions.jna}"
 
+  // jackson
+  api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
+  api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
+
   testImplementation(project(":test:framework")) {
     // tests use the locally compiled version of server
     exclude group: 'org.opensearch', module: 'server'
@@ -208,31 +212,12 @@ tasks.named("processResources").configure {
 
 tasks.named("thirdPartyAudit").configure {
     ignoreMissingClasses(
-            // from com.fasterxml.jackson.dataformat.yaml.YAMLMapper (jackson-dataformat-yaml)
-            'com.fasterxml.jackson.databind.ObjectMapper',
 
             // from log4j
             'com.conversantmedia.util.concurrent.SpinPolicy',
-            'com.fasterxml.jackson.annotation.JsonInclude$Include',
-            'com.fasterxml.jackson.databind.DeserializationContext',
-            'com.fasterxml.jackson.databind.DeserializationFeature',
-            'com.fasterxml.jackson.databind.JsonMappingException',
-            'com.fasterxml.jackson.databind.JsonNode',
-            'com.fasterxml.jackson.databind.Module$SetupContext',
-            'com.fasterxml.jackson.databind.ObjectReader',
-            'com.fasterxml.jackson.databind.ObjectWriter',
-            'com.fasterxml.jackson.databind.SerializerProvider',
-            'com.fasterxml.jackson.databind.deser.std.StdDeserializer',
-            'com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer',
-            'com.fasterxml.jackson.databind.module.SimpleModule',
-            'com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter',
-            'com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider',
-            'com.fasterxml.jackson.databind.ser.std.StdScalarSerializer',
-            'com.fasterxml.jackson.databind.ser.std.StdSerializer',
             'com.fasterxml.jackson.dataformat.xml.JacksonXmlModule',
             'com.fasterxml.jackson.dataformat.xml.XmlMapper',
             'com.fasterxml.jackson.dataformat.xml.util.DefaultXmlPrettyPrinter',
-            'com.fasterxml.jackson.databind.node.ObjectNode',
             'org.fusesource.jansi.Ansi',
             'org.fusesource.jansi.AnsiRenderer$Code',
             'com.lmax.disruptor.EventFactory',
@@ -292,9 +277,6 @@ tasks.named("thirdPartyAudit").configure {
             'org.noggit.JSONParser',
 
             // from lucene-spatial
-            'com.fasterxml.jackson.databind.JsonSerializer',
-            'com.fasterxml.jackson.databind.JsonDeserializer',
-            'com.fasterxml.jackson.databind.node.ArrayNode',
             'com.google.common.geometry.S2Cell',
             'com.google.common.geometry.S2CellId',
             'com.google.common.geometry.S2Projections',

diff --git a/...enses/jackson-annotations-2.14.1.jar.sha1 → ...enses/jackson-annotations-2.14.1.jar.sha1 b/...enses/jackson-annotations-2.14.1.jar.sha1 → ...enses/jackson-annotations-2.14.1.jar.sha1
diff --git a/...ools/upgrade-cli/licenses/jackson-LICENSE → .../licenses/jackson-annotations-LICENSE.txt b/...ools/upgrade-cli/licenses/jackson-LICENSE → .../licenses/jackson-annotations-LICENSE.txt
diff --git a/...tools/upgrade-cli/licenses/jackson-NOTICE → ...r/licenses/jackson-annotations-NOTICE.txt b/...tools/upgrade-cli/licenses/jackson-NOTICE → ...r/licenses/jackson-annotations-NOTICE.txt
diff --git a/...licenses/jackson-databind-2.14.1.jar.sha1 → ...licenses/jackson-databind-2.14.1.jar.sha1 b/...licenses/jackson-databind-2.14.1.jar.sha1 → ...licenses/jackson-databind-2.14.1.jar.sha1
diff --git a/...dfs/licenses/jackson-databind-LICENSE.txt → server/licenses/jackson-databind-LICENSE.txt b/...dfs/licenses/jackson-databind-LICENSE.txt → server/licenses/jackson-databind-LICENSE.txt
diff --git a/...hdfs/licenses/jackson-databind-NOTICE.txt → server/licenses/jackson-databind-NOTICE.txt b/...hdfs/licenses/jackson-databind-NOTICE.txt → server/licenses/jackson-databind-NOTICE.txt