Merge branch 'main' into timeout

Author: blakeli0

.github/workflows/ci.yaml

@@ -327,7 +327,7 @@ jobs:
       run: |
         mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
     - name: Validate gapic-generator-java-bom
-      uses: googleapis/java-cloud-bom/tests/validate-bom@659764fa38f3c80b36319e9692d5a46b23f599eb
+      uses: googleapis/java-cloud-bom/tests/validate-bom@7071341075a2aea70d84ac92c90411988a690560
       with:
         bom-path: gapic-generator-java-bom/pom.xml
 

.kokoro/presubmit/common.cfg

@@ -30,12 +30,4 @@ env_vars: {
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "cloud-java-ci-it-service-account"
-}
-
-# Defines the google-cloud-java modules to be tested downstream tested with GraalVM native image
-# builds.
-env_vars: {
-  key: "MODULES_UNDER_TEST"
-  value: "java-kms,java-os-login" # KMS's ITKmsTest exercises gax-java's native image
-  # reflect-config.json. OS Login has a similar issue.
-}
+}

.kokoro/presubmit/graalvm-native-17-downstream.cfg

@@ -55,7 +55,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.11</version>
+                <version>0.8.12</version>
                 <executions>
                     <execution>
                         <id>unit-tests-report-aggregate</id>

.kokoro/presubmit/graalvm-native-downstream.cfg

@@ -31,8 +31,8 @@
     <google.http-client.version>1.44.1</google.http-client.version>
     <gson.version>2.10.1</gson.version>
     <guava.version>33.1.0-jre</guava.version>
-    <protobuf.version>3.25.2</protobuf.version>
-    <opentelemetry.version>1.36.0</opentelemetry.version>
+    <protobuf.version>3.25.3</protobuf.version>
+    <opentelemetry.version>1.37.0</opentelemetry.version>
     <maven.compiler.release>8</maven.compiler.release>
     <errorprone.version>2.26.1</errorprone.version>
     <j2objc-annotations.version>3.0.0</j2objc-annotations.version>
@@ -154,7 +154,7 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.11</version>
+            <version>0.8.12</version>
             <executions>
               <execution>
                 <id>unit-test-execution</id>

coverage-report/pom.xml

@@ -106,7 +106,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
+        <version>3.13.0</version>
         <configuration>
           <source>8</source>
           <target>8</target>
@@ -331,7 +331,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.11</version>
+        <version>0.8.12</version>
         <executions>
           <execution>
             <goals>

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

@@ -26,7 +26,7 @@ version.gax_httpjson=2.46.2-SNAPSHOT
 # The protobuf version is only used for generating gradle files for showcase module,
 # not for self-service clients (from googleapis project).
 
-version.com_google_protobuf=3.25.2
+version.com_google_protobuf=3.25.3
 version.google_java_format=1.15.0
 version.io_grpc=1.62.2
 
@@ -35,26 +35,26 @@ version.io_grpc=1.62.2
 # It should be constructed the following way:
 #   1) Take full artifact id (including the group and classifier (if any) portions) and remove version portion.
 #   2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character
-maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.37.0
-maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.37.0
+maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.37.1
+maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.37.1
 maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.23.0
 maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.23.0
-maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.36.0
+maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.37.0
 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1
 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1
 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.31.1
 maven.io_netty_netty_tcnative_boringssl_static=io.netty:netty-tcnative-boringssl-static:2.0.65.Final
-maven.io_netty_netty_handler=io.netty:netty-handler:4.1.107.Final
-maven.io_netty_netty_common=io.netty:netty-common:4.1.107.Final
-maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.107.Final
-maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.107.Final
-maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.107.Final
-maven.io_netty_netty_codec=io.netty:netty-codec:4.1.107.Final
-maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.107.Final
-maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.107.Final
-maven.io_netty_netty_transport=io.netty:netty-transport:4.1.107.Final
-maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.107.Final
-maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.107.Final
+maven.io_netty_netty_handler=io.netty:netty-handler:4.1.109.Final
+maven.io_netty_netty_common=io.netty:netty-common:4.1.109.Final
+maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.109.Final
+maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.109.Final
+maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.109.Final
+maven.io_netty_netty_codec=io.netty:netty-codec:4.1.109.Final
+maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.109.Final
+maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.109.Final
+maven.io_netty_netty_transport=io.netty:netty-transport:4.1.109.Final
+maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.109.Final
+maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.109.Final
 maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.27.0
 maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53
 maven.com_google_code_gson_gson=com.google.code.gson:gson:2.10.1
