From 6963f4e5d1868b66daa0298f29b545d9434de41c Mon Sep 17 00:00:00 2001
From: Ahmed Abualsaud <ahmedabualsaud@google.com>
Date: Wed, 3 Jul 2024 02:11:29 -0400
Subject: [PATCH] shade dependencies

---
 sdks/java/core/build.gradle       |  2 +-
 sdks/java/io/iceberg/build.gradle | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle
index e150c22de62d..1251bef335a3 100644
--- a/sdks/java/core/build.gradle
+++ b/sdks/java/core/build.gradle
@@ -98,7 +98,7 @@ dependencies {
   permitUnusedDeclared enforcedPlatform(library.java.google_cloud_platform_libraries_bom)
   provided library.java.json_org
   implementation library.java.everit_json_schema
-  implementation library.java.snake_yaml
+  shadow library.java.snake_yaml
   shadowTest library.java.everit_json_schema
   provided library.java.junit
   testImplementation "com.github.stefanbirkner:system-rules:1.19.0"
diff --git a/sdks/java/io/iceberg/build.gradle b/sdks/java/io/iceberg/build.gradle
index 7965cde86e7d..81b58e264365 100644
--- a/sdks/java/io/iceberg/build.gradle
+++ b/sdks/java/io/iceberg/build.gradle
@@ -23,6 +23,7 @@ import java.util.stream.Collectors
 plugins { id 'org.apache.beam.module' }
 applyJavaNature(
         automaticModuleName: 'org.apache.beam.sdk.io.iceberg',
+        shadowClosure: {}
 )
 
 description = "Apache Beam :: SDKs :: Java :: IO :: Iceberg"
@@ -54,11 +55,12 @@ dependencies {
     implementation "org.apache.iceberg:iceberg-parquet:$iceberg_version"
     implementation "org.apache.iceberg:iceberg-orc:$iceberg_version"
     implementation library.java.hadoop_common
+    // Hadoop GCS filesystem dependencies
+    runtimeOnly library.java.hadoop_client
+    runtimeOnly library.java.bigdataoss_gcsio
+    runtimeOnly library.java.bigdataoss_gcs_connector
+    runtimeOnly library.java.bigdataoss_util_hadoop
 
-    testImplementation library.java.hadoop_client
-    testImplementation library.java.bigdataoss_gcsio
-    testImplementation library.java.bigdataoss_gcs_connector
-    testImplementation library.java.bigdataoss_util_hadoop
     testImplementation "org.apache.iceberg:iceberg-gcp:$iceberg_version"
     testImplementation "org.apache.iceberg:iceberg-data:$iceberg_version"
     testImplementation project(path: ":sdks:java:core", configuration: "shadowTest")