- Override snakeyaml version to make Trivy happy

- Update to Spring Boot 3 compatible spring doc packages
oracle · Jul 20, 2023 · 1ed1788 · 1ed1788
1 parent 27bf157
commit 1ed1788
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/carts/pom.xml b/carts/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${version.lib.springdoc-openapi}</version>
         </dependency>
 

diff --git a/catalog/pom.xml b/catalog/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${version.lib.springdoc-openapi}</version>
         </dependency>
 

diff --git a/orders/pom.xml b/orders/pom.xml
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${version.lib.springdoc-openapi}</version>
         </dependency>
 

diff --git a/payment/pom.xml b/payment/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${version.lib.springdoc-openapi}</version>
         </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -36,9 +36,10 @@
         <version.lib.junit>5.9.3</version.lib.junit>
         <version.lib.lombok>1.18.28</version.lib.lombok>
         <version.lib.rest-assured>5.3.1</version.lib.rest-assured>
+        <version.lib.snake.yaml>2.0</version.lib.snake.yaml>
         <version.lib.spring-boot>3.1.2</version.lib.spring-boot>
         <version.lib.spring-cloud>2022.0.3</version.lib.spring-cloud>
-        <version.lib.springdoc-openapi>1.7.0</version.lib.springdoc-openapi>
+        <version.lib.springdoc-openapi>2.1.0</version.lib.springdoc-openapi>
 
         <version.plugin.jib>3.3.2</version.plugin.jib>
         <version.plugin.failsafe>3.1.2</version.plugin.failsafe>
@@ -57,6 +58,11 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${version.lib.snake.yaml}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>

diff --git a/shipping/pom.xml b/shipping/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${version.lib.springdoc-openapi}</version>
         </dependency>
 

diff --git a/users/pom.xml b/users/pom.xml
@@ -46,7 +46,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
 			<version>${version.lib.springdoc-openapi}</version>
 		</dependency>