From 3a6818a968c852e2d23a10bbe6e2a63e355104df Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Fri, 25 Apr 2025 18:55:41 +0200 Subject: [PATCH 1/6] Update produceevent.json Signed-off-by: fjtirado --- api/src/main/resources/schema/events/eventref.json | 3 ++- api/src/main/resources/schema/produce/produceevent.json | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 +} From 35a3a49ea0d94400e77b8c868b08e071c36c7033 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> Date: Tue, 29 Apr 2025 11:15:11 -0300 Subject: [PATCH 2/6] =?UTF-8?q?[5.x]=20Upgrade=20Java=20libraries,=20fix?= =?UTF-8?q?=20maven=20plugins,=20remove=20deprecated=20co=E2=80=A6=20(#565?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [5.x] Upgrade Java libraries, fix maven plugins, remove deprecated code, fix release CI Signed-off-by: Ricardo Zanini * Fix verify workflow Signed-off-by: Ricardo Zanini --------- Signed-off-by: Ricardo Zanini --- .github/workflows/maven-verify.yml | 8 +-- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 8 +-- .../api/mapper/BaseObjectMapper.java | 4 +- pom.xml | 52 ++++++++++--------- 5 files changed, 38 insertions(+), 36 deletions(-) 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/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/pom.xml b/pom.xml index a5af87d0..c7219122 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 io.serverlessworkflow @@ -20,7 +22,7 @@ CNCF - https://www.cncf.io// + https://www.cncf.io/ @@ -48,40 +50,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 From 806d9de341cbc1765fc1976a7f47bdce8a508dee Mon Sep 17 00:00:00 2001 From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> Date: Tue, 29 Apr 2025 12:04:45 -0300 Subject: [PATCH 3/6] Release 5.1.0.Final (#569) --- .github/project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yml b/.github/project.yml index 96953fd8..a87eb2f4 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 From 9814be062e662e1e5493720468dade15d13e6e0a Mon Sep 17 00:00:00 2001 From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> Date: Tue, 29 Apr 2025 12:48:57 -0300 Subject: [PATCH 4/6] [5.x] - Fix SNAPSHOT versions before releasing 5.1.0.Final (#570) Signed-off-by: Ricardo Zanini --- README.md | 20 ++++++++++---------- api/pom.xml | 2 +- diagram-rest/pom.xml | 4 ++-- diagram/pom.xml | 2 +- pom.xml | 4 ++-- spi/pom.xml | 2 +- utils/pom.xml | 2 +- validation/pom.xml | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) 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..66b30058 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0-SNAPSHOT serverlessworkflow-api 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..458331f2 100644 --- a/diagram/pom.xml +++ b/diagram/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0-SNAPSHOT serverlessworkflow-diagram diff --git a/pom.xml b/pom.xml index c7219122..3cd3e668 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0-SNAPSHOT pom Serverless Workflow :: Parent @@ -35,7 +35,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-SNAPSHOT diff --git a/spi/pom.xml b/spi/pom.xml index b84de57c..f37e00b3 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0-SNAPSHOT serverlessworkflow-spi diff --git a/utils/pom.xml b/utils/pom.xml index 109d2ab6..49518dbe 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0-SNAPSHOT serverlessworkflow-util diff --git a/validation/pom.xml b/validation/pom.xml index e5a45a89..910ba906 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.0.0.Final + 5.1.0-SNAPSHOT serverlessworkflow-validation From 30e83cc22e1c0477e10f4d488711195d286c6206 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> Date: Tue, 29 Apr 2025 13:22:34 -0300 Subject: [PATCH 5/6] Relese 5.1.0.Final (Second Try) (#571) * Relese 5.1.0.Final (Second Try) * Removing blanks Signed-off-by: Ricardo Zanini --------- Signed-off-by: Ricardo Zanini --- .github/project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/project.yml b/.github/project.yml index a87eb2f4..e246d98d 100644 --- a/.github/project.yml +++ b/.github/project.yml @@ -1,3 +1,3 @@ release: current-version: 5.1.0.Final - next-version: 5.2.0-SNAPSHOT + next-version: 5.2.0-SNAPSHOT \ No newline at end of file From c11a521c34b2e0d6ba271925e0b0e1477de4e7e9 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 29 Apr 2025 16:23:41 +0000 Subject: [PATCH 6/6] [maven-release-plugin] prepare release 5.1.0.Final --- api/pom.xml | 2 +- diagram/pom.xml | 2 +- pom.xml | 8 +++----- spi/pom.xml | 2 +- utils/pom.xml | 2 +- validation/pom.xml | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 66b30058..690a347f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.1.0-SNAPSHOT + 5.1.0.Final serverlessworkflow-api diff --git a/diagram/pom.xml b/diagram/pom.xml index 458331f2..35183bd5 100644 --- a/diagram/pom.xml +++ b/diagram/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.1.0-SNAPSHOT + 5.1.0.Final serverlessworkflow-diagram diff --git a/pom.xml b/pom.xml index 3cd3e668..afa11a45 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.serverlessworkflow serverlessworkflow-parent - 5.1.0-SNAPSHOT + 5.1.0.Final pom Serverless Workflow :: Parent @@ -35,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.1.0-SNAPSHOT + 5.1.0.Final diff --git a/spi/pom.xml b/spi/pom.xml index f37e00b3..e0ae4252 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.1.0-SNAPSHOT + 5.1.0.Final serverlessworkflow-spi diff --git a/utils/pom.xml b/utils/pom.xml index 49518dbe..2ee7ae56 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.1.0-SNAPSHOT + 5.1.0.Final serverlessworkflow-util diff --git a/validation/pom.xml b/validation/pom.xml index 910ba906..b508b230 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -4,7 +4,7 @@ io.serverlessworkflow serverlessworkflow-parent - 5.1.0-SNAPSHOT + 5.1.0.Final serverlessworkflow-validation