Merge branch 'main' into sajc-universe-domain

Author: mpeddada1

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -58,7 +58,7 @@ FROM docker.io/library/python:3.13.2-alpine3.20@sha256:816feb29731cdee64b15b0ae9
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
 ARG PROTOC_VERSION=25.5
-ARG GRPC_VERSION=1.70.0
+ARG GRPC_VERSION=1.71.0
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 

.cloudbuild/library_generation/library_generation_airlock.Dockerfile

@@ -60,7 +60,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:b83
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
 ARG PROTOC_VERSION=25.5
-ARG GRPC_VERSION=1.70.0
+ARG GRPC_VERSION=1.71.0
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 

.kokoro/presubmit/downstream-build.sh

@@ -25,10 +25,6 @@ scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 cd "${scriptDir}/../.." # git repo root
 source "$scriptDir/common.sh"
 
-# Use GCP Maven Mirror
-mkdir -p "${HOME}/.m2"
-cp settings.xml "${HOME}/.m2"
-
 # Publish this repo's modules to local maven to make them available for downstream libraries
 mvn install --projects '!gapic-generator-java' \
   -Danimal.sniffer.skip \

DEVELOPMENT.md

@@ -44,7 +44,7 @@ for gapic-generator-java's Bazel build.
 There are 4 layers of testing in this repo:
 1. Traditional unit tests. These tests usually focus on testing one very specific test case at a time. For example, [MethodTest](https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java/src/test/java/com/google/api/generator/gapic/model/MethodTest.java) 
 2. Golden unit tests. These tests start with a test proto, we create different test cases in the proto, load the proto in unit tests and save the generated file as golden files. For example, [routing header proto](https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java/src/test/proto/explicit_dynamic_routing_header_testing.proto) -> Load in the [unit test](https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java#L56-L64) -> Saved as [golden](https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/GrpcRoutingHeadersStub.golden)    
-3. Showcase integration tests. They test the generated library's behavior against a mock server, see [README.md](https://github.com/googleapis/sdk-platform-java/blob/main/showcase/README.md) of showcase module for details.
+3. Showcase integration tests. They test the generated library's behavior against a mock server, see [README.md](https://github.com/googleapis/sdk-platform-java/blob/main/java-showcase/README.md) of showcase module for details.
 4. Golden integration tests. These tests generate a full client library with real protos from googleapis, for example, golden integration tests for [compute](https://github.com/googleapis/sdk-platform-java/tree/main/test/integration/goldens/compute). However, we _should_ stop adding new ones, and rely on golden unit tests and showcase tests.
 
 Based on where the code changes are, we should add different tests, in general
@@ -60,7 +60,7 @@ Based on where the code changes are, we should add different tests, in general
 
 See the [Unit Tests](https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java/DEVELOPMENT.md#unit-tests) section in gapic-generator-java/DEVELOPMENT.md for how to run traditional and golden unit tests.
 
-See [Running the Integration Tests](https://github.com/googleapis/sdk-platform-java/blob/main/showcase/README.md#running-the-integration-tests) and [Update the Golden Showcase Files](https://github.com/googleapis/sdk-platform-java/blob/main/showcase/README.md#update-the-golden-showcase-files) sections in showcase/README.md for how to run and update showcase integration tests.
+See [Running the Integration Tests](https://github.com/googleapis/sdk-platform-java/blob/main/java-showcase/README.md#running-the-integration-tests) and [Update the Golden Showcase Files](https://github.com/googleapis/sdk-platform-java/blob/main/java-showcase/README.md#update-the-golden-showcase-files) sections in java-showcase/README.md for how to run and update showcase integration tests.
 
 See the [Integration Tests](https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java/DEVELOPMENT.md#integration-tests) section in gapic-generator-java/DEVELOPMENT.md for how to run golden integration tests.
  

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

@@ -26,8 +26,8 @@
     <!-- External dependencies, especially gRPC and Protobuf version, should be
         consistent across modules in this repository -->
     <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
-    <grpc.version>1.70.0</grpc.version>
-    <google.auth.version>1.35.1-SNAPSHOT</google.auth.version>
+    <grpc.version>1.71.0</grpc.version>
+    <google.auth.version>1.36.0</google.auth.version>
     <google.http-client.version>1.47.0</google.http-client.version>
     <gson.version>2.12.1</gson.version>
     <guava.version>33.4.0-jre</guava.version>

gax-java/dependencies.properties

@@ -28,7 +28,7 @@ version.gax_httpjson=2.66.1-SNAPSHOT
 
 version.com_google_protobuf=3.25.5
 version.google_java_format=1.15.0
-version.io_grpc=1.70.0
+version.io_grpc=1.71.0
 
 # Maven artifacts.
 # Note, the actual name of each property matters (bazel build scripts depend on it).
@@ -37,8 +37,8 @@ version.io_grpc=1.70.0
 #   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.52.0
 maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.52.0
-maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.35.0
-maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.35.0
+maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.36.0
+maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.36.0
 maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.47.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

java-shared-dependencies/first-party-dependencies/pom.xml

@@ -23,7 +23,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <site.installationModule>${project.artifactId}</site.installationModule>
     <grpc-gcp.version>1.6.1</grpc-gcp.version>
-    <google.oauth-client.version>1.37.0</google.oauth-client.version>
+    <google.oauth-client.version>1.39.0</google.oauth-client.version>
     <google.api-client.version>2.7.2</google.api-client.version>
   </properties>
 

java-showcase/owlbot.py

@@ -18,8 +18,6 @@
 
 for library in s.get_staging_dirs():
     # put any special-case replacements here
-    print('moving library asdasd: ')
-    print(library)
     s.move(library)
 
 s.remove_staging_dirs()
@@ -36,4 +34,4 @@
     "license-checks.xml",
     "renovate.json",
     ".gitignore"
-])
+])

settings.xml

@@ -18,15 +18,15 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
                           https://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <mirrors>
-    <mirror>
-      <!-- Google's Maven Central mirror for Americas
-       https://maven-central.storage.googleapis.com/index.html
-      -->
-      <id>google-maven-central</id>
-      <name>GCS Maven Central mirror</name>
-      <url>https://maven-central.storage-download.googleapis.com/maven2/</url>
-      <mirrorOf>central</mirrorOf>
-    </mirror>
-  </mirrors>
-</settings>
+<!--  <mirrors>-->
+<!--    <mirror>-->
+<!--      &lt;!&ndash; Google's Maven Central mirror for Americas-->
+<!--       https://maven-central.storage.googleapis.com/index.html-->
+<!--      &ndash;&gt;-->
+<!--      <id>google-maven-central</id>-->
+<!--      <name>GCS Maven Central mirror</name>-->
+<!--      <url>https://maven-central.storage-download.googleapis.com/maven2/</url>-->
+<!--      <mirrorOf>central</mirrorOf>-->
+<!--    </mirror>-->
+<!--  </mirrors>-->
+</settings>