@@ -67,10 +67,10 @@ maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_
 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.10.4
 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.10.4
-maven.com_google_api_api_common=com.google.api:api-common:2.28.0
+maven.com_google_api_api_common=com.google.api:api-common:2.29.1
 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.8
-maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.32.0
-maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.32.0
+maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.32.1
+maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.32.1
 maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.44.1
 maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.44.1
 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.23
@@ -83,5 +83,5 @@ maven.org_mockito_mockito_core=org.mockito:mockito-core:2.28.2
 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3
 maven.com_google_truth_truth=com.google.truth:truth:1.4.2
 maven.com_googlecode_java_diff_utils_diffutils=com.googlecode.java-diff-utils:diffutils:1.3.0
-maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.14.12
+maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.14.13
 maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6

gapic-generator-java/pom.xml

@@ -199,7 +199,6 @@ public void testNonRetryUnarySettingsWithoutIndividualRpcTimeout() {
             .setMaxAttempts(1)
             .setJittered(true)
             .setRpcTimeoutMultiplier(1.0)
-            .setRpcTimeoutMultiplier(1.0)
             .build();
     CallOptions callOptionsUsed =
         setupUnaryCallable(retrySettings, emptyRetryCodes, defaultCallContext);
@@ -315,7 +314,6 @@ public void testNonRetryServerStreamingSettingsWithoutIndividualRpcTimeout() {
             .setMaxAttempts(1)
             .setJittered(true)
             .setRpcTimeoutMultiplier(1.0)
-            .setRpcTimeoutMultiplier(1.0)
             .build();
     CallOptions callOptionsUsed =
         setupServerStreamingCallable(retrySettings, emptyRetryCodes, defaultCallContext);

gax-java/dependencies.properties

@@ -1,8 +1,6 @@
 Args = --enable-url-protocols=https,http \
 --initialize-at-build-time=org.conscrypt,\
-  org.slf4j.LoggerFactory,\
   org.junit.platform.engine.TestTag \
---initialize-at-run-time=com.google.api.client.googleapis.services.AbstractGoogleClientRequest$ApiClientVersion \
   --features=com.google.api.gax.nativeimage.OpenCensusFeature,\
   com.google.api.gax.nativeimage.GoogleJsonClientFeature \
   --add-modules=jdk.httpserver

gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/TimeoutTest.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**

gax-java/gax/src/main/resources/META-INF/native-image/com.google.api/gax/native-image.properties

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public interface AuditConfigDeltaOrBuilder

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public interface AuditConfigOrBuilder

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDeltaOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public interface AuditLogConfigOrBuilder

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfigOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Binding.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public interface BindingDeltaOrBuilder

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDelta.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public interface BindingOrBuilder

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingDeltaOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/BindingOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public interface GetIamPolicyRequestOrBuilder

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequest.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/options.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetIamPolicyRequestOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/options.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public interface GetPolicyOptionsOrBuilder

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptions.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public final class IamPolicyProto {

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/GetPolicyOptionsOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/options.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public final class OptionsProto {

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/IamPolicyProto.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/OptionsProto.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/Policy.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public interface PolicyDeltaOrBuilder

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDelta.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public interface PolicyOrBuilder

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyDeltaOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public final class PolicyProto {

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/PolicyProto.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 public interface SetIamPolicyRequestOrBuilder

java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/SetIamPolicyRequest.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/iam/v1/iam_policy.proto
 
-// Protobuf Java Version: 3.25.2
+// Protobuf Java Version: 3.25.3
 package com.google.iam.v1;
 
 /**