JDK 21 support

atlassian-labs · Aug 7, 2024 · 9f572df · 9f572df
1 parent 03fbbed
commit 9f572df
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 15 deletions.
diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml
@@ -32,7 +32,7 @@ jobs:
     if: "(github.event.inputs.jobs == '' || contains(github.event.inputs.jobs, 'unit-tests')) && !contains(github.event.head_commit.message, '[skip ci]')"
     strategy:
       matrix:
-        java-version: [17]
+        java-version: [17, 21]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
@@ -62,7 +62,7 @@ jobs:
     needs: unit-tests
     strategy:
       matrix:
-        java-version: [17]
+        java-version: [17, 21]
         jira-version: [10.0.0-m0009]
       fail-fast: false
     steps:
@@ -101,7 +101,7 @@ jobs:
     strategy:
       matrix:
         # every version part should be 0 <= <version> <= 255; otherwise Confluence fails to start
-        java-version: [17]
+        java-version: [17, 21]
         confluence-version: [9.0.0-rc2]
       fail-fast: false
     steps:
@@ -139,7 +139,7 @@ jobs:
     needs: unit-tests
     strategy:
       matrix:
-        java-version: [17]
+        java-version: [17, 21]
         bitbucket-version: [9.0.0-eap09]
       fail-fast: false
     steps:

diff --git a/bitbucket-slack-server-integration-plugin/pom.xml b/bitbucket-slack-server-integration-plugin/pom.xml
@@ -293,7 +293,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
+            <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
 
@@ -338,6 +338,12 @@
             <version>${mockito-core.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>1.14.18</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
@@ -600,7 +606,7 @@
         <profile>
             <id>jvm17</id>
             <activation>
-                <jdk>17</jdk>
+                <jdk>[17,)</jdk>
             </activation>
             <properties>
                 <!-- Needed to start Bitbucket on JDK 17 -->

diff --git a/confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml b/confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml
@@ -22,10 +22,10 @@
         <project.root.directory>${project.basedir}/..</project.root.directory>
 
         <!-- version of Confluence libraries used to compile plugin code -->
-        <confluence.api.version>9.0.0-rc2</confluence.api.version>
+        <confluence.api.version>9.0.1</confluence.api.version>
 
         <!-- version of Confluence used in integration tests -->
-        <confluence.version>9.0.0-rc2</confluence.version>
+        <confluence.version>9.0.1</confluence.version>
         <confluence.data.version>${confluence.version}</confluence.data.version>
 
         <confluence.amps.version>8.9.2</confluence.amps.version>
@@ -559,7 +559,7 @@
         <profile>
             <id>jvm17</id>
             <activation>
-                <jdk>17</jdk>
+                <jdk>[17,)</jdk>
             </activation>
             <properties>
                 <!-- Needed to start Confluence 8 on JDK 17 -->

diff --git a/...nfluence/plugins/slack/spacetochannel/api/notifications/DefaultAttachmentBuilderTest.java b/...nfluence/plugins/slack/spacetochannel/api/notifications/DefaultAttachmentBuilderTest.java
@@ -202,7 +202,7 @@ public void getSlackPrettyTime_shouldReturnExpectedValue() {
 
         String result = target.getSlackPrettyTime(1551985533000L);
 
-        assertThat(result, is("<!date^" + (1551985533L) + "^{time}|1:05 PM>"));
+        assertThat(result, is("<!date^" + (1551985533L) + "^{time}|1:05\u202fPM>"));
     }
 
     @Test

diff --git a/jira-slack-server-integration/jira-8-compat/pom.xml b/jira-slack-server-integration/jira-8-compat/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.11.22</version>
+            <version>1.14.18</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>

diff --git a/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml b/jira-slack-server-integration/jira-slack-server-integration-plugin/pom.xml
@@ -657,7 +657,7 @@
         <profile>
             <id>jvm17</id>
             <activation>
-                <jdk>17</jdk>
+                <jdk>[17,)</jdk>
             </activation>
             <properties>
                 <!-- Needed to start Jira on JDK 17 -->

diff --git a/pom.xml b/pom.xml
@@ -268,7 +268,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.24</version>
+                <version>1.18.30</version>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
@@ -334,7 +334,7 @@
         <profile>
             <id>jvm17</id>
             <activation>
-                <jdk>17</jdk>
+                <jdk>[17,)</jdk>
             </activation>
             <properties>
                 <jvm17.opens>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-opens=java.base/sun.util.locale=ALL-UNNAMED --add-opens=java.management/javax.management=ALL-UNNAMED --add-exports=java.base/sun.security.action=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xml.internal.utils=ALL-UNNAMED --add-exports=java.desktop/sun.font=ALL-UNNAMED --add-exports=java.base/sun.security.util=ALL-UNNAMED</jvm17.opens>

diff --git a/slack-server-integration-common/pom.xml b/slack-server-integration-common/pom.xml
@@ -237,7 +237,14 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.11.22</version>
+            <version>1.14.18</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.30.2-GA</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
-Original file line number
+Diff line change
@@ Expand Up @@
             String result = target.getSlackPrettyTime(1551985533000L);
-            assertThat(result, is("<!date^" + (1551985533L) + "^{time}|1:05 PM>"));
+            assertThat(result, is("<!date^" + (1551985533L) + "^{time}|1:05\u202fPM>"));
         }
         @Test
@@ Expand Down @@