Merge branch 'develop' into dependabot/maven/springdoc.version-2.2.0

Activiti · Oct 12, 2024 · 9193a2f · 9193a2f
2 parents a954383 + 0ba770f
commit 9193a2f
Show file tree

Hide file tree

Showing 565 changed files with 17,695 additions and 5,112 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -46,23 +46,23 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
-    - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
     - name: Set up JDK 21
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
        java-version: '21'
        distribution: 'temurin'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+      uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -98,6 +98,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+      uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/create-github-prerelease.yaml b/.github/workflows/create-github-prerelease.yaml
@@ -9,7 +9,7 @@ jobs:
   create-prerelease:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Resolve activiti version
         id: resolve-versions
         run: |
@@ -20,13 +20,13 @@ jobs:
 
       - run: touch release.yaml
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/update-project-base-tag@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/update-project-base-tag@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
         with:
           release-descriptor: release.yaml
           project: activiti
           tag: ${{ steps.resolve-versions.outputs.activiti-tag }}
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/update-project-base-tag@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/update-project-base-tag@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
         with:
           release-descriptor: release.yaml
           project: activitiCloud

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,15 +28,15 @@ jobs:
   pre-checks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Check dependabot build
-        uses: Activiti/Activiti/.github/actions/check-ext-build@4db084fcbb13a288f3b66ac08fc50a5ab7f144ed # 8.0.0-alpha.10
+        uses: Activiti/Activiti/.github/actions/check-ext-build@7700f0283a9ff5181581a350d2520e55c61c1c60 # 8.6.0
       - name: pre-commit
-        uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+        uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
         with:
           skip_checkout: true
       - name: Ensure SHA pinned actions
-        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@ba37328d4ea95eaf8b3bd6c6cef308f709a5f2ec # v3.0.3
+        uses: zgosalvez/github-actions-ensure-sha-pinned-actions@40ba2d51b6b6d8695f2b6bd74e785172d4f8d00f # v3.0.14
 
   build:
     runs-on: ubuntu-latest
@@ -48,19 +48,19 @@ jobs:
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
 
-      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
       - name: Setup Java JDK 21
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # 4.2.1
+        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 4.4.0
         with:
           java-version: 21
           distribution: 'temurin'
@@ -72,7 +72,7 @@ jobs:
           GITHUB_PR_NUMBER=PR-${{ github.event.pull_request.number }}
           echo "version=0.0.1-${GITHUB_PR_NUMBER}-SNAPSHOT" >> $GITHUB_OUTPUT
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
         id: update-pom-to-next-version
         with:
           version: ${{ steps.resolve-override-version.outputs.version }}
@@ -104,7 +104,7 @@ jobs:
         run: find . -name TEST-*.xml -exec grep -h testcase {} \; | awk -F '"' '{printf("%s#%s() - %.3fms\n", $4, $2, $6); }' | sort -n -k 3 | tail -20
 
       - name: Login to DockerHub
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -128,7 +128,9 @@ jobs:
     env:
       MAVEN_CLI_OPTS: --show-version --no-transfer-progress --settings settings.xml
     strategy:
-      fail-fast: false
+      # avoid overloading test cluster
+      max-parallel: 2
+      fail-fast: true
       matrix:
         messaging-broker: [ rabbitmq, kafka ]
         messaging-partitioned: [ partitioned, non-partitioned ]
@@ -139,17 +141,17 @@ jobs:
             messaging-destinations: override-destinations
     steps:
       - name: Checkout repository
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
       - name: Setup Java JDK 21
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # 4.2.1
+        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # 4.4.0
         with:
           java-version: 21
           distribution: 'temurin'
@@ -160,12 +162,12 @@ jobs:
           version: v1.19.6
 
       - name: Set up Helm
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3
+        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v3
         with:
           version: v3.5.2
 
       - name: Set up rancher
-        uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+        uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
         with:
           url: ${{ secrets.RANCHER2_URL }}
           access-key: ${{ secrets.RANCHER2_ACCESS_KEY }}
@@ -277,16 +279,9 @@ jobs:
 
       - name: Delete Helm chart for ${{ matrix.messaging-broker }}
         if: always()
-        env:
-          IS_PREVIEW: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'preview') }}
         run: |
