Merge branch 'main' of github.com:flowable/flowable-engine

flowable · Oct 10, 2023 · d94fd5e · d94fd5e
2 parents 99a96d4 + 4c4de64
commit d94fd5e
Show file tree

Hide file tree

Showing 70 changed files with 1,185 additions and 289 deletions.
diff --git a/.github/workflows/db2.yml b/.github/workflows/db2.yml
@@ -38,11 +38,10 @@ jobs:
           --health-timeout 40s
           --health-retries 10
     steps:
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use db2 for the host here because we have specified a container for the job.
@@ -84,11 +83,10 @@ jobs:
           --health-timeout 40s
           --health-retries 10
     steps:
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use db2 for the host here because we have specified a container for the job.

diff --git a/.github/workflows/docker-release-with-latest.yml b/.github/workflows/docker-release-with-latest.yml
@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3

diff --git a/.github/workflows/flowable5.yml b/.github/workflows/flowable5.yml
@@ -14,9 +14,10 @@ jobs:
         -B
         --no-transfer-progress
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v3
       with:
+        distribution: 'zulu'
         java-version: 17
     - name: Build and Test
       run: cd scripts && ./run-flowable5-tests.sh
diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/java-ea.yml b/.github/workflows/java-ea.yml
@@ -16,11 +16,9 @@ jobs:
     name: Linux (OpenJDK EA)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
+      - uses: actions/checkout@v4
       - name: Cache Maven Repository
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,16 +14,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [17]
+        java: [17, 21]
     steps:
-    - uses: actions/checkout@v2-beta
-      with:
-        fetch-depth: 10
-    - uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v3
       with:
+        distribution: 'zulu'
         java-version: ${{ matrix.java }}
     - name: Cache Maven Repository
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
@@ -36,11 +36,10 @@ jobs:
     steps:
       - name: "Set MariaDB collation"
         run: docker exec ${{ job.services.mariadb.id }} sh -c 'mysql --user=flowable --password=flowable --database=flowable --execute="alter database flowable character set utf8mb4 collate utf8mb4_bin"'
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use localhost for the host here because we have specified a vm for the job.
@@ -77,11 +76,10 @@ jobs:
     steps:
       - name: "Set MariaDB collation"
         run: docker exec ${{ job.services.mariadb.id }} sh -c 'mysql --user=flowable --password=flowable --database=flowable --execute="alter database flowable character set utf8mb4 collate utf8mb4_bin"'
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use mariadb for the host here because we have specified a container for the job.

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
@@ -36,11 +36,10 @@ jobs:
     steps:
       - name: "Set MySQL collation"
         run: docker exec ${{ job.services.mysql.id }} sh -c 'mysql --user=flowable --password=flowable --database=flowable --execute="alter database flowable character set utf8mb4 collate utf8mb4_bin"'
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use localhost for the host here because we have specified a vm for the job.
@@ -77,11 +76,10 @@ jobs:
     steps:
       - name: "Set MySQL collation"
         run: docker exec ${{ job.services.mysql.id }} sh -c 'mysql --user=flowable --password=flowable --database=flowable --execute="alter database flowable character set utf8mb4 collate utf8mb4_bin"'
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use mysql for the host here because we have specified a container for the job.

diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml
@@ -44,9 +44,10 @@ jobs:
           --health-timeout 10s
           --health-retries 10
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use oracle for the host here because we have specified a container for the job.
@@ -96,9 +97,10 @@ jobs:
           --health-timeout 10s
           --health-retries 10
     steps:
-      - uses: actions/checkout@v2-beta
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use oracle for the host here because we have specified a container for the job.

diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgres: [11, 12, 13, 14]
+        postgres: [11, 12, 13, 14, 15, 16]
     services:
       postgres:
         image: postgres:${{ matrix.postgres }}
@@ -31,11 +31,10 @@ jobs:
         # needed because the postgres container does not provide a health check
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 --tmpfs /var/lib/postgresql/data:rw
     steps:
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use postgres for the host here because we have specified a container for the job.
@@ -57,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgres: [11, 12, 13, 14]
+        postgres: [11, 12, 13, 14, 15, 16]
     services:
       postgres:
         image: postgres:${{ matrix.postgres }}
@@ -69,11 +68,10 @@ jobs:
         # needed because the postgres container does not provide a health check
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 --tmpfs /var/lib/postgresql/data:rw
     steps:
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use postgres for the host here because we have specified a container for the job.

diff --git a/.github/workflows/sql-server.yml b/.github/workflows/sql-server.yml
@@ -36,18 +36,17 @@ jobs:
           --health-timeout 5s
           --health-retries 10
     steps:
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
+      - uses: actions/checkout@v4
       - name: Prepare Database
         run: ./.github/actions/scripts/prepare-mssql.sh
         env:
           # use localhost for the host here because we have specified a vm for the job.
           # If we were running the job on a container this would be mssql
           MSSQL_HOST: localhost
           MSSQL_PORT: ${{ job.services.mssql.ports[1433] }} # get randomly assigned published port
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use localhost for the host here because we have specified a vm for the job.
@@ -86,18 +85,17 @@ jobs:
           --health-timeout 5s
           --health-retries 10
     steps:
