diff --git a/.github/project.yml b/.github/project.yml index 96953fd8..e246d98d 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,3 +1,3 @@ release: - current-version: 5.0.0.Final - next-version: 7.0.0-SNAPSHOT + current-version: 5.1.0.Final + next-version: 5.2.0-SNAPSHOT \ No newline at end of file diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 1b7d432c..aaca3d0d 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -6,18 +6,18 @@ name: sdk-java Verify on: push: branches: - - main + - 5.* pull_request: branches: - - main + - 5.* jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index ce904c75..44f54117 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -11,7 +11,7 @@ jobs: name: pre release steps: - - uses: radcortez/project-metadata-action@master + - uses: radcortez/project-metadata-action@main name: retrieve project metadata id: metadata with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ef4ee698..df7b0bc5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: release: runs-on: ubuntu-latest name: release - if: ${{github.event.pull_request.merged == true}} + if: ${{ github.event.pull_request.merged == true }} steps: - uses: radcortez/project-metadata-action@main @@ -20,7 +20,7 @@ jobs: github-token: ${{secrets.GITHUB_TOKEN}} metadata-file-path: '.github/project.yml' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Import GPG key id: import_gpg @@ -30,7 +30,7 @@ jobs: passphrase: ${{ secrets.GPG_PASSPHRASE }} - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -51,7 +51,7 @@ jobs: cat release.properties git checkout ${{github.base_ref}} git rebase release - mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease + mvn -B release:perform -Prelease -Darguments="-DperformRelease" env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} diff --git a/README.md b/README.md index 5ac8f45f..8a344f4a 100644 --- a/README.md +++ b/README.md @@ -75,31 +75,31 @@ b) Add the following dependencies to your pom.xml `dependencies` section: io.serverlessworkflow serverlessworkflow-api - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT io.serverlessworkflow serverlessworkflow-spi - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT io.serverlessworkflow serverlessworkflow-validation - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT io.serverlessworkflow serverlessworkflow-diagram - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT io.serverlessworkflow serverlessworkflow-util - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT ``` @@ -114,11 +114,11 @@ maven { url "https://oss.sonatype.org/content/repositories/snapshots" } b) Add the following dependencies to your build.gradle `dependencies` section: ```text -implementation("io.serverlessworkflow:serverlessworkflow-api:5.0.0-SNAPSHOT") -implementation("io.serverlessworkflow:serverlessworkflow-spi:5.0.0-SNAPSHOT") -implementation("io.serverlessworkflow:serverlessworkflow-validation:5.0.0-SNAPSHOT") -implementation("io.serverlessworkflow:serverlessworkflow-diagram:5.0.0-SNAPSHOT") -implementation("io.serverlessworkflow:serverlessworkflow-util:5.0.0-SNAPSHOT") +implementation("io.serverlessworkflow:serverlessworkflow-api:5.1.0-SNAPSHOT") +implementation("io.serverlessworkflow:serverlessworkflow-spi:5.1.0-SNAPSHOT") +implementation("io.serverlessworkflow:serverlessworkflow-validation:5.1.0-SNAPSHOT") +implementation("io.serverlessworkflow:serverlessworkflow-diagram:5.1.0-SNAPSHOT") +implementation("io.serverlessworkflow:serverlessworkflow-util:5.1.0-SNAPSHOT") ``` ### How to Use diff --git a/api/pom.xml b/api/pom.xml index 78c9aada..690a347f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0.Final serverlessworkflow-api diff --git a/api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java b/api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java index 2f71947d..c47f4c2c 100644 --- a/api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java +++ b/api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java @@ -24,7 +24,7 @@ public class BaseObjectMapper extends ObjectMapper { - private WorkflowModule workflowModule; + private final WorkflowModule workflowModule; public BaseObjectMapper(JsonFactory factory, WorkflowPropertySource workflowPropertySource) { super(factory); @@ -33,7 +33,7 @@ public BaseObjectMapper(JsonFactory factory, WorkflowPropertySource workflowProp configure(SerializationFeature.INDENT_OUTPUT, true); registerModule(workflowModule); - configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false); + setSerializationInclusion(JsonInclude.Include.NON_EMPTY); configOverride(Map.class) .setInclude( JsonInclude.Value.construct( diff --git a/api/src/main/resources/schema/events/eventref.json b/api/src/main/resources/schema/events/eventref.json index 76334993..c0e04a7a 100644 --- a/api/src/main/resources/schema/events/eventref.json +++ b/api/src/main/resources/schema/events/eventref.json @@ -16,7 +16,8 @@ "description": "Maximum amount of time (ISO 8601 format) to wait for the result event. If not defined it should default to the actionExecutionTimeout" }, "data": { - "type": "string", + "type": "object", + "existingJavaType": "com.fasterxml.jackson.databind.JsonNode", "description": "Expression which selects parts of the states data output to become the data of the produced event." }, "contextAttributes": { diff --git a/api/src/main/resources/schema/produce/produceevent.json b/api/src/main/resources/schema/produce/produceevent.json index f094824e..37c3a7bb 100644 --- a/api/src/main/resources/schema/produce/produceevent.json +++ b/api/src/main/resources/schema/produce/produceevent.json @@ -8,7 +8,8 @@ "minLength": 1 }, "data": { - "type": "string", + "type": "object", + "existingJavaType": "com.fasterxml.jackson.databind.JsonNode", "description": "Workflow expression which selects parts of the states data output to become the data of the produced event" }, "contextAttributes": { @@ -20,4 +21,4 @@ "required": [ "eventRef" ] -} \ No newline at end of file +} diff --git a/diagram-rest/pom.xml b/diagram-rest/pom.xml index cbaafe2b..9beb9d68 100644 --- a/diagram-rest/pom.xml +++ b/diagram-rest/pom.xml @@ -10,12 +10,12 @@ io.serverless serverlessworkflow-diagram-rest - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT Serverless Workflow :: Diagram :: Rest API Rest Api Module for Diagram Generation 1.6.13 - 5.0.0-SNAPSHOT + 5.1.0-SNAPSHOT diff --git a/diagram/pom.xml b/diagram/pom.xml index 84e5e03e..35183bd5 100644 --- a/diagram/pom.xml +++ b/diagram/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0.Final serverlessworkflow-diagram diff --git a/pom.xml b/pom.xml index a5af87d0..afa11a45 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0.Final pom Serverless Workflow :: Parent @@ -20,7 +20,7 @@ CNCF - https://www.cncf.io// + https://www.cncf.io/ @@ -33,7 +33,7 @@ scm:git:git@github.com:serverlessworkflow/sdk-java.git scm:git:git@github.com:serverlessworkflow/sdk-java.git https://github.com/serverlessworkflow/sdk-java - 5.0.0.Final + 5.1.0.Final @@ -48,40 +48,40 @@ 11 ${java.version} ${java.version} + ${java.version} UTF-8 - 3.6.2 + 3.9.9 - - 3.2.0 - 3.3.1 - 3.13.0 - 3.1.2 - 3.0.0-M2 - 3.2.5 - 2.23 - 3.2.4 - 3.4.1 + + 3.2.1 + 3.6.0 + 3.14.0 + 3.1.4 + 3.5.0 + 3.5.3 + 2.25 + 3.2.7 + 3.4.2 ${java.version} - 1.1.2 - 3.6.3 - 3.0.1 + 1.2.2 + 3.11.2 + 3.1.1 3.3.1 - 3.2.5 + 3.5.3 - - - 1.5.6 - 2.17.1 - 1.4.0 + + 1.5.18 + 2.18.3 + 1.5.6 3.14.0 0.17.0 1.3 3.1.0 1.5.0 3.26.0 - 5.10.2 - 5.12.0 - 2.0.13 + 5.12.2 + 5.17.0 + 2.0.17 8059 3.1.2.RELEASE diff --git a/spi/pom.xml b/spi/pom.xml index b84de57c..e0ae4252 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0.Final serverlessworkflow-spi diff --git a/utils/pom.xml b/utils/pom.xml index 109d2ab6..2ee7ae56 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0.Final serverlessworkflow-util diff --git a/validation/pom.xml b/validation/pom.xml index e5a45a89..b508b230 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0.Final serverlessworkflow-validation pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy