Merge branch 'main' into new-library/health-mzeNy

Author: jinseopkim0

.github/workflows/sdk-platform-java-ci.yaml

@@ -162,7 +162,7 @@ jobs:
           JOB_TYPE: install
       - name: Integration Tests
         run: |
-          bazelisk --batch test //sdk-platform-java/test/integration/...
+          bazelisk --batch test //sdk-platform-java/test/integration/... --test_output=errors
 
   bazel-25:  
     needs: filter

generation/check_non_release_please_versions.sh

@@ -22,6 +22,7 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
       [[ "${pomFile}" =~ .*java-storage.* ]] || \
       [[ "${pomFile}" =~ .*java-storage-nio.* ]] || \
       [[ "${pomFile}" =~ .*java-vertexai.* ]] || \
+      [[ "${pomFile}" =~ .*java-compute.* ]] || \
       [[ "${pomFile}" =~ .*.github*. ]]; then
     continue
   fi

generation_config.yaml

@@ -3099,3 +3099,51 @@ libraries:
   GAPICs:
   - proto_path: google/cloud/workstations/v1
   - proto_path: google/cloud/workstations/v1beta
+- api_shortname: common-protos
+  name_pretty: Common Protos
+  product_documentation: https://github.com/googleapis/api-common-protos
+  api_description: Protobuf classes for Google's common protos.
+  release_level: stable
+  client_documentation: https://cloud.google.com/java/docs/reference/proto-google-common-protos/latest/history
+  distribution_name: com.google.api.grpc:proto-google-common-protos
+  excluded_dependencies: grpc-google-common-protos,proto-google-common-protos,proto-google-common-protos-parent
+  excluded_poms: proto-google-common-protos-bom,proto-google-common-protos
+  library_type: OTHER
+  GAPICs:
+  - proto_path: google/api
+  - proto_path: google/apps/card/v1
+  - proto_path: google/cloud
+  - proto_path: google/cloud/audit
+  - proto_path: google/cloud/location
+  - proto_path: google/geo/type
+  - proto_path: google/logging/type
+  - proto_path: google/longrunning
+  - proto_path: google/rpc
+  - proto_path: google/rpc/context
+  - proto_path: google/shopping/type
+  - proto_path: google/type
+- api_shortname: showcase
+  excluded_poms: gapic-showcase-bom
+  name_pretty: Showcase
+  api_description: Showcase module
+  product_documentation: https://cloud.google.com/dummy
+  distribution_name: com.google.cloud:gapic-showcase
+  library_type: OTHER
+  GAPICs:
+  - proto_path: schema/google/showcase/v1beta1
+- api_shortname: iam
+  name_pretty: IAM
+  product_documentation: https://cloud.google.com/iam
+  api_description: Manages access control for Google Cloud Platform resources
+  release_level: stable
+  client_documentation: https://cloud.google.com/java/docs/reference/proto-google-iam-v1/latest/overview
+  distribution_name: com.google.api.grpc:proto-google-iam-v1
+  excluded_dependencies: "grpc-google-iam-v1"
+  excluded_poms: "proto-google-iam-v1-bom,google-iam-policy,proto-google-iam-v1"
+  library_type: OTHER
+  GAPICs:
+  - proto_path: google/iam/v1
+  - proto_path: google/iam/v2
+  - proto_path: google/iam/v2beta
+  - proto_path: google/iam/v3
+  - proto_path: google/iam/v3beta

google-auth-library-java/pom.xml

@@ -80,12 +80,12 @@
     <project.appengine.version>2.0.33</project.appengine.version>
     <project.findbugs.version>3.0.2</project.findbugs.version>
     <deploy.autorelease>false</deploy.autorelease>
-    <project.error-prone.version>2.45.0</project.error-prone.version>
+    <project.error-prone.version>2.48.0</project.error-prone.version>
     <project.protobuf.version>4.33.2</project.protobuf.version>
     <project.cel.version>0.9.0-proto3</project.cel.version>
     <project.tink.version>1.15.0</project.tink.version>
     <project.slf4j.version>2.0.17</project.slf4j.version>
