From facf092bba93c6d58dce6b94c6331b07d144ffcb Mon Sep 17 00:00:00 2001
From: Ryan Blue <blue@apache.org>
Date: Wed, 29 Apr 2026 13:41:51 -0700
Subject: [PATCH 1/3] Open API: Remove runtime Jar from build and deploy.

---
 build.gradle  | 21 ---------------------
 deploy.gradle |  1 -
 2 files changed, 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index 261dfabf0412..3ca7c3411665 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1060,9 +1060,6 @@ project(':iceberg-snowflake') {
 
 project(':iceberg-open-api') {
   apply plugin: 'java-test-fixtures'
-  apply plugin: 'com.gradleup.shadow'
-
-  build.dependsOn shadowJar
 
   dependencies {
     testImplementation project(':iceberg-api')
@@ -1147,24 +1144,6 @@ project(':iceberg-open-api') {
   }
   check.dependsOn('validateRESTCatalogSpec')
 
-  shadowJar {
-    archiveBaseName.set("iceberg-open-api-test-fixtures-runtime")
-    archiveClassifier.set(null)
-    configurations = [project.configurations.testFixturesRuntimeClasspath]
-    from sourceSets.testFixtures.output
-    zip64 true
-
-    // include the LICENSE and NOTICE files for the runtime Jar
-    from(projectDir) {
-      include 'LICENSE'
-      include 'NOTICE'
-    }
-
-    manifest {
-      attributes 'Main-Class': 'org.apache.iceberg.rest.RESTCatalogServer'
-    }
-  }
-
   jar {
     enabled = false
   }
diff --git a/deploy.gradle b/deploy.gradle
index 740d0056273b..65836bf1b3f1 100644
--- a/deploy.gradle
+++ b/deploy.gradle
@@ -75,7 +75,6 @@ subprojects {
           } else if (isOpenApi) {
             artifact testJar
             artifact testFixturesJar
-            artifact shadowJar
           } else {
             if (tasks.matching({task -> task.name == 'shadowJar'}).isEmpty()) {
               from components.java

From 621d2b4230d552eac8e9ab2bc860c45e33124398 Mon Sep 17 00:00:00 2001
From: Ryan Blue <blue@apache.org>
Date: Thu, 30 Apr 2026 14:02:37 -0700
Subject: [PATCH 2/3] Revert "Open API: Remove runtime Jar from build and
 deploy."

This reverts commit facf092bba93c6d58dce6b94c6331b07d144ffcb.
---
 build.gradle  | 21 +++++++++++++++++++++
 deploy.gradle |  1 +
 2 files changed, 22 insertions(+)

diff --git a/build.gradle b/build.gradle
index 3ca7c3411665..261dfabf0412 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1060,6 +1060,9 @@ project(':iceberg-snowflake') {
 
 project(':iceberg-open-api') {
   apply plugin: 'java-test-fixtures'
+  apply plugin: 'com.gradleup.shadow'
+
+  build.dependsOn shadowJar
 
   dependencies {
     testImplementation project(':iceberg-api')
@@ -1144,6 +1147,24 @@ project(':iceberg-open-api') {
   }
   check.dependsOn('validateRESTCatalogSpec')
 
+  shadowJar {
+    archiveBaseName.set("iceberg-open-api-test-fixtures-runtime")
+    archiveClassifier.set(null)
+    configurations = [project.configurations.testFixturesRuntimeClasspath]
+    from sourceSets.testFixtures.output
+    zip64 true
+
+    // include the LICENSE and NOTICE files for the runtime Jar
+    from(projectDir) {
+      include 'LICENSE'
+      include 'NOTICE'
+    }
+
+    manifest {
+      attributes 'Main-Class': 'org.apache.iceberg.rest.RESTCatalogServer'
+    }
+  }
+
   jar {
     enabled = false
   }
diff --git a/deploy.gradle b/deploy.gradle
index 65836bf1b3f1..740d0056273b 100644
--- a/deploy.gradle
+++ b/deploy.gradle
@@ -75,6 +75,7 @@ subprojects {
           } else if (isOpenApi) {
             artifact testJar
             artifact testFixturesJar
+            artifact shadowJar
           } else {
             if (tasks.matching({task -> task.name == 'shadowJar'}).isEmpty()) {
               from components.java

From eff2980e2442407f3787d3a58e484fec4bcc64fa Mon Sep 17 00:00:00 2001
From: Ryan Blue <blue@apache.org>
Date: Thu, 30 Apr 2026 14:02:46 -0700
Subject: [PATCH 3/3] OpenAPI: Remove shadowJar from deployment.

---
 deploy.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy.gradle b/deploy.gradle
index 740d0056273b..65836bf1b3f1 100644
--- a/deploy.gradle
+++ b/deploy.gradle
@@ -75,7 +75,6 @@ subprojects {
           } else if (isOpenApi) {
             artifact testJar
             artifact testFixturesJar
-            artifact shadowJar
           } else {
             if (tasks.matching({task -> task.name == 'shadowJar'}).isEmpty()) {
               from components.java