Skip to content

Commit 8ce9e63

Browse files
authored
Merge branch 'main' into release-please--branches--main
2 parents 8e40600 + bf7ee1c commit 8ce9e63

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

google-auth-library-java/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@
7676
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7777
<project.google.http.version>2.1.0</project.google.http.version>
7878
<project.junit.version>5.11.4</project.junit.version>
79-
<project.guava.version>33.5.0-android</project.guava.version>
79+
<project.guava.version>33.5.0-jre</project.guava.version>
8080
<project.appengine.version>2.0.33</project.appengine.version>
8181
<project.findbugs.version>3.0.2</project.findbugs.version>
8282
<deploy.autorelease>false</deploy.autorelease>
83-
<project.error-prone.version>2.42.0</project.error-prone.version>
83+
<project.error-prone.version>2.45.0</project.error-prone.version>
8484
<project.protobuf.version>4.33.2</project.protobuf.version>
8585
<project.cel.version>0.9.0-proto3</project.cel.version>
8686
<project.tink.version>1.15.0</project.tink.version>
8787
<project.slf4j.version>2.0.17</project.slf4j.version>
8888
<project.gson.version>2.12.1</project.gson.version>
89-
<project.api-common.version>2.53.0</project.api-common.version>
89+
<project.api-common.version>2.62.0</project.api-common.version><!-- {x-version-update:api-common:current} -->
9090
<surefire.version>3.5.2</surefire.version>
9191
<clirr.skip>true</clirr.skip>
9292
</properties>

sdk-platform-java/dependencies.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ javax.annotation:javax.annotation-api,javax.annotation-api=1.3.2
1212
io.grpc:grpc-bom,grpc=1.80.0
1313
com.google.auth:google-auth-library-bom,google.auth=1.46.0
1414
com.google.http-client:google-http-client,google.http-client=2.1.0
15-
com.google.code.gson:gson,gson=2.13.2
16-
com.google.guava:guava,guava=33.5.0-jre
15+
com.google.code.gson:gson,gson=2.14.0
16+
com.google.guava:guava,guava=33.6.0-jre
1717
com.google.protobuf:protobuf-java,protobuf=4.34.1
1818
io.opentelemetry:opentelemetry-bom,opentelemetry=1.61.0
1919
com.google.errorprone:error_prone_annotations,errorprone=2.49.0
@@ -32,11 +32,11 @@ com.google.api-client:google-api-client,google.api-client=2.9.0
3232
org.threeten:threeten-extra,threeten-extra=1.8.0
3333
io.opencensus:opencensus-api,opencensus=0.31.1
3434
com.google.code.findbugs:jsr305,findbugs=3.0.2
35-
com.fasterxml.jackson:jackson-bom,jackson=2.21.2
36-
commons-codec:commons-codec,codec=1.21.0
35+
com.fasterxml.jackson:jackson-bom,jackson=2.21.3
36+
commons-codec:commons-codec,codec=1.22.0
3737
org.apache.httpcomponents:httpclient,httpcomponents.httpclient=4.5.14
3838
org.apache.httpcomponents:httpcore,httpcomponents.httpcore=4.4.16
39-
org.apache.httpcomponents.client5:httpclient5,apache-httpclient-5=5.6
39+
org.apache.httpcomponents.client5:httpclient5,apache-httpclient-5=5.6.1
4040
org.apache.httpcomponents.core5:httpcore5,apache-httpcore-5=5.4.2
4141
org.json:json,json=20251224
4242
io.perfmark:perfmark-api,perfmark-api=0.27.0

0 commit comments

Comments
 (0)