From f240912f26f825482d22d955a59750d949555bf5 Mon Sep 17 00:00:00 2001
From: Jackeyzhe <jackeyzhe59@163.com>
Date: Tue, 22 Sep 2026 16:55:07 +0800
Subject: [PATCH] [build] Fix stale org.apache.commons relocation list in
 fluss-fs-s3

---
 fluss-filesystems/fluss-fs-s3/pom.xml | 122 ++++++++++++++++++++++++--
 1 file changed, 116 insertions(+), 6 deletions(-)

diff --git a/fluss-filesystems/fluss-fs-s3/pom.xml b/fluss-filesystems/fluss-fs-s3/pom.xml
index 68b4d3bb9f..a4aba5bbd9 100644
--- a/fluss-filesystems/fluss-fs-s3/pom.xml
+++ b/fluss-filesystems/fluss-fs-s3/pom.xml
@@ -388,6 +388,118 @@
                                     <include>*:*</include>
                                 </includes>
                             </artifactSet>
+                            <relocations>
+                                <!-- relocate the packages that are internal to Hadoop/AWS SDK
+                                     and not used / exposed downstream, mirroring the pattern
+                                     of fluss-fs-hadoop-shaded -->
+                                <relocation>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.com.google.common
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.re2j</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.com.google.re2j
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.j2objc</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.com.google.j2objc
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.thirdparty</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.com.google.thirdparty
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.htrace</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.apache.htrace
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.fasterxml</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.com.fasterxml
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.codehaus.stax2</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.codehaus.stax2
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.codehaus.mojo</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.codehaus.mojo
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.ctc</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.com.ctc
+                                    </shadedPattern>
+                                </relocation>
+                                <!-- org.apache.commons: narrow to the packages actually bundled
+                                     in this jar. NOTE: this list is tied to fs.hadoopshaded.version
+                                     (#3699 moved it from 3.3.4 to 3.4.3, which swapped
+                                     commons-collections for commons-collections4 (543 classes),
+                                     so re-check it whenever that property changes. -->
+                                <relocation>
+                                    <pattern>org.apache.commons.codec</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.apache.commons.codec
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons.collections4</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.apache.commons.collections4
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons.compress</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.apache.commons.compress
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons.configuration2</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.apache.commons.configuration2
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons.io</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.apache.commons.io
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons.lang3</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.apache.commons.lang3
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons.logging</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.apache.commons.logging
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons.text</pattern>
+                                    <shadedPattern>
+                                        org.apache.fluss.shaded.org.apache.commons.text
+                                    </shadedPattern>
+                                </relocation>
+                            </relocations>
                             <filters>
                                 <filter>
                                     <artifact>*</artifact>
@@ -397,6 +509,10 @@
                                         <exclude>mozilla/**</exclude>
                                         <exclude>META-INF/maven/**</exclude>
                                         <exclude>META-INF/LICENSE.txt</exclude>
+                                        <!-- the shade plugin relocates base-path classes but not
+                                             Multi-Release JAR entries under META-INF/versions,
+                                             so exclude them to avoid unshaded jackson leaking -->
+                                        <exclude>META-INF/versions/**/com/fasterxml/**</exclude>
                                     </excludes>
                                 </filter>
                                 <filter>
@@ -425,12 +541,6 @@
                                     </excludes>
                                 </filter>
                             </filters>
-                            <relocations>
-                                <relocation>
-                                    <pattern>org.apache.commons</pattern>
-                                    <shadedPattern>org.apache.fluss.shaded.org.apache.commons</shadedPattern>
-                                </relocation>
-                            </relocations>
                         </configuration>
                     </execution>
                 </executions>