From 0eb0a2c5f2115a35401eb38910a8711c0a01a3bb Mon Sep 17 00:00:00 2001 From: yiyangw-g <158514293+yiyangw-g@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:22:48 -0700 Subject: [PATCH] Update the auth dependency to 1.24.1 (#99) --- artifactregistry-auth-common/build.gradle | 7 +++---- artifactregistry-gradle-plugin/build.gradle | 2 +- artifactregistry-maven-wagon/build.gradle | 8 +++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/artifactregistry-auth-common/build.gradle b/artifactregistry-auth-common/build.gradle index b33ca2d..bdcb159 100644 --- a/artifactregistry-auth-common/build.gradle +++ b/artifactregistry-auth-common/build.gradle @@ -1,15 +1,14 @@ dependencies { - implementation('com.google.http-client:google-http-client:1.39.2') + implementation('com.google.http-client:google-http-client:1.44.2') implementation('com.google.http-client:google-http-client-jackson2:1.39.2') - implementation('com.google.auth:google-auth-library-oauth2-http:1.0.0') + implementation('com.google.auth:google-auth-library-oauth2-http:1.24.1') implementation group: 'org.slf4j', name: 'slf4j-api', version:'1.7.30' // override any guava:*-android dependency with jre dependency - implementation group: 'com.google.guava', name: 'guava', version:'30.1.1-jre' + implementation group: 'com.google.guava', name: 'guava', version:'33.2.1-jre' // Exclude stuff that we don't need that bring in a ton of transitive deps. configurations.implementation { - exclude group: 'com.google.guava', module:'failureaccess' exclude group: 'com.google.guava', module:'listenablefuture' exclude group: 'org.checkerframework', module:'checker-compat-qual' exclude group: 'org.checkerframework', module:'checker-qual' diff --git a/artifactregistry-gradle-plugin/build.gradle b/artifactregistry-gradle-plugin/build.gradle index 3c89e09..cc312ba 100644 --- a/artifactregistry-gradle-plugin/build.gradle +++ b/artifactregistry-gradle-plugin/build.gradle @@ -5,7 +5,7 @@ plugins { dependencies { implementation gradleApi() - implementation group: 'com.google.auth', name: 'google-auth-library-oauth2-http', version: '1.0.0' + implementation group: 'com.google.auth', name: 'google-auth-library-oauth2-http', version: '1.24.1' } pluginBundle { diff --git a/artifactregistry-maven-wagon/build.gradle b/artifactregistry-maven-wagon/build.gradle index e90e8a9..c58e10b 100644 --- a/artifactregistry-maven-wagon/build.gradle +++ b/artifactregistry-maven-wagon/build.gradle @@ -1,12 +1,14 @@ dependencies { implementation group: 'org.apache.maven.wagon', name: 'wagon-http-shared', version: '3.3.3' implementation group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1' - implementation('com.google.http-client:google-http-client:1.43.2') - implementation group: 'com.google.auth', name: 'google-auth-library-oauth2-http', version:'1.0.0' + implementation('com.google.http-client:google-http-client:1.44.2') + implementation group: 'com.google.auth', name: 'google-auth-library-oauth2-http', version:'1.24.1' + + // override any guava:*-android dependency with jre dependency + implementation group: 'com.google.guava', name: 'guava', version:'33.2.1-jre' // Exclude stuff that we don't need that bring in a ton of transitive deps. configurations.implementation { - exclude group: 'com.google.guava', module:'failureaccess' exclude group: 'com.google.guava', module:'listenablefuture' exclude group: 'org.checkerframework', module:'checker-compat-qual' exclude group: 'org.checkerframework', module:'checker-qual'