-          if [ $IS_PREVIEW = true ]
-          then
-              echo "Skipping delete Helm release for preview"
-          else
-              echo "Delete Helm release"
-              make delete
-          fi
+          echo "Delete Helm release"
+          make delete
 
   delete-test-images:
     runs-on: ubuntu-latest
@@ -296,7 +291,7 @@ jobs:
       - build
     steps:
       - name: Checkout repository
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Delete Docker images
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -324,17 +319,17 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
 
       - name: Setup Java JDK 21
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
         with:
           java-version: 21
           distribution: 'temurin'
 
-      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -353,7 +348,7 @@ jobs:
           MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
         with:
           username: ${{ secrets.BOT_GITHUB_USERNAME }}
           add-options: -u
@@ -375,8 +370,8 @@ jobs:
       VERSION: ${{ needs.build.outputs.version }}
       DEVELOPMENT_BRANCH: ${{ github.ref_name }}
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/jx-updatebot-pr@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: Alfresco/alfresco-build-tools/.github/actions/jx-updatebot-pr@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
         with:
           version: ${{ needs.build.outputs.version }}
           auto-merge: 'true'
@@ -398,7 +393,7 @@ jobs:
       FULL_CHART_BASE_BRANCH: develop
       FULL_CHART_PR_BRANCH: update-docker-images-${{ needs.build.outputs.version }}
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           path: ${{ env.FULL_CHART_DIR }}
           repository: Activiti/activiti-cloud-full-chart
@@ -413,12 +408,12 @@ jobs:
           yq -i e '.activiti-cloud-connector.image.tag = env(VERSION)' values.yaml
           yq -i e '.activiti-cloud-identity-adapter.image.tag = env(VERSION)' values.yaml
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
       - name: Update helm docs
         working-directory: ${{ env.FULL_CHART_DIR}}
         run: helm-docs
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
         with:
           username: ${{ secrets.BOT_GITHUB_USERNAME }}
           add-options: -u
@@ -441,7 +436,7 @@ jobs:
     if: always() && failure() && github.event_name == 'push'
     steps:
       - name: Slack Notification
-        uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+        uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
         with:
-          channel-id: 'eng-hxp-studio-activiti-gh-notifs'
+          channel-id: 'C03PMT6APFU' # eng-hxp-studio-activiti-gh-notifs, to be renamed eng-automate-activiti-gh-notifs
           token: ${{ secrets.SLACK_NOTIFICATION_BOT_TOKEN }}
diff --git a/.github/workflows/pr-closed.yaml b/.github/workflows/pr-closed.yaml
@@ -26,7 +26,7 @@ jobs:
           version: v1.19.6
 
       - name: Set up rancher
-        uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+        uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
         with:
           url: ${{ secrets.RANCHER2_URL }}
           access-key: ${{ secrets.RANCHER2_ACCESS_KEY }}
@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Set PREVIEW_NAME env variable
         id: set-preview-name

diff --git a/.github/workflows/versions-propagation-auto-merge.yml b/.github/workflows/versions-propagation-auto-merge.yml
@@ -9,7 +9,7 @@ jobs:
   versions-propagation-auto-merge:
     runs-on: ubuntu-latest
     steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/automate-propagation@a3f5a4ae53302e9a1f9dc728dee0f4069c1bc584 # v5.22.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/automate-propagation@209bb4275688720e13dc0703dbd17826bf677c5c # v6.1.0
       with:
         auto-merge-token: ${{ secrets.BOT_GITHUB_TOKEN }}
         approval-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.jx/updatebot.yaml b/.jx/updatebot.yaml
@@ -3,8 +3,7 @@ kind: UpdateConfig
 spec:
   rules:
     - urls:
-        - https://github.com/Alfresco/alfresco-process
-        - https://github.com/Alfresco/alfresco-process-sdk
+        - https://github.com/Alfresco/hxp-process-services
       reusePullRequest: true
       changes:
         - regex:

diff --git a/activiti-cloud-acceptance-scenarios/identity-adapter-acceptance-tests/pom.xml b/activiti-cloud-acceptance-scenarios/identity-adapter-acceptance-tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.activiti.cloud</groupId>
     <artifactId>activiti-cloud-acceptance-scenarios-parent</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>8.7.0-SNAPSHOT</version>
   </parent>
   <artifactId>identity-adapter-acceptance-tests</artifactId>
   <name>Activiti Cloud :: Acceptance Scenarios Identity Adapter</name>

