From 7d5ff5fb6e2a31dc3ea46d369092129507fc7820 Mon Sep 17 00:00:00 2001 From: Shelley Lambert Date: Wed, 11 Nov 2026 19:35:07 -0500 Subject: [PATCH 1/2] Use curl Signed-off-by: Shelley Lambert --- .../generate-release-notes/fetchReleaseNotes.js | 9 --------- .../generate-release-notes/lib/fetchJiraIssues.js | 4 +++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/generate-release-notes/generate-release-notes/fetchReleaseNotes.js b/generate-release-notes/generate-release-notes/fetchReleaseNotes.js index 323547d..91d1e55 100755 --- a/generate-release-notes/generate-release-notes/fetchReleaseNotes.js +++ b/generate-release-notes/generate-release-notes/fetchReleaseNotes.js @@ -65,15 +65,6 @@ for (const commit of commits) { backportOf: null, backportedBy: backportIssueId, }; - } else if (releaseNote.type === 'Backport' && releaseNote.backportOf) { - // For backport issues, use the master bug ID and link so that the release - // notes refer to the canonical bug with a description rather than the - // backport ticket which is usually empty. - releaseNote = { - ...releaseNote, - id: releaseNote.backportOf, - link: `https://bugs.openjdk.org/browse/${releaseNote.backportOf}`, - }; } output.push(releaseNote); diff --git a/generate-release-notes/generate-release-notes/lib/fetchJiraIssues.js b/generate-release-notes/generate-release-notes/lib/fetchJiraIssues.js index b85bbf7..6bc72d3 100644 --- a/generate-release-notes/generate-release-notes/lib/fetchJiraIssues.js +++ b/generate-release-notes/generate-release-notes/lib/fetchJiraIssues.js @@ -3,9 +3,11 @@ const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); async function fetchJiraJson(url, maxRetries = 5) { + // bugs.openjdk.org sits behind Akamai, which returns HTTP 403 (HTML) to browser-style + // and default fetch User-Agents but accepts curl-style ones. const headers = { Accept: 'application/json', - 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36', + 'User-Agent': 'curl/8.0 adoptium-release-notes/1.0', }; for (let attempt = 1; attempt <= maxRetries; attempt += 1) { From 8178cac9baf03206985dba3df054f5db0814781d Mon Sep 17 00:00:00 2001 From: Shelley Lambert Date: Wed, 11 Nov 2026 19:47:07 -0500 Subject: [PATCH 2/2] Commit to add co-author Co-Authored-By: Scott Fryer Signed-off-by: Shelley Lambert --- .../generate-release-notes/lib/fetchJiraIssues.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-release-notes/generate-release-notes/lib/fetchJiraIssues.js b/generate-release-notes/generate-release-notes/lib/fetchJiraIssues.js index 6bc72d3..aa41197 100644 --- a/generate-release-notes/generate-release-notes/lib/fetchJiraIssues.js +++ b/generate-release-notes/generate-release-notes/lib/fetchJiraIssues.js @@ -4,7 +4,7 @@ const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); async function fetchJiraJson(url, maxRetries = 5) { // bugs.openjdk.org sits behind Akamai, which returns HTTP 403 (HTML) to browser-style - // and default fetch User-Agents but accepts curl-style ones. + // and default fetch User-Agents but accepts curl-style ones const headers = { Accept: 'application/json', 'User-Agent': 'curl/8.0 adoptium-release-notes/1.0',