From bbb75b98789f7606a03cc50e16ccbcfd70545574 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Mon, 28 Apr 2025 12:57:42 -0400 Subject: [PATCH 1/2] [4.x] Upgrade Java libraries, fix maven plugins, remove deprecated code, fix release CI Signed-off-by: Ricardo Zanini --- .github/workflows/maven-verify.yml | 8 +- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 10 +-- api/pom.xml | 20 ----- diagram/pom.xml | 20 ----- pom.xml | 76 +++++++++++++------ spi/pom.xml | 20 ----- utils/pom.xml | 20 ----- .../utils/WorkflowUtils.java | 8 +- validation/pom.xml | 20 ----- .../test/WorkflowValidationTest.java | 2 +- 11 files changed, 66 insertions(+), 140 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 44aba632..e5689513 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -6,18 +6,18 @@ name: sdk-java Verify on: push: branches: - - 4.0.* + - 4.* pull_request: branches: - - 4.0.* + - 4.* jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 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 3a188b77..07361f95 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 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 @@ -51,10 +51,10 @@ 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 }} - name: Push tags - run: git push && git push --tags + run: git push && git push --tags \ No newline at end of file diff --git a/api/pom.xml b/api/pom.xml index dc01dfeb..1aef17b9 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -140,26 +140,6 @@ - - com.coveo - fmt-maven-plugin - - src/main/java - src/test/java - false - .*\.java - false - false - - - - - - format - - - - org.apache.maven.plugins maven-jar-plugin diff --git a/diagram/pom.xml b/diagram/pom.xml index dbbbf0d3..89899ea5 100644 --- a/diagram/pom.xml +++ b/diagram/pom.xml @@ -127,26 +127,6 @@ - - com.coveo - fmt-maven-plugin - - src/main/java - src/test/java - false - .*\.java - false - false - - - - - - format - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index e4d125b4..7bf34a27 100644 --- a/pom.xml +++ b/pom.xml @@ -48,42 +48,42 @@ 1.8 ${java.version} ${java.version} + 8 UTF-8 - 3.6.2 + 3.9.7 - 3.2.0 - 3.1.1 - 3.8.1 - 2.8.2 - 3.0.0-M2 - 3.1.2 - 2.9.1 - 3.1.0 - 3.2.0 + 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.0.1 - 3.6.0 - 3.0.1 - 3.3.0 - 2.22.0 + 1.2.2 + 3.11.2 + 3.1.1 + 3.3.1 + 3.5.3 + 1.7.0 - 1.4.9 - 2.15.3 - 1.0.87 + 1.5.18 + 2.18.3 + 1.5.6 3.13.0 0.17.0 1.3 2.0.1.Final 1.5.0 3.13.2 - ${version.org.junit} - 6.0 - 5.${version.org.junit.minor} - 5.6.0 - 1.7.25 + 5.12.2 + 5.17.0 + 2.0.17 8059 3.1.2.RELEASE @@ -271,6 +271,17 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + ${version.nexus.plugin} + true + + ossrh + https://oss.sonatype.org/ + true + + org.apache.maven.plugins maven-gpg-plugin @@ -383,9 +394,24 @@ ${version.checkstyle.plugin} - com.coveo + com.spotify.fmt fmt-maven-plugin - ${version.fmt-maven-plugin} + + src/main/java + src/test/java + false + .*\.java + false + false + + + + + + format + + + org.apache.maven.plugins diff --git a/spi/pom.xml b/spi/pom.xml index 6121958e..bafb917b 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -99,26 +99,6 @@ - - com.coveo - fmt-maven-plugin - - src/main/java - src/test/java - false - .*\.java - false - false - - - - - - format - - - - \ No newline at end of file diff --git a/utils/pom.xml b/utils/pom.xml index d0b6d73f..4d758cf7 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -99,26 +99,6 @@ - - com.coveo - fmt-maven-plugin - - src/main/java - src/test/java - false - .*\.java - false - false - - - - - - format - - - - \ No newline at end of file diff --git a/utils/src/main/java/io/serverlessworkflow/utils/WorkflowUtils.java b/utils/src/main/java/io/serverlessworkflow/utils/WorkflowUtils.java index 29b8c7cc..a5673b40 100644 --- a/utils/src/main/java/io/serverlessworkflow/utils/WorkflowUtils.java +++ b/utils/src/main/java/io/serverlessworkflow/utils/WorkflowUtils.java @@ -574,7 +574,7 @@ public static JsonNode mergeNodes(JsonNode mainNode, JsonNode updateNode) { if (mainNode instanceof ObjectNode) { // Overwrite field JsonNode value = updateNode.get(fieldName); - ((ObjectNode) mainNode).put(fieldName, value); + ((ObjectNode) mainNode).set(fieldName, value); } } } @@ -591,7 +591,7 @@ public static JsonNode mergeNodes(JsonNode mainNode, JsonNode updateNode) { * @return original, main node with field added */ public static JsonNode addNode(JsonNode mainNode, JsonNode toAddNode, String fieldName) { - ((ObjectNode) mainNode).put(fieldName, toAddNode); + ((ObjectNode) mainNode).set(fieldName, toAddNode); return mainNode; } @@ -604,7 +604,7 @@ public static JsonNode addNode(JsonNode mainNode, JsonNode toAddNode, String fie * @return original, main node with array added */ public static JsonNode addArray(JsonNode mainNode, ArrayNode toAddArray, String arrayName) { - ((ObjectNode) mainNode).put(arrayName, toAddArray); + ((ObjectNode) mainNode).set(arrayName, toAddArray); return mainNode; } @@ -618,7 +618,7 @@ public static JsonNode addArray(JsonNode mainNode, ArrayNode toAddArray, String */ public static JsonNode addFieldValue(JsonNode mainNode, Object toAddValue, String fieldName) { ObjectMapper mapper = new ObjectMapper(); - ((ObjectNode) mainNode).put(fieldName, mapper.valueToTree(toAddValue)); + ((ObjectNode) mainNode).set(fieldName, mapper.valueToTree(toAddValue)); return mainNode; } } diff --git a/validation/pom.xml b/validation/pom.xml index 9ad9ea2b..28d185ef 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -121,26 +121,6 @@ - - com.coveo - fmt-maven-plugin - - src/main/java - src/test/java - false - .*\.java - false - false - - - - - - format - - - - diff --git a/validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java b/validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java index 08237525..6ccef44f 100644 --- a/validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java +++ b/validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java @@ -122,7 +122,7 @@ public void testWorkflowMissingStatesIdAndKey() { Assertions.assertEquals(1, validationErrors.size()); Assertions.assertEquals( - "$.id: is missing but it is required", validationErrors.get(0).getMessage()); + "$: required property 'id' not found", validationErrors.get(0).getMessage()); } @Test From a2352e98bd273365c49bc21c42441b5723c5041d Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Mon, 28 Apr 2025 13:04:51 -0400 Subject: [PATCH 2/2] Downgrade Logback to support Java 8 Signed-off-by: Ricardo Zanini --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7bf34a27..df9355b5 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ - 1.5.18 + 1.2.11 2.18.3 1.5.6 3.13.0