Merge branch 'googleapis:main' into main

Author: yoshi-code-bot

.github/release-please.yml

@@ -33,3 +33,8 @@ branches:
     manifest: true
     handleGHRelease: true
     branch: 1.58.x
+  - primaryBranch: main
+    releaseType: java-yoshi
+    manifest: true
+    handleGHRelease: true
+    branch: protobuf-4.x-rc

.github/release/fixture/snapshot/versions-snapshot.txt

@@ -0,0 +1 @@
+google-cloud-asset:1.2.3:1.2.3

.github/release/partial_release.py

@@ -24,7 +24,8 @@
 class VersionType(Enum):
     MAJOR = (1,)
     MINOR = (2,)
-    PATCH = 3
+    PATCH = (3,)
+    SNAPSHOT = (4,)
 
 
 @click.group(invoke_without_command=False)
@@ -34,6 +35,27 @@ def main(ctx):
     pass
 
 
+@main.command()
+@click.option(
+    "--artifact-ids",
+    required=True,
+    type=str,
+    help="""
+    Artifact IDs whose version needs to update, separated by comma.
+    """,
+)
+@click.option(
+    "--versions",
+    required=False,
+    default="./versions.txt",
+    type=str,
+    help="""
+    The path to the versions.txt.
+    """,
+)
+def bump_snapshot_version(artifact_ids: str, versions: str) -> None:
+    bump_version(artifact_ids, "snapshot", versions)
+
 @main.command()
 @click.option(
     "--artifact-ids",
@@ -49,7 +71,7 @@ def main(ctx):
     default="patch",
     type=str,
     help="""
-    The type of version bump, one of major, minor or patch.
+    The type of version bump, one of major, minor, patch.
     """,
 )
 @click.option(
@@ -62,6 +84,9 @@ def main(ctx):
     """,
 )
 def bump_released_version(artifact_ids: str, version_type: str, versions: str) -> None:
+    bump_version(artifact_ids, version_type, versions)
+
+def bump_version(artifact_ids: str, version_type: str, versions: str) -> None:
     target_artifact_ids = set(artifact_ids.split(","))
     version_enum = _parse_type_or_raise(version_type)
     newlines = []
@@ -95,6 +120,12 @@ def bump_released_version(artifact_ids: str, version_type: str, versions: str) -
                     minor += 1
                 case VersionType.PATCH:
                     patch += 1
+                case VersionType.SNAPSHOT:
+                    # Keep the released version as is.
+                    newlines.append(
+                        f"{artifact_id}:{major}.{minor}.{patch}:{major}.{minor + 1}.0-SNAPSHOT"
+                    )
+                    continue
             newlines.append(
                 f"{artifact_id}:{major}.{minor}.{patch}:{major}.{minor}.{patch}"
             )

.github/release/release_unit_tests.py

@@ -4,7 +4,7 @@
 import shutil
 import tempfile
 import unittest
-from partial_release import bump_released_version
+from partial_release import bump_released_version, bump_snapshot_version
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 GOLDEN = os.path.join(SCRIPT_DIR, "testdata")
@@ -45,6 +45,22 @@ def test_bump_multiple_versions_success(self):
                 actual = f.read()
             self.assertEqual(expected, actual)
 
+    def test_bump_snapshot_version_success(self):
+        golden = f"{GOLDEN}/snapshot/versions-snapshot-golden.txt"
+        with copied_fixtures_dir(f"{FIXTURES}/snapshot"):
+            runner.invoke(
+                bump_snapshot_version,
+                [
+                    "--artifact-ids=google-cloud-asset",
+                    "--versions=versions-snapshot.txt",
+                ],
+            )
+            with open(golden) as g:
+                expected = g.read()
+            with open("./versions-snapshot.txt") as f:
+                actual = f.read()
+            self.assertEqual(expected, actual)
+
 
 @contextlib.contextmanager
 def change_dir_to(path: str) -> str:

.github/release/testdata/snapshot/versions-snapshot-golden.txt

@@ -0,0 +1 @@
+google-cloud-asset:1.2.3:1.3.0-SNAPSHOT

generation/apply_current_versions.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# This script sets the "current-version" written in versions.txt applied to all
+# pom.xml files in this monorepo.
+# This script plays supplemental role just in case Release Please pull request
+# fails to update all files.
+
+# Usage:
+# # Run this script at the root of the monorepo
+# bash generation/apply_current_versions.sh
+
+set -e
+
+versions_file=$1
+column_name=$2
+if [[ -z "$versions_file" || -z "$column_name" ]]; then
+  echo "Replaces the versions annotated with the x-version-update tag in"
+  echo "all pom.xml files in the current working directory and its subdirectories"
+  echo "with the versions specified in the versions.txt file (current or released)."
+  echo
+  echo "Usage: $0 path/to/versions.txt (released|current)"
+  exit 1
+fi
+if [[ "$column_name" == "released" ]]; then 
+  column_index=2
+elif [[ "$column_name" == "current" ]]; then
+  column_index=3
+elif "$column_name" != "current" ]]; then
+  echo "Error: column_name must be either 'released' or 'current'"
+  exit 1
+fi
+
+
+SED_OPTIONS=""
+
+# The second column is 
+for KV in $(cut -f1,"${column_index}" -d: $versions_file |grep -v "#"); do
+  K=${KV%:*}; V=${KV#*:}
+  echo Key:$K, Value:$V;
+  SED_OPTIONS="$SED_OPTIONS -e /x-version-update:$K:current/{s|<version>.*<\/version>|<version>$V<\/version>|;}"
+done
+
+echo "Running sed command. It may take few minutes."
+find . -maxdepth 3 -name pom.xml |sort --dictionary-order |xargs sed -i.bak $SED_OPTIONS
+find . -maxdepth 3 -name pom.xml.bak |xargs rm

generation/apply_versions.sh

@@ -1,6 +1,6 @@
 gapic_generator_version: 2.64.1
-googleapis_commitish: ba80e9b5251c974d18c3c25fa905e2d0ae4a0f02
-libraries_bom_version: 26.71.0
+googleapis_commitish: bfdeefc22ce661d0b0efb68c83c2afd5a3aa9c2c
+libraries_bom_version: 26.72.0
 
 # the libraries are ordered with respect to library name, which is
 # java-{library.library_name} or java-{library.api-shortname} when

generation_config.yaml

@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.71.0</version>
+      <version>26.72.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -42,20 +42,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-accessapproval</artifactId>
-  <version>2.79.0</version>
+  <version>2.81.0</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-accessapproval:2.79.0'
+implementation 'com.google.cloud:google-cloud-accessapproval:2.81.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-accessapproval" % "2.79.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-accessapproval" % "2.81.0"
 ```
 
 ## Authentication
@@ -194,7 +194,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-accessapproval.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-accessapproval/2.79.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-accessapproval/2.81.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

java-accessapproval/README.md

@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.71.0</version>
+      <version>26.72.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -42,20 +42,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-identity-accesscontextmanager</artifactId>
-  <version>1.79.0</version>
+  <version>1.81.0</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-identity-accesscontextmanager:1.79.0'
+implementation 'com.google.cloud:google-identity-accesscontextmanager:1.81.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-identity-accesscontextmanager" % "1.79.0"
+libraryDependencies += "com.google.cloud" % "google-identity-accesscontextmanager" % "1.81.0"
 ```
 
 ## Authentication
@@ -194,7 +194,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-identity-accesscontextmanager.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-identity-accesscontextmanager/1.79.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-identity-accesscontextmanager/1.81.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles