Skip to content

Commit 77fb3ea

Browse files
committed
Library updates to squash reported CVEs.
1 parent 0ba6aba commit 77fb3ea

File tree

2 files changed

+2
-62
lines changed

2 files changed

+2
-62
lines changed

etc/owasp-suppressions.xml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,6 @@
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
33
<suppress>
44
<notes><![CDATA[
5-
file name: log4j-api-2.14.1.jar
6-
]]></notes>
7-
<packageUrl regex="true">^pkg:maven/org\.apache\.logging\.log4j/log4j\-api@.*$</packageUrl>
8-
<cve>CVE-2021-44228</cve>
9-
</suppress>
10-
<suppress>
11-
<notes><![CDATA[
12-
file name: log4j-api-2.14.1.jar
13-
]]></notes>
14-
<packageUrl regex="true">^pkg:maven/org\.apache\.logging\.log4j/log4j\-api@.*$</packageUrl>
15-
<cve>CVE-2021-45046</cve>
16-
</suppress>
17-
<suppress>
18-
<notes><![CDATA[
19-
file name: log4j-to-slf4j-2.14.1.jar
20-
]]></notes>
21-
<packageUrl regex="true">^pkg:maven/org\.apache\.logging\.log4j/log4j\-to\-slf4j@.*$</packageUrl>
22-
<cve>CVE-2021-44228</cve>
23-
</suppress>
24-
<suppress>
25-
<notes><![CDATA[
26-
file name: log4j-to-slf4j-2.14.1.jar
27-
]]></notes>
28-
<packageUrl regex="true">^pkg:maven/org\.apache\.logging\.log4j/log4j\-to\-slf4j@.*$</packageUrl>
29-
<cve>CVE-2021-45046</cve>
30-
</suppress>
31-
<suppress>
32-
<notes><![CDATA[
33-
file name: log4j-api-2.14.1.jar
34-
]]></notes>
35-
<packageUrl regex="true">^pkg:maven/org\.apache\.logging\.log4j/log4j\-api@.*$</packageUrl>
36-
<cve>CVE-2021-45105</cve>
37-
</suppress>
38-
<suppress>
39-
<notes><![CDATA[
40-
file name: log4j-to-slf4j-2.14.1.jar
41-
]]></notes>
42-
<packageUrl regex="true">^pkg:maven/org\.apache\.logging\.log4j/log4j\-to\-slf4j@.*$</packageUrl>
43-
<cve>CVE-2021-45105</cve>
44-
</suppress>
45-
<suppress>
46-
<notes><![CDATA[
475
file name: itext-2.1.7.js8.jar
486
]]></notes>
497
<packageUrl regex="true">^pkg:maven/com\.lowagie/itext@.*$</packageUrl>

pom.xml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>2.6.1</version>
16+
<version>2.6.2</version>
1717
</parent>
1818

1919
<modules>
@@ -45,15 +45,7 @@
4545
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4646
<validatorTimestamp>${maven.build.timestamp}</validatorTimestamp>
4747
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss (XXX)</maven.build.timestamp.format>
48-
<!-- Note START
49-
For Spring Boot versions above 2.6.1 check to see
50-
if the org.thymeleaf.thymeleaf-spring5 dependency is at least at 3.0.13.RELEASE.
51-
If yes remove the explicit thymeleaf version and dependency management section
52-
(this was added to address CVE-2021-43466).
53-
-->
54-
<version.springBoot>2.6.1</version.springBoot>
55-
<version.thymeleaf>3.0.13.RELEASE</version.thymeleaf>
56-
<!-- Note END -->
48+
<version.springBoot>2.6.2</version.springBoot>
5749
<version.gitbTypes>1.15.0</version.gitbTypes>
5850
<version.itbCommons>1.1.0-SNAPSHOT</version.itbCommons>
5951
<version.slf4j>1.7.32</version.slf4j>
@@ -105,16 +97,6 @@
10597

10698
<dependencyManagement>
10799
<dependencies>
108-
<dependency>
109-
<groupId>org.thymeleaf</groupId>
110-
<artifactId>thymeleaf-spring5</artifactId>
111-
<version>${version.thymeleaf}</version>
112-
</dependency>
113-
<dependency>
114-
<groupId>org.thymeleaf</groupId>
115-
<artifactId>thymeleaf</artifactId>
116-
<version>${version.thymeleaf}</version>
117-
</dependency>
118100
<dependency>
119101
<groupId>eu.europa.ec.itb.json</groupId>
120102
<artifactId>jsonvalidator-common</artifactId>

0 commit comments

Comments
 (0)