From 480c27ac4c431d2bd718b2a7fd4d35332ae0fa61 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Thu, 24 Jul 2025 08:49:00 +0200
Subject: [PATCH] Update to the new JIRA search API (as previous one is getting
 deprecated)

and fix the query to look only for "done" tickets that would include resolved ones and no in-progress

(cherry picked from commit 007d2f190e6219d972f73dd95d5ba2d42e777ecc)
---
 release/release.gradle | 51 +++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/release/release.gradle b/release/release.gradle
index ceca2cab6638..585bac6a33eb 100644
--- a/release/release.gradle
+++ b/release/release.gradle
@@ -286,7 +286,7 @@ def changeLogFileTask = tasks.register( "changeLogFile" ) {
 
     doFirst {
         logger.lifecycle( "Appending version `${project.releaseVersion}` to changelog..." )
-        ChangeLogFile.update( ormVersion.fullName );
+        ChangeLogFile.update( ormVersion.fullName, rootProject );
     }
 }
 
@@ -433,9 +433,9 @@ static String inputStreamToString(InputStream inputStream) {
 class ChangeLogFile {
 
     // Get the Release Notes from Jira and add them to the Hibernate changelog.txt file
-    static void update(String releaseVersion) {
+    static void update(String releaseVersion, Project project) {
         def text = ""
-        File changelog = new File( "changelog.txt" )
+        File changelog = project.rootProject.layout.projectDirectory.file( "changelog.txt" ).asFile
         def newReleaseNoteBlock = getNewReleaseNoteBlock(releaseVersion)
         changelog.eachLine {
             line ->
@@ -458,24 +458,33 @@ class ChangeLogFile {
         else {
             restReleaseVersion = releaseVersion
         }
-        def apiString = "https://hibernate.atlassian.net/rest/api/2/search/?jql=project=HHH%20AND%20fixVersion=${restReleaseVersion}%20order%20by%20issuetype%20ASC"
-        def apiUrl = new URL( apiString )
-        def jsonReleaseNotes = new JsonSlurper().parse( apiUrl )
-        def releaseDate = new Date().format( 'MMMM dd, YYYY' )
-        def versionId = getVersionId( jsonReleaseNotes, restReleaseVersion )
-
-        ReleaseNote releaseNotes = new ReleaseNote( releaseVersion, releaseDate, versionId )
-
-        def issuetype
-        jsonReleaseNotes.issues.each {
-            issue ->
-                if ( issuetype != issue.fields.issuetype.name ) {
-                    issuetype = issue.fields.issuetype.name
-                    releaseNotes.addEmptyLine();
-                    releaseNotes.addLine( "** ${issue.fields.issuetype.name}" )
-                }
-                releaseNotes.addLine( "    * [" + issue.key + "] - " + issue.fields.summary )
-        }
+        def ReleaseNote releaseNotes = null
+        def String nextPageToken = null
+        def issuetype = null
+        do {
+            def apiString = "https://hibernate.atlassian.net/rest/api/3/search/jql/?jql=project=HHH%20AND%20fixVersion=${restReleaseVersion}%20AND%20statusCategory%20%3D%20Done%20order%20by%20issuetype%20ASC&fields=issuetype,summary,fixVersions&maxResults=200${nextPageToken == null ? '' : '&nextPageToken=' + nextPageToken}"
+            def apiUrl = new URI(apiString).toURL()
+            def jsonReleaseNotes = new JsonSlurper().parse(apiUrl)
+            if (releaseNotes == null) {
+                def releaseDate = new Date().format( 'MMMM dd, YYYY' )
+                def versionId = getVersionId(jsonReleaseNotes, restReleaseVersion)
+                releaseNotes = new ReleaseNote(releaseVersion, releaseDate, versionId)
+            }
+
+            jsonReleaseNotes.issues.each {
+                issue ->
+                    if ( issuetype != issue.fields.issuetype.name ) {
+                        issuetype = issue.fields.issuetype.name
+                        releaseNotes.addEmptyLine();
+                        releaseNotes.addLine( "** ${issue.fields.issuetype.name}" )
+                    }
+                    releaseNotes.addLine( "    * [" + issue.key + "] - " + issue.fields.summary )
+            }
+
+            nextPageToken = jsonReleaseNotes.nextPageToken
+
+        } while (nextPageToken != null)
+
         releaseNotes.addEmptyLine()
         return releaseNotes.notes
     }