Skip to content

[GOBBLIN-2197] Replace use of org.codehaus.jackson with org.fasterxml.jackson #4104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[GOBBLIN-2197] Replace use of org.codehaus.jackson with org.fasterxml.jackson #4104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gobblin-api/src/main/java/org/apache/gobblin/writer/FsWriterMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions .../org/apache/gobblin/compaction/mapreduce/avro/FieldAttributeBasedDeltaFieldsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions gobblin-core/src/main/java/org/apache/gobblin/source/extractor/utils/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion gobblin-iceberg/src/main/java/org/apache/gobblin/iceberg/Utils/TypeInfoToSchemaParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/org/apache/gobblin/converter/avro/AvroToJsonRecordWithMetadataConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...o-json/src/test/java/org/apache/gobblin/converter/avro/AvroToJsonStringConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...n-modules/gobblin-crypto/src/main/java/org/apache/gobblin/crypto/JsonCredentialStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubDataWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...es/gobblin-eventhub/src/main/java/org/apache/gobblin/eventhub/writer/EventhubRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...modules/gobblin-kafka-08/src/main/java/org/apache/gobblin/kafka/tool/KafkaCheckpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
10 changes: 5 additions & 5 deletions ...in/java/org/apache/gobblin/converter/EnvelopedRecordWithMetadataToRecordWithMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ...in/java/org/apache/gobblin/converter/RecordWithMetadataToEnvelopedRecordWithMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions ...ules/gobblin-metadata/src/main/java/org/apache/gobblin/metadata/types/GlobalMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...ava/org/apache/gobblin/converter/EnvelopedRecordWithMetadataToRecordWithMetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...ava/org/apache/gobblin/converter/RecordWithMetadataToEnvelopedRecordWithMetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions .../gobblin-metadata/src/test/java/org/apache/gobblin/metadata/types/GlobalMetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...flow-config-service-server/src/main/java/org/apache/gobblin/service/RequesterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions gobblin-utility/src/main/java/org/apache/gobblin/util/json/JsonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
4 changes: 2 additions & 2 deletions gradle/scripts/dependencyDefinitions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading