Adopt the plugin to Jira 10 (milestone)

atlassian-labs · Jul 27, 2024 · ac440c8 · ac440c8
1 parent 00a30f7
commit ac440c8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 26 deletions.
diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml
@@ -58,13 +58,12 @@ jobs:
     name: Jira
     runs-on: ubuntu-20.04
     timeout-minutes: 30
-    # Disabled until Jira version is available
-    if: (github.event.inputs.jobs == '' || contains(github.event.inputs.jobs, 'integration-tests-jira')) && false
+    if: github.event.inputs.jobs == '' || contains(github.event.inputs.jobs, 'integration-tests-jira')
     needs: unit-tests
     strategy:
       matrix:
         java-version: [17]
-        jira-version: [10.0.0]
+        jira-version: [10.0.0-m0008]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4

diff --git a/bin/build/prepare-matrices.sh b/bin/build/prepare-matrices.sh
diff --git a/...a/com/atlassian/jira/plugins/slack/web/contextproviders/SlackGlobalAdminDataProvider.java b/...a/com/atlassian/jira/plugins/slack/web/contextproviders/SlackGlobalAdminDataProvider.java
@@ -98,7 +98,7 @@ private String getProjectsFieldHtml() {
                 .build();
 
         // We pass new JiraWebActionSupport() so the template has access to i18n
-        final JiraWebActionSupport fakeAction = new JiraWebActionSupport();
+        final JiraWebActionSupport fakeAction = new JiraWebActionSupport() {};
         ActionContext.getValueStack().pushValue(fakeAction);
         return projectField.getCreateHtml(null, operationContext, fakeAction, null, displayParameters);
     }

diff --git a/...st/java/com/atlassian/jira/plugins/slack/service/issuefilter/impl/JqlIssueFilterTest.java b/...st/java/com/atlassian/jira/plugins/slack/service/issuefilter/impl/JqlIssueFilterTest.java
@@ -37,7 +37,7 @@
 import static org.mockito.Mockito.when;
 
 @PrepareForTest({JqlIssueFilter.class, JqlQueryBuilder.class})
-@PowerMockIgnore("javax.*")
+@PowerMockIgnore({"javax.*", "org.xml.*", "org.w3c.*"})
 @RunWith(PowerMockRunner.class)
 public class JqlIssueFilterTest {
     @Mock

diff --git a/jira-slack-server-integration/pom.xml b/jira-slack-server-integration/pom.xml
@@ -22,12 +22,12 @@
         <aui.version>5.1.3</aui.version>
 
         <!-- this is the version we will run integration tests against -->
-        <jira.version>10.0.0-QR-20240423065758</jira.version>
+        <jira.version>10.0.0-m0008</jira.version>
         <testkit.version>8.2.2</testkit.version>
         <jira.test.unit.version>${jira.version}</jira.test.unit.version>
 
         <!-- This is the version the plugin is compiled against -->
-        <jira.compile.version>10.0.0-QR-20240423065758</jira.compile.version>
+        <jira.compile.version>10.0.0-m0008</jira.compile.version>
 
         <jira.pageobjects.version>${jira.version}</jira.pageobjects.version>