Skip to content

Commit

Permalink
Compile against Jira (LTS) 9.4.4 Api
Browse files Browse the repository at this point in the history
Fixes: MeetMe#93
  • Loading branch information
imsandli committed Jul 7, 2023
1 parent a0be628 commit 57b6053
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
17 changes: 12 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,21 @@
<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>

<build>
<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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 57b6053

Please sign in to comment.