From ce3b11513dbf7d03de4167c71c15ca5236c96b36 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 31 May 2022 14:07:15 -0400
Subject: [PATCH 01/10] fix: java 17 reflection issue

---
 google-cloud-os-login/pom.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
index 5c14b19a..6bd1b00a 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-os-login/pom.xml
@@ -96,6 +96,7 @@
     </dependency>
   </dependencies>
 
+
   <profiles>
     <profile>
       <id>java9</id>
@@ -109,6 +110,24 @@
         </dependency>
       </dependencies>
     </profile>
+    <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.time=ALL-UNNAMED</argLine>
+        </configuration>
+      </plugin>
+        </plugins>
+      </build>
+
+    </profile>
   </profiles>
 
   <build>

From f29863d2261df35595a851b440e00ad503ce99d0 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 31 May 2022 14:17:39 -0400
Subject: [PATCH 02/10] java.math

---
 google-cloud-os-login/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
index 6bd1b00a..33f9cbeb 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-os-login/pom.xml
@@ -121,7 +121,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <argLine>--add-opens java.base/java.time=ALL-UNNAMED</argLine>
+          <argLine>--add-opens java.base/java.time=ALL-UNNAMED
+            --add-opens=java.base/java.math=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
         </plugins>

From 55f25faf6f593ea4f17cccfce92507bf43c9e94e Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 31 May 2022 14:29:15 -0400
Subject: [PATCH 03/10] fix pom formatting

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

diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
index 33f9cbeb..f387fc25 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-os-login/pom.xml
@@ -121,8 +121,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <argLine>--add-opens java.base/java.time=ALL-UNNAMED
-            --add-opens=java.base/java.math=ALL-UNNAMED</argLine>
+          <argLine>--add-opens=java.base/java.time=ALL-UNNAMED
+              --add-opens=java.base/java.math=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
         </plugins>

From 5b5bc524ffc7b877de35f37ae2152eee4221df8b Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 31 May 2022 14:53:42 -0400
Subject: [PATCH 04/10] add opens for sun.security

---
 google-cloud-os-login/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
index f387fc25..821cb1a1 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-os-login/pom.xml
@@ -122,7 +122,8 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>--add-opens=java.base/java.time=ALL-UNNAMED
-              --add-opens=java.base/java.math=ALL-UNNAMED</argLine>
+              --add-opens=java.base/java.math=ALL-UNNAMED
+              --add-opens=java.base/sun.security.util=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
         </plugins>

From c236f6ab3439f8e96c183c9179f8e44aeb26c37c Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 31 May 2022 15:22:29 -0400
Subject: [PATCH 05/10] fix add-opens

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

diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
index 821cb1a1..a6c24a6a 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-os-login/pom.xml
@@ -122,8 +122,8 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>--add-opens=java.base/java.time=ALL-UNNAMED
-              --add-opens=java.base/java.math=ALL-UNNAMED
-              --add-opens=java.base/sun.security.util=ALL-UNNAMED</argLine>
+            --add-opens=java.base/java.math=ALL-UNNAMED 
+            --add-opens=java.base/sun.security.rsa=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
         </plugins>

From 1df891711e641dca01ae5f889746cad9b738b5b7 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 31 May 2022 16:21:54 -0400
Subject: [PATCH 06/10] add sun.security.pkcs

---
 google-cloud-os-login/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
index a6c24a6a..2790c51e 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-os-login/pom.xml
@@ -122,8 +122,9 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>--add-opens=java.base/java.time=ALL-UNNAMED
-            --add-opens=java.base/java.math=ALL-UNNAMED 
-            --add-opens=java.base/sun.security.rsa=ALL-UNNAMED</argLine>
+            --add-opens=java.base/java.math=ALL-UNNAMED
+            --add-opens=java.base/sun.security.rsa=ALL-UNNAMED
+            --add-opens=java.base/sun.security.pkcs=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
         </plugins>

From c970048c19345b50faa47b7815dbcc287a0202f0 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 31 May 2022 16:28:23 -0400
Subject: [PATCH 07/10] try using sun.security

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

diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
index 2790c51e..8664bddd 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-os-login/pom.xml
@@ -124,7 +124,7 @@
           <argLine>--add-opens=java.base/java.time=ALL-UNNAMED
             --add-opens=java.base/java.math=ALL-UNNAMED
             --add-opens=java.base/sun.security.rsa=ALL-UNNAMED
-            --add-opens=java.base/sun.security.pkcs=ALL-UNNAMED</argLine>
+            --add-opens=java.base/sun.security=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
         </plugins>

From e93ae437c3c0f4778735511fed98de53558ceca2 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 31 May 2022 16:36:16 -0400
Subject: [PATCH 08/10] try using sun.security.x509

---
 google-cloud-os-login/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
index 8664bddd..a32f5e23 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-os-login/pom.xml
@@ -124,7 +124,8 @@
           <argLine>--add-opens=java.base/java.time=ALL-UNNAMED
             --add-opens=java.base/java.math=ALL-UNNAMED
             --add-opens=java.base/sun.security.rsa=ALL-UNNAMED
-            --add-opens=java.base/sun.security=ALL-UNNAMED</argLine>
+            --add-opens=java.base/sun.security.pkcs=ALL-UNNAMED
+            --add-opens=java.base/sun.security.x509=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
         </plugins>

From 7042879f97a997b524c1e9232980dfd8faa57553 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 31 May 2022 16:45:41 -0400
Subject: [PATCH 09/10] google-cloud-os-login/pom.xml

---
 google-cloud-os-login/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
index a32f5e23..732b0b24 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-os-login/pom.xml
@@ -125,7 +125,8 @@
             --add-opens=java.base/java.math=ALL-UNNAMED
             --add-opens=java.base/sun.security.rsa=ALL-UNNAMED
             --add-opens=java.base/sun.security.pkcs=ALL-UNNAMED
-            --add-opens=java.base/sun.security.x509=ALL-UNNAMED</argLine>
+            --add-opens=java.base/sun.security.x509=ALL-UNNAMED
+            --add-opens=java.base/sun.security.util=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
         </plugins>

From 3821d9a9333278b94199c8ce720c07f90d4075df Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 31 May 2022 16:52:06 -0400
Subject: [PATCH 10/10] add java.security

---
 google-cloud-os-login/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
index 732b0b24..e78f7662 100644
--- a/google-cloud-os-login/pom.xml
+++ b/google-cloud-os-login/pom.xml
@@ -126,7 +126,8 @@
             --add-opens=java.base/sun.security.rsa=ALL-UNNAMED
             --add-opens=java.base/sun.security.pkcs=ALL-UNNAMED
             --add-opens=java.base/sun.security.x509=ALL-UNNAMED
-            --add-opens=java.base/sun.security.util=ALL-UNNAMED</argLine>
+            --add-opens=java.base/sun.security.util=ALL-UNNAMED
+            --add-opens=java.base/java.security=ALL-UNNAMED</argLine>
         </configuration>
       </plugin>
         </plugins>