From d3cab9a3266dcbdbc8115e58336bd5b385e41580 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Fri, 26 Jan 2024 15:41:43 +0200
Subject: [PATCH] [#1383] Spring Boot 3 migration Step 2: fix swagger (#1566)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com
---
 hawkbit-rest/hawkbit-ddi-api/pom.xml             | 11 +----------
 hawkbit-rest/hawkbit-mgmt-api/pom.xml            | 11 +----------
 hawkbit-rest/hawkbit-rest-core/pom.xml           | 10 +---------
 .../hawkbit/rest/OpenApiConfiguration.java       |  7 +++----
 pom.xml                                          | 16 ++--------------
 5 files changed, 8 insertions(+), 47 deletions(-)

diff --git a/hawkbit-rest/hawkbit-ddi-api/pom.xml b/hawkbit-rest/hawkbit-ddi-api/pom.xml
index ff8a9f467..e36c6f039 100644
--- a/hawkbit-rest/hawkbit-ddi-api/pom.xml
+++ b/hawkbit-rest/hawkbit-ddi-api/pom.xml
@@ -43,18 +43,9 @@
          <artifactId>hawkbit-rest-core</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <!-- Swagger Support -->
       <dependency>
          <groupId>org.springdoc</groupId>
-         <artifactId>springdoc-openapi-ui</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.springdoc</groupId>
-         <artifactId>springdoc-openapi-hateoas</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.springdoc</groupId>
-         <artifactId>springdoc-openapi-security</artifactId>
+         <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
       </dependency>
 
       <!-- TEST -->
diff --git a/hawkbit-rest/hawkbit-mgmt-api/pom.xml b/hawkbit-rest/hawkbit-mgmt-api/pom.xml
index 3ae595aed..ac6040a2a 100644
--- a/hawkbit-rest/hawkbit-mgmt-api/pom.xml
+++ b/hawkbit-rest/hawkbit-mgmt-api/pom.xml
@@ -32,18 +32,9 @@
          <groupId>org.springframework.hateoas</groupId>
          <artifactId>spring-hateoas</artifactId>
       </dependency>
-      <!-- Swagger Support -->
       <dependency>
          <groupId>org.springdoc</groupId>
-         <artifactId>springdoc-openapi-ui</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.springdoc</groupId>
-         <artifactId>springdoc-openapi-hateoas</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.springdoc</groupId>
-         <artifactId>springdoc-openapi-security</artifactId>
+         <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
       </dependency>
 
       <dependency>
diff --git a/hawkbit-rest/hawkbit-rest-core/pom.xml b/hawkbit-rest/hawkbit-rest-core/pom.xml
index 9a8bf3b19..64898aee9 100644
--- a/hawkbit-rest/hawkbit-rest-core/pom.xml
+++ b/hawkbit-rest/hawkbit-rest-core/pom.xml
@@ -53,15 +53,7 @@
       </dependency>
       <dependency>
          <groupId>org.springdoc</groupId>
-         <artifactId>springdoc-openapi-ui</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.springdoc</groupId>
-         <artifactId>springdoc-openapi-hateoas</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.springdoc</groupId>
-         <artifactId>springdoc-openapi-security</artifactId>
+         <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
       </dependency>
       <dependency>
          <groupId>jakarta.servlet</groupId>
diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java
index 6b9f09c20..a7b2c4337 100644
--- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java
+++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java
@@ -9,12 +9,11 @@
  */
 package org.eclipse.hawkbit.rest;
 
-import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
-import org.springdoc.core.GroupedOpenApi;
+import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +50,7 @@ public class OpenApiConfiguration {
         .builder()
         .group("Management API")
         .pathsToMatch("/rest/v1/**")
-        .addOpenApiCustomiser(openApi -> {
+        .addOpenApiCustomizer(openApi -> {
             openApi
                 .addSecurityItem(new SecurityRequirement()
                         .addList(BASIC_AUTH_SEC_SCHEME_NAME)
@@ -85,7 +84,7 @@ public class OpenApiConfiguration {
         .builder()
         .group("Direct Device Integration API")
         .pathsToMatch("/{tenant}/controller/**")
-        .addOpenApiCustomiser(openApi -> {
+        .addOpenApiCustomizer(openApi -> {
             openApi
                 .addSecurityItem(new SecurityRequirement().addList(DDI_TOKEN_SEC_SCHEME_NAME))
                 .components(
diff --git a/pom.xml b/pom.xml
index 0070d30d8..b866bd3a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,10 +144,9 @@
 
       <spring.boot.version>3.2.1</spring.boot.version>
       <spring.cloud.version>2023.0.0</spring.cloud.version>
+      <springdoc-openapi.version>2.3.0</springdoc-openapi.version>
       <spring.plugin.core.version>3.0.0</spring.plugin.core.version>
 
-      <!-- Swagger Support -->
-      <springdoc-openapi.version>1.7.0</springdoc-openapi.version>
 
       <!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->
       <!-- Newer versions needed than defined in Boot -->
@@ -732,20 +731,9 @@
             <scope>compile</scope>
          </dependency>
 
-         <!-- Swagger Support -->
          <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <version>${springdoc-openapi.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-hateoas</artifactId>
-            <version>${springdoc-openapi.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-security</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${springdoc-openapi.version}</version>
          </dependency>