Update GitHub actions

* Update actions to latest versions * Add Postgres 15 and 16 * Add Java 21 * Upgrade Drools to 8.44.0 to run on Java 21 * Fix byte-buddy for Mockito to work on Java 21 * Use latest asm version for OSGi tests
flowable · Oct 5, 2023 · e1f5095 · e1f5095
1 parent 35a1463
commit e1f5095
Show file tree

Hide file tree

Showing 16 changed files with 93 additions and 69 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/modules/flowable-osgi/pom.xml b/modules/flowable-osgi/pom.xml
@@ -158,8 +158,26 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.spifly</groupId>
-            <artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
-            <version>1.3.5</version>
+            <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+            <version>1.3.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>9.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>9.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-util</artifactId>
+            <version>9.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/modules/flowable-osgi/src/test/java/org/flowable/osgi/blueprint/BlueprintBasicTest.java b/modules/flowable-osgi/src/test/java/org/flowable/osgi/blueprint/BlueprintBasicTest.java
@@ -137,7 +137,12 @@ public Option[] createConfiguration() {
                 mavenBundle().groupId("org.apache.aries.blueprint").artifactId("org.apache.aries.blueprint.core").versionAsInProject(),
                 mavenBundle().groupId("org.apache.aries.proxy").artifactId("org.apache.aries.proxy").versionAsInProject(),
                 mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").versionAsInProject(),
-                mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.framework.extension").versionAsInProject(),
+                mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.bundle").versionAsInProject(),
+                mavenBundle().groupId("org.ow2.asm").artifactId("asm").versionAsInProject(),
+                mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").versionAsInProject(),
+                mavenBundle().groupId("org.ow2.asm").artifactId("asm-util").versionAsInProject(),
+                mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").versionAsInProject(),
+                mavenBundle().groupId("org.ow2.asm").artifactId("asm-analysis").versionAsInProject(),
                 bundle("reference:file:target/classes"));
 
         Option[] optionArray = OptionUtils.combine(coreBundles, CoreOptions.junitBundles(),

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,12 @@
 		<hikari.version>5.0.1</hikari.version>
 		<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
 		<maven.resources.plugin.version>3.3.0</maven.resources.plugin.version>
-		<mockito.version>5.3.1</mockito.version>
+		<mockito.version>5.5.0</mockito.version>
+		<!--
+		 	AssertJ 3.24.2 is pulling older byte buddy not compatible with Java 21.
+			Therefore, we are fixing it like this.
+		-->
+		<byte-buddy.version>1.14.8</byte-buddy.version>
 		<testcontainers.version>1.18.3</testcontainers.version>
 		<artemis.version>2.28.0</artemis.version>
 
@@ -280,7 +285,7 @@
 			<dependency>
 				<groupId>org.drools</groupId>
 				<artifactId>drools-bom</artifactId>
-				<version>7.63.0.Final</version>
+				<version>8.44.0.Final</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -464,6 +469,11 @@
 				<version>2.35.0</version>
 				<scope>test</scope>
 			</dependency>
+			<dependency>
+				<groupId>net.bytebuddy</groupId>
+				<artifactId>byte-buddy</artifactId>
+				<version>${byte-buddy.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.github.h-thurow</groupId>
 				<artifactId>simple-jndi</artifactId>