From c4fc52f9ac92e6e5db401c32b1c5e0148f87f5c8 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Mon, 10 Mar 2025 18:27:32 +0000
Subject: [PATCH 1/4] chore: centralize native config

---
 .../google-cloud-spanner-jdbc/native-image.properties          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties
index f9e42bad8..47a3aff28 100644
--- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties
+++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties
@@ -2,9 +2,6 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\
   com.google.cloud.spanner.jdbc.it.JdbcIntegrationTestEnv,\
   com.google.cloud.spanner.jdbc.it.DialectTestParameter,\
   com.google.common.collect.RegularImmutableMap,\
-  com.google.common.collect.ImmutableMapEntry,\
-  com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry,\
-  com.google.common.collect.SingletonImmutableBiMap,\
   com.google.cloud.spanner.Dialect,\
   com.google.cloud.spanner.Dialect$2,\
   com.google.cloud.spanner.Dialect$1,\

From 522422f4d1b131b9fe0e4a3c700d561da48d9943 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Mon, 17 Mar 2025 17:50:18 +0000
Subject: [PATCH 2/4] chore: centralize native config

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

diff --git a/pom.xml b/pom.xml
index 34131db65..c37abd951 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,6 +199,12 @@
       <classifier>testlib</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax</artifactId>
+      <classifier>testlib</classifier>
+      <scope>test</scope>
+    </dependency>
 
     <!-- Add OpenTelemetry implementation and exporters for use in integration tests. -->
     <dependency>

From ea71024e04aa479c50e45c89831ccfbfe4933dd6 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Mon, 8 Sep 2025 15:04:14 -0400
Subject: [PATCH 3/4] Clean up native-image.properties by removing JUnit
 entries

---
 .../google-cloud-spanner-jdbc/native-image.properties      | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties
index 47a3aff28..1fc61b0c7 100644
--- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties
+++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties
@@ -7,10 +7,3 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\
   com.google.cloud.spanner.Dialect$1,\
   com.google.spanner.admin.database.v1.DatabaseDialect,\
   com.google.spanner.admin.database.v1.DatabaseDialect$1,\
-  org.junit.runners.MethodSorters,\
-  org.junit.runners.Parameterized,\
-  org.junit.runner.RunWith,\
-  org.junit.FixMethodOrder,\
-  org.junit.experimental.categories.Category,\
-  org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters,\
-  org.junit.runners.model.FrameworkField,\
\ No newline at end of file

From cade5aea88af46876321826f8b7d160032cc221b Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Mon, 8 Sep 2025 15:11:44 -0400
Subject: [PATCH 4/4] chore: ignore gax dependency

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

diff --git a/pom.xml b/pom.xml
index c37abd951..941d1fb72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,6 +372,8 @@
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
             <ignoredUsedUndeclaredDependencies>
+              <!-- This dependency is used for its native image configuration in the test scope -->
+              <ignoredUnusedDeclaredDependency>com.google.api:gax:jar</ignoredUnusedDeclaredDependency>
               <ignoredUsedUndeclaredDependency>org.graalvm.sdk:graal-sdk</ignoredUsedUndeclaredDependency>
               <ignoredUsedUndeclaredDependency>com.google.api.grpc:grpc-google-cloud-spanner-v1</ignoredUsedUndeclaredDependency>
               <ignoredUsedUndeclaredDependency>com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1</ignoredUsedUndeclaredDependency>