From e27d5d0be677d6df67ccd9f766a19008377de369 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Wed, 11 Jun 2025 16:17:24 -0400
Subject: [PATCH 1/2] build: include arrow dependency suggested compiler flags

This follows https://arrow.apache.org/docs/java/install.html,
where we add the indicated `--add-opens` flag.

This is meant to follow from https://github.com/googleapis/java-bigquery/pull/3811#issuecomment-2941443802
---
 google-cloud-bigquery/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index 9599d760c..ec32e0702 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -239,6 +239,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <encoding>UTF-8</encoding>
+          <fork>true</fork>
+          <compilerArgs>
+            <arg>-J--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
       <plugin>
         <!-- Allow script to run, so we can run benchmarks. -->
         <groupId>org.codehaus.mojo</groupId>

From b54aa08b750b3a80440974208cfde9b32b2f2074 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Wed, 11 Jun 2025 16:27:49 -0400
Subject: [PATCH 2/2] fix: only activate on JDK 9+

---
 google-cloud-bigquery/pom.xml | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index ec32e0702..1bdc43fae 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -239,17 +239,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <encoding>UTF-8</encoding>
-          <fork>true</fork>
-          <compilerArgs>
-            <arg>-J--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
       <plugin>
         <!-- Allow script to run, so we can run benchmarks. -->
         <groupId>org.codehaus.mojo</groupId>
@@ -286,6 +275,27 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>arrow-config</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <encoding>UTF-8</encoding>
+              <fork>true</fork>
+              <compilerArgs>
+                <arg>-J--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</arg>
+              </compilerArgs>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>java17</id>
       <activation>