Merge branch 'main' into renovate/google.api-client.version

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

@@ -28,8 +28,8 @@
     <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
     <grpc.version>1.62.2</grpc.version>
     <google.auth.version>1.23.0</google.auth.version>
-    <google.http-client.version>1.44.1</google.http-client.version>
-    <gson.version>2.10.1</gson.version>
+    <google.http-client.version>1.44.2</google.http-client.version>
+    <gson.version>2.11.0</gson.version>
     <guava.version>33.1.0-jre</guava.version>
     <protobuf.version>3.25.3</protobuf.version>
     <opentelemetry.version>1.38.0</opentelemetry.version>

gax-java/dependencies.properties

@@ -44,20 +44,20 @@ 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.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_netty_netty_handler=io.netty:netty-handler:4.1.110.Final
+maven.io_netty_netty_common=io.netty:netty-common:4.1.110.Final
+maven.io_netty_netty_codec_socks=io.netty:netty-codec-socks:4.1.110.Final
+maven.io_netty_netty_codec_http2=io.netty:netty-codec-http2:4.1.110.Final
+maven.io_netty_netty_codec_http=io.netty:netty-codec-http:4.1.110.Final
+maven.io_netty_netty_codec=io.netty:netty-codec:4.1.110.Final
+maven.io_netty_netty_buffer=io.netty:netty-buffer:4.1.110.Final
+maven.io_netty_netty_resolver=io.netty:netty-resolver:4.1.110.Final
+maven.io_netty_netty_transport=io.netty:netty-transport:4.1.110.Final
+maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.110.Final
+maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-native-unix-common:4.1.110.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
+maven.com_google_code_gson_gson=com.google.code.gson:gson:2.11.0
 maven.com_google_guava_guava=com.google.guava:guava:32.1.3-jre
 maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.2
 maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.14.0
@@ -71,8 +71,8 @@ maven.com_google_api_api_common=com.google.api:api-common:2.31.1
 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.6.9
 maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.34.1
 maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.34.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.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.44.2
+maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.44.2
 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.23
 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
 maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.5

java-shared-dependencies/dependency-analyzer/pom.xml

@@ -18,7 +18,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <goals>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.10.1</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

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

@@ -33,7 +33,7 @@
     <httpcomponents.httpcore.version>4.4.16</httpcomponents.httpcore.version>
     <httpcomponents.httpclient.version>4.5.14</httpcomponents.httpclient.version>
     <!-- ensure checker-qual version matches what Guava uses -->
-    <checker-qual.version>3.42.0</checker-qual.version>
+    <checker-qual.version>3.43.0</checker-qual.version>
     <perfmark-api.version>0.27.0</perfmark-api.version>
     <j2objc-annotations.version>3.0.0</j2objc-annotations.version>
     <google.cloud.opentelemetry.version>0.28.0</google.cloud.opentelemetry.version>

java-shared-dependencies/unmanaged-dependency-check/pom.xml

@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <goals>

library_generation/generate_pr_description.py

@@ -19,7 +19,10 @@
 from git import Commit, Repo
 from library_generation.model.generation_config import GenerationConfig
 from library_generation.utils.proto_path_utils import find_versioned_proto_path
-from library_generation.utils.commit_message_formatter import format_commit_message
+from library_generation.utils.commit_message_formatter import (
+    format_commit_message,
+    commit_link,
+)
 from library_generation.utils.commit_message_formatter import wrap_override_commit
 
 EMPTY_MESSAGE = ""
