From 0b55f142ad79a43a5c708af322e84c06dea03dcd Mon Sep 17 00:00:00 2001
From: rsandell <rsandell@cloudbees.com>
Date: Tue, 6 Sep 2022 20:11:54 +0200
Subject: [PATCH 1/2] Bump library versions to avoid security issues

---
 pom.xml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 535f94b7..05c53f9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,14 +65,14 @@
   <properties>
     <revision>1.5.7</revision>
     <changelist>-SNAPSHOT</changelist>
-    <jenkins.version>2.289.3</jenkins.version>
+    <jenkins.version>2.319.3</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
     <hpi.compatibleSinceVersion>1.5.0</hpi.compatibleSinceVersion>
-    <google.api.version>1.25.0</google.api.version>
+    <google.api.version>1.34.1</google.api.version>
     <google.http.version>1.42.2</google.http.version>
     <google.guava.version>31.0.1-jre</google.guava.version>
-    <google-oauth.version>1.0.0</google-oauth.version>
-    <storage.revision>158</storage.revision>
+    <google-oauth.version>1.34.1</google-oauth.version>
+    <storage.revision>20220705</storage.revision>
     <concurrency>5</concurrency>
     <skipIts>true</skipIts>
     <!-- TODO some violations remaining -->
@@ -83,8 +83,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.289.x</artifactId>
-        <version>1500.ve4d05cd32975</version>
+        <artifactId>bom-2.319.x</artifactId>
+        <version>1607.va_c1576527071</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -93,6 +93,11 @@
         <artifactId>error_prone_annotations</artifactId>
         <version>2.7.1</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.http-client</groupId>
+        <artifactId>google-http-client-gson</artifactId>
+        <version>1.42.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -149,7 +154,7 @@
     <dependency>
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client</artifactId>
-      <version>${google.api.version}</version>
+      <version>${google-oauth.version}</version>
       <exclusions>
         <exclusion>
           <groupId>com.google.code.findbugs</groupId>
@@ -179,7 +184,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jackson2</artifactId>
-      <version>${google.api.version}</version>
+      <version>${google.http.version}</version>
       <exclusions>
         <exclusion>
           <groupId>com.google.http-client</groupId>
@@ -215,7 +220,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>google-oauth-plugin</artifactId>
-      <version>${google-oauth.version}</version>
+      <version>1.0.7-SNAPSHOT</version> <!-- TODO https://github.com/jenkinsci/google-oauth-plugin/pull/162 -->
       <exclusions>
         <exclusion>
           <groupId>net.sourceforge.findbugs</groupId>
@@ -234,7 +239,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-storage</artifactId>
-      <version>v1-rev${storage.revision}-${google.api.version}</version>
+      <version>v1-rev20220705-1.32.1</version>
       <exclusions>
         <exclusion>
           <groupId>com.google.http-client</groupId>

From 91cb1d069219efe9c2ada8cf40ba8346f295df56 Mon Sep 17 00:00:00 2001
From: Robert Sandell <rsandell@cloudbees.com>
Date: Wed, 7 Sep 2022 15:09:39 +0200
Subject: [PATCH 2/2] google oauth plugin is now released

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

diff --git a/pom.xml b/pom.xml
index 05c53f9a..836a69b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,7 +220,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>google-oauth-plugin</artifactId>
-      <version>1.0.7-SNAPSHOT</version> <!-- TODO https://github.com/jenkinsci/google-oauth-plugin/pull/162 -->
+      <version>1.0.7</version>
       <exclusions>
         <exclusion>
           <groupId>net.sourceforge.findbugs</groupId>