Use li-iceberg

Author: maluchari

apps/spark-3.5/build.gradle

@@ -18,6 +18,7 @@ ext {
 
 configurations.all {
     exclude group: 'org.apache.iceberg', module: 'iceberg-data'
+    exclude group: 'com.linkedin.iceberg', module: 'iceberg-data'
 }
 dependencies {
     compileOnly (project(path: openhouseSparkRuntimeModule)) {
@@ -29,6 +30,7 @@ dependencies {
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
     implementation(project(':libs:datalayout')) {
         exclude group: 'org.apache.iceberg', module: 'iceberg-spark-runtime-3.1_2.12'
+        exclude group: 'com.linkedin.iceberg', module: 'iceberg-spark-runtime-3.1_2.12'
     }
     implementation ('org.apache.spark:spark-core_2.12:' + sparkVersion) {
         exclude group: 'io.netty'

build.gradle

@@ -69,6 +69,22 @@ allprojects {
         force 'com.fasterxml.jackson.core:jackson-databind:2.13.4'
         force 'org.apache.orc:orc-core:1.8.3'
         force 'com.google.guava:guava:31.1-jre'
+
+        // Redirect Apache Iceberg 1.2.0 core modules to LinkedIn groupId/version without changing declarations/imports
+        dependencySubstitution {
+          all { sub ->
+            def req = sub.requested
+            if (req instanceof org.gradle.api.artifacts.component.ModuleComponentSelector && req.group == 'org.apache.iceberg') {
+              def module = req.module
+              def version = req.version
+              boolean isIceberg120 = version != null && version == '1.2.0'
+              boolean isAwsOrAzure = module != null && (module.startsWith('iceberg-aws') || module.startsWith('iceberg-azure'))
+              if (isIceberg120 && !isAwsOrAzure) {
+                sub.useTarget("com.linkedin.iceberg:${module}:1.2.0.0-rc2")
+              }
+            }
+          }
+        }
       }
     }
   }

buildSrc/src/main/groovy/openhouse.apps-spark-common.gradle

@@ -22,10 +22,6 @@ dependencies {
   implementation project(':services:common')
   implementation project(':cluster:storage')
 
-  implementation("org.apache.iceberg:iceberg-bundled-guava")
-  implementation("org.apache.iceberg:iceberg-data")
-  implementation("org.apache.iceberg:iceberg-core")
-  implementation("org.apache.iceberg:iceberg-common")
 
   implementation ('org.apache.hadoop:hadoop-common:2.10.0') {
     exclude group: 'io.netty'
@@ -74,6 +70,10 @@ shadowJar {
     // this dependency will be provided at runtime
     exclude(dependency('org.apache.iceberg:iceberg-spark3-runtime::'))
 
+    // mirror excludes for com.linkedin.iceberg groupId after dependency substitution
+    exclude(dependency('com.linkedin.iceberg::'))
+    exclude(dependency('com.linkedin.iceberg:iceberg-spark3-runtime::'))
+
     // can possibly be removed with gradle8 and shadow upgrade
     // https://github.com/GradleUp/shadow/issues/877#issuecomment-2472922043
     exclude 'META-INF/versions/19/'

scripts/java/tools/dummytokens/build.gradle

@@ -9,6 +9,7 @@ mainClassName = 'com.linkedin.openhouse.tools.dummytokens.DummyTokenGenerator'
 dependencies {
     implementation(project(':services:common')){
         exclude group: 'org.apache.iceberg'
+        exclude group: 'com.linkedin.iceberg'
         exclude group: 'com.azure'
     }
     implementation 'commons-cli:commons-cli:1.5.0'

services/tables/build.gradle

@@ -37,5 +37,6 @@ dependencies {
   testImplementation(testFixtures(project(':services:common')))
   testImplementation (project(':tables-test-fixtures:tables-test-fixtures_2.12')) {
     exclude group: 'org.apache.iceberg'
+    exclude group: 'com.linkedin.iceberg'
   }
 }