@@ -58,8 +61,8 @@ def generate_pr_descriptions(
     paths = config.get_proto_path_to_library_name()
     description = get_commit_messages(
         repo_url=repo_url,
-        current_commit=config.googleapis_commitish,
-        baseline_commit=baseline_commit,
+        current_commit_sha=config.googleapis_commitish,
+        baseline_commit_sha=baseline_commit,
         paths=paths,
         is_monorepo=config.is_monorepo(),
     )
@@ -76,8 +79,8 @@ def generate_pr_descriptions(
 
 def get_commit_messages(
     repo_url: str,
-    current_commit: str,
-    baseline_commit: str,
+    current_commit_sha: str,
+    baseline_commit_sha: str,
     paths: Dict[str, str],
     is_monorepo: bool,
 ) -> str:
@@ -88,9 +91,9 @@ def get_commit_messages(
     Note that baseline_commit should be an ancestor of latest_commit.
 
     :param repo_url: the url of the repository.
-    :param current_commit: the newest commit to be considered in
+    :param current_commit_sha: the newest commit to be considered in
     selecting commit message.
-    :param baseline_commit: the oldest commit to be considered in
+    :param baseline_commit_sha: the oldest commit to be considered in
     selecting commit message. This commit should be an ancestor of
     :param paths: a mapping from file paths to library_name.
     :param is_monorepo: whether to generate commit messages in a monorepo.
@@ -102,17 +105,19 @@ def get_commit_messages(
     shutil.rmtree(tmp_dir, ignore_errors=True)
     os.mkdir(tmp_dir)
     repo = Repo.clone_from(repo_url, tmp_dir)
-    commit = repo.commit(current_commit)
-    current_commit_time = __get_commit_timestamp(commit)
-    baseline_commit_time = __get_commit_timestamp(repo.commit(baseline_commit))
+    current_commit = repo.commit(current_commit_sha)
+    baseline_commit = repo.commit(baseline_commit_sha)
+    current_commit_time = __get_commit_timestamp(current_commit)
+    baseline_commit_time = __get_commit_timestamp(baseline_commit)
     if current_commit_time <= baseline_commit_time:
         raise ValueError(
-            f"current_commit ({current_commit[:7]}, committed on "
+            f"current_commit ({current_commit_sha[:7]}, committed on "
             f"{current_commit_time}) should be newer than baseline_commit "
-            f"({baseline_commit[:7]}, committed on {baseline_commit_time})."
+            f"({baseline_commit_sha[:7]}, committed on {baseline_commit_time})."
         )
     qualified_commits = {}
-    while str(commit.hexsha) != baseline_commit:
+    commit = current_commit
+    while str(commit.hexsha) != baseline_commit_sha:
         commit_and_name = __filter_qualified_commit(paths=paths, commit=commit)
         if commit_and_name != ():
             qualified_commits[commit_and_name[0]] = commit_and_name[1]
@@ -151,20 +156,16 @@ def __filter_qualified_commit(paths: Dict[str, str], commit: Commit) -> (Commit,
 
 
 def __combine_commit_messages(
-    current_commit: str,
-    baseline_commit: str,
+    current_commit: Commit,
+    baseline_commit: Commit,
     commits: Dict[Commit, str],
     is_monorepo: bool,
 ) -> str:
     messages = [
-        f"This pull request is generated with proto changes between googleapis commit {baseline_commit} (exclusive) and {current_commit} (inclusive).",
-        "Qualified commits are:",
+        f"This pull request is generated with proto changes between {commit_link(baseline_commit)} (exclusive) "
+        f"and {commit_link(current_commit)} (inclusive).",
+        "",
     ]
-    for commit in commits:
-        short_sha = commit.hexsha[:7]
-        messages.append(
-            f"[googleapis/googleapis@{short_sha}](https://github.com/googleapis/googleapis/commit/{commit.hexsha})"
-        )
 
     messages.extend(
         wrap_override_commit(

library_generation/requirements.txt

@@ -16,4 +16,4 @@ smmap==5.0.1
 typing==3.7.4.3
 parameterized==0.9.0 # used in parameterized test
 colorlog==6.8.2
-watchdog==4.0.0
+watchdog==4.0.1

library_generation/test/resources/integration/google-cloud-java/pr-description-golden.txt

@@ -1,23 +1,19 @@
-This pull request is generated with proto changes between googleapis commit a17d4caf184b050d50cacf2b0d579ce72c31ce74 (exclusive) and 4ce0ff67a3d4509be641cbe47a35844ddc1268fc (inclusive).
-Qualified commits are:
-[googleapis/googleapis@7659dd2](https://github.com/googleapis/googleapis/commit/7659dd2244563fd902b681bdcadbe5385b8d3462)
-[googleapis/googleapis@05d889e](https://github.com/googleapis/googleapis/commit/05d889e7dfe087fc2ddc9de9579f01d4e1c2f35e)
-[googleapis/googleapis@aa16fda](https://github.com/googleapis/googleapis/commit/aa16fdad909bc33e2d4ff04cfde56a46d0e52b13)
-[googleapis/googleapis@0733fdb](https://github.com/googleapis/googleapis/commit/0733fdb5f745192f9f3c95f8d08039286567cbcc)
-[googleapis/googleapis@9e35c62](https://github.com/googleapis/googleapis/commit/9e35c620157d7b11cb5b2e5d0249c5caaee824f3)
-[googleapis/googleapis@36dedd0](https://github.com/googleapis/googleapis/commit/36dedd0d9020c19d1c8259003c2fe9656ada7471)
+This pull request is generated with proto changes between [googleapis/googleapis@a17d4ca](https://github.com/googleapis/googleapis/commit/a17d4caf184b050d50cacf2b0d579ce72c31ce74) (exclusive) and [googleapis/googleapis@4ce0ff6](https://github.com/googleapis/googleapis/commit/4ce0ff67a3d4509be641cbe47a35844ddc1268fc) (inclusive).
+
 BEGIN_COMMIT_OVERRIDE
 BEGIN_NESTED_COMMIT
 docs: [cloudcontrolspartner] update documentation URL
 
 PiperOrigin-RevId: 612723053
 
+Source Link: [googleapis/googleapis@7659dd2](https://github.com/googleapis/googleapis/commit/7659dd2244563fd902b681bdcadbe5385b8d3462)
 END_NESTED_COMMIT
 BEGIN_NESTED_COMMIT
 feat: [cloudcontrolspartner] added CloudControlsPartner API
 
 PiperOrigin-RevId: 612632640
 
+Source Link: [googleapis/googleapis@05d889e](https://github.com/googleapis/googleapis/commit/05d889e7dfe087fc2ddc9de9579f01d4e1c2f35e)
 END_NESTED_COMMIT
 BEGIN_NESTED_COMMIT
 feat: [alloydb] support for obtaining the public IP address of an Instance
@@ -28,13 +24,15 @@ docs: [alloydb] clarified read pool config is for read pool type instances
 
 PiperOrigin-RevId: 610475013
 
+Source Link: [googleapis/googleapis@aa16fda](https://github.com/googleapis/googleapis/commit/aa16fdad909bc33e2d4ff04cfde56a46d0e52b13)
 END_NESTED_COMMIT
 BEGIN_NESTED_COMMIT
 feat: [alloydb] support for obtaining the public IP address of an Instance
 feat: [alloydb] support for getting PSC DNS name from the GetConnectionInfo API
 
 PiperOrigin-RevId: 610415824
 
+Source Link: [googleapis/googleapis@0733fdb](https://github.com/googleapis/googleapis/commit/0733fdb5f745192f9f3c95f8d08039286567cbcc)
 END_NESTED_COMMIT
 BEGIN_NESTED_COMMIT
 docs: [cloudcontrolspartner] Updated comment for method `ListCustomers` in service `CloudControlsPartnerCore`
@@ -44,11 +42,13 @@ docs: [cloudcontrolspartner] Updated documentation URL
 
 PiperOrigin-RevId: 609026905
 
+Source Link: [googleapis/googleapis@9e35c62](https://github.com/googleapis/googleapis/commit/9e35c620157d7b11cb5b2e5d0249c5caaee824f3)
 END_NESTED_COMMIT
 BEGIN_NESTED_COMMIT
 feat: [cloudcontrolspartner] added CloudControlsPartner API
 
 PiperOrigin-RevId: 606720708
 
+Source Link: [googleapis/googleapis@36dedd0](https://github.com/googleapis/googleapis/commit/36dedd0d9020c19d1c8259003c2fe9656ada7471)
 END_NESTED_COMMIT
 END_COMMIT_OVERRIDE