Skip to content
This repository was archived by the owner on May 16, 2023. It is now read-only.

Commit 964f6a3

Browse files
authored
Feat/springdocs upgrade (#15)
* Migration to Springdoc 2 * Migration to Springdoc 2 * Explicit import of newer version of fileupload to fix CVE-2023-24998 * Added another h2 CVE suppression since still only used for testing * Added false positive for guava * Removed version since it's managed at parent * Moved version since it's managed at parent
1 parent 0809116 commit 964f6a3

4 files changed

Lines changed: 20 additions & 3 deletions

File tree

feign/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,15 @@
2727
<groupId>org.springframework.cloud</groupId>
2828
<artifactId>spring-cloud-starter-openfeign</artifactId>
2929
</dependency>
30+
3031
<dependency>
3132
<groupId>io.github.openfeign</groupId>
3233
<artifactId>feign-httpclient</artifactId>
3334
</dependency>
35+
<!-- To satisfy CVE-2023-24998 happening in openfeign -->
36+
<dependency>
37+
<groupId>commons-fileupload</groupId>
38+
<artifactId>commons-fileupload</artifactId>
39+
</dependency>
3440
</dependencies>
3541
</project>

owasp/suppressions.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,17 @@
1414
<suppress>
1515
<notes>H2 is only used for testing, not production</notes>
1616
<cve>CVE-2022-45868</cve>
17+
<cve>CVE-2018-14335</cve>
1718
</suppress>
1819

1920
<suppress>
2021
<notes>False positive. CVE is matching for hutools. OWASP Check matches for json-lib</notes>
2122
<cve>CVE-2022-45688</cve>
2223
</suppress>
2324

25+
<suppress>
26+
<notes>False positive. guava version is higher than 30.0 and this CVE should not match</notes>
27+
<cve>CVE-2020-8908</cve>
28+
</suppress>
29+
2430
</suppressions>

pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
</dependency>
8181
<dependency>
8282
<groupId>org.springdoc</groupId>
83-
<artifactId>springdoc-openapi-ui</artifactId>
84-
<version>1.6.14</version>
83+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
84+
<version>2.0.4</version>
8585
</dependency>
8686

8787

@@ -117,6 +117,11 @@
117117
<version>3.6.1</version>
118118
<scope>compile</scope>
119119
</dependency>
120+
<dependency>
121+
<groupId>commons-fileupload</groupId>
122+
<artifactId>commons-fileupload</artifactId>
123+
<version>1.5</version>
124+
</dependency>
120125

121126

122127
<!-- JJWT -->

spring-boot/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<!-- Documentation -->
7474
<dependency>
7575
<groupId>org.springdoc</groupId>
76-
<artifactId>springdoc-openapi-ui</artifactId>
76+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
7777
</dependency>
7878

7979
<!-- Test -->

0 commit comments

Comments
 (0)