[iceberg] Upgrade iceberg version to 1.9.1 (#1520)

Author: luoyuxia

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>

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
+- 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

…keting/IcebergBucketingFunctionTest.java …keting/IcebergBucketingFunctionTest.javafluss-common/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java renamed to fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java fluss-common/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java renamed to fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java

@@ -94,7 +94,6 @@ void testLongEncoding() throws IOException {
         // Encode with Iceberg's implementation
         ByteBuffer icebergBuffer = Conversions.toByteBuffer(Types.LongType.get(), testValue);
         byte[] icebergEncoded = toByteArray(icebergBuffer);
-
         assertThat(ourEncoded).isEqualTo(icebergEncoded);
     }
 

…/iceberg/IcebergBinaryRowWriterTest.java …/iceberg/IcebergBinaryRowWriterTest.javafluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java renamed to fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java renamed to fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java

@@ -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>

…ncode/iceberg/IcebergKeyEncoderTest.java …ncode/iceberg/IcebergKeyEncoderTest.javafluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java renamed to fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java renamed to fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java

@@ -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>