Forward merge to master

.github/workflows/all-tests.yml

@@ -32,9 +32,8 @@ jobs:
       jira-it-matrix: ${{ steps.set-matrix.outputs.jira-it-matrix }}
       confluence-it-matrix: ${{ steps.set-matrix.outputs.confluence-it-matrix }}
       bitbucket-it-matrix: ${{ steps.set-matrix.outputs.bitbucket-it-matrix }}
-      # TODO: Remove these flags when new major jira (10.x) and bitbucket (9.x) are released
+      # TODO: Remove these flags when new major jira (10.x) is released
       skip-jira-its: ${{ steps.set-matrix.outputs.skip-jira-its }}
-      skip-bitbucket-its: ${{ steps.set-matrix.outputs.skip-bitbucket-its }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -148,7 +147,7 @@ jobs:
     name: Bitbucket
     runs-on: ubuntu-20.04
     timeout-minutes: 30
-    if: (github.event.inputs.jobs == '' || contains(github.event.inputs.jobs, 'integration-tests-bitbucket')) && !needs.prepare.outputs.skip-bitbucket-its
+    if: github.event.inputs.jobs == '' || contains(github.event.inputs.jobs, 'integration-tests-bitbucket')
     needs: [prepare, unit-tests]
     strategy:
       matrix: ${{ fromJSON(needs.prepare.outputs.bitbucket-it-matrix) }}

.github/workflows/release-check.yml

@@ -22,16 +22,19 @@ jobs:
           PRODUCT="jira" \
           GH_USER=${{ secrets.GH_USER }} \
           GH_TOKEN=${{ secrets.GH_TOKEN }} \
+          GITHUB_REF=${{ matrix.branch }} \
           ./run-product-release-check.sh
       - working-directory: bin/release-check
         run: |
           PRODUCT="confluence" \
           GH_USER=${{ secrets.GH_USER }} \
           GH_TOKEN=${{ secrets.GH_TOKEN }} \
+          GITHUB_REF=${{ matrix.branch }} \
           ./run-product-release-check.sh
       - working-directory: bin/release-check
         run: |
           PRODUCT="bitbucket" \
           GH_USER=${{ secrets.GH_USER }} \
           GH_TOKEN=${{ secrets.GH_TOKEN }} \
+          GITHUB_REF=${{ matrix.branch }} \
           ./run-product-release-check.sh

.github/workflows/release.yml

@@ -45,10 +45,10 @@ jobs:
       - name: Populate plugin module by selected product
         run: bin/build/populate-plugin-by-product.sh ${{ github.event.inputs.product }}
       - name: Install JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: 8
-          distribution: temurin
+          java-version: 17
+          distribution: adopt
       - name: Log Maven settings.xml
         run: cat $HOME/.m2/settings.xml
       - name: Install Atlassian Plugin SDK

bin/build/java-product-matrix.json

@@ -13,7 +13,7 @@
     },
     "bitbucket-it": {
       "java-version": ["17"],
-      "bitbucket-version": ["9.0.0"]
+      "bitbucket-version": ["9.0.0-eap03"]
     }
   },
   "old": {

bin/build/prepare-matrices.sh

@@ -6,9 +6,8 @@ matrix_file='bin/build/java-product-matrix.json'
 pl_common_version=$(. bin/build/get-plugin-major-version.sh common)
 if [ $pl_common_version -gt 1 ]; then
   matrix_key='current'
-# TODO: Remove these flags when new major jira (10.x) and bitbucket (9.x) are released
+# TODO: Remove these flags when new major jira (10.x) is released
   echo "skip-jira-its=true" >> $GITHUB_OUTPUT
-  echo "skip-bitbucket-its=true" >> $GITHUB_OUTPUT
 else
   matrix_key='old'
 fi

bitbucket-slack-server-integration-plugin/pom.xml

@@ -44,11 +44,11 @@
 
         <!-- product properties -->
         <plugin.key>${project.groupId}.${project.artifactId}</plugin.key>
-        <bitbucket.api.version>9.0.0-plat-7-m20</bitbucket.api.version>
-        <bitbucket.version>9.0.0-plat-7-m20</bitbucket.version>
+        <bitbucket.api.version>9.0.0-eap03</bitbucket.api.version>
+        <bitbucket.version>9.0.0-eap03</bitbucket.version>
         <bitbucket.data.version>${bitbucket.version}</bitbucket.data.version>
-        <bitbucket.amps.version>8.2.2</bitbucket.amps.version>
-        <platform.version>7.0.0</platform.version>
+        <bitbucket.amps.version>8.16.1</bitbucket.amps.version>
+        <platform.version>7.0.5</platform.version>
     </properties>
 
     <dependencyManagement>
@@ -174,9 +174,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -223,7 +222,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.atlassian.util.concurrent</groupId>
+            <groupId>io.atlassian.util.concurrent</groupId>
             <artifactId>atlassian-util-concurrent</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -482,6 +481,12 @@
                     <jvmArgs>${jvm17.opens} -Djdbc.url=jdbc:h2:${project.build.directory}/bitbucket/home/shared/data/db;DB_CLOSE_DELAY=-1;AUTO_SERVER=TRUE</jvmArgs>
                     <jvmDebugPort>5007</jvmDebugPort>
 
+                    <banningExcludes>
+                        <exclude>com.atlassian.security:atlassian-secure-random</exclude>
+                        <exclude>com.atlassian.fugue:fugue</exclude>
+                        <exclude>com.google.code.gson:gson</exclude>
+                    </banningExcludes>
+
                     <systemPropertyVariables>
                         <plugin.resource.directories>
                             ${project.basedir}/../slack-server-integration-common/src/main/resources,

bitbucket.sh

@@ -23,10 +23,10 @@ Examples:
   ./bitbucket.sh clean run    -> cleans all compiled files but the Bitbucket home directory, compiles everything, and runs Bitbucket in development mode
 "
 
-# check java 8
+# check java 17
 javaVersion=`java -version 2>&1 | head -n 1 | cut -d\" -f 2`
 javaCompilerVersion=`javac -version 2>&1 | head -n 1 | cut -d\" -f 2`
-[[ "$javaVersion" != "1.8."* && "$javaVersion" != "11."* || "$javaCompilerVersion" != *"1.8."* && "$javaCompilerVersion" != *"11."* ]] && echo "Java 8 expected" && exit 1
+[[ "$javaVersion" != "17."* || "$javaCompilerVersion" != *"17."* ]] && echo "Java 17 expected" && exit 1
 
 # compute parameters
 purge=$([[ "$*" == *"purge"* ]] && echo "yes" || echo "no")

slack-server-integration-common/pom.xml

@@ -193,7 +193,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.atlassian.util.concurrent</groupId>
+            <groupId>io.atlassian.util.concurrent</groupId>
             <artifactId>atlassian-util-concurrent</artifactId>
             <scope>provided</scope>
         </dependency>

slack-server-integration-common/src/main/java/com/atlassian/plugins/slack/api/client/DefaultSlackClientProvider.java

@@ -11,10 +11,10 @@
 import com.atlassian.plugins.slack.link.SlackLinkManager;
 import com.atlassian.plugins.slack.user.SlackUserManager;
 import com.atlassian.sal.api.user.UserManager;
-import com.atlassian.util.concurrent.LazyReference;
 import com.github.seratch.jslack.Slack;
 import com.github.seratch.jslack.common.http.SlackHttpClient;
 import io.atlassian.fugue.Either;
+import io.atlassian.util.concurrent.LazyReference;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Authenticator;
 import okhttp3.Challenge;

slack-server-integration-common/src/main/java/com/atlassian/plugins/slack/api/client/ExecutorServiceHelper.java

@@ -1,6 +1,6 @@
 package com.atlassian.plugins.slack.api.client;
 
-import com.atlassian.util.concurrent.ThreadFactories;
+import io.atlassian.util.concurrent.ThreadFactories;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import static com.atlassian.util.concurrent.ThreadFactories.Type.DAEMON;
+import static io.atlassian.util.concurrent.ThreadFactories.Type.DAEMON;
 
 @Component
 public class ExecutorServiceHelper {

slack-server-integration-common/src/main/java/com/atlassian/plugins/slack/api/descriptor/SlackNotificationContextDescriptor.java

@@ -6,7 +6,7 @@
 import com.atlassian.plugin.module.Element;
 import com.atlassian.plugin.module.ModuleFactory;
 import com.atlassian.plugins.slack.api.notification.SlackNotificationContext;
-import com.atlassian.util.concurrent.ResettableLazyReference;
+import io.atlassian.util.concurrent.ResettableLazyReference;
 
 public class SlackNotificationContextDescriptor extends AbstractModuleDescriptor<SlackNotificationContext> {
     private String value;

slack-server-integration-common/src/main/java/com/atlassian/plugins/slack/api/descriptor/SlackNotificationDescriptor.java

@@ -6,7 +6,7 @@
 import com.atlassian.plugin.module.Element;
 import com.atlassian.plugin.module.ModuleFactory;
 import com.atlassian.plugins.slack.api.notification.SlackNotification;
-import com.atlassian.util.concurrent.ResettableLazyReference;
+import io.atlassian.util.concurrent.ResettableLazyReference;
 
 public class SlackNotificationDescriptor extends AbstractModuleDescriptor<SlackNotification<Object>> {
     private String value;

slack-server-integration-common/src/main/java/com/atlassian/plugins/slack/soy/AddQueryParamSlackFunction.java

@@ -3,6 +3,8 @@
 import com.atlassian.soy.renderer.SoyServerFunction;
 
 import javax.ws.rs.core.UriBuilder;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Set;
 
@@ -22,7 +24,8 @@ public Set<Integer> validArgSizes() {
 
     @Override
     public String apply(final Object... args) {
-        return UriBuilder.fromUri(args[0].toString())
+        String decodedUri = URLDecoder.decode(args[0].toString(), StandardCharsets.UTF_8);
+        return UriBuilder.fromUri(decodedUri)
                 .replaceQueryParam(args[1].toString(), args[2].toString())
                 .build()
                 .toString();