Skip to content

Commit fc8dc2a

Browse files
authored
Merge branch 'main' into trigger-gen
2 parents ab118c4 + 814cb1a commit fc8dc2a

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

google-auth-library-java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@
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.45.0</project.error-prone.version>
83+
<project.error-prone.version>2.48.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>
88-
<project.gson.version>2.12.1</project.gson.version>
88+
<project.gson.version>2.13.2</project.gson.version>
8989
<project.api-common.version>2.63.0-SNAPSHOT</project.api-common.version><!-- {x-version-update:api-common:current} -->
9090
<surefire.version>3.5.2</surefire.version>
9191
<clirr.skip>true</clirr.skip>

sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad31690
3939

4040
ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
4141
ARG PROTOC_VERSION=33.2
42-
ARG GRPC_VERSION=1.80.0
42+
ARG GRPC_VERSION=1.81.0
4343
ENV HOME=/home
4444
ENV OS_ARCHITECTURE="linux-x86_64"
4545

sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc
4040

4141
ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
4242
ARG PROTOC_VERSION=33.2
43-
ARG GRPC_VERSION=1.80.0
43+
ARG GRPC_VERSION=1.81.0
4444
ENV HOME=/home
4545
ENV OS_ARCHITECTURE="linux-x86_64"
4646

sdk-platform-java/gapic-generator-java-pom-parent/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
<!-- External dependencies, especially gRPC and Protobuf version, should be
2727
consistent across modules in this repository -->
2828
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
29-
<grpc.version>1.80.0</grpc.version>
29+
<grpc.version>1.81.0</grpc.version>
3030
<google.http-client.version>2.1.0</google.http-client.version>
31-
<gson.version>2.12.1</gson.version>
31+
<gson.version>2.13.2</gson.version>
3232
<guava.version>33.5.0-jre</guava.version>
3333
<protobuf.version>4.33.2</protobuf.version>
3434
<opentelemetry.version>1.57.0</opentelemetry.version>
35-
<errorprone.version>2.45.0</errorprone.version>
35+
<errorprone.version>2.48.0</errorprone.version>
3636
<j2objc-annotations.version>3.1</j2objc-annotations.version>
3737
<threetenbp.version>1.7.0</threetenbp.version>
3838
<junit.version>5.11.4</junit.version>

sdk-platform-java/gax-java/dependencies.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.118.Final
5858
maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.118.Final
5959
maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.27.0
6060
maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53
61-
maven.com_google_code_gson_gson=com.google.code.gson:gson:2.12.1
61+
maven.com_google_code_gson_gson=com.google.code.gson:gson:2.13.2
6262
maven.com_google_guava_guava=com.google.guava:guava:32.1.3-jre
6363
maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.2
6464
maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.17.0
6565
maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4
6666
maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2
67-
maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.38.0
67+
maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.48.0
6868
maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
6969
maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.11.0
7070
maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.11.0

sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<site.installationModule>${project.artifactId}</site.installationModule>
2525

2626
<threeten-extra.version>1.8.0</threeten-extra.version>
27-
<animal-sniffer.version>1.26</animal-sniffer.version>
27+
<animal-sniffer.version>1.27</animal-sniffer.version>
2828
<opencensus.version>0.31.1</opencensus.version>
2929
<findbugs.version>3.0.2</findbugs.version>
3030
<jackson.version>2.18.3</jackson.version>

0 commit comments

Comments
 (0)