Merge branch 'main' into fix-logging-tracer-exception-details

Author: blakeli0

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java

@@ -4698,13 +4698,10 @@ void testProjectIDFastSQLQueryWithJobId() {
     JobId jobIdWithProjectId = JobId.newBuilder().setProject(invalidProjectId).build();
     QueryJobConfiguration configSelect =
         QueryJobConfiguration.newBuilder(query).setDefaultDataset(DatasetId.of(DATASET)).build();
-    try {
-      bigquery.query(configSelect, jobIdWithProjectId);
-    } catch (Exception exception) {
-      // error message for non-existent project
-      assertEquals("Cannot parse  as CloudRegion.", exception.getMessage());
-      assertEquals(BigQueryException.class, exception.getClass());
-    }
+    BigQueryException bqException =
+        assertThrows(
+            BigQueryException.class, () -> bigquery.query(configSelect, jobIdWithProjectId));
+    assertEquals(400, bqException.getCode());
   }
 
   @Test

java-storage/google-cloud-storage-control/pom.xml

@@ -53,7 +53,6 @@
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax</artifactId>
-          <version>2.76.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
         </dependency>
         <dependency>
             <groupId>com.google.api</groupId>
@@ -71,14 +70,14 @@
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax-httpjson</artifactId>
-          <version>2.76.1-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
+          <version>2.76.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
         </dependency>
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax-httpjson</artifactId>
             <scope>test</scope>
             <classifier>testlib</classifier>
-          <version>2.76.1-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
+          <version>2.76.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

sdk-platform-java/GEMINI.md

@@ -131,14 +131,22 @@ Showcase integration tests are run against a local server that implements the Sh
     cd java-showcase
     mvn verify -P enable-integration-tests
     ```
-    
-## 5. Dependency Management
+
+## 5. Style Guide
+
+1. Minimize visibility scopes by defaulting to the most restrictive access level, avoiding the `public` modifier unless required.
+2. Use short names over fully qualified names.
+3. Avoid calling `@ObsoleteApi` or `@Deprecated` methods unless there are no alternatives.
+4. Avoid unnecessary formatting changes to keep diffs clean.
+5. Use `mvn` for everything other than the `test/integration` folder.
+
+## 6. Dependency Management
 
 - Try not to bump any external dependency version unless there is a known CVE (security or vulnerability issue) or a critical bug fix.
 - Try to avoid introducing new external dependencies. If a new dependency is required, please state the reason.
 - Prefer to use features from the Java standard library, then try to use features from any existing dependencies (preferably from Google managed dependencies).
 
-## 6. Contribution Guidelines
+## 7. Contribution Guidelines
 
 - **Commits:** Commit messages should follow the [Conventional Commits](https://www.conventionalcommits.org/)
   specification. The format is `<type>: <description>`. The type should be one of the following: fix, feat,

sdk-platform-java/dependencies.txt

@@ -9,12 +9,12 @@
 # Pom-Parent Dependencies
 # These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml
 javax.annotation:javax.annotation-api,javax.annotation-api=1.3.2
-io.grpc:grpc-bom,grpc=1.79.0
+io.grpc:grpc-bom,grpc=1.80.0
 com.google.auth:google-auth-library-bom,google.auth=1.43.0
 com.google.http-client:google-http-client,google.http-client=2.1.0
 com.google.code.gson:gson,gson=2.13.2
 com.google.guava:guava,guava=33.5.0-jre
-com.google.protobuf:protobuf-java,protobuf=4.34.0
+com.google.protobuf:protobuf-java,protobuf=4.34.1
 io.opentelemetry:opentelemetry-bom,opentelemetry=1.60.1
 com.google.errorprone:error_prone_annotations,errorprone=2.48.0
 com.google.j2objc:j2objc-annotations,j2objc-annotations=3.1
@@ -32,7 +32,7 @@ com.google.api-client:google-api-client,google.api-client=2.9.0
 org.threeten:threeten-extra,threeten-extra=1.8.0
 io.opencensus:opencensus-api,opencensus=0.31.1
 com.google.code.findbugs:jsr305,findbugs=3.0.2
-com.fasterxml.jackson:jackson-bom,jackson=2.21.1
+com.fasterxml.jackson:jackson-bom,jackson=2.21.2
 commons-codec:commons-codec,codec=1.21.0
 org.apache.httpcomponents:httpclient,httpcomponents.httpclient=4.5.14
 org.apache.httpcomponents:httpcore,httpcomponents.httpcore=4.4.16
@@ -45,7 +45,7 @@ com.google.cloud.opentelemetry:exporter-metrics,google.cloud.opentelemetry=0.36.
 com.google.flogger:flogger,flogger=0.9
 org.apache.arrow:arrow-memory-core,arrow=18.3.0
 dev.cel:cel,dev.cel=0.12.0
-com.google.crypto.tink:tink,com.google.crypto.tink=1.20.0
+com.google.crypto.tink:tink,com.google.crypto.tink=1.21.0
 # The follow opentelemetry dependencies have a different version from the opentelemetry-bom
 io.opentelemetry.semconv:opentelemetry-semconv,opentelemetry-semconv=1.40.0
 io.opentelemetry.contrib:opentelemetry-gcp-resources,io.opentelemetry.contrib.opentelemetry-gcp-resources=1.52.0-alpha

versions.txt

@@ -986,7 +986,6 @@ gapic-generator-java:2.68.0:2.68.1-SNAPSHOT
 api-common:2.59.0:2.59.1-SNAPSHOT
 gax:2.76.0:2.76.1-SNAPSHOT
 gax-grpc:2.76.0:2.76.1-SNAPSHOT
-gax-httpjson:0.161.0:0.161.1-SNAPSHOT
 proto-google-common-protos:2.67.0:2.67.1-SNAPSHOT
 grpc-google-common-protos:2.67.0:2.67.1-SNAPSHOT
 proto-google-iam-v1:1.62.0:1.62.1-SNAPSHOT