From 4b1dcc0df934c391f95695d513736ab78980294e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Aug 2026 00:01:12 +0000
Subject: [PATCH 1/4] MINOR: Bump error_prone_core.version from 2.42.0 to
 2.50.0

Bumps `error_prone_core.version` from 2.42.0 to 2.50.0.

Updates `com.google.errorprone:error_prone_annotations` from 2.42.0 to 2.50.0
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.42.0...v2.50.0)

Updates `com.google.errorprone:error_prone_core` from 2.42.0 to 2.50.0
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.42.0...v2.50.0)

---
updated-dependencies:
- dependency-name: com.google.errorprone:error_prone_annotations
  dependency-version: 2.50.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.errorprone:error_prone_core
  dependency-version: 2.50.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 78137eb4e9..8f5b263b58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@ under the License.
     <forkCount>2</forkCount>
     <checkstyle.version>10.23.0</checkstyle.version>
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
-    <error_prone_core.version>2.42.0</error_prone_core.version>
+    <error_prone_core.version>2.50.0</error_prone_core.version>
     <checker.framework.version>4.2.1</checker.framework.version>
     <logback.version>1.5.37</logback.version>
     <doclint>none</doclint>

From 6ca47363df5b2d37962666aa52aab05d96b6debe Mon Sep 17 00:00:00 2001
From: David Li <li.davidm96@gmail.com>
Date: Tue, 25 Aug 2026 11:12:18 +0900
Subject: [PATCH 2/4] fix java versions

---
 .github/workflows/test.yml | 2 +-
 pom.xml                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 653b16fa32..1103a7f845 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [17, 21, 23]
+        jdk: [17, 21, 25]
         maven: [3.9.9]
         image: [ubuntu, conda-jni-cdata]
         include:
diff --git a/pom.xml b/pom.xml
index 8f5b263b58..d656554475 100644
--- a/pom.xml
+++ b/pom.xml
@@ -850,7 +850,7 @@ under the License.
       -->
       <id>error-prone</id>
       <activation>
-        <jdk>[17,)</jdk>
+        <jdk>[21,)</jdk>
         <property>
           <name>!m2e.version</name>
         </property>

From a25566e763ebf0c80bd2fd9a9dea55d4d5bca93d Mon Sep 17 00:00:00 2001
From: David Li <li.davidm96@gmail.com>
Date: Tue, 25 Aug 2026 11:14:23 +0900
Subject: [PATCH 3/4] missing arg

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index d656554475..9aa92479c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -863,6 +863,7 @@ under the License.
             <configuration>
               <compilerArgs combine.children="append">
                 <arg>-XDcompilePolicy=simple</arg>
+                <arg>-XDaddTypeAnnotationsToSymbol=true</arg>
                 <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/(target/generated-source|format/src/main/java/org/apache/arrow/flatbuf)/.*</arg>
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>

From 10181fb9695b1b618ebc46ccde7fac20c9701121 Mon Sep 17 00:00:00 2001
From: David Li <li.davidm96@gmail.com>
Date: Tue, 25 Aug 2026 11:19:06 +0900
Subject: [PATCH 4/4] revert

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1103a7f845..653b16fa32 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [17, 21, 25]
+        jdk: [17, 21, 23]
         maven: [3.9.9]
         image: [ubuntu, conda-jni-cdata]
         include: