This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 352a9ffa87 [#8153] feat(iceberg): upgrade iceberg version in document
and docker image bundle jars (#8194)
352a9ffa87 is described below
commit 352a9ffa8755380722548af72a19dd9230008523
Author: FANNG <[email protected]>
AuthorDate: Mon Aug 25 11:30:34 2025 +0900
[#8153] feat(iceberg): upgrade iceberg version in document and docker image
bundle jars (#8194)
### What changes were proposed in this pull request?
upgrade iceberg version in document and docker image bundle jars
### Why are the changes needed?
Fix: #8153
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
testing s3,aws,azure,oss with Iceberg docker image locally.
---
dev/docker/gravitino/gravitino-dependency.sh | 22 ++++++++++++----------
.../iceberg-rest-server-dependency.sh | 10 +++++-----
docs/iceberg-rest-service.md | 4 ++--
docs/lakehouse-iceberg-catalog.md | 2 +-
iceberg/iceberg-rest-server/build.gradle.kts | 6 +-----
.../trino-test-tools/download_jar.sh | 4 ++--
6 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/dev/docker/gravitino/gravitino-dependency.sh
b/dev/docker/gravitino/gravitino-dependency.sh
index f0c6cd3b0a..d2f1c5d742 100755
--- a/dev/docker/gravitino/gravitino-dependency.sh
+++ b/dev/docker/gravitino/gravitino-dependency.sh
@@ -80,7 +80,7 @@ cp "${gravitino_staging_dir}/${pg_driver}"
"${gravitino_package_dir}/catalogs/jd
cp "${gravitino_staging_dir}/${pg_driver}"
"${gravitino_package_dir}/catalogs/lakehouse-iceberg/libs/"
cp "${gravitino_staging_dir}/${pg_driver}" "${gravitino_iceberg_rest_dir}"
-iceberg_version="1.6.1"
+iceberg_version="1.9.2"
iceberg_aws_bundle="iceberg-aws-bundle-${iceberg_version}.jar"
wget
"https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-aws-bundle/${iceberg_version}/${iceberg_aws_bundle}";
-O "${gravitino_staging_dir}/${iceberg_aws_bundle}"
cp "${gravitino_staging_dir}/${iceberg_aws_bundle}"
"${gravitino_iceberg_rest_dir}"
@@ -99,16 +99,18 @@ mkdir -p "${gravitino_dir}/packages/gravitino/bin"
cp "${gravitino_dir}/rewrite_gravitino_server_config.py"
"${gravitino_dir}/packages/gravitino/bin/"
cp "${gravitino_dir}/start-gravitino.sh"
"${gravitino_dir}/packages/gravitino/bin/"
+fileset_lib_dir="${gravitino_dir}/packages/gravitino/catalogs/fileset/libs"
+
# Copy the Aliyun, AWS, GCP and Azure bundles to the Fileset catalog libs
-cp ${gravitino_home}/bundles/aliyun-bundle/build/libs/*.jar
"${gravitino_dir}/packages/gravitino/catalogs/fileset/libs"
-cp ${gravitino_home}/bundles/aws-bundle/build/libs/*.jar
"${gravitino_dir}/packages/gravitino/catalogs/fileset/libs"
-cp ${gravitino_home}/bundles/gcp-bundle/build/libs/*.jar
"${gravitino_dir}/packages/gravitino/catalogs/fileset/libs"
-cp ${gravitino_home}/bundles/azure-bundle/build/libs/*.jar
"${gravitino_dir}/packages/gravitino/catalogs/fileset/libs"
-
-cp ${gravitino_home}/bundles/aws/build/libs/*.jar
"${gravitino_iceberg_rest_dir}"
-cp ${gravitino_home}/bundles/gcp/build/libs/*.jar
"${gravitino_iceberg_rest_dir}"
-cp ${gravitino_home}/bundles/azure/build/libs/*.jar
"${gravitino_iceberg_rest_dir}"
-cp ${gravitino_home}/bundles/aliyun-bundle/build/libs/*.jar
"${gravitino_iceberg_rest_dir}"
+find ${gravitino_home}/bundles/aliyun-bundle/build/libs/ -name
'gravitino-aliyun-bundle-*.jar' ! -name '*-empty.jar' -exec cp -v {}
"${fileset_lib_dir}" \;
+find ${gravitino_home}/bundles/aws-bundle/build/libs/ -name
'gravitino-aws-*.jar' ! -name '*-empty.jar' -exec cp -v {} "${fileset_lib_dir}"
\;
+find ${gravitino_home}/bundles/gcp-bundle/build/libs/ -name
'gravitino-gcp-*.jar' ! -name '*-empty.jar' -exec cp -v {} "${fileset_lib_dir}"
\;
+find ${gravitino_home}/bundles/azure-bundle/build/libs/ -name
'gravitino-azure-*.jar' ! -name '*-empty.jar' -exec cp -v {}
"${fileset_lib_dir}" \;
+
+find ${gravitino_home}/bundles/gcp/build/libs/ -name 'gravitino-gcp-*.jar' !
-name '*-empty.jar' -exec cp -v {} "${gravitino_iceberg_rest_dir}" \;
+find ${gravitino_home}/bundles/aws/build/libs/ -name 'gravitino-aws-*.jar' !
-name '*-empty.jar' -exec cp -v {} "${gravitino_iceberg_rest_dir}" \;
+find ${gravitino_home}/bundles/azure/build/libs/ -name 'gravitino-azure-*.jar'
! -name '*-empty.jar' -exec cp -v {} "${gravitino_iceberg_rest_dir}" \;
+find ${gravitino_home}/bundles/aliyun-bundle/build/libs/ -name
'gravitino-aliyun-bundle-*.jar' ! -name '*-empty.jar' -exec cp -v {}
"${gravitino_iceberg_rest_dir}" \;
download_gcs_connector
diff --git a/dev/docker/iceberg-rest-server/iceberg-rest-server-dependency.sh
b/dev/docker/iceberg-rest-server/iceberg-rest-server-dependency.sh
index 1640d0195b..06033371e8 100755
--- a/dev/docker/iceberg-rest-server/iceberg-rest-server-dependency.sh
+++ b/dev/docker/iceberg-rest-server/iceberg-rest-server-dependency.sh
@@ -44,12 +44,12 @@ cd ${gravitino_home}
# prepare bundle jar
cd ${iceberg_rest_server_dir}
mkdir -p bundles
-cp ${gravitino_home}/bundles/gcp/build/libs/gravitino-gcp-*.jar bundles/
-cp ${gravitino_home}/bundles/aws/build/libs/gravitino-aws-*.jar bundles/
-cp ${gravitino_home}/bundles/azure/build/libs/gravitino-azure-*.jar bundles/
-cp
${gravitino_home}/bundles/aliyun-bundle/build/libs/gravitino-aliyun-bundle-*.jar
bundles/
+find ${gravitino_home}/bundles/gcp/build/libs/ -name 'gravitino-gcp-*.jar' !
-name '*-empty.jar' -exec cp -v {} bundles/ \;
+find ${gravitino_home}/bundles/aws/build/libs/ -name 'gravitino-aws-*.jar' !
-name '*-empty.jar' -exec cp -v {} bundles/ \;
+find ${gravitino_home}/bundles/azure/build/libs/ -name 'gravitino-azure-*.jar'
! -name '*-empty.jar' -exec cp -v {} bundles/ \;
+find ${gravitino_home}/bundles/aliyun-bundle/build/libs/ -name
'gravitino-aliyun-bundle-*.jar' ! -name '*-empty.jar' -exec cp -v {} bundles/ \;
-iceberg_version="1.6.1"
+iceberg_version="1.9.2"
iceberg_gcp_bundle="iceberg-gcp-bundle-${iceberg_version}.jar"
if [ ! -f "bundles/${iceberg_gcp_bundle}" ]; then
diff --git a/docs/iceberg-rest-service.md b/docs/iceberg-rest-service.md
index 30b465c619..af51cebc82 100644
--- a/docs/iceberg-rest-service.md
+++ b/docs/iceberg-rest-service.md
@@ -378,7 +378,7 @@ You can access different catalogs by setting the
`warehouse` to the catalog name
### Other Apache Iceberg catalog properties
-You can add other properties defined in [Iceberg catalog
properties](https://iceberg.apache.org/docs/1.6.1/configuration/#catalog-properties).
+You can add other properties defined in [Iceberg catalog
properties](https://iceberg.apache.org/docs/1.9.2/configuration/#catalog-properties).
The `clients` property for example:
| Configuration item | Description |
Default value | Required |
@@ -439,7 +439,7 @@ Normally you will see the output like
`{"defaults":{},"overrides":{}}%`.
### Deploying Apache Spark with Apache Iceberg support
-Follow the [Spark Iceberg start
guide](https://iceberg.apache.org/docs/1.6.1/spark-getting-started/) to set up
Apache Spark's and Apache Iceberg's environment.
+Follow the [Spark Iceberg start
guide](https://iceberg.apache.org/docs/1.9.2/spark-getting-started/) to set up
Apache Spark's and Apache Iceberg's environment.
### Starting the Apache Spark client with the Apache Iceberg REST catalog
diff --git a/docs/lakehouse-iceberg-catalog.md
b/docs/lakehouse-iceberg-catalog.md
index 1c518ed758..db3cdf676b 100644
--- a/docs/lakehouse-iceberg-catalog.md
+++ b/docs/lakehouse-iceberg-catalog.md
@@ -18,7 +18,7 @@ Apache Gravitino provides the ability to manage Apache
Iceberg metadata.
### Requirements and limitations
:::info
-Builds with Apache Iceberg `1.6.1`. The Apache Iceberg table format version is
`2` by default.
+Builds with Apache Iceberg `1.9.2`. The Apache Iceberg table format version is
`2` by default.
:::
## Catalog
diff --git a/iceberg/iceberg-rest-server/build.gradle.kts
b/iceberg/iceberg-rest-server/build.gradle.kts
index 66a9bde371..d183f4e0af 100644
--- a/iceberg/iceberg-rest-server/build.gradle.kts
+++ b/iceberg/iceberg-rest-server/build.gradle.kts
@@ -65,7 +65,7 @@ dependencies {
// Iceberg doesn't provide Aliyun bundle jar, use Gravitino Aliyun bundle to
provide OSS packages
testImplementation(project(":bundles:aliyun-bundle"))
- testImplementation(project(":bundles:aws"))
+ testImplementation(project(":bundles:aws", configuration = "shadow"))
testImplementation(project(":bundles:gcp", configuration = "shadow"))
testImplementation(project(":bundles:azure", configuration = "shadow"))
testImplementation(project(":integration-test-common", "testArtifacts"))
@@ -82,11 +82,7 @@ dependencies {
testImplementation(libs.iceberg.aws.bundle)
testImplementation(libs.iceberg.gcp.bundle)
- // Prevent netty conflict
- testImplementation(libs.reactor.netty.http)
- testImplementation(libs.reactor.netty.core)
testImplementation(libs.iceberg.azure.bundle) {
- exclude("io.netty")
exclude("com.google.guava", "guava")
}
testImplementation(libs.jersey.test.framework.core) {
diff --git a/trino-connector/integration-test/trino-test-tools/download_jar.sh
b/trino-connector/integration-test/trino-test-tools/download_jar.sh
index ea982b8c67..2c15cd7414 100755
--- a/trino-connector/integration-test/trino-test-tools/download_jar.sh
+++ b/trino-connector/integration-test/trino-test-tools/download_jar.sh
@@ -61,8 +61,8 @@ download_postgresql_jar() {
}
download_iceberg_aws_bundle() {
- download_jar "iceberg-aws-bundle-1.6.1.jar" \
- "https://jdbc.postgresql.org/download/iceberg-aws-bundle-1.6.1.jar"; \
+ download_jar "iceberg-aws-bundle-1.9.2.jar" \
+
"https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-aws-bundle/1.9.2/iceberg-aws-bundle-1.9.2.jar";
\
"$GRAVITINO_SERVER_DIR/catalogs/lakehouse-iceberg/libs"
}
