Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is wrong - should be com.fasterxml.jackson.databind.ObjectMapper and com.fasterxml.jackson.core.JsonFactory



/**
Expand Down
4 changes: 2 additions & 2 deletions gradle/scripts/dependencyDefinitions.gradle
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",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Blazer-007 this doesn't look right

should be

com.fasterxml.jackson.core:jackson-core:2.18.9
com.fasterxml.jackson.core:jackson-databind:2.18.9

2.18.9 was released today with more security fixes

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would suggest that you remove jacksonMapperAsl and use jacksonMapper below while fixing the version number to be newer, eg 2.18.9

"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