Skip to content

Commit 6016407

Browse files
fjtiradofjtirado
authored
Merge pull request #564 from ricardozanini/fix-ci-release-4.x
[4.x] Upgrade Java libraries, fix maven plugins, remove deprecated code, fix release CI
2 parents c60e746 + a2352e9 commit 6016407

File tree

11 files changed

+66
-140
lines changed

11 files changed

+66
-140
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-
- 4.0.*
9+
- 4.*
1010
pull_request:
1111
branches:
12-
- 4.0.*
12+
- 4.*
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 1.8
20-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v4
2121
with:
2222
distribution: temurin
2323
java-version: 8

‎.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: 5 additions & 5 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 1.8
33-
uses: actions/setup-java@v3
33+
uses: actions/setup-java@v4
3434
with:
3535
distribution: temurin
3636
java-version: 8
@@ -51,10 +51,10 @@ 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 }}
5858

5959
- name: Push tags
60-
run: git push && git push --tags
60+
run: git push && git push --tags

‎api/pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -140,26 +140,6 @@
140140
</execution>
141141
</executions>
142142
</plugin>
143-
<plugin>
144-
<groupId>com.coveo</groupId>
145-
<artifactId>fmt-maven-plugin</artifactId>
146-
<configuration>
147-
<sourceDirectory>src/main/java</sourceDirectory>
148-
<testSourceDirectory>src/test/java</testSourceDirectory>
149-
<verbose>false</verbose>
150-
<filesNamePattern>.*\.java</filesNamePattern>
151-
<skip>false</skip>
152-
<skipSortingImports>false</skipSortingImports>
153-
<style>google</style>
154-
</configuration>
155-
<executions>
156-
<execution>
157-
<goals>
158-
<goal>format</goal>
159-
</goals>
160-
</execution>
161-
</executions>
162-
</plugin>
163143
<plugin>
164144
<groupId>org.apache.maven.plugins</groupId>
165145
<artifactId>maven-jar-plugin</artifactId>

‎diagram/pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -127,26 +127,6 @@
127127
</execution>
128128
</executions>
129129
</plugin>
130-
<plugin>
131-
<groupId>com.coveo</groupId>
132-
<artifactId>fmt-maven-plugin</artifactId>
133-
<configuration>
134-
<sourceDirectory>src/main/java</sourceDirectory>
135-
<testSourceDirectory>src/test/java</testSourceDirectory>
136-
<verbose>false</verbose>
137-
<filesNamePattern>.*\.java</filesNamePattern>
138-
<skip>false</skip>
139-
<skipSortingImports>false</skipSortingImports>
140-
<style>google</style>
141-
</configuration>
142-
<executions>
143-
<execution>
144-
<goals>
145-
<goal>format</goal>
146-
</goals>
147-
</execution>
148-
</executions>
149-
</plugin>
150130
</plugins>
151131
</build>
152132
</project>

‎pom.xml

Lines changed: 51 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,42 +48,42 @@
4848
<java.version>1.8</java.version>
4949
<maven.compiler.source>${java.version}</maven.compiler.source>
5050
<maven.compiler.target>${java.version}</maven.compiler.target>
51+
<maven.compiler.release>8</maven.compiler.release>
5152
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
52-
<version.maven>3.6.2</version.maven>
53+
<version.maven>3.9.7</version.maven>
5354

5455
<!-- Plugin versions, please keep in alphabetical order -->
55-
<version.buildnumber.plugin>3.2.0</version.buildnumber.plugin>
56-
<version.checkstyle.plugin>3.1.1</version.checkstyle.plugin>
57-
<version.compiler.plugin>3.8.1</version.compiler.plugin>
58-
<version.deploy.plugin>2.8.2</version.deploy.plugin>
59-
<version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
60-
<version.failsafe.plugin>3.1.2</version.failsafe.plugin>
61-
<version.fmt-maven-plugin>2.9.1</version.fmt-maven-plugin>
62-
<version.gpg.plugin>3.1.0</version.gpg.plugin>
63-
<version.jar.plugin>3.2.0</version.jar.plugin>
56+
<version.buildnumber.plugin>3.2.1</version.buildnumber.plugin>
57+
<version.checkstyle.plugin>3.6.0</version.checkstyle.plugin>
58+
<version.compiler.plugin>3.14.0</version.compiler.plugin>
59+
<version.deploy.plugin>3.1.4</version.deploy.plugin>
60+
<version.enforcer.plugin>3.5.0</version.enforcer.plugin>
61+
<version.failsafe.plugin>3.5.3</version.failsafe.plugin>
62+
<version.fmt-maven-plugin>2.25</version.fmt-maven-plugin>
63+
<version.gpg.plugin>3.2.7</version.gpg.plugin>
64+
<version.jar.plugin>3.4.2</version.jar.plugin>
6465
<version.jdk>${java.version}</version.jdk>
65-
<version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
66-
<version.javadoc.plugin>3.6.0</version.javadoc.plugin>
67-
<version.release.plugin>3.0.1</version.release.plugin>
68-
<version.source.plugin>3.3.0</version.source.plugin>
69-
<version.surefire.plugin>2.22.0</version.surefire.plugin>
66+
<version.jsonschema2pojo-maven-plugin>1.2.2</version.jsonschema2pojo-maven-plugin>
67+
<version.javadoc.plugin>3.11.2</version.javadoc.plugin>
68+
<version.release.plugin>3.1.1</version.release.plugin>
69+
<version.source.plugin>3.3.1</version.source.plugin>
70+
<version.surefire.plugin>3.5.3</version.surefire.plugin>
71+
<version.nexus.plugin>1.7.0</version.nexus.plugin>
7072

