This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new ca558744 [FLINK-33287] Using the flink shaded jackson for
flink-autoscaler
ca558744 is described below
commit ca5587445e1cde945e26bd6aa65b9bf10bad41a8
Author: Rui Fan <1996fan...@gmail.com>
AuthorDate: Tue Jan 23 15:10:56 2024 +0800
[FLINK-33287] Using the flink shaded jackson for flink-autoscaler
---
flink-autoscaler-plugin-jdbc/pom.xml | 7 -------
.../autoscaler/jdbc/state/JdbcAutoScalerStateStore.java | 9 +++++----
.../src/main/resources/META-INF/NOTICE | 3 ---
flink-autoscaler/pom.xml | 13 -------------
.../java/org/apache/flink/autoscaler/ScalingSummary.java | 3 ++-
.../java/org/apache/flink/autoscaler/ScalingTracking.java | 3 ++-
.../org/apache/flink/autoscaler/topology/JobTopology.java | 10 +++++-----
.../flink/autoscaler/utils/AutoScalerSerDeModule.java | 12 ++++++------
.../apache/flink/autoscaler/topology/JobTopologyTest.java | 3 ++-
.../autoscaler/state/KubernetesAutoScalerStateStore.java | 15 ++++++++-------
10 files changed, 30 insertions(+), 48 deletions(-)
diff --git a/flink-autoscaler-plugin-jdbc/pom.xml
b/flink-autoscaler-plugin-jdbc/pom.xml
index adadedda..097d4f22 100644
--- a/flink-autoscaler-plugin-jdbc/pom.xml
+++ b/flink-autoscaler-plugin-jdbc/pom.xml
@@ -66,13 +66,6 @@ under the License.
<scope>provided</scope>
</dependency>
- <!-- TODO FLINK-33098: These jackson dependencies can be replaced with
flink shaded jackson. It can be done
- after the flink-1.18.1 is released. -->
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- </dependency>
-
<!-- Test dependencies -->
<dependency>
diff --git
a/flink-autoscaler-plugin-jdbc/src/main/java/org/apache/flink/autoscaler/jdbc/state/JdbcAutoScalerStateStore.java
b/flink-autoscaler-plugin-jdbc/src/main/java/org/apache/flink/autoscaler/jdbc/state/JdbcAutoScalerStateStore.java
index 8a78782b..7b459ef4 100644
---
a/flink-autoscaler-plugin-jdbc/src/main/java/org/apache/flink/autoscaler/jdbc/state/JdbcAutoScalerStateStore.java
+++
b/flink-autoscaler-plugin-jdbc/src/main/java/org/apache/flink/autoscaler/jdbc/state/JdbcAutoScalerStateStore.java
@@ -28,10 +28,11 @@ import
org.apache.flink.autoscaler.utils.AutoScalerSerDeModule;
import org.apache.flink.configuration.ConfigurationUtils;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import com.fasterxml.jackson.core.JacksonException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JacksonException;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.type.TypeReference;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-autoscaler-standalone/src/main/resources/META-INF/NOTICE
b/flink-autoscaler-standalone/src/main/resources/META-INF/NOTICE
index 37ac8a9a..e17f3fd5 100644
--- a/flink-autoscaler-standalone/src/main/resources/META-INF/NOTICE
+++ b/flink-autoscaler-standalone/src/main/resources/META-INF/NOTICE
@@ -6,9 +6,6 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software
License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- com.fasterxml.jackson.core:jackson-core:2.15.0
-- com.fasterxml.jackson.core:jackson-databind:2.15.0
-- com.fasterxml.jackson.core:jackson-annotations:2.15.0
- org.objenesis:objenesis:2.1
- commons-collections:commons-collections:3.2.2
- org.apache.commons:commons-math3:3.6.1
diff --git a/flink-autoscaler/pom.xml b/flink-autoscaler/pom.xml
index 54b42670..b6bc74e8 100644
--- a/flink-autoscaler/pom.xml
+++ b/flink-autoscaler/pom.xml
@@ -53,19 +53,6 @@ under the License.
<scope>provided</scope>
</dependency>
- <!-- TODO FLINK-33098: These jackson dependencies can be replaced with
flink shaded jackson. It can be done
- after the flink-1.18 is released, because the shaded jackson version
of flink-1.17 is 2.13.4,
- it doesn't support loaderOptions. -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
-
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/ScalingSummary.java
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/ScalingSummary.java
index bc25f6c4..fc946114 100644
---
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/ScalingSummary.java
+++
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/ScalingSummary.java
@@ -20,7 +20,8 @@ package org.apache.flink.autoscaler;
import org.apache.flink.autoscaler.metrics.EvaluatedScalingMetric;
import org.apache.flink.autoscaler.metrics.ScalingMetric;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
+
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/ScalingTracking.java
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/ScalingTracking.java
index 064bc68d..0f11445b 100644
---
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/ScalingTracking.java
+++
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/ScalingTracking.java
@@ -23,7 +23,8 @@ import org.apache.flink.autoscaler.topology.JobTopology;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
+
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/topology/JobTopology.java
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/topology/JobTopology.java
index 80285540..93296e3a 100644
---
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/topology/JobTopology.java
+++
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/topology/JobTopology.java
@@ -21,12 +21,12 @@ import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;
import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ArrayNode;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/utils/AutoScalerSerDeModule.java
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/utils/AutoScalerSerDeModule.java
index ce991403..9a7bd1f8 100644
---
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/utils/AutoScalerSerDeModule.java
+++
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/utils/AutoScalerSerDeModule.java
@@ -20,12 +20,12 @@ package org.apache.flink.autoscaler.utils;
import org.apache.flink.autoscaler.metrics.Edge;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.KeyDeserializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.module.SimpleModule;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationContext;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonSerializer;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.KeyDeserializer;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.SerializerProvider;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.module.SimpleModule;
import java.io.IOException;
diff --git
a/flink-autoscaler/src/test/java/org/apache/flink/autoscaler/topology/JobTopologyTest.java
b/flink-autoscaler/src/test/java/org/apache/flink/autoscaler/topology/JobTopologyTest.java
index f16a2711..9c218543 100644
---
a/flink-autoscaler/src/test/java/org/apache/flink/autoscaler/topology/JobTopologyTest.java
+++
b/flink-autoscaler/src/test/java/org/apache/flink/autoscaler/topology/JobTopologyTest.java
@@ -23,7 +23,8 @@ import
org.apache.flink.runtime.jobgraph.jsonplan.JsonPlanGenerator;
import org.apache.flink.runtime.scheduler.SchedulerBase;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+
import org.junit.jupiter.api.Test;
import java.util.Collections;
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/autoscaler/state/KubernetesAutoScalerStateStore.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/autoscaler/state/KubernetesAutoScalerStateStore.java
index 083c62f6..2e516ae6 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/autoscaler/state/KubernetesAutoScalerStateStore.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/autoscaler/state/KubernetesAutoScalerStateStore.java
@@ -27,18 +27,19 @@ import org.apache.flink.configuration.ConfigurationUtils;
import
org.apache.flink.kubernetes.operator.autoscaler.KubernetesJobAutoScalerContext;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JacksonException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JacksonException;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.type.TypeReference;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.apache.flink.shaded.jackson2.org.yaml.snakeyaml.LoaderOptions;
+
import io.javaoperatorsdk.operator.processing.event.ResourceID;
import lombok.SneakyThrows;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.LoaderOptions;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