-      - uses: actions/checkout@v2-beta
-        with:
-          fetch-depth: 10
+      - uses: actions/checkout@v4
       - name: Prepare Database
         run: ./.github/actions/scripts/prepare-mssql.sh
         env:
           # use localhost for the host here because we have specified a vm for the job.
           # If we were running the job on a container this would be mssql
           MSSQL_HOST: localhost
           MSSQL_PORT: ${{ job.services.mssql.ports[1433] }} # get randomly assigned published port
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Test
         # use localhost for the host here because we have specified a vm for the job.

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -12,13 +12,14 @@ jobs:
     name: 'Windows'
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: 'Set up JDK 17'
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
       - name: Cache Maven Repository
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/distro/src/notice.txt b/distro/src/notice.txt
@@ -97,16 +97,16 @@ org.apache.httpcomponents       httpclient                  4.5.13          Apac
 org.apache.httpcomponents       httpcore                    4.4.15          Apache License, Version 2.0
 org.apache.httpcomponents       httpmime                    4.5.13          Apache License, Version 2.0
 org.apache.geronimo.bundles     json                        20090211_1      The Apache Software License, Version 2.0
-org.apache.groovy               groovy                      4.0.14          The Apache Software License, Version 2.0
-org.apache.groovy               groovy-jsr223               4.0.14          The Apache Software License, Version 2.0
+org.apache.groovy               groovy                      4.0.15          The Apache Software License, Version 2.0
+org.apache.groovy               groovy-jsr223               4.0.15          The Apache Software License, Version 2.0
 org.eclipse.angus               angus-mail                  2.0.2           EDL 1.0 / EPL 2.0
 org.liquibase                   liquibase-core              4.5.0           Apache License, Version 2.0
 org.mybatis                     mybatis                     3.5.11          The Apache Software License, Version 2.0
 org.mybatis                     mybatis-spring              3.0.0           The Apache Software License, Version 2.0
 org.mvel                        mvel2                       2.2.6.Final     The Apache Software License, Version 2.0
-org.slf4j                       jcl-over-slf4j              2.0.7           MIT License
-org.slf4j                       slf4j-api                   2.0.7           MIT License
-org.slf4j                       slf4j-log4j12               2.0.7           MIT License
+org.slf4j                       jcl-over-slf4j              2.0.9           MIT License
+org.slf4j                       slf4j-api                   2.0.9           MIT License
+org.slf4j                       slf4j-log4j12               2.0.9           MIT License
 org.springframework             spring-beans                6.0.12           The Apache Software License, Version 2.0
 org.springframework             spring-core                 6.0.12           The Apache Software License, Version 2.0
 org.springframework             spring-context              6.0.12           The Apache Software License, Version 2.0

diff --git a/modules/flowable-cdi/src/main/java/org/flowable/cdi/CdiJtaProcessEngineConfiguration.java b/modules/flowable-cdi/src/main/java/org/flowable/cdi/CdiJtaProcessEngineConfiguration.java
@@ -12,7 +12,7 @@
  */
 package org.flowable.cdi;
 
-import org.flowable.cdi.impl.CdiCommandInvoker;
+import org.flowable.cdi.impl.CdiAgendaOperationExecutionListener;
 import org.flowable.cdi.impl.el.CdiResolver;
 import org.flowable.engine.impl.bpmn.parser.factory.AbstractBehaviorFactory;
 import org.flowable.engine.impl.cfg.JtaProcessEngineConfiguration;
@@ -24,13 +24,7 @@ public class CdiJtaProcessEngineConfiguration extends JtaProcessEngineConfigurat
 
     public CdiJtaProcessEngineConfiguration() {
         addPreDefaultELResolver(new CdiResolver());
-    }
-
-    @Override
-    public void initCommandInvoker() {
-        if (commandInvoker == null) {
-            commandInvoker = new CdiCommandInvoker(agendaOperationRunner);
-        }
+        addAgendaOperationExecutionListener(new CdiAgendaOperationExecutionListener());
     }
 
     @Override

diff --git a/.../flowable-cdi/src/main/java/org/flowable/cdi/CdiStandaloneProcessEngineConfiguration.java b/.../flowable-cdi/src/main/java/org/flowable/cdi/CdiStandaloneProcessEngineConfiguration.java
@@ -12,7 +12,7 @@
  */
 package org.flowable.cdi;
 
-import org.flowable.cdi.impl.CdiCommandInvoker;
+import org.flowable.cdi.impl.CdiAgendaOperationExecutionListener;
 import org.flowable.cdi.impl.el.CdiResolver;
 import org.flowable.engine.impl.bpmn.parser.factory.AbstractBehaviorFactory;
 import org.flowable.engine.impl.cfg.StandaloneProcessEngineConfiguration;
@@ -24,13 +24,7 @@ public class CdiStandaloneProcessEngineConfiguration extends StandaloneProcessEn
 
     public CdiStandaloneProcessEngineConfiguration() {
         addPreDefaultELResolver(new CdiResolver());
-    }
-
-    @Override
-    public void initCommandInvoker() {
-        if (commandInvoker == null) {
-            commandInvoker = new CdiCommandInvoker(agendaOperationRunner);
-        }
+        addAgendaOperationExecutionListener(new CdiAgendaOperationExecutionListener());
     }
 
     @Override