From c11275cc63ef1406654dbbfdb67c4e75d37a96d1 Mon Sep 17 00:00:00 2001
From: Imsandli <imsandli@gmail.com>
Date: Fri, 7 Jul 2023 14:35:01 +0200
Subject: [PATCH] Compile against Jira (LTS) 9.4.4 Api

minimal change to run the plugin against Jira 9.4.4+

Fixes: https://github.com/MeetMe/jira-gerrit-plugin/issues/93
---
 pom.xml                                         | 17 ++++++++++++-----
 .../gerrit/tabpanel/GerritReviewsTabPanel.java  |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd5694f..ac0a4bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,13 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>1.3</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -181,7 +188,7 @@
         <plugins>
             <plugin>
                 <groupId>com.atlassian.maven.plugins</groupId>
-                <artifactId>maven-jira-plugin</artifactId>
+                <artifactId>jira-maven-plugin</artifactId>
                 <version>${amps.version}</version>
                 <extensions>true</extensions>
                 <configuration>
@@ -232,15 +239,15 @@
     </build>
 
     <properties>
-        <jira.version>7.2.0</jira.version>
-        <amps.version>6.3.21</amps.version>
+        <jira.version>9.4.4</jira.version>
+        <amps.version>8.10.1</amps.version>
         <plugin.testrunner.version>1.2.3</plugin.testrunner.version>
         <atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
         <testkit.version>6.3.11</testkit.version>
         <quick.reload.version>1.30.5</quick.reload.version>
 
-        <jira.test.version>7.2.0</jira.test.version>
-        <jira.data.version>7.2.0</jira.data.version>
+        <jira.test.version>9.4.4</jira.test.version>
+        <jira.data.version>9.4.4</jira.data.version>
         <jira.rest.version>3.0.8</jira.rest.version>
         <atlas.template.version>3.0.0</atlas.template.version>
         <atlas.concurrent.version>3.0.0</atlas.concurrent.version>
diff --git a/src/main/java/com/meetme/plugins/jira/gerrit/tabpanel/GerritReviewsTabPanel.java b/src/main/java/com/meetme/plugins/jira/gerrit/tabpanel/GerritReviewsTabPanel.java
index 6bca796..a034b02 100644
--- a/src/main/java/com/meetme/plugins/jira/gerrit/tabpanel/GerritReviewsTabPanel.java
+++ b/src/main/java/com/meetme/plugins/jira/gerrit/tabpanel/GerritReviewsTabPanel.java
@@ -146,7 +146,7 @@ private ApplicationUser getUserByEmail(String email) {
             if (user == null) user = UserUtils.getUserByEmail(email);
 
             if (user == null) {
-                for (ApplicationUser iUser : userManager.getUsers()) {
+                for (ApplicationUser iUser : userSearchService.findUsersByEmail(email)) {
                     if (email.equalsIgnoreCase(iUser.getEmailAddress())) {
                         user = iUser;
                         break;