From 10d7ab11c90f7f0f6b60919e3bca6db251ec697e Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Wed, 19 Jun 2024 18:53:27 +0200
Subject: [PATCH] Run Hive3 tests on Java 11 and 17 too (#10482)

Project supports building with 8, 11 and 17. In most CI scripts we run
the jobs on all supported Java versions, let's do same here to ensure
the build would work locally too.
---
 .github/workflows/hive-ci.yml |  5 ++++-
 settings.gradle               | 13 +++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/hive-ci.yml b/.github/workflows/hive-ci.yml
index ffa49f6da3db..cd201a09d0fa 100644
--- a/.github/workflows/hive-ci.yml
+++ b/.github/workflows/hive-ci.yml
@@ -94,6 +94,9 @@ jobs:
 
   hive3-tests:
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        jvm: [8, 11, 17]
     env:
       SPARK_LOCAL_IP: localhost
     steps:
@@ -101,7 +104,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: zulu
-        java-version: 8
+        java-version: ${{ matrix.jvm }}
     - uses: actions/cache@v4
       with:
         path: |
diff --git a/settings.gradle b/settings.gradle
index 2fa05fb46d0d..46c85fb65546 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -184,14 +184,11 @@ if (hiveVersions.contains("2") || hiveVersions.contains("3")) {
   project(':hive-runtime').name = 'iceberg-hive-runtime'
 }
 
-if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
-  if (hiveVersions.contains("3")) {
-    include 'hive3'
-    include 'hive3-orc-bundle'
-
-    project(':hive3').name = 'iceberg-hive3'
-    project(':hive3-orc-bundle').name = 'iceberg-hive3-orc-bundle'
-  }
+if (hiveVersions.contains("3")) {
+  include 'hive3'
+  include 'hive3-orc-bundle'
+  project(':hive3').name = 'iceberg-hive3'
+  project(':hive3-orc-bundle').name = 'iceberg-hive3-orc-bundle'
 }
 
 include ":iceberg-kafka-connect:kafka-connect-events"