From a4eaacd850cbce8d9a2e1bfd852180ba0ff280bf Mon Sep 17 00:00:00 2001
From: chengpeiming <chengpeiming@gf.com.cn>
Date: Thu, 14 Nov 2024 18:25:09 +0800
Subject: [PATCH] [KYUUBI #6804] Bump Iceberg from 1.6.1 to 1.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# :mag: Description
## Issue References 🔗

Apache Iceberg 1.7.0 release https://github.com/apache/iceberg/releases/tag/apache-iceberg-1.7.0

## Describe Your Solution 🔧
- Bump Apache Iceberg to 1.7.0
- As Apache Iceberg 1.7.0 drops support for Java 8 and building with Java 11, keep it in 1.6.x for Java 8

## Types of changes :bookmark:

- [ ] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Test Plan 🧪

#### Behavior Without This Pull Request :coffin:

#### Behavior With This Pull Request :tada:

#### Related Unit Tests

---

# Checklist 📝

- [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html)

**Be nice. Be informative.**

Closes #6804 from pionCham/bump-iceberg-version.

Closes #6804

0896ac768 [Bowen Liang] keep iceberg 1.6.1 in playground
eba16ae6c [chengpeiming] Specify the iceberg version in java-8 profile
3b160ddd6 [chengpeiming] Bump iceberg version

Lead-authored-by: chengpeiming <chengpeiming@gf.com.cn>
Co-authored-by: Bowen Liang <bowenliang@apache.org>
Signed-off-by: Kent Yao <yao@apache.org>
---
 docs/connector/flink/iceberg.rst | 2 +-
 docs/connector/spark/iceberg.rst | 2 +-
 pom.xml                          | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/connector/flink/iceberg.rst b/docs/connector/flink/iceberg.rst
index d66749d8a92..7b956365e01 100644
--- a/docs/connector/flink/iceberg.rst
+++ b/docs/connector/flink/iceberg.rst
@@ -45,7 +45,7 @@ The **classpath** of kyuubi flink sql engine with Iceberg supported consists of
 
 1. kyuubi-flink-sql-engine-\ |release|\ _2.12.jar, the engine jar deployed with a Kyuubi distribution
 2. a copy of flink distribution
-3. iceberg-flink-runtime-<flink.version>-<iceberg.version>.jar (example: iceberg-flink-runtime-1.18-1.6.1.jar), which can be found in the `Maven Central`_
+3. iceberg-flink-runtime-<flink.version>-<iceberg.version>.jar (example: iceberg-flink-runtime-1.18-1.7.0.jar), which can be found in the `Maven Central`_
 
 In order to make the Iceberg packages visible for the runtime classpath of engines, we can use one of these methods:
 
diff --git a/docs/connector/spark/iceberg.rst b/docs/connector/spark/iceberg.rst
index 3d77014eba5..2969d355b69 100644
--- a/docs/connector/spark/iceberg.rst
+++ b/docs/connector/spark/iceberg.rst
@@ -47,7 +47,7 @@ The **classpath** of Kyuubi Spark SQL engine with Iceberg supported consists of
 
 1. kyuubi-spark-sql-engine-\ |release|\ _2.12.jar, the engine jar deployed with a Kyuubi distribution
 2. a copy of Spark distribution
-3. iceberg-spark-runtime-<spark.version>_<scala.version>-<iceberg.version>.jar (example: iceberg-spark-runtime-3.5_2.12-1.6.1.jar), which can be found in the `Maven Central`_
+3. iceberg-spark-runtime-<spark.version>_<scala.version>-<iceberg.version>.jar (example: iceberg-spark-runtime-3.5_2.12-1.7.0.jar), which can be found in the `Maven Central`_
 
 In order to make the Iceberg packages visible for the runtime classpath of engines, we can use one of these methods:
 
diff --git a/pom.xml b/pom.xml
index c9e56b6eb14..a0411a0967f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
         <httpcore.version>4.4.16</httpcore.version>
         <hudi.version>0.15.0</hudi.version>
         <hudi.artifact>hudi-spark${spark.binary.version}-bundle_${scala.binary.version}</hudi.artifact>
-        <iceberg.version>1.6.1</iceberg.version>
+        <iceberg.version>1.7.0</iceberg.version>
         <iceberg.artifact>iceberg-spark-runtime-${spark.binary.version}_${scala.binary.version}</iceberg.artifact>
         <jackson.version>2.15.4</jackson.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
@@ -1905,6 +1905,7 @@
             </activation>
             <properties>
                 <java.version>1.8</java.version>
+                <iceberg.version>1.6.1</iceberg.version>
             </properties>
         </profile>