From d4fa9aefdb57821e5f52784f6d98980db7e06e6b Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Thu, 14 Jul 2022 14:43:53 -0400
Subject: [PATCH 1/6] fix(java): troubleshoot Java 17 issue with arrow

---
 .kokoro/build.sh              |  2 +-
 google-cloud-bigquery/pom.xml | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 089ca0e23..c576d60af 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -87,7 +87,7 @@ graalvm)
     ;;
 graalvm17)
     # Run Unit and Integration Tests with Native Image. Skip Arrow tests until https://github.com/googleapis/java-bigquery/issues/2060 is fixed.
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=!com.google.cloud.bigquery.it.ITBigQueryTest#testBQResultSetPaginationSlowQuery+testReadAPIConnectionMultiClose+testReadAPIIterationAndOrder, !com.google.cloud.bigquery.it.ITNightlyBigQueryTest#testIterateAndOrder+testMultipleRuns+testIterateAndOrderDefaultConnSettings, IT*, *ClientTest"
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
     RETURN_CODE=$?
     ;;
 samples)
diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index 3e2982dcb..a543ca7fa 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -204,4 +204,25 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>java17</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+
+    </profile>
+  </profiles>
 </project>

From 78ae71f4727e43221d9d9107384c56db87b3ce4a Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Fri, 15 Jul 2022 14:28:38 -0400
Subject: [PATCH 2/6] empty commit to run build


From c8f0777209073316ec7c50fc5e883244b19f5f19 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 18 Jul 2022 09:44:42 -0400
Subject: [PATCH 3/6] remove comment

---
 .kokoro/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index c576d60af..8de53cace 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -86,7 +86,7 @@ graalvm)
     RETURN_CODE=$?
     ;;
 graalvm17)
-    # Run Unit and Integration Tests with Native Image. Skip Arrow tests until https://github.com/googleapis/java-bigquery/issues/2060 is fixed.
+    # Run Unit and Integration Tests with Native Image
     mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
     RETURN_CODE=$?
     ;;

From 85c9ffd9d6e30cc11e8e2f645ec0d7503fb89a8c Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 18 Jul 2022 10:20:27 -0400
Subject: [PATCH 4/6] empty commit to run build


From 7679121ddaa06c8f0c1f320f62aaa04d2c7a77c5 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 18 Jul 2022 15:03:41 -0400
Subject: [PATCH 5/6] another empty commit to run build


From da61ed6da450d14b1da5852ded7b92b29c5484ab Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Fri, 22 Jul 2022 15:41:13 -0400
Subject: [PATCH 6/6] exclude nightly tests

---
 .kokoro/build.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 8de53cace..4b1c5de2b 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -81,13 +81,13 @@ nightly-it)
     RETURN_CODE=$?
     ;;
 graalvm)
-    # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    # Run Integration Tests with Native Image. Skip running nightly tests in presubmits.
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Dtest=ITBigQueryTest -Pnative -Penable-integration-tests test
     RETURN_CODE=$?
     ;;
 graalvm17)
-    # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    # Run Integration Tests with Native Image. Skip running nightly tests in presubmits.
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Dtest=ITBigQueryTest -Pnative -Penable-integration-tests test
     RETURN_CODE=$?
     ;;
 samples)