diff --git a/inlong-common/pom.xml b/inlong-common/pom.xml index 7e4bbff2f65..2d3dfecfbfb 100644 --- a/inlong-common/pom.xml +++ b/inlong-common/pom.xml @@ -96,6 +96,10 @@ com.fasterxml.jackson.core jackson-databind + + org.apache.flink + flink-shaded-jackson + diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java index 880644cb0cb..ef6a0f4e6bf 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/deserialization/DeserializationConfig.java @@ -19,8 +19,8 @@ import org.apache.inlong.common.constant.Constants; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; import java.io.Serializable; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java index e9456ba9e2a..30aab091e23 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayFormatInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java index 000399c379e..f3868a06ac6 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/ArrayTypeInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java index b1ad81413bb..3838145ff1c 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/BinaryFormatInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import java.nio.charset.StandardCharsets; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java index 462a440cd07..5c2694cf596 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DateFormatInfo.java @@ -17,9 +17,9 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java index 4c33678a0ad..4eb480658e6 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/DecimalFormatInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import java.math.BigDecimal; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java index b83da028183..bd2b5a1dbde 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatInfo.java @@ -17,9 +17,9 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; import java.io.Serializable; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatUtils.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatUtils.java index caf6b3d1d29..82ca93a6355 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatUtils.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/FormatUtils.java @@ -17,10 +17,10 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationFeature; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializationFeature; import javax.annotation.Nonnull; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java index 62c178d0e6a..20c9d7db81b 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapFormatInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java index a479c4f3e24..73cba9949e4 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/MapTypeInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java index 6fe85a52130..4bc0e22fd4f 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowFormatInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java index fe07906ceab..ecaaddccff3 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/RowTypeInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java index 439a2811cb2..65101cb7bd0 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimeFormatInfo.java @@ -17,9 +17,9 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java index 4519e38c833..1985c2fea59 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TimestampFormatInfo.java @@ -17,9 +17,9 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java index 53b16143a73..738a67f4b05 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/TypeInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; import java.io.Serializable; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java index f14f025853f..aca02ea8052 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarBinaryFormatInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; import java.nio.charset.StandardCharsets; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java index 2fae720e4e4..ac5694bb9c7 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/field/format/VarCharFormatInfo.java @@ -17,8 +17,8 @@ package org.apache.inlong.common.pojo.sort.dataflow.field.format; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; /** * The format information for varchar. diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java index 590d987c93b..3a89361bcb5 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/dataflow/sink/SinkConfig.java @@ -20,9 +20,9 @@ import org.apache.inlong.common.constant.Constants; import org.apache.inlong.common.pojo.sort.dataflow.field.FieldConfig; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.Data; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; import java.io.Serializable; import java.util.List; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java index bb297168b24..4f89e071a4a 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/mq/MqClusterConfig.java @@ -19,9 +19,9 @@ import org.apache.inlong.common.constant.Constants; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.Data; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; import java.io.Serializable; diff --git a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java index 9d6daf455ce..61da6960c6a 100644 --- a/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java +++ b/inlong-common/src/main/java/org/apache/inlong/common/pojo/sort/node/NodeConfig.java @@ -19,9 +19,9 @@ import org.apache.inlong.common.constant.Constants; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.Data; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo; import java.io.Serializable;