From 184e8906ba6baa9e77d81ebb3a6c8caf69c03930 Mon Sep 17 00:00:00 2001
From: "zhengyunhong.zyh" <zhengyunhong.zyh@alibaba-inc.com>
Date: Thu, 21 May 2026 14:09:33 +0800
Subject: [PATCH 1/2] [arrow] Bump Arrow Java to 19.0.0 and upgrade CI to Java
 11

Arrow 19.0.0 requires Java 11+. This adds a new fluss-shaded-arrow-19
module and updates the CI and release enforcer to use Java 11.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/workflows/ci.yml                      |  4 +-
 .../fluss-shaded-arrow-19/pom.xml             | 96 +++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE        | 14 +++
 fluss-shaded-arrow-parent/pom.xml             |  1 +
 pom.xml                                       |  2 +-
 5 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 fluss-shaded-arrow-parent/fluss-shaded-arrow-19/pom.xml
 create mode 100644 fluss-shaded-arrow-parent/fluss-shaded-arrow-19/src/main/resources/META-INF/NOTICE

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0092caa..38dbb9a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Java 8 Build
+name: Java 11 Build
 
 on: [push, pull_request]
 
@@ -31,7 +31,7 @@ jobs:
       - name: Set JDK
         uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'temurin'
 
       - name: Set Maven 3.8.6
diff --git a/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/pom.xml b/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/pom.xml
new file mode 100644
index 0000000..7a114b4
--- /dev/null
+++ b/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.fluss</groupId>
+        <artifactId>fluss-shaded-arrow-parent</artifactId>
+        <version>2.0-incubating</version>
+    </parent>
+
+    <artifactId>fluss-shaded-arrow${fluss.ci.license.suffix}</artifactId>
+    <name>fluss-shaded-arrow-19</name>
+    <version>${arrow.version}-2.0-incubating</version>
+
+    <packaging>jar</packaging>
+
+    <properties>
+        <!-- Arrow 19 requires Java 11+ -->
+        <arrow.version>19.0.0</arrow.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.arrow</groupId>
+            <artifactId>arrow-vector</artifactId>
+            <version>${arrow.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-common</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.arrow</groupId>
+            <artifactId>arrow-memory-netty</artifactId>
+            <version>${arrow.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-common</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-buffer</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>license-check</id>
+            <properties>
+                <fluss.ci.license.suffix>-19</fluss.ci.license.suffix>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/src/main/resources/META-INF/NOTICE b/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..ceb1160
--- /dev/null
+++ b/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,14 @@
+fluss-shaded-arrow-19
+Copyright 2025 The Apache Software Foundation
+
+This product includes software developed at
+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.arrow:arrow-vector:19.0.0
+- org.apache.arrow:arrow-format:19.0.0
+- org.apache.arrow:arrow-memory-core:19.0.0
+- org.apache.arrow:arrow-memory-netty:19.0.0
+- org.apache.arrow:arrow-memory-netty-buffer-patch:19.0.0
+- com.google.flatbuffers:flatbuffers-java:25.2.10
diff --git a/fluss-shaded-arrow-parent/pom.xml b/fluss-shaded-arrow-parent/pom.xml
index 0a401e1..edf3451 100644
--- a/fluss-shaded-arrow-parent/pom.xml
+++ b/fluss-shaded-arrow-parent/pom.xml
@@ -34,6 +34,7 @@
     <modules>
         <module>fluss-shaded-arrow-15</module>
         <module>fluss-shaded-arrow-16</module>
+        <module>fluss-shaded-arrow-19</module>
     </modules>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 38472ef..29ba75e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
                                 <configuration>
                                     <rules>
                                         <requireJavaVersion>
-                                            <version>1.8.0</version>
+                                            <version>11</version>
                                         </requireJavaVersion>
                                         <requireMavenVersion>
                                             <!-- Maven version for releasing should match

From 5ae1ce699d8f53794efd68b6c2f6122b0b62da5d Mon Sep 17 00:00:00 2001
From: "zhengyunhong.zyh" <zhengyunhong.zyh@alibaba-inc.com>
Date: Thu, 21 May 2026 17:09:37 +0800
Subject: [PATCH 2/2] [arrow] Add arrow-variant module with parquet
 dependencies to shaded arrow-19

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../fluss-shaded-arrow-19/pom.xml                    | 12 ++++++++++++
 .../src/main/resources/META-INF/NOTICE               |  6 ++++++
 fluss-shaded-arrow-parent/pom.xml                    | 11 +++++++++++
 3 files changed, 29 insertions(+)

diff --git a/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/pom.xml b/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/pom.xml
index 7a114b4..2c1a6a7 100644
--- a/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/pom.xml
+++ b/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/pom.xml
@@ -82,6 +82,18 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.arrow</groupId>
+            <artifactId>arrow-variant</artifactId>
+            <version>${arrow.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/src/main/resources/META-INF/NOTICE b/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/src/main/resources/META-INF/NOTICE
index ceb1160..fa48757 100644
--- a/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/src/main/resources/META-INF/NOTICE
+++ b/fluss-shaded-arrow-parent/fluss-shaded-arrow-19/src/main/resources/META-INF/NOTICE
@@ -11,4 +11,10 @@ This project bundles the following dependencies under the Apache Software Licens
 - org.apache.arrow:arrow-memory-core:19.0.0
 - org.apache.arrow:arrow-memory-netty:19.0.0
 - org.apache.arrow:arrow-memory-netty-buffer-patch:19.0.0
+- org.apache.arrow:arrow-variant:19.0.0
 - com.google.flatbuffers:flatbuffers-java:25.2.10
+- org.apache.parquet:parquet-variant:1.17.0
+- org.apache.parquet:parquet-common:1.17.0
+- org.apache.parquet:parquet-column:1.17.0
+- org.apache.parquet:parquet-format-structures:1.17.0
+- org.apache.parquet:parquet-encoding:1.17.0
diff --git a/fluss-shaded-arrow-parent/pom.xml b/fluss-shaded-arrow-parent/pom.xml
index edf3451..d8d7161 100644
--- a/fluss-shaded-arrow-parent/pom.xml
+++ b/fluss-shaded-arrow-parent/pom.xml
@@ -60,6 +60,8 @@
                                     <include>io.netty:*</include>
                                     <!-- Only for Arrow 15.0.0 -->
                                     <include>org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap</include>
+                                    <!-- arrow-variant depends on parquet-variant -->
+                                    <include>org.apache.parquet:*</include>
                                 </includes>
                                 <excludes>
                                     <!-- We re-use fluss-shaded-jackson -->
@@ -88,6 +90,15 @@
                                     <pattern>com.fasterxml.jackson</pattern>
                                     <shadedPattern>${shading.prefix}.jackson2.com.fasterxml.jackson</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.apache.parquet</pattern>
+                                    <shadedPattern>${shading.prefix}.arrow.org.apache.parquet</shadedPattern>
+                                </relocation>
+                                <!-- parquet-format-structures bundles its own shaded thrift -->
+                                <relocation>
+                                    <pattern>shaded.parquet</pattern>
+                                    <shadedPattern>${shading.prefix}.arrow.shaded.parquet</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>