7173

7274
<!-- Dependencies versions, please keep in alphabetical order -->
73-
<version.ch.qos.logback>1.4.9</version.ch.qos.logback>
74-
<version.com.fasterxml.jackson>2.15.3</version.com.fasterxml.jackson>
75-
<version.com.networknt>1.0.87</version.com.networknt>
75+
<version.ch.qos.logback>1.2.11</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.13.0</version.commons.lang>
7779
<version.graphviz>0.17.0</version.graphviz>
7880
<version.hamcrest>1.3</version.hamcrest>
7981
<version.javax.validation>2.0.1.Final</version.javax.validation>
8082
<version.jsonassert>1.5.0</version.jsonassert>
8183
<version.org.assertj>3.13.2</version.org.assertj>
82-
<version.org.junit.jupiter>${version.org.junit}</version.org.junit.jupiter>
83-
<version.org.junit.minor>6.0</version.org.junit.minor>
84-
<version.org.junit>5.${version.org.junit.minor}</version.org.junit>
85-
<version.org.mockito>5.6.0</version.org.mockito>
86-
<version.org.slf4j>1.7.25</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>
8787
<version.plantuml>8059</version.plantuml>
8888
<version.thymeleaf>3.1.2.RELEASE</version.thymeleaf>
8989

@@ -271,6 +271,17 @@
271271

272272
<pluginManagement>
273273
<plugins>
274+
<plugin>
275+
<groupId>org.sonatype.plugins</groupId>
276+
<artifactId>nexus-staging-maven-plugin</artifactId>
277+
<version>${version.nexus.plugin}</version>
278+
<extensions>true</extensions>
279+
<configuration>
280+
<serverId>ossrh</serverId>
281+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
282+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
283+
</configuration>
284+
</plugin>
274285
<plugin>
275286
<groupId>org.apache.maven.plugins</groupId>
276287
<artifactId>maven-gpg-plugin</artifactId>
@@ -383,9 +394,24 @@
383394
<version>${version.checkstyle.plugin}</version>
384395
</plugin>
385396
<plugin>
386-
<groupId>com.coveo</groupId>
397+
<groupId>com.spotify.fmt</groupId>
387398
<artifactId>fmt-maven-plugin</artifactId>
388-
<version>${version.fmt-maven-plugin}</version>
399+
<configuration>
400+
<sourceDirectory>src/main/java</sourceDirectory>
401+
<testSourceDirectory>src/test/java</testSourceDirectory>
402+
<verbose>false</verbose>
403+
<filesNamePattern>.*\.java</filesNamePattern>
404+
<skip>false</skip>
405+
<skipSortingImports>false</skipSortingImports>
406+
<style>google</style>
407+
</configuration>
408+
<executions>
409+
<execution>
410+
<goals>
411+
<goal>format</goal>
412+
</goals>
413+
</execution>
414+
</executions>
389415
</plugin>
390416
<plugin>
391417
<groupId>org.apache.maven.plugins</groupId>

‎spi/pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -99,26 +99,6 @@
9999
</execution>
100100
</executions>
101101
</plugin>
102-
<plugin>
103-
<groupId>com.coveo</groupId>
104-
<artifactId>fmt-maven-plugin</artifactId>
105-
<configuration>
106-
<sourceDirectory>src/main/java</sourceDirectory>
107-
<testSourceDirectory>src/test/java</testSourceDirectory>
108-
<verbose>false</verbose>
109-
<filesNamePattern>.*\.java</filesNamePattern>
110-
<skip>false</skip>
111-
<skipSortingImports>false</skipSortingImports>
112-
<style>google</style>
113-
</configuration>
114-
<executions>
115-
<execution>
116-
<goals>
117-
<goal>format</goal>
118-
</goals>
119-
</execution>
120-
</executions>
121-
</plugin>
122102
</plugins>
123103
</build>
124104
</project>

