diff --git a/gobblin-api/src/main/java/org/apache/gobblin/writer/FsWriterMetrics.java b/gobblin-api/src/main/java/org/apache/gobblin/writer/FsWriterMetrics.java index 374c557605b..ea5db249e0c 100644 --- a/gobblin-api/src/main/java/org/apache/gobblin/writer/FsWriterMetrics.java +++ b/gobblin-api/src/main/java/org/apache/gobblin/writer/FsWriterMetrics.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Collection; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.map.ObjectMapper; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/gobblin-compaction/src/main/java/org/apache/gobblin/compaction/mapreduce/avro/FieldAttributeBasedDeltaFieldsProvider.java b/gobblin-compaction/src/main/java/org/apache/gobblin/compaction/mapreduce/avro/FieldAttributeBasedDeltaFieldsProvider.java index 6a01b392370..41a8a3a03dc 100644 --- a/gobblin-compaction/src/main/java/org/apache/gobblin/compaction/mapreduce/avro/FieldAttributeBasedDeltaFieldsProvider.java +++ b/gobblin-compaction/src/main/java/org/apache/gobblin/compaction/mapreduce/avro/FieldAttributeBasedDeltaFieldsProvider.java @@ -27,11 +27,11 @@ import org.apache.avro.Schema.Field; import org.apache.avro.generic.GenericRecord; import org.apache.hadoop.conf.Configuration; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.ObjectNode; +import org.fasterxml.jackson.JsonFactory; +import org.fasterxml.jackson.JsonNode; +import org.fasterxml.jackson.JsonParser; +import org.fasterxml.jackson.map.ObjectMapper; +import org.fasterxml.jackson.node.ObjectNode; import com.google.common.base.Preconditions; import com.google.common.cache.CacheBuilder; diff --git a/gobblin-core/src/main/java/org/apache/gobblin/source/extractor/utils/Utils.java b/gobblin-core/src/main/java/org/apache/gobblin/source/extractor/utils/Utils.java index 86d8f58a960..c13f0de6065 100644 --- a/gobblin-core/src/main/java/org/apache/gobblin/source/extractor/utils/Utils.java +++ b/gobblin-core/src/main/java/org/apache/gobblin/source/extractor/utils/Utils.java @@ -29,8 +29,8 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonNode; +import org.fasterxml.jackson.map.ObjectMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; diff --git a/gobblin-iceberg/src/main/java/org/apache/gobblin/iceberg/Utils/TypeInfoToSchemaParser.java b/gobblin-iceberg/src/main/java/org/apache/gobblin/iceberg/Utils/TypeInfoToSchemaParser.java index 514bb68e442..4b7ee9b2a72 100644 --- a/gobblin-iceberg/src/main/java/org/apache/gobblin/iceberg/Utils/TypeInfoToSchemaParser.java +++ b/gobblin-iceberg/src/main/java/org/apache/gobblin/iceberg/Utils/TypeInfoToSchemaParser.java @@ -36,7 +36,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.UnionTypeInfo; -import org.codehaus.jackson.node.JsonNodeFactory; +import org.fasterxml.jackson.node.JsonNodeFactory; import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper; diff --git a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverter.java b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverter.java index 60c46615bb0..08d340eb019 100644 --- a/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverter.java +++ b/gobblin-modules/gobblin-avro-json/src/main/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverter.java @@ -21,8 +21,8 @@ import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonNode; +import org.fasterxml.jackson.map.ObjectMapper; import org.apache.gobblin.configuration.WorkUnitState; import org.apache.gobblin.converter.Converter; diff --git a/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverterTest.java b/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverterTest.java index 10774c5057e..45ac5362d56 100644 --- a/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverterTest.java +++ b/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverterTest.java @@ -17,7 +17,7 @@ package org.apache.gobblin.converter.avro; import org.apache.avro.generic.GenericRecord; -import org.codehaus.jackson.JsonNode; +import org.fasterxml.jackson.JsonNode; import org.testng.Assert; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterTest.java b/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterTest.java index 28ee8440719..75af1d05be5 100644 --- a/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterTest.java +++ b/gobblin-modules/gobblin-avro-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterTest.java @@ -21,8 +21,8 @@ import java.util.Iterator; import org.apache.avro.generic.GenericRecord; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonNode; +import org.fasterxml.jackson.map.ObjectMapper; import org.testng.Assert; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JsonCredentialStore.java b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JsonCredentialStore.java index 8a69b189521..2fae2fceeae 100644 --- a/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JsonCredentialStore.java +++ b/gobblin-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JsonCredentialStore.java @@ -26,8 +26,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonNode; +import org.fasterxml.jackson.map.ObjectMapper; import lombok.extern.slf4j.Slf4j; diff --git a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriter.java b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriter.java index dc8a8adde92..b109fd68fb8 100644 --- a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriter.java +++ b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriter.java @@ -32,7 +32,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubRequest.java b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubRequest.java index 57d92cf573f..29395dddafb 100644 --- a/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubRequest.java +++ b/gobblin-modules/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubRequest.java @@ -18,7 +18,7 @@ package org.apache.gobblin.eventhub.writer; -import org.codehaus.jackson.annotate.JsonProperty; +import org.fasterxml.jackson.annotate.JsonProperty; /** * The EventhubRequest is a wrapper of given json string diff --git a/gobblin-modules/gobblin-kafka-08/src/main/java/org/apache/gobblin/kafka/tool/KafkaCheckpoint.java b/gobblin-modules/gobblin-kafka-08/src/main/java/org/apache/gobblin/kafka/tool/KafkaCheckpoint.java index 527135d62a6..7e13ccff685 100644 --- a/gobblin-modules/gobblin-kafka-08/src/main/java/org/apache/gobblin/kafka/tool/KafkaCheckpoint.java +++ b/gobblin-modules/gobblin-kafka-08/src/main/java/org/apache/gobblin/kafka/tool/KafkaCheckpoint.java @@ -23,9 +23,9 @@ import java.io.OutputStream; import java.util.HashMap; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.type.MapType; -import org.codehaus.jackson.map.type.TypeFactory; +import org.fasterxml.jackson.map.ObjectMapper; +import org.fasterxml.jackson.map.type.MapType; +import org.fasterxml.jackson.map.type.TypeFactory; /** diff --git a/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/converter/EnvelopedRecordWithMetadataToRecordWithMetadata.java b/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/converter/EnvelopedRecordWithMetadataToRecordWithMetadata.java index c686091a199..e7ee5267ed0 100644 --- a/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/converter/EnvelopedRecordWithMetadataToRecordWithMetadata.java +++ b/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/converter/EnvelopedRecordWithMetadataToRecordWithMetadata.java @@ -23,11 +23,11 @@ import org.apache.gobblin.configuration.WorkUnitState; import org.apache.gobblin.metadata.types.Metadata; import org.apache.gobblin.type.RecordWithMetadata; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonFactory; +import org.fasterxml.jackson.JsonNode; +import org.fasterxml.jackson.JsonParser; +import org.fasterxml.jackson.map.DeserializationConfig; +import org.fasterxml.jackson.map.ObjectMapper; /** * A converter that takes a {@link RecordWithMetadata} and deserializes it by trying to parse it into a diff --git a/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/converter/RecordWithMetadataToEnvelopedRecordWithMetadata.java b/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/converter/RecordWithMetadataToEnvelopedRecordWithMetadata.java index a494553d34d..61e5b9ca517 100644 --- a/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/converter/RecordWithMetadataToEnvelopedRecordWithMetadata.java +++ b/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/converter/RecordWithMetadataToEnvelopedRecordWithMetadata.java @@ -21,10 +21,10 @@ import java.io.IOException; import java.util.Collections; -import org.codehaus.jackson.JsonEncoding; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonEncoding; +import org.fasterxml.jackson.JsonFactory; +import org.fasterxml.jackson.JsonGenerator; +import org.fasterxml.jackson.map.ObjectMapper; import org.apache.gobblin.configuration.WorkUnitState; import org.apache.gobblin.metadata.types.GlobalMetadata; diff --git a/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/metadata/types/GlobalMetadata.java b/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/metadata/types/GlobalMetadata.java index 4dde2f34cc7..ff80754c346 100644 --- a/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/metadata/types/GlobalMetadata.java +++ b/gobblin-modules/gobblin-metadata/src/main/java/org/apache/gobblin/metadata/types/GlobalMetadata.java @@ -26,11 +26,11 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.codehaus.jackson.JsonEncoding; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonEncoding; +import org.fasterxml.jackson.JsonFactory; +import org.fasterxml.jackson.JsonGenerator; +import org.fasterxml.jackson.annotate.JsonProperty; +import org.fasterxml.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/converter/EnvelopedRecordWithMetadataToRecordWithMetadataTest.java b/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/converter/EnvelopedRecordWithMetadataToRecordWithMetadataTest.java index 8d247a74434..44710cd597a 100644 --- a/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/converter/EnvelopedRecordWithMetadataToRecordWithMetadataTest.java +++ b/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/converter/EnvelopedRecordWithMetadataToRecordWithMetadataTest.java @@ -22,8 +22,8 @@ import java.util.Iterator; import org.apache.gobblin.metadata.types.Metadata; import org.apache.gobblin.type.RecordWithMetadata; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonNode; +import org.fasterxml.jackson.map.ObjectMapper; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/converter/RecordWithMetadataToEnvelopedRecordWithMetadataTest.java b/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/converter/RecordWithMetadataToEnvelopedRecordWithMetadataTest.java index 578a67956ff..2f7b5095513 100644 --- a/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/converter/RecordWithMetadataToEnvelopedRecordWithMetadataTest.java +++ b/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/converter/RecordWithMetadataToEnvelopedRecordWithMetadataTest.java @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.Iterator; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonNode; +import org.fasterxml.jackson.map.ObjectMapper; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/metadata/types/GlobalMetadataTest.java b/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/metadata/types/GlobalMetadataTest.java index 29838c24982..97ec3361cb7 100644 --- a/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/metadata/types/GlobalMetadataTest.java +++ b/gobblin-modules/gobblin-metadata/src/test/java/org/apache/gobblin/metadata/types/GlobalMetadataTest.java @@ -21,8 +21,8 @@ import java.util.Iterator; import java.util.List; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonNode; +import org.fasterxml.jackson.map.ObjectMapper; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/RequesterService.java b/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/RequesterService.java index 03e0e41f21e..553742338ce 100644 --- a/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/RequesterService.java +++ b/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/RequesterService.java @@ -23,8 +23,8 @@ import java.util.Base64; import java.util.List; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import org.fasterxml.jackson.map.ObjectMapper; +import org.fasterxml.jackson.type.TypeReference; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; diff --git a/gobblin-utility/src/main/java/org/apache/gobblin/util/json/JsonUtils.java b/gobblin-utility/src/main/java/org/apache/gobblin/util/json/JsonUtils.java index d575ce64c48..4060ff07078 100644 --- a/gobblin-utility/src/main/java/org/apache/gobblin/util/json/JsonUtils.java +++ b/gobblin-utility/src/main/java/org/apache/gobblin/util/json/JsonUtils.java @@ -16,8 +16,8 @@ */ package org.apache.gobblin.util.json; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.map.ObjectMapper; +import org.fasterxml.jackson.JsonFactory; +import org.fasterxml.jackson.map.ObjectMapper; /** diff --git a/gradle/scripts/dependencyDefinitions.gradle b/gradle/scripts/dependencyDefinitions.gradle index da40582331f..be13ec8a77b 100644 --- a/gradle/scripts/dependencyDefinitions.gradle +++ b/gradle/scripts/dependencyDefinitions.gradle @@ -106,8 +106,8 @@ ext.externalDependency = [ "testng": "org.testng:testng:6.14.3", "junit": "junit:junit:4.13.2", "mockserver":"org.mock-server:mockserver-netty:3.10.4", - "jacksonCore": "org.codehaus.jackson:jackson-core-asl:1.9.13", - "jacksonMapperAsl": "org.codehaus.jackson:jackson-mapper-asl:1.9.13", + "jacksonCore": "org.fasterxml.jackson:jackson-core-asl:2.18.0", + "jacksonMapperAsl": "org.fasterxml.jackson:jackson-mapper-asl:2.18.0", "jacksonMapper": "com.fasterxml.jackson.core:jackson-databind:2.10.2", "jasypt": "org.jasypt:jasypt:1.9.2", "jodaTime": "joda-time:joda-time:2.9.3",