diff --git a/.github/workflows/db2.yml b/.github/workflows/db2.yml index 5503b79e288..bc39c3aa75d 100644 --- 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 index 30c735e0f8c..a42f3f30ba4 100644 --- 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 index 45bcb0d5115..3ea3dd57003 100644 --- 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 index 0e24f3b4dea..b0c5f6a657c 100644 --- 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 index 44036d6c91f..b4e296fe5d2 100644 --- 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 index 92395d21aee..e5436671167 100644 --- 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 index 1c1a83071a7..f867db39e77 100644 --- 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 index bfda5d1a3c1..bb8164da19f 100644 --- 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 index bafeeba0946..df233cf5496 100644 --- 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 index c66ac2d16d4..7129619eba4 100644 --- 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 index e36e0019a00..ab5e43686a1 100644 --- 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 index 143152233c2..84a1d0a2059 100644 --- a/.github/workflows/sql-server.yml +++ b/.github/workflows/sql-server.yml @@ -36,9 +36,7 @@ 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: @@ -46,8 +44,9 @@ jobs: # 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,9 +85,7 @@ 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: @@ -96,8 +93,9 @@ jobs: # 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 index 695fabdcd6a..da5050ed816 100644 --- 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 index 7193af025b0..099ea725c9c 100644 --- a/modules/flowable-osgi/pom.xml +++ b/modules/flowable-osgi/pom.xml @@ -158,8 +158,26 @@ org.apache.aries.spifly - org.apache.aries.spifly.dynamic.framework.extension - 1.3.5 + org.apache.aries.spifly.dynamic.bundle + 1.3.6 + test + + + org.ow2.asm + asm + 9.6 + test + + + org.ow2.asm + asm-commons + 9.6 + test + + + org.ow2.asm + asm-util + 9.6 test 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 index a8001b9135b..b0426fa37d4 100755 --- 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 index 1bdcf6c8aed..65d89038065 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,12 @@ 5.0.1 3.1.1 3.3.0 - 5.3.1 + 5.5.0 + + 1.14.8 1.18.3 2.28.0 @@ -280,7 +285,7 @@ org.drools drools-bom - 7.63.0.Final + 8.44.0.Final pom import @@ -464,6 +469,11 @@ 2.35.0 test + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + com.github.h-thurow simple-jndi