Skip to content

Commit b4e7b96

Browse files
committed
feat: ensure compatibility with Jira 11.1.0
* use jakarta namespace for Inject * use jakarta namespace for Rest API * use jakarta namespace fpr Servlet API * compile against Java 21 * update platform dependency * disable signature check for testing with Docker * update compatibility matrix
1 parent 6904bdc commit b4e7b96

46 files changed

Lines changed: 59 additions & 69 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
jira:
44
build: ./.docker
55
environment:
6-
- JVM_SUPPORT_RECOMMENDED_ARGS=-Xdebug -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dquickreload.dirs=/opt/app -Dupm.plugin.upload.enabled=true
6+
- JVM_SUPPORT_RECOMMENDED_ARGS=-Xdebug -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dquickreload.dirs=/opt/app -Dupm.plugin.upload.enabled=true -Datlassian.upm.signature.check.upload.disabled=true -Datlassian.upm.signature.check.disabled=true
77
ports:
88
- 5005:5005
99
- 8080:8080

docs/changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ category: Administration
1111

1212
### [Unreleased]
1313

14+
**Scrum Poker supports Jira 11**
15+
1416
* feat: ensure compatibility with Jira 10.7.1
1517
* feat: ensure compatibility with Jira 10.7.2
1618
* feat: ensure compatibility with Jira 10.7.4
19+
* feat: ensure compatibility with Jira 11.1.0
1720

1821
### [25.05.0] - 2025-05-17
1922

docs/compatibility-matrix.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ Scrum Poker for Jira has a very broad range of supported versions of Jira Server
3838

3939
| Jira Server & Data Center | Scrum Poker for Jira |
4040
|---------------------------|----------------------|
41-
| 10.0.x and newer | use latest version |
41+
| 11.0.x and newer | use latest version |
42+
| 10.0.x - 10.7.x | use version 25.05.0 |
4243
| 9.4.x - 9.17.x | use version 24.08.0 |
4344
| 8.20.x - 9.3.x | use version 23.11.0 |
4445
| 8.13.x - 8.19x | use version 22.08.0 |

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@
3636

3737
<properties>
3838
<!-- Java version -->
39-
<java.version>17</java.version>
39+
<java.version>21</java.version>
4040
<maven.compiler.release>${java.version}</maven.compiler.release>
4141

4242
<!-- Jira versions -->
43-
<jira.version>10.7.4</jira.version>
43+
<jira.version>11.1.0</jira.version>
4444

4545
<!-- Plugin versions (keep in sync with jira-project) -->
4646
<amps.version>9.1.1</amps.version>
47-
<platform.spring-scanner.version>3.0.3</platform.spring-scanner.version>
48-
<platform7.version>7.0.14</platform7.version>
47+
<platform.spring-scanner.version>6.0.0</platform.spring-scanner.version>
48+
<platform.version>8.2.1</platform.version>
4949

5050
<!-- Source encoding -->
5151
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>com.atlassian.platform.dependencies</groupId>
8787
<artifactId>platform-test-resources</artifactId>
88-
<version>${platform7.version}</version>
88+
<version>${platform.version}</version>
8989
<type>pom</type>
9090
<scope>import</scope>
9191
</dependency>
@@ -138,8 +138,8 @@
138138
</dependency>
139139

140140
<dependency>
141-
<groupId>javax.servlet</groupId>
142-
<artifactId>javax.servlet-api</artifactId>
141+
<groupId>jakarta.servlet</groupId>
142+
<artifactId>jakarta.servlet-api</artifactId>
143143
<scope>provided</scope>
144144
</dependency>
145145
<dependency>

src/main/java/de/codescape/jira/plugins/scrumpoker/action/ScrumPokerAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.atlassian.sal.api.message.I18nResolver;
2323
import com.atlassian.velocity.htmlsafe.HtmlSafe;
2424
import de.codescape.jira.plugins.scrumpoker.service.*;
25+
import jakarta.inject.Inject;
2526

26-
import javax.inject.Inject;
2727
import java.util.List;
2828

2929
import static com.atlassian.jira.permission.ProjectPermissions.BROWSE_PROJECTS;

src/main/java/de/codescape/jira/plugins/scrumpoker/action/ScrumPokerConfigurationAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import de.codescape.jira.plugins.scrumpoker.model.DisplayCommentsForIssue;
1111
import de.codescape.jira.plugins.scrumpoker.model.GlobalSettings;
1212
import de.codescape.jira.plugins.scrumpoker.service.*;
13+
import jakarta.inject.Inject;
1314

14-
import javax.inject.Inject;
1515
import java.util.List;
1616

1717
/**

src/main/java/de/codescape/jira/plugins/scrumpoker/action/ScrumPokerErrorLogAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import de.codescape.jira.plugins.scrumpoker.ScrumPokerConstants;
77
import de.codescape.jira.plugins.scrumpoker.model.Error;
88
import de.codescape.jira.plugins.scrumpoker.service.ErrorLogService;
9+
import jakarta.inject.Inject;
910

10-
import javax.inject.Inject;
1111
import java.util.List;
1212
import java.util.stream.Collectors;
1313

src/main/java/de/codescape/jira/plugins/scrumpoker/action/ScrumPokerGettingStartedAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import com.atlassian.jira.security.request.SupportedMethods;
55
import de.codescape.jira.plugins.scrumpoker.ScrumPokerConstants;
66
import de.codescape.jira.plugins.scrumpoker.service.ErrorLogService;
7-
8-
import javax.inject.Inject;
7+
import jakarta.inject.Inject;
98

109
/**
1110
* Getting Started page for the Scrum Poker app.

src/main/java/de/codescape/jira/plugins/scrumpoker/action/ScrumPokerHealthCheckAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import de.codescape.jira.plugins.scrumpoker.model.Card;
1010
import de.codescape.jira.plugins.scrumpoker.model.ProjectActivation;
1111
import de.codescape.jira.plugins.scrumpoker.service.*;
12+
import jakarta.inject.Inject;
1213

13-
import javax.inject.Inject;
1414
import java.util.ArrayList;
1515
import java.util.List;
1616
import java.util.stream.Collectors;

src/main/java/de/codescape/jira/plugins/scrumpoker/action/ScrumPokerProjectConfigurationAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import de.codescape.jira.plugins.scrumpoker.model.ProjectActivation;
1616
import de.codescape.jira.plugins.scrumpoker.model.ProjectSettings;
1717
import de.codescape.jira.plugins.scrumpoker.service.*;
18+
import jakarta.inject.Inject;
1819

19-
import javax.inject.Inject;
2020
import java.util.List;
2121

2222
/**

0 commit comments

Comments
 (0)