From ae6e94c2809274dc8f2e77b833a95ab4584ccf3e Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Mon, 28 Apr 2025 13:43:34 -0400 Subject: [PATCH 1/2] [5.x] Upgrade Java libraries, fix maven plugins, remove deprecated code, fix release CI Signed-off-by: Ricardo Zanini --- .github/workflows/maven-verify.yml | 4 +- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 8 +-- .../api/mapper/BaseObjectMapper.java | 4 +- pom.xml | 52 ++++++++++--------- 5 files changed, 36 insertions(+), 34 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 1b7d432c..a7040fc0 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -14,10 +14,10 @@ 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 3ab34954a7e0ffcdc5b6fc834f4153d8777d6e04 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Mon, 28 Apr 2025 13:56:06 -0400 Subject: [PATCH 2/2] Fix verify workflow Signed-off-by: Ricardo Zanini --- .github/workflows/maven-verify.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index a7040fc0..aaca3d0d 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -6,10 +6,10 @@ name: sdk-java Verify on: push: branches: - - main + - 5.* pull_request: branches: - - main + - 5.* jobs: build: runs-on: ubuntu-latest 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