From 8feeda9676243ee935cf2296ed10a1ef4d07d4f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Mar 2025 14:59:07 +0000
Subject: [PATCH 1/3] MINOR: Bump error_prone_core.version from 2.31.0 to
 2.37.0

Bumps `error_prone_core.version` from 2.31.0 to 2.37.0.

Updates `com.google.errorprone:error_prone_annotations` from 2.31.0 to 2.37.0
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.31.0...v2.37.0)

Updates `com.google.errorprone:error_prone_core` from 2.31.0 to 2.37.0
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](https://github.com/google/error-prone/compare/v2.31.0...v2.37.0)

---
updated-dependencies:
- dependency-name: com.google.errorprone:error_prone_annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.errorprone:error_prone_core
  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 d74ca1e5a1..52673fda5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@ under the License.
     <forkCount>2</forkCount>
     <checkstyle.version>10.21.4</checkstyle.version>
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
-    <error_prone_core.version>2.31.0</error_prone_core.version>
+    <error_prone_core.version>2.37.0</error_prone_core.version>
     <checker.framework.version>3.49.1</checker.framework.version>
     <logback.version>1.5.18</logback.version>
     <doclint>none</doclint>

From 88c764f910bb5b81bb52337e302678ac9926631d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Mon, 24 Mar 2025 17:55:25 +0100
Subject: [PATCH 2/3] Pass the right error prone compiler command line arg

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

diff --git a/pom.xml b/pom.xml
index 52673fda5d..3178dd05cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -868,6 +868,7 @@ under the License.
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
                 <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                 <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+                <arg>--should-stop=ifError=FLOW</arg>
               </compilerArgs>
               <annotationProcessorPaths combine.children="append">
                 <path>

From 49be4b7786642f0e51f315f63b52a20abaab57c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jb.onofre@dremio.com>
Date: Thu, 27 Mar 2025 19:12:44 +0100
Subject: [PATCH 3/3] Use error prone 2.37.0 only with JDK 17+

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

diff --git a/pom.xml b/pom.xml
index 3178dd05cc..afb753dcb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -845,6 +845,7 @@ under the License.
       -->
       <id>error-prone</id>
       <activation>
+        <jdk>[17,)</jdk>
         <property>
           <name>!m2e.version</name>
         </property>