Merge pull request #231 from ricardozanini/cherry-pick-cve-4.0.3

Cherry-pick CVEs fixes and javadoc upgrade
serverlessworkflow · Jul 4, 2023 · f87a94b · f87a94b
2 parents 357fc71 + a8e81da
commit f87a94b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar

diff --git a/pom.xml b/pom.xml
@@ -66,14 +66,14 @@
         <version.org.junit>5.${version.org.junit.minor}</version.org.junit>
         <version.org.junit.jupiter>${version.org.junit}</version.org.junit.jupiter>
         <version.org.mockito>3.0.0</version.org.mockito>
-        <version.ch.qos.logback>1.1.3</version.ch.qos.logback>
+        <version.ch.qos.logback>1.4.8</version.ch.qos.logback>
         <version.org.assertj>3.13.2</version.org.assertj>
         <version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
         <commons.lang.version>3.9</commons.lang.version>
         <hamcrest.version>1.3</hamcrest.version>
         <jsonassert.version>1.5.0</jsonassert.version>
-        <json.schema.validation.version>1.12.1</json.schema.validation.version>
-        <version.json>20200518</version.json>
+        <json.schema.validation.version>1.14.1</json.schema.validation.version>
+        <version.json>20230618</version.json>
         <version.thymeleaf>3.0.11.RELEASE</version.thymeleaf>
         <version.plantuml>8059</version.plantuml>
         <version.graphviz>0.17.0</version.graphviz>
@@ -277,7 +277,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${version.surefire.plugin}</version>
                 <configuration>
-                    <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
+                    <argLine>-Xmx1024m -XX:+IgnoreUnrecognizedVMOptions -XX:MaxPermSize=256m</argLine>
                 </configuration>
             </plugin>
             <plugin>
@@ -311,7 +311,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
+                <version>3.5.0</version>
                 <configuration>
                     <source>8</source>
                     <additionalparam>-Xdoclint:none</additionalparam>
@@ -322,6 +322,9 @@
                         <goals>
                             <goal>jar</goal>
                         </goals>
+                        <configuration>
+                            <failOnError>false</failOnError>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>