From 2ee62c18bbf2571cb12f57f99659abedc346b951 Mon Sep 17 00:00:00 2001
From: yuqi <yuqi@datastrato.com>
Date: Mon, 27 Jan 2025 11:01:06 +0800
Subject: [PATCH] Fix

---
 catalogs/catalog-hadoop/build.gradle.kts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/catalogs/catalog-hadoop/build.gradle.kts b/catalogs/catalog-hadoop/build.gradle.kts
index 3108d993c1a..47b0e08db27 100644
--- a/catalogs/catalog-hadoop/build.gradle.kts
+++ b/catalogs/catalog-hadoop/build.gradle.kts
@@ -52,6 +52,8 @@ dependencies {
     exclude("org.eclipse.jetty", "*")
     exclude("io.netty")
     exclude("org.fusesource.leveldbjni")
+    // Exclude protobuf-java to avoid conflict with;
+    exclude("com.google.protobuf", "protobuf-java")
   }
   implementation(libs.slf4j.api)
   implementation(libs.awaitility)
@@ -101,6 +103,9 @@ tasks {
       exclude("javax.servlet-*.jar")
       exclude("kerb-*.jar")
       exclude("kerby-*.jar")
+      // As L55-56 takes no effect actually in the final distribution package, we need to exclude
+      // protobuf-java here
+      exclude("protobuf-java-*.jar")
     }
     into("$rootDir/distribution/package/catalogs/hadoop/libs")
   }