From 9d68e7175b5ef22cea2ddecf4573d8d0c76de58f Mon Sep 17 00:00:00 2001
From: Timur Sadykov <stim@google.com>
Date: Mon, 9 Aug 2021 19:21:50 -0700
Subject: [PATCH 1/9] revert some changes

---
 google-oauth-client-bom/pom.xml     | 4 +++-
 pom.xml                             | 4 ++--
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml
index 43cd4b50e..828cab0b3 100644
--- a/google-oauth-client-bom/pom.xml
+++ b/google-oauth-client-bom/pom.xml
@@ -107,12 +107,14 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.3.0</version>
         <configuration>
           <skip>true</skip>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
+        <version>3.9.1</version>
         <configuration>
           <skip>true</skip>
         </configuration>
@@ -129,7 +131,7 @@
           <dependency>
             <groupId>com.google.googlejavaformat</groupId>
             <artifactId>google-java-format</artifactId>
-            <version>1.10.0</version>
+            <version>1.7.0</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/pom.xml b/pom.xml
index 1516d3a51..ea5ecdefe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -435,7 +435,7 @@
           <dependency>
             <groupId>com.google.googlejavaformat</groupId>
             <artifactId>google-java-format</artifactId>
-            <version>1.10.0</version>
+            <version>1.7.0</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -531,7 +531,7 @@
               <doclet>com.microsoft.doclet.DocFxDoclet</doclet>
               <useStandardDocletOptions>false</useStandardDocletOptions>
               <docletPath>${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.0.jar</docletPath>
-              <additionalOptions>-outputpath ${project.build.directory}/docfx-yml -projectname ${artifactId}</additionalOptions>
+              <additionalOptions>-outputpath ${project.build.directory}/docfx-yml -projectname ${project.artifactId}</additionalOptions>
               <doclint>none</doclint>
               <show>protected</show>
               <nohelp>true</nohelp>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index e447f5531..214d8bb65 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.23</version>
+    <version>1.0.22</version>
   </parent>
 
   <properties>
diff --git a/samples/pom.xml b/samples/pom.xml
index e0fc54d28..3bacd5ec6 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.23</version>
+    <version>1.0.22</version>
   </parent>
 
   <properties>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 2d89eae37..3f3d6ad7d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.23</version>
+    <version>1.0.22</version>
   </parent>
 
   <properties>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 3a10b0f08..a2eb7c707 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.23</version>
+    <version>1.0.22</version>
   </parent>
 
   <properties>

From fac13867e4f8b64b9c78676b2b667bb51fd07f49 Mon Sep 17 00:00:00 2001
From: Timur Sadykov <stim@google.com>
Date: Mon, 9 Aug 2021 19:26:45 -0700
Subject: [PATCH 2/9] fix version

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

diff --git a/pom.xml b/pom.xml
index ea5ecdefe..04a48cd52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -435,7 +435,7 @@
           <dependency>
             <groupId>com.google.googlejavaformat</groupId>
             <artifactId>google-java-format</artifactId>
-            <version>1.7.0</version>
+            <version>1.7</version>
           </dependency>
         </dependencies>
       </plugin>

From 3197b8a08c03cf2445bbb5f815beeec321be9f42 Mon Sep 17 00:00:00 2001
From: Timur Sadykov <stim@google.com>
Date: Mon, 9 Aug 2021 19:49:07 -0700
Subject: [PATCH 3/9] updte maven

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

diff --git a/pom.xml b/pom.xml
index 04a48cd52..51cbe3586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>3.8.1</version>
           <configuration>
             <source>1.7</source>
             <target>1.7</target>

From e4f55e439e6a69c8f452d4a0ff839f7e7d22c2f5 Mon Sep 17 00:00:00 2001
From: Timur Sadykov <stim@google.com>
Date: Tue, 10 Aug 2021 14:35:29 -0700
Subject: [PATCH 4/9] fix: revert cleanup

---
 google-oauth-client-bom/pom.xml     | 2 +-
 pom.xml                             | 2 +-
 samples/install-without-bom/pom.xml | 2 +-
 samples/pom.xml                     | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml
index 828cab0b3..820fa5524 100644
--- a/google-oauth-client-bom/pom.xml
+++ b/google-oauth-client-bom/pom.xml
@@ -122,7 +122,7 @@
       <plugin>
         <groupId>com.coveo</groupId>
         <artifactId>fmt-maven-plugin</artifactId>
-        <version>2.11</version>
+        <version>2.9</version>
         <configuration>
           <style>google</style>
           <verbose>true</verbose>
diff --git a/pom.xml b/pom.xml
index 51cbe3586..dc02326da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -426,7 +426,7 @@
       <plugin>
         <groupId>com.coveo</groupId>
         <artifactId>fmt-maven-plugin</artifactId>
-        <version>2.11</version>
+        <version>2.9</version>
         <configuration>
           <style>google</style>
           <verbose>true</verbose>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 214d8bb65..e447f5531 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.22</version>
+    <version>1.0.23</version>
   </parent>
 
   <properties>
diff --git a/samples/pom.xml b/samples/pom.xml
index 3bacd5ec6..e0fc54d28 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.22</version>
+    <version>1.0.23</version>
   </parent>
 
   <properties>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3f3d6ad7d..2d89eae37 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.22</version>
+    <version>1.0.23</version>
   </parent>
 
   <properties>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index a2eb7c707..3a10b0f08 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.22</version>
+    <version>1.0.23</version>
   </parent>
 
   <properties>

From 32c5de5f60d3019332634cea606b406487fccec9 Mon Sep 17 00:00:00 2001
From: Timur Sadykov <stim@google.com>
Date: Wed, 11 Aug 2021 14:19:07 -0700
Subject: [PATCH 5/9] fix: empty to restart GitHub Actions


From 9265c04d677560cb29eb23cda90bc223d77f0f7f Mon Sep 17 00:00:00 2001
From: Timur Sadykov <stim@google.com>
Date: Wed, 11 Aug 2021 14:31:49 -0700
Subject: [PATCH 6/9] reverting compiler version

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

diff --git a/pom.xml b/pom.xml
index dc02326da..9db023565 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>2.5.1</version>
           <configuration>
             <source>1.7</source>
             <target>1.7</target>

From c9a04782b31e1d381c6c7e3c6222765ece44aeb9 Mon Sep 17 00:00:00 2001
From: Timur Sadykov <stim@google.com>
Date: Wed, 11 Aug 2021 14:45:41 -0700
Subject: [PATCH 7/9] fix: fix java format version

---
 google-oauth-client-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml
index 820fa5524..078fdc6ec 100644
--- a/google-oauth-client-bom/pom.xml
+++ b/google-oauth-client-bom/pom.xml
@@ -131,7 +131,7 @@
           <dependency>
             <groupId>com.google.googlejavaformat</groupId>
             <artifactId>google-java-format</artifactId>
-            <version>1.7.0</version>
+            <version>1.7</version>
           </dependency>
         </dependencies>
       </plugin>

From c13c6c87841a555639bd4217174776a4a9b377be Mon Sep 17 00:00:00 2001
From: Timur Sadykov <stim@google.com>
Date: Wed, 11 Aug 2021 14:52:12 -0700
Subject: [PATCH 8/9] change compiler version

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

diff --git a/pom.xml b/pom.xml
index 9db023565..d1e9d6025 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>3.5.1</version>
           <configuration>
             <source>1.7</source>
             <target>1.7</target>

From 3412dfa6ef81e688668d3340b589bfb3591f1dff Mon Sep 17 00:00:00 2001
From: Timur Sadykov <stim@google.com>
Date: Wed, 11 Aug 2021 15:05:13 -0700
Subject: [PATCH 9/9] reverting compiler version

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

diff --git a/pom.xml b/pom.xml
index d1e9d6025..9db023565 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.5.1</version>
+          <version>2.5.1</version>
           <configuration>
             <source>1.7</source>
             <target>1.7</target>