From 6fafcb3247cc7f377e465fc1144fb9d2227be899 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Tue, 19 Nov 2024 09:47:48 -0500 Subject: [PATCH] fix: Propagate repo level dependency change sdk-platform-java-config to each module's release notes (#11294) --- .../golden/java-analytics-admin/CHANGELOG.md | 3 +-- .../golden/java-maps-mapsplatformdatasets/CHANGELOG.md | 3 +-- .../release-note-generation/golden/java-vertexai/CHANGELOG.md | 3 +-- .github/release-note-generation/split_release_note.py | 2 +- .../release-note-generation/testdata/main_release_note.txt | 3 +-- .github/release-note-generation/unit_test.py | 4 ++-- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/release-note-generation/golden/java-analytics-admin/CHANGELOG.md b/.github/release-note-generation/golden/java-analytics-admin/CHANGELOG.md index f9e0cff1c68b..ce0077b76e6b 100644 --- a/.github/release-note-generation/golden/java-analytics-admin/CHANGELOG.md +++ b/.github/release-note-generation/golden/java-analytics-admin/CHANGELOG.md @@ -8,8 +8,7 @@ ### Dependencies -* **deps:** update dependency com.google.cloud:google-cloud-shared-config to v1.5.6 ([#9494](https://github.com/googleapis/google-cloud-java/issues/9494)) ([739763f](https://github.com/googleapis/google-cloud-java/commit/739763f15ffa2434d7fa089899165f1e8fa5f870)) -* **deps:** update dependency com.google.cloud:google-cloud-shared-dependencies to v3.11.0 ([#9505](https://github.com/googleapis/google-cloud-java/issues/9505)) ([30bc6f0](https://github.com/googleapis/google-cloud-java/commit/30bc6f0aef5b95549230dbd5b5246f2a8dab4ba4)) +* **deps:** update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#11188](https://github.com/googleapis/google-cloud-java/pull/11188)) ([0200922](https://github.com/googleapis/google-cloud-java/commit/02009221d7d1966b4d180468f0cd1e32fbbab2c8)) ## [0.15.0](https://github.com/googleapis/google-cloud-java/compare/google-analytics-admin-v0.14.1-SNAPSHOT...google-analytics-admin-v0.15.0) (2022-10-24) diff --git a/.github/release-note-generation/golden/java-maps-mapsplatformdatasets/CHANGELOG.md b/.github/release-note-generation/golden/java-maps-mapsplatformdatasets/CHANGELOG.md index f24187fabfbe..65aa08207e1a 100644 --- a/.github/release-note-generation/golden/java-maps-mapsplatformdatasets/CHANGELOG.md +++ b/.github/release-note-generation/golden/java-maps-mapsplatformdatasets/CHANGELOG.md @@ -9,5 +9,4 @@ ### Dependencies -* **deps:** update dependency com.google.cloud:google-cloud-shared-config to v1.5.6 ([#9494](https://github.com/googleapis/google-cloud-java/issues/9494)) ([739763f](https://github.com/googleapis/google-cloud-java/commit/739763f15ffa2434d7fa089899165f1e8fa5f870)) -* **deps:** update dependency com.google.cloud:google-cloud-shared-dependencies to v3.11.0 ([#9505](https://github.com/googleapis/google-cloud-java/issues/9505)) ([30bc6f0](https://github.com/googleapis/google-cloud-java/commit/30bc6f0aef5b95549230dbd5b5246f2a8dab4ba4)) +* **deps:** update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#11188](https://github.com/googleapis/google-cloud-java/pull/11188)) ([0200922](https://github.com/googleapis/google-cloud-java/commit/02009221d7d1966b4d180468f0cd1e32fbbab2c8)) diff --git a/.github/release-note-generation/golden/java-vertexai/CHANGELOG.md b/.github/release-note-generation/golden/java-vertexai/CHANGELOG.md index d0f798d232fa..5f5954ee448d 100644 --- a/.github/release-note-generation/golden/java-vertexai/CHANGELOG.md +++ b/.github/release-note-generation/golden/java-vertexai/CHANGELOG.md @@ -13,8 +13,7 @@ ### Dependencies -* **deps:** update dependency com.google.cloud:google-cloud-shared-config to v1.5.6 ([#9494](https://github.com/googleapis/google-cloud-java/issues/9494)) ([739763f](https://github.com/googleapis/google-cloud-java/commit/739763f15ffa2434d7fa089899165f1e8fa5f870)) -* **deps:** update dependency com.google.cloud:google-cloud-shared-dependencies to v3.11.0 ([#9505](https://github.com/googleapis/google-cloud-java/issues/9505)) ([30bc6f0](https://github.com/googleapis/google-cloud-java/commit/30bc6f0aef5b95549230dbd5b5246f2a8dab4ba4)) +* **deps:** update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#11188](https://github.com/googleapis/google-cloud-java/pull/11188)) ([0200922](https://github.com/googleapis/google-cloud-java/commit/02009221d7d1966b4d180468f0cd1e32fbbab2c8)) ## [0.15.0](https://github.com/googleapis/google-cloud-java/compare/google-analytics-admin-v0.14.1-SNAPSHOT...google-analytics-admin-v0.15.0) (2022-10-24) diff --git a/.github/release-note-generation/split_release_note.py b/.github/release-note-generation/split_release_note.py index ab1ebe4d2102..c304aae89d2f 100644 --- a/.github/release-note-generation/split_release_note.py +++ b/.github/release-note-generation/split_release_note.py @@ -140,7 +140,7 @@ def group_changes_by_api(main_changes: [str]): def find_repo_wide_dependency_changes(main_changes: [str]): repo_wide_changes = [] for changelog in main_changes: - match = re.search(r'\* (.+com\.google\.cloud:google-cloud-shared.+)', + match = re.search(r'\* (.+com\.google\.cloud:sdk-platform-java-config.+)', changelog) if match: note = match.group(1) diff --git a/.github/release-note-generation/testdata/main_release_note.txt b/.github/release-note-generation/testdata/main_release_note.txt index 2707b9113b6a..65c6807e01e2 100644 --- a/.github/release-note-generation/testdata/main_release_note.txt +++ b/.github/release-note-generation/testdata/main_release_note.txt @@ -23,8 +23,7 @@ ### Bug Fixes * **deps:** update dependency com.google.cloud:google-cloud-pubsub-bom to v1.123.13 ([#9478](https://github.com/googleapis/google-cloud-java/issues/9478)) ([47778ff](https://github.com/googleapis/google-cloud-java/commit/47778ff0b2eb98b6354f237ee84df0dafc567bec)) -* **deps:** update dependency com.google.cloud:google-cloud-shared-config to v1.5.6 ([#9494](https://github.com/googleapis/google-cloud-java/issues/9494)) ([739763f](https://github.com/googleapis/google-cloud-java/commit/739763f15ffa2434d7fa089899165f1e8fa5f870)) -* **deps:** update dependency com.google.cloud:google-cloud-shared-dependencies to v3.11.0 ([#9505](https://github.com/googleapis/google-cloud-java/issues/9505)) ([30bc6f0](https://github.com/googleapis/google-cloud-java/commit/30bc6f0aef5b95549230dbd5b5246f2a8dab4ba4)) +* **deps:** update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#11188](https://github.com/googleapis/google-cloud-java/pull/11188)) ([0200922](https://github.com/googleapis/google-cloud-java/commit/02009221d7d1966b4d180468f0cd1e32fbbab2c8)) * **deps:** update dependency com.google.cloud:google-cloud-storage to v2.22.3 ([#9477](https://github.com/googleapis/google-cloud-java/issues/9477)) ([ce1ce33](https://github.com/googleapis/google-cloud-java/commit/ce1ce333f6e3e11a9382c8f29196b53c7afa21c2)) diff --git a/.github/release-note-generation/unit_test.py b/.github/release-note-generation/unit_test.py index fbd1bc79a124..9cb83b6253ab 100644 --- a/.github/release-note-generation/unit_test.py +++ b/.github/release-note-generation/unit_test.py @@ -40,7 +40,7 @@ def test_create_changelog_entry(self): def test_create_changelog_entry_only_deps(self): dep_changes = ChangesOnApi( dependency_upgrades=[ - 'update google-cloud-shared-dependencies to 1.2.3'] + 'update dependency com.google.cloud:sdk-platform-java-config to 1.2.3'] ) entry = create_changelog_entry( '2023-06-10', @@ -51,7 +51,7 @@ def test_create_changelog_entry_only_deps(self): ### Dependencies -* update google-cloud-shared-dependencies to 1.2.3 +* update dependency com.google.cloud:sdk-platform-java-config to 1.2.3 ''') def test_create_changelog_entry_empty(self):