From 60fd04f8a81d938e9c01136ec4b3657031b9409c Mon Sep 17 00:00:00 2001
From: Richard Eckart de Castilho <rec@apache.org>
Date: Mon, 16 Jan 2023 08:47:21 +0100
Subject: [PATCH 1/2] Issue #283: Update issue report generation

- Rename the marker file to trigger the issue report generation
- Add more configuration to the Jira report which is no longer set by the parent UIMA POM
- Make necessary changes to the GitHub issue report generation profile
---
 ...pom => marker-file-enabling-changes-report |  0
 pom.xml                                       | 28 +++++++++++++------
 uimaj-legacy-jira-report/pom.xml              | 12 ++++++--
 uimaj-parent/pom.xml                          |  2 --
 4 files changed, 30 insertions(+), 12 deletions(-)
 rename marker-file-identifying-parent-pom => marker-file-enabling-changes-report (100%)

diff --git a/marker-file-identifying-parent-pom b/marker-file-enabling-changes-report
similarity index 100%
rename from marker-file-identifying-parent-pom
rename to marker-file-enabling-changes-report
diff --git a/pom.xml b/pom.xml
index 19427e7f8..58da41cad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,23 +331,35 @@
     </profile>
     
     <profile>
-      <id>apache-release</id>
+      <id>generate-changes-report</id>
+      <activation>
+        <file>
+          <exists>marker-file-enabling-changes-report</exists>
+        </file>
+      </activation>
       <build>
         <plugins>
           <plugin>
-            <artifactId>maven-changes-plugin</artifactId>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>default-cli</id>
+                <!-- 
+                 - Copies the legacy Jira issue report to the issuesFixed folder. We cannot simple
+                 - configure the uimaj-legacy-jira-report module to write the report directly there
+                 - because otherwise it woudl be cleaned during the clean phase of the root module.
+                 -->
+                <id>copy-legacy-jira-issues-report-to-issues-fixed-folder</id>
                 <phase>generate-resources</phase>
                 <goals>
-                  <goal>github-report</goal>
+                  <goal>run</goal>
                 </goals>
                 <configuration>
-                  <columnNames>Type,Id,Status,Summary</columnNames>
-                  <onlyCurrentVersion>true</onlyCurrentVersion>
-                  <githubAPIScheme>https</githubAPIScheme>
-                  <githubAPIPort>443</githubAPIPort>
+                  <target>
+                    <copy todir="${basedir}/issuesFixed">
+                      <fileset dir="uimaj-legacy-jira-report/target/issuesFixed"/>
+                    </copy>
+                  </target>
                 </configuration>
               </execution>
             </executions>
diff --git a/uimaj-legacy-jira-report/pom.xml b/uimaj-legacy-jira-report/pom.xml
index c04be281f..ad52dc36d 100644
--- a/uimaj-legacy-jira-report/pom.xml
+++ b/uimaj-legacy-jira-report/pom.xml
@@ -59,9 +59,17 @@
                   <goal>jira-report</goal>
                 </goals>
                 <configuration>
-                  <columnNames>Type,Key,Status,Summary</columnNames>
-                  <outputDirectory>${project.basedir}/../issuesFixed</outputDirectory>
+                  <useJql>true</useJql>
                   <fixVersionIds>${jiraVersion}</fixVersionIds>
+                  <columnNames>Type,Key,Status,Summary</columnNames>
+                  <resolutionIds>Fixed</resolutionIds>
+                  <statusIds>Closed,Resolved</statusIds>
+                  <sortColumnNames>Type, Key</sortColumnNames>
+                  <!-- changed sortColumnNames for Jira 5
+                       was: <sortColumnNames>Status, Key, Type</sortColumnNames>
+                   -->
+                  <outputDirectory>target/issuesFixed</outputDirectory>
+                  <maxEntries>1000</maxEntries> <!-- hopefully, bigger than ever needed -->
                 </configuration>
               </execution>
             </executions>
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index 7d8982ee8..9f797a104 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -276,8 +276,6 @@
         <!-- See: https://issues.apache.org/jira/browse/UIMA-6349 -->
         <groupId>com.github.siom79.japicmp</groupId>
         <artifactId>japicmp-maven-plugin</artifactId>
-        <!-- Version can be removed after updating to the UIMA Parent POM 16 or higher  -->
-        <version>0.15.7</version>
         <configuration>
           <newVersion>
             <file>

From ff7f3e47f6f4e4e31f555043a046af60c3d8d73a Mon Sep 17 00:00:00 2001
From: Richard Eckart de Castilho <rec@apache.org>
Date: Mon, 16 Jan 2023 10:28:35 +0100
Subject: [PATCH 2/2] Issue #283: Update issue report generation

- Ignore it if the Jira report has not been generated during non-release builds
---
 pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 58da41cad..1346d05d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -356,7 +356,11 @@
                 </goals>
                 <configuration>
                   <target>
-                    <copy todir="${basedir}/issuesFixed">
+                    <!-- 
+                      GitHub changes report is always generated, Jira only during release builds,
+                      so it could be missing - hence failonerror="false"
+                      -->
+                    <copy todir="${basedir}/issuesFixed" failonerror="false">
                       <fileset dir="uimaj-legacy-jira-report/target/issuesFixed"/>
                     </copy>
                   </target>