(amoro) branch master updated: [Hotfix] Replace Jersey Guava imports with Amoro shaded Guava (#3674)

[jinsongzhou]

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new 419a94790 [Hotfix] Replace Jersey Guava imports with Amoro shaded 
Guava (#3674)
419a94790 is described below

commit 419a947909df3a9d2e577e8f2c3c8007eda09509
Author: Qishang Zhong <zhongqish...@gmail.com>
AuthorDate: Tue Jul 22 15:06:58 2025 +0800

    [Hotfix] Replace Jersey Guava imports with Amoro shaded Guava (#3674)
---
 .../apache/amoro/server/dashboard/controller/SettingController.java  | 2 +-
 .../java/org/apache/amoro/server/optimizing/KeyedTableCommit.java    | 2 +-
 .../java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java  | 2 +-
 tools/maven/checkstyle.xml                                           | 5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git 
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java
 
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java
index a0ce1bcbf..faf86b082 100644
--- 
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java
+++ 
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/SettingController.java
@@ -26,7 +26,7 @@ import org.apache.amoro.server.dashboard.response.OkResponse;
 import org.apache.amoro.server.resource.ContainerMetadata;
 import org.apache.amoro.server.resource.InternalContainers;
 import org.apache.amoro.server.resource.OptimizerManager;
-import org.glassfish.jersey.internal.guava.Sets;
+import org.apache.amoro.shade.guava32.com.google.common.collect.Sets;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git 
a/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java
 
b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java
index 5362f366a..ac7781f3a 100644
--- 
a/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java
+++ 
b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/KeyedTableCommit.java
@@ -32,6 +32,7 @@ import org.apache.amoro.op.SnapshotSummary;
 import org.apache.amoro.optimizing.RewriteFilesInput;
 import org.apache.amoro.optimizing.RewriteFilesOutput;
 import org.apache.amoro.optimizing.RewriteStageTask;
+import org.apache.amoro.shade.guava32.com.google.common.collect.Sets;
 import org.apache.amoro.table.MixedTable;
 import org.apache.amoro.utils.ContentFiles;
 import org.apache.amoro.utils.MixedTableUtil;
@@ -43,7 +44,6 @@ import org.apache.iceberg.StructLike;
 import org.apache.iceberg.exceptions.ValidationException;
 import org.apache.iceberg.expressions.Expressions;
 import org.apache.iceberg.util.StructLikeMap;
-import org.glassfish.jersey.internal.guava.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git 
a/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java
 
b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java
index dbeb37a58..4583af858 100644
--- 
a/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java
+++ 
b/amoro-ams/src/main/java/org/apache/amoro/server/optimizing/UnKeyedTableCommit.java
@@ -36,6 +36,7 @@ import org.apache.amoro.optimizing.RewriteFilesOutput;
 import org.apache.amoro.optimizing.RewriteStageTask;
 import org.apache.amoro.properties.HiveTableProperties;
 import org.apache.amoro.server.utils.IcebergTableUtil;
+import org.apache.amoro.shade.guava32.com.google.common.collect.Sets;
 import org.apache.amoro.table.MixedTable;
 import org.apache.amoro.table.UnkeyedTable;
 import org.apache.amoro.utils.ContentFiles;
@@ -57,7 +58,6 @@ import org.apache.iceberg.Transaction;
 import org.apache.iceberg.types.Types;
 import org.apache.iceberg.util.SnapshotUtil;
 import org.apache.iceberg.util.StructLikeMap;
-import org.glassfish.jersey.internal.guava.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index ab4272879..e186b6328 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -120,6 +120,11 @@ This file is based on the checkstyle file of Apache Beam.
             <message key="import.illegal" value="{0}; Use amoro shaded guava 
instead."/>
         </module>
 
+        <module name="IllegalImport">
+            <property name="illegalPkgs" 
value="org.glassfish.jersey.internal.guava"/>
+            <message key="import.illegal" value="{0}; Use amoro shaded guava 
instead."/>
+        </module>
+
         <module name="Regexp">
             <property name="format" value="import com\.fasterxml\.jackson"/>
             <property name="illegalPattern" value="true"/>