Skip to content

Commit f87a94b

Browse files
Merge pull request #231 from ricardozanini/cherry-pick-cve-4.0.3
Cherry-pick CVEs fixes and javadoc upgrade
2 parents 357fc71 + a8e81da commit f87a94b

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.DS_Store
12
HELP.md
23
target/
34
!.mvn/wrapper/maven-wrapper.jar

pom.xml

+8-5
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@
6666
<version.org.junit>5.${version.org.junit.minor}</version.org.junit>
6767
<version.org.junit.jupiter>${version.org.junit}</version.org.junit.jupiter>
6868
<version.org.mockito>3.0.0</version.org.mockito>
69-
<version.ch.qos.logback>1.1.3</version.ch.qos.logback>
69+
<version.ch.qos.logback>1.4.8</version.ch.qos.logback>
7070
<version.org.assertj>3.13.2</version.org.assertj>
7171
<version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
7272
<commons.lang.version>3.9</commons.lang.version>
7373
<hamcrest.version>1.3</hamcrest.version>
7474
<jsonassert.version>1.5.0</jsonassert.version>
75-
<json.schema.validation.version>1.12.1</json.schema.validation.version>
76-
<version.json>20200518</version.json>
75+
<json.schema.validation.version>1.14.1</json.schema.validation.version>
76+
<version.json>20230618</version.json>
7777
<version.thymeleaf>3.0.11.RELEASE</version.thymeleaf>
7878
<version.plantuml>8059</version.plantuml>
7979
<version.graphviz>0.17.0</version.graphviz>
@@ -277,7 +277,7 @@
277277
<artifactId>maven-surefire-plugin</artifactId>
278278
<version>${version.surefire.plugin}</version>
279279
<configuration>
280-
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
280+
<argLine>-Xmx1024m -XX:+IgnoreUnrecognizedVMOptions -XX:MaxPermSize=256m</argLine>
281281
</configuration>
282282
</plugin>
283283
<plugin>
@@ -311,7 +311,7 @@
311311
<plugin>
312312
<groupId>org.apache.maven.plugins</groupId>
313313
<artifactId>maven-javadoc-plugin</artifactId>
314-
<version>2.10.4</version>
314+
<version>3.5.0</version>
315315
<configuration>
316316
<source>8</source>
317317
<additionalparam>-Xdoclint:none</additionalparam>
@@ -322,6 +322,9 @@
322322
<goals>
323323
<goal>jar</goal>
324324
</goals>
325+
<configuration>
326+
<failOnError>false</failOnError>
327+
</configuration>
325328
</execution>
326329
</executions>
327330
</plugin>

0 commit comments

Comments
 (0)