From 2d894611958a99c8e03553d1dfa59a072760afec Mon Sep 17 00:00:00 2001
From: Larry Booker <lbooker42@gmail.com>
Date: Wed, 26 Jun 2024 12:51:36 -0700
Subject: [PATCH] feat: reduce included dependencies for Iceberg implementation
 (#5668)

Removes the unnecessary dependencies that earlier Iceberg PR added to the core project.
---
 buildSrc/src/main/groovy/Classpaths.groovy | 24 +++++++++++++++-------
 extensions/iceberg/build.gradle            |  1 +
 extensions/kafka/build.gradle              |  3 ++-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/buildSrc/src/main/groovy/Classpaths.groovy b/buildSrc/src/main/groovy/Classpaths.groovy
index df2877db0f0..01abc0e3a90 100644
--- a/buildSrc/src/main/groovy/Classpaths.groovy
+++ b/buildSrc/src/main/groovy/Classpaths.groovy
@@ -122,6 +122,10 @@ class Classpaths {
     static final String GUAVA_NAME = 'guava'
     static final String GUAVA_VERSION = '33.2.0-jre'
 
+    static final String AVRO_GROUP = 'org.apache.avro'
+    static final String AVRO_NAME = 'avro'
+    static final String AVRO_VERSION = '1.11.3'
+
     static final String HADOOP_GROUP = 'org.apache.hadoop'
     static final String HADOOP_VERSION = '3.4.0'
 
@@ -298,6 +302,11 @@ class Classpaths {
         addDependency(config, GUAVA_GROUP, GUAVA_NAME, GUAVA_VERSION)
     }
 
+    static void inheritAvro(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
+        Configuration config = p.configurations.getByName(configName)
+        addDependency(config, AVRO_GROUP, AVRO_NAME, AVRO_VERSION)
+    }
+
     static void inheritParquetHadoop(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
         Configuration config = p.configurations.getByName(configName)
         addDependency(config, 'org.apache.parquet', 'parquet-hadoop', '1.14.0')
@@ -328,17 +337,18 @@ class Classpaths {
 
     static void inheritIcebergHadoop(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
         Configuration config = p.configurations.getByName(configName)
-        addDependency(config, HADOOP_GROUP, 'hadoop-common', HADOOP_VERSION)
+        inheritParquetHadoopConfiguration(p, configName)
         addDependency(config, HADOOP_GROUP, 'hadoop-hdfs-client', HADOOP_VERSION)
     }
 
+    static void inheritIcebergCore(Project p) {
+        Configuration apiConfig = p.configurations.getByName(JavaPlugin.API_CONFIGURATION_NAME)
+        addDependency(apiConfig, p.getDependencies().platform(ICEBERG_GROUP + ":iceberg-bom:" + ICEBERG_VERSION))
+        addDependency(apiConfig, ICEBERG_GROUP, 'iceberg-api', ICEBERG_VERSION)
 
-    static void inheritIcebergCore(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, p.getDependencies().platform(ICEBERG_GROUP + ":iceberg-bom:" + ICEBERG_VERSION))
-
-        addDependency(config, ICEBERG_GROUP, 'iceberg-core', ICEBERG_VERSION)
-        addDependency(config, ICEBERG_GROUP, 'iceberg-bundled-guava', ICEBERG_VERSION)
+        Configuration implConfig = p.configurations.getByName(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME)
+        addDependency(implConfig, ICEBERG_GROUP, 'iceberg-bundled-guava', ICEBERG_VERSION)
+        addDependency(implConfig, ICEBERG_GROUP, 'iceberg-core', ICEBERG_VERSION)
     }
 
     static void inheritAWSSDK(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
diff --git a/extensions/iceberg/build.gradle b/extensions/iceberg/build.gradle
index 2eba0158fb1..18a3e7f9b60 100644
--- a/extensions/iceberg/build.gradle
+++ b/extensions/iceberg/build.gradle
@@ -23,6 +23,7 @@ dependencies {
 
     Classpaths.inheritIcebergCore(project)
     Classpaths.inheritIcebergHadoop(project)
+    Classpaths.inheritAvro(project)
 
     Classpaths.inheritJUnitPlatform(project)
     Classpaths.inheritAssertJ(project)
diff --git a/extensions/kafka/build.gradle b/extensions/kafka/build.gradle
index 39c39e4f980..082c201b35b 100644
--- a/extensions/kafka/build.gradle
+++ b/extensions/kafka/build.gradle
@@ -10,7 +10,8 @@ dependencies {
 
     api project(':engine-processor')
 
-    api 'org.apache.avro:avro:1.11.3'
+    // Expose Avro to the users of this extension.
+    Classpaths.inheritAvro(project, JavaPlugin.API_CONFIGURATION_NAME)
 
     // Using io.confluent dependencies requires code in the toplevel build.gradle to add their maven repository.
     // Note: the -ccs flavor is provided by confluent as their community edition. It is equivalent to the maven central