From 95bf00ecc1bd4d50885bbf113615abdd1044b62a Mon Sep 17 00:00:00 2001 From: fanng Date: Fri, 10 May 2024 10:41:46 +0800 Subject: [PATCH 1/3] shadow slf4j --- clients/client-java-runtime/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/clients/client-java-runtime/build.gradle.kts b/clients/client-java-runtime/build.gradle.kts index a51b382e031..7afccf8e863 100644 --- a/clients/client-java-runtime/build.gradle.kts +++ b/clients/client-java-runtime/build.gradle.kts @@ -24,6 +24,7 @@ tasks.withType(ShadowJar::class.java) { relocate("com.fasterxml", "com.datastrato.gravitino.shaded.com.fasterxml") relocate("org.apache.httpcomponents", "com.datastrato.gravitino.shaded.org.apache.httpcomponents") relocate("org.apache.commons", "com.datastrato.gravitino.shaded.org.apache.commons") + relocate("org.apache.logging.slf4j", "com.datastrato.gravitino.shaded.org.apache.logging.slf4j") relocate("org.antlr", "com.datastrato.gravitino.shaded.org.antlr") } From 4c9b6003b2e2e7f07c9a9f5228d02b079cf1c19b Mon Sep 17 00:00:00 2001 From: fanng Date: Fri, 10 May 2024 10:47:45 +0800 Subject: [PATCH 2/3] shadow slf4j --- spark-connector/spark-connector-runtime/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/spark-connector/spark-connector-runtime/build.gradle.kts b/spark-connector/spark-connector-runtime/build.gradle.kts index 5da442ec62b..885f1865e43 100644 --- a/spark-connector/spark-connector-runtime/build.gradle.kts +++ b/spark-connector/spark-connector-runtime/build.gradle.kts @@ -29,6 +29,7 @@ tasks.withType(ShadowJar::class.java) { relocate("com.google", "com.datastrato.gravitino.shaded.com.google") relocate("google", "com.datastrato.gravitino.shaded.google") relocate("org.apache.hc", "com.datastrato.gravitino.shaded.org.apache.hc") + relocate("org.apache.logging.slf4j", "com.datastrato.gravitino.shaded.org.apache.logging.slf4j") } tasks.jar { From 8aa598203c17f235ebac5d6758c5bf1ec2ffc9da Mon Sep 17 00:00:00 2001 From: fanng Date: Fri, 10 May 2024 20:33:34 +0800 Subject: [PATCH 3/3] fix comment --- spark-connector/spark-connector-runtime/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/spark-connector/spark-connector-runtime/build.gradle.kts b/spark-connector/spark-connector-runtime/build.gradle.kts index 885f1865e43..5da442ec62b 100644 --- a/spark-connector/spark-connector-runtime/build.gradle.kts +++ b/spark-connector/spark-connector-runtime/build.gradle.kts @@ -29,7 +29,6 @@ tasks.withType(ShadowJar::class.java) { relocate("com.google", "com.datastrato.gravitino.shaded.com.google") relocate("google", "com.datastrato.gravitino.shaded.google") relocate("org.apache.hc", "com.datastrato.gravitino.shaded.org.apache.hc") - relocate("org.apache.logging.slf4j", "com.datastrato.gravitino.shaded.org.apache.logging.slf4j") } tasks.jar {