Consolidate google-oauth-client to latest version (#91722)

related: #87800 fixes #90126
elastic · Feb 1, 2023 · 93ecc4d · 93ecc4d
1 parent 8e44603
commit 93ecc4d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -14,12 +14,10 @@ supercsv          = 2.4.0
 log4j             = 2.19.0
 slf4j             = 1.6.2
 ecsLogging        = 1.2.0
-
 jna               = 5.10.0
-
 netty             = 4.1.86.Final
-
-commons_lang3                   = 3.9
+commons_lang3     = 3.9
+google_oauth_client = 1.34.1
 
 antlr4            = 4.11.1
 # when updating this version, you need to ensure compatibility with:

diff --git a/docs/changelog/91722.yaml b/docs/changelog/91722.yaml
@@ -0,0 +1,5 @@
+pr: 91722
+summary: Consolidate google-oauth-client to latest version
+area: Snapshot/Restore
+type: upgrade
+issues: []
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -699,11 +699,6 @@
             <sha256 value="de16d5c8489729a8512f1a02fbd81f58f89249b72066987da4cc5c87ecb9f72d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.oauth-client" name="google-oauth-client" version="1.33.0">
-         <artifact name="google-oauth-client-1.33.0.jar">
-            <sha256 value="ce615114bb3a7ed9729825ee4c21a22db9ccdeb31e2c5429e4a28949afa9c94b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.oauth-client" name="google-oauth-client" version="1.34.1">
          <artifact name="google-oauth-client-1.34.1.jar">
             <sha256 value="193edf97aefa28b93c5892bdc598bac34fa4c396588030084f290b1440e8b98a" origin="Generated by Gradle"/>

diff --git a/modules/repository-gcs/build.gradle b/modules/repository-gcs/build.gradle
@@ -44,7 +44,7 @@ dependencies {
   api 'com.google.api.grpc:proto-google-iam-v1:1.6.2'
   api 'com.google.auth:google-auth-library-credentials:1.11.0'
   api 'com.google.auth:google-auth-library-oauth2-http:1.11.0'
-  api 'com.google.oauth-client:google-oauth-client:1.34.1'
+  api "com.google.oauth-client:google-oauth-client:${versions.google_oauth_client}"
   api 'com.google.api-client:google-api-client:2.1.1'
   api 'com.google.http-client:google-http-client:1.42.3'
   api 'com.google.http-client:google-http-client-gson:1.42.3'

diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle
@@ -9,8 +9,7 @@ esplugin {
 versions << [
   'google'              : '1.41.1',
   'google_api_client'   : '1.33.1',
-  'api_services_compute': 'v1-rev20220322-1.32.1',
-  'google_oauth_client' : '1.33.0',
+  'api_services_compute': 'v1-rev20220322-1.32.1'
 ]
 
 dependencies {