From 2ee62c18bbf2571cb12f57f99659abedc346b951 Mon Sep 17 00:00:00 2001 From: yuqi Date: Mon, 27 Jan 2025 11:01:06 +0800 Subject: [PATCH 1/3] 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") } From 661305a82795b96cd02ef8200397a918e01a99c9 Mon Sep 17 00:00:00 2001 From: yuqi Date: Wed, 5 Feb 2025 19:31:32 +0800 Subject: [PATCH 2/3] Resolve comments. --- catalogs/catalog-hadoop/build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/catalogs/catalog-hadoop/build.gradle.kts b/catalogs/catalog-hadoop/build.gradle.kts index 47b0e08db27..36e6934d110 100644 --- a/catalogs/catalog-hadoop/build.gradle.kts +++ b/catalogs/catalog-hadoop/build.gradle.kts @@ -103,9 +103,6 @@ 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") } From e36a36c3a6c615fd3aaf3df536f733c02f79c0da Mon Sep 17 00:00:00 2001 From: yuqi Date: Thu, 6 Feb 2025 11:01:42 +0800 Subject: [PATCH 3/3] Resolve comments. --- catalogs/catalog-hadoop/build.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/catalogs/catalog-hadoop/build.gradle.kts b/catalogs/catalog-hadoop/build.gradle.kts index 36e6934d110..b8877646f5a 100644 --- a/catalogs/catalog-hadoop/build.gradle.kts +++ b/catalogs/catalog-hadoop/build.gradle.kts @@ -52,7 +52,11 @@ dependencies { exclude("org.eclipse.jetty", "*") exclude("io.netty") exclude("org.fusesource.leveldbjni") - // Exclude protobuf-java to avoid conflict with; + // Exclude `protobuf-java` 2.5.0 to avoid conflict with a higher version of `protobuf-java` + // in the authorization module. The reason is that the class loader of `catalog-hadoop` is the + // parent of the class loader of the authorization module, so the class loader of `catalog-hadoop` + // will load the class `protobuf-java` 2.5.0 first, which will cause the authorization module to + // fail to load the class `protobuf-java` 3.15.8. exclude("com.google.protobuf", "protobuf-java") } implementation(libs.slf4j.api)