From 61ff8296623199f6457bbdd34a5c0b97dcd138f3 Mon Sep 17 00:00:00 2001
From: Mike Eltsufin <meltsufin@google.com>
Date: Fri, 24 Apr 2026 23:06:56 -0400
Subject: [PATCH 1/2] build: fix release notes generation for migrated
 libraries

- Remove migrated libraries (bigquery, spanner, storage, datastore, logging) from the hardcoded split list in ReleaseNoteGeneration.java to prevent "release not found" crashes.
- Add explicit test dependency on Guava 32.1.3-jre in release-note-generation/pom.xml to fix conflicts with Truth.
- Add version 3.1.0 to exec-maven-plugin in release-note-generation/pom.xml.
- Update ReleaseNoteGenerationTest to expect monorepo links for logging.

Fixes #7466
---
 release-note-generation/pom.xml                      |  7 +++++++
 .../java/com/google/cloud/ReleaseNoteGeneration.java | 12 +-----------
 .../com/google/cloud/ReleaseNoteGenerationTest.java  |  6 +++---
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/release-note-generation/pom.xml b/release-note-generation/pom.xml
index 0ac5527cbb8f..349205fb07ea 100644
--- a/release-note-generation/pom.xml
+++ b/release-note-generation/pom.xml
@@ -38,6 +38,12 @@
 			<version>1.4.5</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>32.1.3-jre</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -45,6 +51,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
+				<version>3.1.0</version>
 				<configuration>
 					<skip>false</skip>
 					<mainClass>com.google.cloud.ReleaseNoteGeneration</mainClass>
diff --git a/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java b/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java
index 4f572591ba02..d8862db1a808 100644
--- a/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java
+++ b/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java
@@ -64,20 +64,10 @@ public class ReleaseNoteGeneration {
 
   private static final ImmutableSet<String> splitRepositoryLibraryNames =
       ImmutableSet.of(
-          "bigquery",
-          "bigquerystorage",
           "bigtable",
-          "datastore",
           "firestore",
-          "logging",
-          "logging-logback",
-          "logging-servlet-initializer",
           "pubsub",
-          "pubsublite",
-          "spanner",
-          "spanner-jdbc",
-          "storage",
-          "storage-nio");
+          "pubsublite");
 
   private static boolean clientLibraryFilter(String coordinates) {
     if (coordinates.contains("google-cloud-core")) {
diff --git a/release-note-generation/src/test/java/com/google/cloud/ReleaseNoteGenerationTest.java b/release-note-generation/src/test/java/com/google/cloud/ReleaseNoteGenerationTest.java
index 96fbf4876ed8..41520c0a8728 100644
--- a/release-note-generation/src/test/java/com/google/cloud/ReleaseNoteGenerationTest.java
+++ b/release-note-generation/src/test/java/com/google/cloud/ReleaseNoteGenerationTest.java
@@ -83,9 +83,9 @@ public void testPrintClientLibraryVersionDifference() throws Exception {
     Truth.assertThat(report)
         .contains(
             "- google-cloud-logging:3.13.1 (prev:3.12.0; Release Notes: "
-                + "[v3.12.1](https://github.com/googleapis/java-logging/releases/tag/v3.12.1), "
-                + "[v3.13.0](https://github.com/googleapis/java-logging/releases/tag/v3.13.0), "
-                + "[v3.13.1](https://github.com/googleapis/java-logging/releases/tag/v3.13.1))");
+                + "[v3.12.1](https://github.com/googleapis/google-cloud-java/releases/tag/v1.1.0), "
+                + "[v3.13.0](https://github.com/googleapis/google-cloud-java/releases/tag/v1.1.0), "
+                + "[v3.13.1](https://github.com/googleapis/google-cloud-java/releases/tag/v1.1.0))");
   }
 
   @Test

From 2c34eb61f0c8c31a70954dca730f9c2317e0d1e4 Mon Sep 17 00:00:00 2001
From: Mike Eltsufin <meltsufin@google.com>
Date: Fri, 24 Apr 2026 23:11:24 -0400
Subject: [PATCH 2/2] build: make Guava a compile dependency to fix CI failure

---
 release-note-generation/pom.xml                                  | 1 -
 .../test/java/com/google/cloud/ReleaseNoteGenerationTest.java    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/release-note-generation/pom.xml b/release-note-generation/pom.xml
index 349205fb07ea..859ec580b96b 100644
--- a/release-note-generation/pom.xml
+++ b/release-note-generation/pom.xml
@@ -42,7 +42,6 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<version>32.1.3-jre</version>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/release-note-generation/src/test/java/com/google/cloud/ReleaseNoteGenerationTest.java b/release-note-generation/src/test/java/com/google/cloud/ReleaseNoteGenerationTest.java
index 41520c0a8728..9d98fea2a36c 100644
--- a/release-note-generation/src/test/java/com/google/cloud/ReleaseNoteGenerationTest.java
+++ b/release-note-generation/src/test/java/com/google/cloud/ReleaseNoteGenerationTest.java
@@ -167,4 +167,5 @@ public void testFetchReleaseNote() throws Exception {
                 + " ([#1790](https://github.com/googleapis/java-storage/issues/1790)) "
                 + "([31c1b18](https://github.com/googleapis/java-storage/commit/31c1b18acc3c118e39eb613a82ee292f3e246b8f))");
   }
+
 }