Skip to content

Commit 61ff829

Browse files
committed
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
1 parent 67d5d99 commit 61ff829

3 files changed

Lines changed: 11 additions & 14 deletions

File tree

release-note-generation/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,20 @@
3838
<version>1.4.5</version>
3939
<scope>test</scope>
4040
</dependency>
41+
<dependency>
42+
<groupId>com.google.guava</groupId>
43+
<artifactId>guava</artifactId>
44+
<version>32.1.3-jre</version>
45+
<scope>test</scope>
46+
</dependency>
4147
</dependencies>
4248

4349
<build>
4450
<plugins>
4551
<plugin>
4652
<groupId>org.codehaus.mojo</groupId>
4753
<artifactId>exec-maven-plugin</artifactId>
54+
<version>3.1.0</version>
4855
<configuration>
4956
<skip>false</skip>
5057
<mainClass>com.google.cloud.ReleaseNoteGeneration</mainClass>

release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,10 @@ public class ReleaseNoteGeneration {
6464

6565
private static final ImmutableSet<String> splitRepositoryLibraryNames =
6666
ImmutableSet.of(
67-
"bigquery",
68-
"bigquerystorage",
6967
"bigtable",
70-
"datastore",
7168
"firestore",
72-
"logging",
73-
"logging-logback",
74-
"logging-servlet-initializer",
7569
"pubsub",
76-
"pubsublite",
77-
"spanner",
78-
"spanner-jdbc",
79-
"storage",
80-
"storage-nio");
70+
"pubsublite");
8171

8272
private static boolean clientLibraryFilter(String coordinates) {
8373
if (coordinates.contains("google-cloud-core")) {

release-note-generation/src/test/java/com/google/cloud/ReleaseNoteGenerationTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public void testPrintClientLibraryVersionDifference() throws Exception {
8383
Truth.assertThat(report)
8484
.contains(
8585
"- google-cloud-logging:3.13.1 (prev:3.12.0; Release Notes: "
86-
+ "[v3.12.1](https://github.com/googleapis/java-logging/releases/tag/v3.12.1), "
87-
+ "[v3.13.0](https://github.com/googleapis/java-logging/releases/tag/v3.13.0), "
88-
+ "[v3.13.1](https://github.com/googleapis/java-logging/releases/tag/v3.13.1))");
86+
+ "[v3.12.1](https://github.com/googleapis/google-cloud-java/releases/tag/v1.1.0), "
87+
+ "[v3.13.0](https://github.com/googleapis/google-cloud-java/releases/tag/v1.1.0), "
88+
+ "[v3.13.1](https://github.com/googleapis/google-cloud-java/releases/tag/v1.1.0))");
8989
}
9090

9191
@Test

0 commit comments

Comments
 (0)