‎utils/pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -99,26 +99,6 @@
9999
</execution>
100100
</executions>
101101
</plugin>
102-
<plugin>
103-
<groupId>com.coveo</groupId>
104-
<artifactId>fmt-maven-plugin</artifactId>
105-
<configuration>
106-
<sourceDirectory>src/main/java</sourceDirectory>
107-
<testSourceDirectory>src/test/java</testSourceDirectory>
108-
<verbose>false</verbose>
109-
<filesNamePattern>.*\.java</filesNamePattern>
110-
<skip>false</skip>
111-
<skipSortingImports>false</skipSortingImports>
112-
<style>google</style>
113-
</configuration>
114-
<executions>
115-
<execution>
116-
<goals>
117-
<goal>format</goal>
118-
</goals>
119-
</execution>
120-
</executions>
121-
</plugin>
122102
</plugins>
123103
</build>
124104
</project>

‎utils/src/main/java/io/serverlessworkflow/utils/WorkflowUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ public static JsonNode mergeNodes(JsonNode mainNode, JsonNode updateNode) {
574574
if (mainNode instanceof ObjectNode) {
575575
// Overwrite field
576576
JsonNode value = updateNode.get(fieldName);
577-
((ObjectNode) mainNode).put(fieldName, value);
577+
((ObjectNode) mainNode).set(fieldName, value);
578578
}
579579
}
580580
}
@@ -591,7 +591,7 @@ public static JsonNode mergeNodes(JsonNode mainNode, JsonNode updateNode) {
591591
* @return original, main node with field added
592592
*/
593593
public static JsonNode addNode(JsonNode mainNode, JsonNode toAddNode, String fieldName) {
594-
((ObjectNode) mainNode).put(fieldName, toAddNode);
594+
((ObjectNode) mainNode).set(fieldName, toAddNode);
595595
return mainNode;
596596
}
597597

@@ -604,7 +604,7 @@ public static JsonNode addNode(JsonNode mainNode, JsonNode toAddNode, String fie
604604
* @return original, main node with array added
605605
*/
606606
public static JsonNode addArray(JsonNode mainNode, ArrayNode toAddArray, String arrayName) {
607-
((ObjectNode) mainNode).put(arrayName, toAddArray);
607+
((ObjectNode) mainNode).set(arrayName, toAddArray);
608608
return mainNode;
609609
}
610610

@@ -618,7 +618,7 @@ public static JsonNode addArray(JsonNode mainNode, ArrayNode toAddArray, String
618618
*/
619619
public static JsonNode addFieldValue(JsonNode mainNode, Object toAddValue, String fieldName) {
620620
ObjectMapper mapper = new ObjectMapper();
621-
((ObjectNode) mainNode).put(fieldName, mapper.valueToTree(toAddValue));
621+
((ObjectNode) mainNode).set(fieldName, mapper.valueToTree(toAddValue));
622622
return mainNode;
623623
}
624624
}

‎validation/pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -121,26 +121,6 @@
121121
</execution>
122122
</executions>
123123
</plugin>
124-
<plugin>
125-
<groupId>com.coveo</groupId>
126-
<artifactId>fmt-maven-plugin</artifactId>
127-
<configuration>
128-
<sourceDirectory>src/main/java</sourceDirectory>
129-
<testSourceDirectory>src/test/java</testSourceDirectory>
130-
<verbose>false</verbose>
131-
<filesNamePattern>.*\.java</filesNamePattern>
132-
<skip>false</skip>
133-
<skipSortingImports>false</skipSortingImports>
134-
<style>google</style>
135-
</configuration>
136-
<executions>
137-
<execution>
138-
<goals>
139-
<goal>format</goal>
140-
</goals>
141-
</execution>
142-
</executions>
143-
</plugin>
144124
</plugins>
145125
</build>
146126
</project>

‎validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public void testWorkflowMissingStatesIdAndKey() {
122122
Assertions.assertEquals(1, validationErrors.size());
123123

124124
Assertions.assertEquals(
125-
"$.id: is missing but it is required", validationErrors.get(0).getMessage());
125+
"$: required property 'id' not found", validationErrors.get(0).getMessage());
126126
}
127127

128128
@Test

0 commit comments

Comments
 (0)