This is an automated email from the ASF dual-hosted git repository.
gyfora 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 723eb75c [FLINK-38860] Remove flink shaded guava usage
723eb75c is described below
commit 723eb75c17e3a001e6d425c2474414c59b8baf16
Author: Gyula Fora <[email protected]>
AuthorDate: Mon Jan 5 14:49:32 2026 +0100
[FLINK-38860] Remove flink shaded guava usage
---
flink-autoscaler-plugin-jdbc/pom.xml | 5 +++++
.../flink/autoscaler/jdbc/event/JdbcAutoScalerEventHandler.java | 3 +--
flink-autoscaler-standalone/pom.xml | 5 +++++
.../autoscaler/standalone/StandaloneAutoscalerExecutor.java | 3 +--
flink-autoscaler/pom.xml | 5 +++++
.../org/apache/flink/autoscaler/RestApiMetricsCollector.java | 3 +--
.../java/org/apache/flink/autoscaler/topology/JobTopology.java | 4 ++--
flink-kubernetes-operator/pom.xml | 5 +++++
.../kubeclient/decorators/FlinkConfMountDecorator.java | 2 +-
.../flink/kubernetes/operator/config/FlinkConfigManager.java | 9 ++++-----
.../kubernetes/operator/exception/DeploymentFailedException.java | 3 +--
.../flink/kubernetes/operator/service/AbstractFlinkService.java | 2 +-
.../kubernetes/operator/service/FlinkResourceContextFactory.java | 3 +--
flink-kubernetes-operator/src/main/resources/META-INF/NOTICE | 6 ++++++
pom.xml | 6 ++++++
tools/maven/checkstyle.xml | 5 +++--
16 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/flink-autoscaler-plugin-jdbc/pom.xml
b/flink-autoscaler-plugin-jdbc/pom.xml
index 6add8794..2f1c0fac 100644
--- a/flink-autoscaler-plugin-jdbc/pom.xml
+++ b/flink-autoscaler-plugin-jdbc/pom.xml
@@ -73,6 +73,11 @@ under the License.
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
diff --git
a/flink-autoscaler-plugin-jdbc/src/main/java/org/apache/flink/autoscaler/jdbc/event/JdbcAutoScalerEventHandler.java
b/flink-autoscaler-plugin-jdbc/src/main/java/org/apache/flink/autoscaler/jdbc/event/JdbcAutoScalerEventHandler.java
index 8faef51f..69639a8d 100644
---
a/flink-autoscaler-plugin-jdbc/src/main/java/org/apache/flink/autoscaler/jdbc/event/JdbcAutoScalerEventHandler.java
+++
b/flink-autoscaler-plugin-jdbc/src/main/java/org/apache/flink/autoscaler/jdbc/event/JdbcAutoScalerEventHandler.java
@@ -25,8 +25,7 @@ import
org.apache.flink.autoscaler.event.AutoScalerEventHandler;
import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.util.Preconditions;
-import
org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder;
-
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
diff --git a/flink-autoscaler-standalone/pom.xml
b/flink-autoscaler-standalone/pom.xml
index b2708632..83b5c1cb 100644
--- a/flink-autoscaler-standalone/pom.xml
+++ b/flink-autoscaler-standalone/pom.xml
@@ -45,6 +45,11 @@ under the License.
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime</artifactId>
diff --git
a/flink-autoscaler-standalone/src/main/java/org/apache/flink/autoscaler/standalone/StandaloneAutoscalerExecutor.java
b/flink-autoscaler-standalone/src/main/java/org/apache/flink/autoscaler/standalone/StandaloneAutoscalerExecutor.java
index 7e13be92..c5de149c 100644
---
a/flink-autoscaler-standalone/src/main/java/org/apache/flink/autoscaler/standalone/StandaloneAutoscalerExecutor.java
+++
b/flink-autoscaler-standalone/src/main/java/org/apache/flink/autoscaler/standalone/StandaloneAutoscalerExecutor.java
@@ -26,8 +26,7 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.UnmodifiableConfiguration;
import org.apache.flink.util.concurrent.ExecutorThreadFactory;
-import
org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder;
-
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
diff --git a/flink-autoscaler/pom.xml b/flink-autoscaler/pom.xml
index de63218b..d97f3355 100644
--- a/flink-autoscaler/pom.xml
+++ b/flink-autoscaler/pom.xml
@@ -78,6 +78,11 @@ under the License.
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils-junit</artifactId>
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/RestApiMetricsCollector.java
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/RestApiMetricsCollector.java
index 67d77c35..7ebedb76 100644
---
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/RestApiMetricsCollector.java
+++
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/RestApiMetricsCollector.java
@@ -35,8 +35,7 @@ import
org.apache.flink.runtime.rest.messages.job.metrics.Metric;
import
org.apache.flink.runtime.rest.messages.job.metrics.MetricsAggregationParameter;
import
org.apache.flink.runtime.rest.messages.job.metrics.MetricsFilterParameter;
-import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;
-
+import com.google.common.collect.ImmutableMap;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
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 83e81117..26004509 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,14 +21,14 @@ import
org.apache.flink.autoscaler.exceptions.NotReadyException;
import org.apache.flink.runtime.instance.SlotSharingGroupId;
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.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
diff --git a/flink-kubernetes-operator/pom.xml
b/flink-kubernetes-operator/pom.xml
index 618ffa84..728ef11c 100644
--- a/flink-kubernetes-operator/pom.xml
+++ b/flink-kubernetes-operator/pom.xml
@@ -154,6 +154,11 @@ under the License.
<version>${log4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
<!-- Test -->
<dependency>
<groupId>org.apache.flink</groupId>
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java
index 4615423b..2d5cbe6d 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java
@@ -43,7 +43,7 @@ import
org.apache.flink.kubernetes.shaded.io.fabric8.kubernetes.api.model.Volume
import
org.apache.flink.kubernetes.shaded.io.fabric8.kubernetes.api.model.VolumeBuilder;
import org.apache.flink.kubernetes.utils.Constants;
-import org.apache.flink.shaded.guava31.com.google.common.io.Files;
+import com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigManager.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigManager.java
index f31fc7ba..62fe3239 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigManager.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigManager.java
@@ -33,13 +33,12 @@ import
org.apache.flink.kubernetes.operator.reconciler.ReconciliationUtils;
import org.apache.flink.kubernetes.operator.utils.EnvUtils;
import org.apache.flink.kubernetes.operator.utils.FlinkUtils;
-import org.apache.flink.shaded.guava31.com.google.common.cache.Cache;
-import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder;
-import org.apache.flink.shaded.guava31.com.google.common.cache.CacheLoader;
-import org.apache.flink.shaded.guava31.com.google.common.cache.LoadingCache;
-
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import lombok.Builder;
import lombok.SneakyThrows;
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/exception/DeploymentFailedException.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/exception/DeploymentFailedException.java
index 9fc6143f..7ce84243 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/exception/DeploymentFailedException.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/exception/DeploymentFailedException.java
@@ -17,8 +17,7 @@
package org.apache.flink.kubernetes.operator.exception;
-import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet;
-
+import com.google.common.collect.ImmutableSet;
import io.fabric8.kubernetes.api.model.ContainerStatus;
import io.fabric8.kubernetes.api.model.apps.DeploymentCondition;
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkService.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkService.java
index 5598410c..f0a7b25b 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkService.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkService.java
@@ -108,9 +108,9 @@ import org.apache.flink.util.FileUtils;
import org.apache.flink.util.FlinkRuntimeException;
import org.apache.flink.util.Preconditions;
-import org.apache.flink.shaded.guava31.com.google.common.collect.Iterables;
import
org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus;
+import com.google.common.collect.Iterables;
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.PodList;
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/FlinkResourceContextFactory.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/FlinkResourceContextFactory.java
index f2f75a52..9cc9b489 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/FlinkResourceContextFactory.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/FlinkResourceContextFactory.java
@@ -35,8 +35,7 @@ import
org.apache.flink.kubernetes.operator.metrics.OperatorMetricUtils;
import org.apache.flink.kubernetes.operator.utils.EventRecorder;
import org.apache.flink.util.concurrent.ExecutorThreadFactory;
-import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;
-
+import com.google.common.collect.ImmutableMap;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.processing.event.ResourceID;
import lombok.Data;
diff --git a/flink-kubernetes-operator/src/main/resources/META-INF/NOTICE
b/flink-kubernetes-operator/src/main/resources/META-INF/NOTICE
index b63fb880..497b3c7c 100644
--- a/flink-kubernetes-operator/src/main/resources/META-INF/NOTICE
+++ b/flink-kubernetes-operator/src/main/resources/META-INF/NOTICE
@@ -12,6 +12,11 @@ This project bundles the following dependencies under the
Apache Software Licens
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.15.0
- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.15.0
- com.google.code.findbugs:jsr305:jar:1.3.9
+- com.google.errorprone:error_prone_annotations:jar:2.36.0
+- com.google.guava:failureaccess:jar:1.0.2
+- com.google.guava:guava:jar:33.4.0-jre
+-
com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava
+- com.google.j2objc:j2objc-annotations:jar:3.0.0
- com.squareup.okhttp3:logging-interceptor:jar:4.12.0
- com.squareup.okhttp3:okhttp:jar:4.12.0
- com.squareup.okio:okio-jvm:jar:3.6.0
@@ -58,6 +63,7 @@ This project bundles the following dependencies under the
Apache Software Licens
- org.apache.logging.log4j:log4j-api:jar:2.23.1
- org.apache.logging.log4j:log4j-core:jar:2.23.1
- org.apache.logging.log4j:log4j-slf4j-impl:jar:2.23.1
+- org.checkerframework:checker-qual:jar:3.43.0
- org.javassist:javassist:jar:3.24.0-GA
- org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.8.21
- org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.8.21
diff --git a/pom.xml b/pom.xml
index 44a1fffd..19d27b88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,7 @@ under the License.
<commons-lang3.version>3.18.0</commons-lang3.version>
<commons-io.version>2.17.0</commons-io.version>
<flink.version>1.20.1</flink.version>
+ <guava.version>33.4.0-jre</guava.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.23.1</log4j.version>
@@ -133,6 +134,11 @@ under the License.
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index b160f472..216ad479 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -230,8 +230,9 @@ This file is based on the checkstyle file of Apache Beam.
<message key="import.illegal" value="{0}; Use
flink-shaded-netty instead."/>
</module>
<module name="IllegalImport">
- <property name="illegalPkgs" value="com.google.common"/>
- <message key="import.illegal" value="{0}; Use
flink-shaded-guava instead."/>
+ <property name="regexp" value="true"/>
+ <property name="illegalPkgs"
value="org.apache.flink.shaded.guava.*"/>
+ <message key="import.illegal" value="{0}; Use regular
guava instead."/>
</module>
<module name="RedundantModifier">
