This is an automated email from the ASF dual-hosted git repository.
yuxia pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluss.git
The following commit(s) were added to refs/heads/main by this push:
new faa08159a [iceberg] Upgrade iceberg version to 1.9.1 (#1520)
faa08159a is described below
commit faa08159a7a012cdb65d61b62207fdcaac8087bc
Author: yuxia Luo <[email protected]>
AuthorDate: Wed Aug 27 09:39:56 2025 +0800
[iceberg] Upgrade iceberg version to 1.9.1 (#1520)
---
fluss-lake/fluss-lake-iceberg/pom.xml | 51 +++++++++++++++++++++-
.../src/main/resources/META-INF/NOTICE | 14 +++---
.../bucketing/IcebergBucketingFunctionTest.java | 0
.../encode/iceberg/IcebergBinaryRowWriterTest.java | 0
.../row/encode/iceberg/IcebergKeyEncoderTest.java | 1 -
fluss-test-coverage/pom.xml | 2 +
pom.xml | 3 +-
7 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/fluss-lake/fluss-lake-iceberg/pom.xml
b/fluss-lake/fluss-lake-iceberg/pom.xml
index 0b328c1bc..5ad616def 100644
--- a/fluss-lake/fluss-lake-iceberg/pom.xml
+++ b/fluss-lake/fluss-lake-iceberg/pom.xml
@@ -227,6 +227,56 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- compilation of main sources -->
+ <skipMain>${skip.on.java8}</skipMain>
+ <!-- compilation of test sources -->
+ <skip>${skip.on.java8}</skip>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <!-- Test end with ITCase is e2e test in this module -->
+ <execution>
+ <id>integration-tests</id>
+ <phase>integration-test</phase>
+ <inherited>false</inherited>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${skip.on.java8}</skip>
+ <includes>
+ <include>**/*ITCase.*</include>
+ </includes>
+ <!-- e2e test with flink/zookeeper cluster, we set
forkCount=1 -->
+ <forkCount>1</forkCount>
+ </configuration>
+ </execution>
+ <!-- others unit tests -->
+ <execution>
+ <id>default-test</id>
+ <phase>test</phase>
+ <inherited>false</inherited>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${skip.on.java8}</skip>
+ <excludes>
+ <exclude>**/*ITCase.*</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -265,5 +315,4 @@
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/fluss-lake/fluss-lake-iceberg/src/main/resources/META-INF/NOTICE
b/fluss-lake/fluss-lake-iceberg/src/main/resources/META-INF/NOTICE
index edfd8ca2e..ba87ebd33 100644
--- a/fluss-lake/fluss-lake-iceberg/src/main/resources/META-INF/NOTICE
+++ b/fluss-lake/fluss-lake-iceberg/src/main/resources/META-INF/NOTICE
@@ -6,10 +6,10 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software
License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- org.apache.iceberg:iceberg-core:1.4.3
-- org.apache.iceberg:iceberg-api:1.4.3
-- org.apache.iceberg:iceberg-bundled-guava:1.4.3
-- org.apache.iceberg:iceberg-common:1.4.3
-- org.apache.iceberg:iceberg-data:1.4.3
-- org.apache.iceberg:iceberg-orc:1.4.3
-- org.apache.iceberg:iceberg-parquet:1.4.3
\ No newline at end of file
+- org.apache.iceberg:iceberg-core:1.9.1
+- org.apache.iceberg:iceberg-api:1.9.1
+- org.apache.iceberg:iceberg-bundled-guava:1.9.1
+- org.apache.iceberg:iceberg-common:1.9.1
+- org.apache.iceberg:iceberg-data:1.9.1
+- org.apache.iceberg:iceberg-orc:1.9.1
+- org.apache.iceberg:iceberg-parquet:1.9.1
\ No newline at end of file
diff --git
a/fluss-common/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java
b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java
similarity index 100%
rename from
fluss-common/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java
rename to
fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java
diff --git
a/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java
b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java
similarity index 100%
rename from
fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java
rename to
fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java
diff --git
a/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java
b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java
similarity index 99%
rename from
fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java
rename to
fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java
index e7059f296..139031e08 100644
---
a/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java
+++
b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java
@@ -94,7 +94,6 @@ class IcebergKeyEncoderTest {
// Encode with Iceberg's implementation
ByteBuffer icebergBuffer =
Conversions.toByteBuffer(Types.LongType.get(), testValue);
byte[] icebergEncoded = toByteArray(icebergBuffer);
-
assertThat(ourEncoded).isEqualTo(icebergEncoded);
}
diff --git a/fluss-test-coverage/pom.xml b/fluss-test-coverage/pom.xml
index b9c26aca3..aaa08c07d 100644
--- a/fluss-test-coverage/pom.xml
+++ b/fluss-test-coverage/pom.xml
@@ -386,6 +386,8 @@
<exclude>org.apache.fluss.lake.lance.*</exclude>
<!-- temporarily exclude iceberg -->
<exclude>org.apache.fluss.lake.iceberg.*</exclude>
+
<exclude>org.apache.fluss.row.encode.iceberg.*</exclude>
+
<exclude>org.apache.fluss.bucketing.IcebergBucketingFunction</exclude>
<!-- start exclude for flink tiering
service -->
<exclude>org.apache.fluss.flink.tiering.source.TieringSourceOptions</exclude>
<exclude>org.apache.fluss.flink.tiering.source.TieringSource.Builder</exclude>
diff --git a/pom.xml b/pom.xml
index eaec9ce2f..9ae2a7527 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,8 +100,7 @@
<netty.version>4.1.104.Final</netty.version>
<arrow.version>15.0.0</arrow.version>
<paimon.version>1.2.0</paimon.version>
- <!-- todo: Revisit to add support as per Iceberg 1.9.1 post #1195
merge for Java 11 support-->
- <iceberg.version>1.4.3</iceberg.version>
+ <iceberg.version>1.9.1</iceberg.version>
<fluss.hadoop.version>2.10.2</fluss.hadoop.version>
<frocksdb.version>6.20.3-ververica-2.0</frocksdb.version>
