feat: update with latest from main

.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

.github/scripts/update_generation_config.sh

@@ -18,7 +18,17 @@ function get_latest_released_version() {
     group_id_url_path="$(sed 's|\.|/|g' <<< "${group_id}")"
     url="https://repo1.maven.org/maven2/${group_id_url_path}/${artifact_id}/maven-metadata.xml"
     xml_content=$(curl -s --fail "${url}")
-    latest=$(xmllint --xpath 'metadata/versioning/latest/text()' - <<< "${xml_content}")
+
+    # 1. Extract all version tags
+    # 2. Strip the XML tags to leave just the version numbers
+    # 3. Filter for strictly numbers.numbers.numbers (e.g., 2.54.0)
+    # 4. Sort by version (V) and take the last one (tail -n 1)
+    latest=$(echo "${xml_content}" \
+      | grep -oE '<version>[0-9]+\.[0-9]+\.[0-9]+</version>' \
+      | sed -E 's/<[^>]+>//g' \
+      | sort -V \
+      | tail -n 1)
+
     if [[ -z "${latest}" ]]; then
         echo "The latest version of ${group_id}:${artifact_id} is empty."
         echo "The returned json from maven.org is invalid: ${json_content}"
@@ -174,4 +184,4 @@ if [ -z "${pr_num}" ]; then
 else
   git push
   gh pr edit "${pr_num}" --title "${title}" --body "${title}"
-fi
+fi

.github/workflows/ci.yaml

@@ -127,7 +127,7 @@ jobs:
           gcr.io/cloud-devrel-public-resources/java-library-generation:"${library_generation_image_tag}" \
           /src/library_generation/cli/entry_point.py validate-generation-config
       env:
-        library_generation_image_tag: 2.62.3
+        library_generation_image_tag: 2.64.2
         workspace_name: /workspace
 
 # TODO: Uncomment the needed Github Actions

.github/workflows/generated_files_sync.yaml

@@ -17,7 +17,7 @@ on:
   pull_request:
 name: generation diff
 env:
-  library_generation_image_tag: 2.62.3
+  library_generation_image_tag: 2.64.2
 jobs:
   root-pom:
     # root pom.xml does not have diff from generated one

.github/workflows/hermetic_library_generation.yaml

@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/[email protected].1
+    - uses: googleapis/sdk-platform-java/.github/[email protected].2
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

.github/workflows/unmanaged_dependency_check.yaml

@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: mvn install -B -ntp  -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.54.2
       with:
         bom-path: gapic-libraries-bom/pom.xml

.kokoro/common.sh

@@ -161,7 +161,8 @@ function generate_modified_modules_list() {
   # grep returns 1 (error code) and exits the pipeline if there is no match
   # If there is no match, it will return true so the rest of the commands can run
   git config --global --add safe.directory $(realpath .)
-  modified_files=$(git diff --name-only "${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT}")
+  git fetch origin "${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}"
+  modified_files=$(git diff --name-only "origin/${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT}")
   printf "Modified files:\n%s\n" "${modified_files}"
 
   # Generate the list of valid maven modules

.kokoro/nightly/graalvm-native-a.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.2"
 }
 
 env_vars: {

.kokoro/nightly/graalvm-native-b.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.2"
 }
 
 env_vars: {

.kokoro/nightly/graalvm-native-c.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.2"
 }
 
 env_vars: {

.kokoro/nightly/graalvm-sub-jobs/native-a/common.cfg

@@ -29,7 +29,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.2"
 }
 
 # TODO: remove this after we've migrated all tests and scripts

.kokoro/nightly/graalvm-sub-jobs/native-b/common.cfg

@@ -24,7 +24,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.2"
 }
 
 env_vars: {

.kokoro/nightly/graalvm-sub-jobs/native-c/common.cfg

@@ -24,7 +24,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.2"
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native-a-presubmit.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.2"
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native-b-presubmit.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.2"
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native-c-presubmit.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.2"
 }
 
 env_vars: {

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.74.0"
+  ".": "1.75.0"
 }