-    <project.gson.version>2.12.1</project.gson.version>
+    <project.gson.version>2.13.2</project.gson.version>
     <project.api-common.version>2.63.0-SNAPSHOT</project.api-common.version><!-- {x-version-update:api-common:current} -->
     <surefire.version>3.5.2</surefire.version>
     <clirr.skip>true</clirr.skip>

google-cloud-jar-parent/pom.xml

@@ -77,6 +77,18 @@
         <version>4.13.2</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>1.5.25</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <version>1.5.25</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryConversionException.java

@@ -27,7 +27,7 @@ public class BigQueryConversionException extends SQLException {
       new BigQueryJdbcCustomLogger(BigQueryConversionException.class.getName());
 
   public BigQueryConversionException(String message, Throwable cause) {
-    super(message, cause);
-    LOG.severe(message, this);
+    super(BigQueryJdbcExceptionUtils.formatMessage(message, cause), cause);
+    LOG.severe(this.getMessage(), this);
   }
 }

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryJdbcCoercionException.java

@@ -34,7 +34,7 @@ public class BigQueryJdbcCoercionException extends RuntimeException {
    * @param cause the actual cause which was thrown while performing the coercion.
    */
   public BigQueryJdbcCoercionException(Exception cause) {
-    super("Coercion error", cause);
-    LOG.severe("Coercion error", this);
+    super(BigQueryJdbcExceptionUtils.formatMessage("Coercion error", cause), cause);
+    LOG.severe(this.getMessage(), this);
   }
 }

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryJdbcException.java

@@ -52,9 +52,9 @@ public BigQueryJdbcException(InterruptedException ex) {
    * @param ex The BigQueryException to be thrown.
    */
   public BigQueryJdbcException(String message, BigQueryException ex) {
-    super(message, ex);
+    super(BigQueryJdbcExceptionUtils.formatMessage(message, ex), ex);
     this.bigQueryException = ex;
-    LOG.severe(ex.getMessage(), this);
+    LOG.severe(this.getMessage(), this);
   }
 
   /**
@@ -64,8 +64,8 @@ public BigQueryJdbcException(String message, BigQueryException ex) {
    * @param cause Throwable that is being converted.
    */
   public BigQueryJdbcException(String message, Throwable cause) {
-    super(message, cause);
-    LOG.severe(message, this);
+    super(BigQueryJdbcExceptionUtils.formatMessage(message, cause), cause);
+    LOG.severe(this.getMessage(), this);
   }
 
   /**

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryJdbcExceptionUtils.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.bigquery.exception;
+
+/** Utility class for JDBC exceptions. */
+final class BigQueryJdbcExceptionUtils {
+
+  private BigQueryJdbcExceptionUtils() {
+    // Utility class, prevent instantiation
+  }
+
+  /**
+   * Formats the exception message by appending the cause's message (or toString if null) on a
+   * newline.
+   *
+   * @param message The custom detail message.
+   * @param cause The underlying cause of the exception.
+   * @return The formatted message.
+   */
+  public static String formatMessage(String message, Throwable cause) {
+    return message
+        + (cause != null
+            ? "\n" + (cause.getMessage() != null ? cause.getMessage() : cause.toString())
+            : "");
+  }
+}

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/exception/BigQueryJdbcRuntimeException.java

@@ -50,12 +50,12 @@ public BigQueryJdbcRuntimeException(Throwable ex) {
    * @param ex Throwable to be thrown.
    */
   public BigQueryJdbcRuntimeException(String message, InterruptedException ex) {
-    super(message, ex);
-    LOG.severe(message, this);
+    super(BigQueryJdbcExceptionUtils.formatMessage(message, ex), ex);
+    LOG.severe(this.getMessage(), this);
   }
 
   public BigQueryJdbcRuntimeException(String message, Throwable ex) {
-    super(message, ex);
-    LOG.severe(message, this);
+    super(BigQueryJdbcExceptionUtils.formatMessage(message, ex), ex);
+    LOG.severe(this.getMessage(), this);
   }
 }