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

stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop-thirdparty.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 800a114  HADOOP-19694: Exclude conflicting modulo-info.class files 
from shaded guava (#47)
800a114 is described below

commit 800a114df32472dc96f8f1f7b6cc2c80632614bc
Author: rohit-kb <115476286+rohit...@users.noreply.github.com>
AuthorDate: Tue Sep 23 18:24:17 2025 +0530

    HADOOP-19694: Exclude conflicting modulo-info.class files from shaded guava 
(#47)
    
    
    Followup to the guava update to  33.4.8-jre #45; the version of
    META-INF.versions.9.module-info to include in the bundle is the
    one from the guava JAR.
    
    Contributed by Rohit Kumar
---
 hadoop-shaded-guava/pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/hadoop-shaded-guava/pom.xml b/hadoop-shaded-guava/pom.xml
index 010f18a..a785f9c 100644
--- a/hadoop-shaded-guava/pom.xml
+++ b/hadoop-shaded-guava/pom.xml
@@ -87,6 +87,30 @@
                                         <exclude>META-INF/LICENSE.txt</exclude>
                                     </excludes>
                                 </filter>
+                                <filter>
+                                    
<artifact>com.google.guava:failureaccess</artifact>
+                                    <excludes>
+                                        
<exclude>META-INF/versions/9/module-info.class</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.jspecify:jspecify</artifact>
+                                    <excludes>
+                                        
<exclude>META-INF/versions/9/module-info.class</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    
<artifact>com.google.errorprone:error_prone_annotations</artifact>
+                                    <excludes>
+                                        
<exclude>META-INF/versions/9/module-info.class</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    
<artifact>com.google.j2objc:j2objc-annotations</artifact>
+                                    <excludes>
+                                        
<exclude>META-INF/versions/9/module-info.class</exclude>
+                                    </excludes>
+                                </filter>
                             </filters>
                             <relocations>
                                 <relocation>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to