diff --git a/activiti-cloud-acceptance-scenarios/multiple-runtime-acceptance-tests/pom.xml b/activiti-cloud-acceptance-scenarios/multiple-runtime-acceptance-tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.activiti.cloud</groupId>
     <artifactId>activiti-cloud-acceptance-scenarios-parent</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>8.7.0-SNAPSHOT</version>
   </parent>
   <artifactId>multiple-runtime-acceptance-tests</artifactId>
   <name>Activiti Cloud :: Acceptance Scenarios Multi-Runtime</name>

diff --git a/activiti-cloud-acceptance-scenarios/pom.xml b/activiti-cloud-acceptance-scenarios/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.activiti.cloud</groupId>
     <artifactId>activiti-cloud-build-parent</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>8.7.0-SNAPSHOT</version>
     <relativePath>../activiti-cloud-build</relativePath>
   </parent>
   <artifactId>activiti-cloud-acceptance-scenarios-parent</artifactId>

diff --git a/activiti-cloud-acceptance-scenarios/runtime-acceptance-tests/pom.xml b/activiti-cloud-acceptance-scenarios/runtime-acceptance-tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.activiti.cloud</groupId>
     <artifactId>activiti-cloud-acceptance-scenarios-parent</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>8.7.0-SNAPSHOT</version>
   </parent>
   <artifactId>runtime-acceptance-tests</artifactId>
   <name>Activiti Cloud :: Acceptance Scenarios Runtime</name>

diff --git a/...time-acceptance-tests/src/main/java/org/activiti/cloud/qa/story/ProcessInstanceTasks.java b/...time-acceptance-tests/src/main/java/org/activiti/cloud/qa/story/ProcessInstanceTasks.java
@@ -404,6 +404,11 @@ public void adminDeleteCurrentProcessInstance() throws Exception {
         processRuntimeAdminSteps.deleteProcessInstance(processInstance.getId());
     }
 
+    @When("the admin force destroys the process")
+    public void adminForceDeleteCurrentProcessInstance() throws Exception {
+        processRuntimeAdminSteps.destroyProcessInstance(processInstance.getId(), true);
+    }
+
     @When("the user suspends the process instance")
     public void suspendProcessInstance() throws Exception {
         processRuntimeBundleSteps.suspendProcessInstance(processInstance.getId());
@@ -423,6 +428,16 @@ public void verifyProcessInstanceIsDeleted() throws Exception {
         );
     }
 
+    @Then("the process instance is destroyed")
+    public void verifyProcessInstanceIsForceDestroyed() throws Exception {
+        processRuntimeBundleSteps.checkProcessInstanceNotFound(processInstance.getId());
+        processQuerySteps.checkProcessInstanceNotFound(processInstance.getId());
+        auditSteps.checkProcessInstanceEvent(
+            processInstance.getId(),
+            ProcessRuntimeEvent.ProcessEvents.PROCESS_DELETED
+        );
+    }
+
     @When("open the process diagram")
     public void openProcessInstanceDiagram() {
         processInstanceDiagram = processRuntimeBundleSteps.openProcessInstanceDiagram(processInstance.getId());

diff --git a/...acceptance-tests/src/main/resources/stories/runtime-bundle/process-instance-actions.story b/...acceptance-tests/src/main/resources/stories/runtime-bundle/process-instance-actions.story
@@ -120,6 +120,12 @@ When the user starts an instance of the process called PROCESS_INSTANCE_WITH_VAR
 And the admin deletes the process
 Then the process instance is deleted
 
+Scenario: admin force destroy a process instance
+Given the user is authenticated as testadmin
+When the user starts an instance of the process called PROCESS_INSTANCE_WITH_VARIABLES
+And the admin force destroys the process
+Then the process instance is destroyed
+
 Scenario: check sequence number and message id for events
 Given the user is authenticated as testuser
 When the user starts an instance of the process called SIMPLE_PROCESS_INSTANCE

diff --git a/activiti-cloud-acceptance-scenarios/security-policies-acceptance-tests/pom.xml b/activiti-cloud-acceptance-scenarios/security-policies-acceptance-tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.activiti.cloud</groupId>
     <artifactId>activiti-cloud-acceptance-scenarios-parent</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>8.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>security-policies-acceptance-tests</artifactId>