From d014593ed5d59072c3ada452a272224738a54f4b Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 20 Jul 2026 17:54:27 +0000 Subject: [PATCH 1/3] fix(bom): make release-note-generation Java 8 compatible This changes the target version to 1.8 and replaces Java 9+ API usage. TAG=agy CONV=f312eaf9-61ab-449f-868d-eae4d12a1830 --- java-cloud-bom/release-note-generation/pom.xml | 4 ++-- .../src/main/java/com/google/cloud/ReleaseNoteGeneration.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java-cloud-bom/release-note-generation/pom.xml b/java-cloud-bom/release-note-generation/pom.xml index caa089e3a351..6cc525ea6fc9 100644 --- a/java-cloud-bom/release-note-generation/pom.xml +++ b/java-cloud-bom/release-note-generation/pom.xml @@ -16,8 +16,8 @@ UTF-8 - 11 - 11 + 1.8 + 1.8 true diff --git a/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java b/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java index 483df61ba1ed..a3d1ef020e90 100644 --- a/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java +++ b/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java @@ -34,6 +34,7 @@ import com.google.common.collect.Sets; import com.google.common.collect.Sets.SetView; import com.google.common.collect.Streams; +import com.google.common.io.ByteStreams; import com.google.common.io.Files; import java.io.File; import java.io.IOException; @@ -618,7 +619,8 @@ static String fetchReleaseNote(String owner, String repository, String tag) Process process = builder.start(); String output = new String( - process.getInputStream().readAllBytes(), java.nio.charset.StandardCharsets.UTF_8); + ByteStreams.toByteArray(process.getInputStream()), + java.nio.charset.StandardCharsets.UTF_8); boolean finished = process.waitFor(1, TimeUnit.MINUTES); Verify.verify(finished, "The process timed out"); Verify.verify(0 == process.exitValue(), "The command failed: %s", output); From f88466494c6c6baa85f76ce23c9aba185137a45c Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 20 Jul 2026 17:57:46 +0000 Subject: [PATCH 2/3] refactor(bom): import StandardCharsets in release-note-generation TAG=agy CONV=f312eaf9-61ab-449f-868d-eae4d12a1830 --- .../main/java/com/google/cloud/ReleaseNoteGeneration.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java b/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java index a3d1ef020e90..0881590762ac 100644 --- a/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java +++ b/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java @@ -38,6 +38,7 @@ import com.google.common.io.Files; import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -618,9 +619,7 @@ static String fetchReleaseNote(String owner, String repository, String tag) builder.redirectErrorStream(true); Process process = builder.start(); String output = - new String( - ByteStreams.toByteArray(process.getInputStream()), - java.nio.charset.StandardCharsets.UTF_8); + new String(ByteStreams.toByteArray(process.getInputStream()), StandardCharsets.UTF_8); boolean finished = process.waitFor(1, TimeUnit.MINUTES); Verify.verify(finished, "The process timed out"); Verify.verify(0 == process.exitValue(), "The command failed: %s", output); From 6bf28e32117d262cb27608f46c94fec20ce7359a Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 20 Jul 2026 18:04:50 +0000 Subject: [PATCH 3/3] perf(bom): use CharStreams to read process output in release-note-generation TAG=agy CONV=f312eaf9-61ab-449f-868d-eae4d12a1830 --- .../main/java/com/google/cloud/ReleaseNoteGeneration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java b/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java index 0881590762ac..c71e1b61cc3b 100644 --- a/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java +++ b/java-cloud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java @@ -34,10 +34,11 @@ import com.google.common.collect.Sets; import com.google.common.collect.Sets.SetView; import com.google.common.collect.Streams; -import com.google.common.io.ByteStreams; +import com.google.common.io.CharStreams; import com.google.common.io.Files; import java.io.File; import java.io.IOException; +import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; @@ -619,7 +620,8 @@ static String fetchReleaseNote(String owner, String repository, String tag) builder.redirectErrorStream(true); Process process = builder.start(); String output = - new String(ByteStreams.toByteArray(process.getInputStream()), StandardCharsets.UTF_8); + CharStreams.toString( + new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8)); boolean finished = process.waitFor(1, TimeUnit.MINUTES); Verify.verify(finished, "The process timed out"); Verify.verify(0 == process.exitValue(), "The command failed: %s", output);