From 22169115befcc5ae52e764972541713b6d5313e4 Mon Sep 17 00:00:00 2001
From: stianst <stianst@gmail.com>
Date: Tue, 28 Nov 2023 09:06:13 +0100
Subject: [PATCH] Add issues with release label to changelog

Signed-off-by: stianst <stianst@gmail.com>
---
 .../keycloak/webbuilder/builders/ChangelogBuilder.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/keycloak/webbuilder/builders/ChangelogBuilder.java b/src/main/java/org/keycloak/webbuilder/builders/ChangelogBuilder.java
index 2f8d634c..58589da3 100644
--- a/src/main/java/org/keycloak/webbuilder/builders/ChangelogBuilder.java
+++ b/src/main/java/org/keycloak/webbuilder/builders/ChangelogBuilder.java
@@ -6,6 +6,7 @@
 import org.kohsuke.github.GHIssue;
 import org.kohsuke.github.GitHub;
 import org.kohsuke.github.GitHubBuilder;
+import org.kohsuke.github.PagedSearchIterable;
 import org.kohsuke.github.extras.ImpatientHttpConnector;
 
 import java.io.BufferedReader;
@@ -14,8 +15,10 @@
 import java.net.HttpURLConnection;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 public class ChangelogBuilder extends AbstractBuilder {
@@ -62,11 +65,14 @@ protected void build() throws Exception {
                 printStep("exists", v.getVersion());
             } else {
                 if (v.getBlogTemplate() >= 2) {
-                    List<GHIssue> ghIssues = gh.searchIssues().q("user:keycloak milestone:" + v.getVersion() + " is:closed is:issue").isClosed().list().toList();
+                    Map<Integer, GHIssue> ghIssues = new HashMap<>();
+
+                    gh.searchIssues().q("user:keycloak milestone:" + v.getVersion() + " is:closed is:issue").isClosed().list().forEach(i -> ghIssues.put(i.getNumber(), i));
+                    gh.searchIssues().q("user:keycloak label:release/" + v.getVersion() + " is:closed is:issue").isClosed().list().forEach(i -> ghIssues.put(i.getNumber(), i));
 
                     List<ChangeLogEntry> changes = new LinkedList<>();
 
-                    for (GHIssue issue : ghIssues) {
+                    for (GHIssue issue : ghIssues.values()) {
                         ChangeLogEntry change = new ChangeLogEntry();
                         change.setNumber(issue.getNumber());
                         change.setRepository(issue.getRepository().getName());