From 726a3eee4c8afff54a63456cdbe04bd15efa53f2 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Mon, 17 Mar 2025 17:46:49 +0000
Subject: [PATCH 1/9] chore: centralize graalvm config

---
 google-cloud-nio/pom.xml                                    | 6 ++++++
 .../google/cloud/google-cloud-nio/native-image.properties   | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml
index e7989ac2c..3b8763240 100644
--- a/google-cloud-nio/pom.xml
+++ b/google-cloud-nio/pom.xml
@@ -61,6 +61,12 @@
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax</artifactId>
+      <classifier>testlib</classifier>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>
diff --git a/google-cloud-nio/src/main/resources/META-INF/native-image/com/google/cloud/google-cloud-nio/native-image.properties b/google-cloud-nio/src/main/resources/META-INF/native-image/com/google/cloud/google-cloud-nio/native-image.properties
index 1449dc0e0..be1730e46 100644
--- a/google-cloud-nio/src/main/resources/META-INF/native-image/com/google/cloud/google-cloud-nio/native-image.properties
+++ b/google-cloud-nio/src/main/resources/META-INF/native-image/com/google/cloud/google-cloud-nio/native-image.properties
@@ -7,6 +7,3 @@
 Args = --initialize-at-build-time=com.google.cloud.storage.contrib.nio.CloudStorageFileSystemProvider,\
   com.google.cloud.storage.contrib.nio.CloudStorageConfiguration,\
   com.google.cloud.storage.contrib.nio.AutoValue_CloudStorageConfiguration,\
-  com.google.common.collect.RegularImmutableList,\
-  org.junit.runner.RunWith,java.lang.annotation.Annotation,\
-  org.junit.runners.model.FrameworkField

From 66acaf001e1cd636e89e5b235af60e3234f91712 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Mon, 2 Jun 2025 11:39:05 -0400
Subject: [PATCH 2/9] chore: ignore gax testlib

---
 google-cloud-nio/pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml
index 173d1cb72..0101273fb 100644
--- a/google-cloud-nio/pom.xml
+++ b/google-cloud-nio/pom.xml
@@ -189,6 +189,19 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.10</version>
+        <executions>
+          <execution>
+            <configuration>
+              <ignoredDependencies>
+                <ignoredDependency>com.google.api:gax:jar:testlib</ignoredDependency>
+              </ignoredDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

From 550ac167640f76ca9f944b660bbcb6907db724fd Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Mon, 2 Jun 2025 11:54:37 -0400
Subject: [PATCH 3/9] fix: use correct ignore for gax dependency

---
 google-cloud-nio/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml
index 0101273fb..07de0cab9 100644
--- a/google-cloud-nio/pom.xml
+++ b/google-cloud-nio/pom.xml
@@ -199,6 +199,12 @@
                 <ignoredDependency>com.google.api:gax:jar:testlib</ignoredDependency>
               </ignoredDependencies>
             </configuration>
+            <configuration>
+            <ignoredUnusedDeclaredDependencies>
+			  <!-- This dependency is used for its native image configuration -->
+              <ignoredUnusedDeclaredDependency>com.google.api:gax:jar:testlib</ignoredUnusedDeclaredDependency>
+            </ignoredUnusedDeclaredDependencies>
+          </configuration>
           </execution>
         </executions>
       </plugin>

From 5912eef3ca6a521065210dd4d881a8509036842a Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 3 Jun 2025 12:21:58 -0400
Subject: [PATCH 4/9] Update pom.xml

---
 google-cloud-nio/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml
index 07de0cab9..d69eb1780 100644
--- a/google-cloud-nio/pom.xml
+++ b/google-cloud-nio/pom.xml
@@ -191,7 +191,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.10</version>
         <executions>
           <execution>
             <configuration>

From 9f045538682d4edc3bbe3589f80d5301aa1fbb18 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 3 Jun 2025 12:27:14 -0400
Subject: [PATCH 5/9] chore: remove duplicate configuration entries

---
 google-cloud-nio/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml
