Skip to content

Commit 35a3a49

Browse files
ricardozaniniricardozanini
authored
[5.x] Upgrade Java libraries, fix maven plugins, remove deprecated co… (#565)
* [5.x] Upgrade Java libraries, fix maven plugins, remove deprecated code, fix release CI Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com> * Fix verify workflow Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com> --------- Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com>
1 parent 716514e commit 35a3a49

File tree

5 files changed

+38
-36
lines changed

5 files changed

+38
-36
lines changed

‎.github/workflows/maven-verify.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ name: sdk-java Verify
66
on:
77
push:
88
branches:
9-
- main
9+
- 5.*
1010
pull_request:
1111
branches:
12-
- main
12+
- 5.*
1313
jobs:
1414
build:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
1818

1919
- name: Set up JDK 11
20-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v4
2121
with:
2222
distribution: temurin
2323
java-version: 11

‎.github/workflows/pre-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: pre release
1212

1313
steps:
14-
- uses: radcortez/project-metadata-action@master
14+
- uses: radcortez/project-metadata-action@main
1515
name: retrieve project metadata
1616
id: metadata
1717
with:

‎.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
release:
1111
runs-on: ubuntu-latest
1212
name: release
13-
if: ${{github.event.pull_request.merged == true}}
13+
if: ${{ github.event.pull_request.merged == true }}
1414

1515
steps:
1616
- uses: radcortez/project-metadata-action@main
@@ -20,7 +20,7 @@ jobs:
2020
github-token: ${{secrets.GITHUB_TOKEN}}
2121
metadata-file-path: '.github/project.yml'
2222

23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424

2525
- name: Import GPG key
2626
id: import_gpg
@@ -30,7 +30,7 @@ jobs:
3030
passphrase: ${{ secrets.GPG_PASSPHRASE }}
3131

3232
- name: Set up JDK 11
33-
uses: actions/setup-java@v3
33+
uses: actions/setup-java@v4
3434
with:
3535
distribution: temurin
3636
java-version: 11
@@ -51,7 +51,7 @@ jobs:
5151
cat release.properties
5252
git checkout ${{github.base_ref}}
5353
git rebase release
54-
mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
54+
mvn -B release:perform -Prelease -Darguments="-DperformRelease"
5555
env:
5656
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
5757
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

‎api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
public class BaseObjectMapper extends ObjectMapper {
2626

27-
private WorkflowModule workflowModule;
27+
private final WorkflowModule workflowModule;
2828

2929
public BaseObjectMapper(JsonFactory factory, WorkflowPropertySource workflowPropertySource) {
3030
super(factory);
@@ -33,7 +33,7 @@ public BaseObjectMapper(JsonFactory factory, WorkflowPropertySource workflowProp
3333

3434
configure(SerializationFeature.INDENT_OUTPUT, true);
3535
registerModule(workflowModule);
36-
configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false);
36+
setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
3737
configOverride(Map.class)
3838
.setInclude(
3939
JsonInclude.Value.construct(

‎pom.xml

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<groupId>io.serverlessworkflow</groupId>
@@ -20,7 +22,7 @@
2022
</developers>
2123
<organization>
2224
<name>CNCF</name>
23-
<url>https://www.cncf.io//</url>
25+
<url>https://www.cncf.io/</url>
2426
</organization>
2527
<licenses>
2628
<license>
@@ -48,40 +50,40 @@
4850
<java.version>11</java.version>
4951
<maven.compiler.source>${java.version}</maven.compiler.source>
5052
<maven.compiler.target>${java.version}</maven.compiler.target>
53+
<maven.compiler.release>${java.version}</maven.compiler.release>
5154
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
52-
<version.maven>3.6.2</version.maven>
55+
<version.maven>3.9.9</version.maven>
5356

54-
<!-- Plugin versions, please keep in alphabetical order -->
55-
<version.buildnumber.plugin>3.2.0</version.buildnumber.plugin>
56-
<version.checkstyle.plugin>3.3.1</version.checkstyle.plugin>
57-
<version.compiler.plugin>3.13.0</version.compiler.plugin>
58-
<version.deploy.plugin>3.1.2</version.deploy.plugin>
59-
<version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
60-
<version.failsafe.plugin>3.2.5</version.failsafe.plugin>
61-
<version.fmt-maven-plugin>2.23</version.fmt-maven-plugin>
62-
<version.gpg.plugin>3.2.4</version.gpg.plugin>
63-
<version.jar.plugin>3.4.1</version.jar.plugin>
57+
<!-- Plugin versions -->
58+
<version.buildnumber.plugin>3.2.1</version.buildnumber.plugin>
59+
<version.checkstyle.plugin>3.6.0</version.checkstyle.plugin>
60+
<version.compiler.plugin>3.14.0</version.compiler.plugin>
61+
<version.deploy.plugin>3.1.4</version.deploy.plugin>
62+
<version.enforcer.plugin>3.5.0</version.enforcer.plugin>
63+
<version.failsafe.plugin>3.5.3</version.failsafe.plugin>
64+
<version.fmt-maven-plugin>2.25</version.fmt-maven-plugin>
65+
<version.gpg.plugin>3.2.7</version.gpg.plugin>
66+
<version.jar.plugin>3.4.2</version.jar.plugin>
6467
<version.jdk>${java.version}</version.jdk>
65-
<version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
66-
<version.javadoc.plugin>3.6.3</version.javadoc.plugin>
67-
<version.release.plugin>3.0.1</version.release.plugin>
68+
<version.jsonschema2pojo-maven-plugin>1.2.2</version.jsonschema2pojo-maven-plugin>
69+
<version.javadoc.plugin>3.11.2</version.javadoc.plugin>
70+
<version.release.plugin>3.1.1</version.release.plugin>
6871
<version.source.plugin>3.3.1</version.source.plugin>
69-
<version.surefire.plugin>3.2.5</version.surefire.plugin>
72+
<version.surefire.plugin>3.5.3</version.surefire.plugin>
7073

71-
72-
<!-- Dependencies versions, please keep in alphabetical order -->
73-
<version.ch.qos.logback>1.5.6</version.ch.qos.logback>
74-
<version.com.fasterxml.jackson>2.17.1</version.com.fasterxml.jackson>
75-
<version.com.networknt>1.4.0</version.com.networknt>
74+
<!-- Dependency versions -->
75+
<version.ch.qos.logback>1.5.18</version.ch.qos.logback>
76+
<version.com.fasterxml.jackson>2.18.3</version.com.fasterxml.jackson>
77+
<version.com.networknt>1.5.6</version.com.networknt>
7678
<version.commons.lang>3.14.0</version.commons.lang>
7779
<version.graphviz>0.17.0</version.graphviz>
7880
<version.hamcrest>1.3</version.hamcrest>
7981
<version.jakarta.validation>3.1.0</version.jakarta.validation>
8082
<version.jsonassert>1.5.0</version.jsonassert>
8183
<version.org.assertj>3.26.0</version.org.assertj>
82-
<version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
83-
<version.org.mockito>5.12.0</version.org.mockito>
84-
<version.org.slf4j>2.0.13</version.org.slf4j>
84+
<version.org.junit.jupiter>5.12.2</version.org.junit.jupiter>
85+
<version.org.mockito>5.17.0</version.org.mockito>
86+
<version.org.slf4j>2.0.17</version.org.slf4j>
8587
<version.plantuml>8059</version.plantuml>
8688
<version.thymeleaf>3.1.2.RELEASE</version.thymeleaf>
8789

0 commit comments

Comments
 (0)