index d69eb1780..dfb6cba92 100644
--- a/google-cloud-nio/pom.xml
+++ b/google-cloud-nio/pom.xml
@@ -193,11 +193,6 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <configuration>
-              <ignoredDependencies>
-                <ignoredDependency>com.google.api:gax:jar:testlib</ignoredDependency>
-              </ignoredDependencies>
-            </configuration>
             <configuration>
             <ignoredUnusedDeclaredDependencies>
 			  <!-- This dependency is used for its native image configuration -->

From 94f5a77c81eab1a7c2697971cf4e0b81645ffe4d Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Wed, 4 Jun 2025 11:45:57 -0400
Subject: [PATCH 6/9] chore: use group ID and artifact ID only for ignore entry

---
 google-cloud-nio/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml
index dfb6cba92..911d9032d 100644
--- a/google-cloud-nio/pom.xml
+++ b/google-cloud-nio/pom.xml
@@ -196,7 +196,7 @@
             <configuration>
             <ignoredUnusedDeclaredDependencies>
 			  <!-- This dependency is used for its native image configuration -->
-              <ignoredUnusedDeclaredDependency>com.google.api:gax:jar:testlib</ignoredUnusedDeclaredDependency>
+              <ignoredUnusedDeclaredDependency>com.google.api:gax</ignoredUnusedDeclaredDependency>
             </ignoredUnusedDeclaredDependencies>
           </configuration>
           </execution>

From 66fd89ec54074d333be0c733b57ee1a7c9d61b78 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 17 Jun 2025 10:55:13 -0400
Subject: [PATCH 7/9] fix: use correct configuration format

---
 google-cloud-nio/pom.xml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml
index 911d9032d..05a56b54e 100644
--- a/google-cloud-nio/pom.xml
+++ b/google-cloud-nio/pom.xml
@@ -191,16 +191,10 @@
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <configuration>
-            <ignoredUnusedDeclaredDependencies>
-			  <!-- This dependency is used for its native image configuration -->
-              <ignoredUnusedDeclaredDependency>com.google.api:gax</ignoredUnusedDeclaredDependency>
-            </ignoredUnusedDeclaredDependencies>
-          </configuration>
-          </execution>
-        </executions>
+        <configuration>
+		<!-- This dependency is used for its native image configuration in the test scope -->
+        <ignoredUnusedDeclaredDependencies>com.google.api:gax:testlib</ignoredUnusedDeclaredDependencies>
+        </configuration>
       </plugin>
     </plugins>
   </build>

From 83ffd7a81c51159b46fd0f06bbca97d2fac694d9 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 17 Jun 2025 11:06:24 -0400
Subject: [PATCH 8/9] fix: include jar modifier

---
 google-cloud-nio/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml
index 05a56b54e..9f4720473 100644
--- a/google-cloud-nio/pom.xml
+++ b/google-cloud-nio/pom.xml
@@ -193,7 +193,7 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <configuration>
 		<!-- This dependency is used for its native image configuration in the test scope -->
-        <ignoredUnusedDeclaredDependencies>com.google.api:gax:testlib</ignoredUnusedDeclaredDependencies>
+        <ignoredUnusedDeclaredDependencies>com.google.api:gax:jar:testlib</ignoredUnusedDeclaredDependencies>
         </configuration>
       </plugin>
     </plugins>

From 1473afe9b72e308528af93ee24ea5f8d9976fbd0 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Tue, 17 Jun 2025 11:11:09 -0400
Subject: [PATCH 9/9] fix: use granular example

---
 google-cloud-nio/pom.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/google-cloud-nio/pom.xml b/google-cloud-nio/pom.xml
index 9f4720473..fed7abdd2 100644
--- a/google-cloud-nio/pom.xml
+++ b/google-cloud-nio/pom.xml
@@ -192,8 +192,10 @@
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <configuration>
-		<!-- This dependency is used for its native image configuration in the test scope -->
-        <ignoredUnusedDeclaredDependencies>com.google.api:gax:jar:testlib</ignoredUnusedDeclaredDependencies>
+        <ignoredUnusedDeclaredDependencies>
+		  <!-- This dependency is used for its native image configuration in the test scope -->
+          <ignoredUnusedDeclaredDependency>com.google.api:gax:jar</ignoredUnusedDeclaredDependency>
+		</ignoredUnusedDeclaredDependencies>
         </configuration>
       </plugin>
     </plugins>