Upgrade to SpringDoc 2.2, this fixes #294

holunda-io · Mar 20, 2024 · 4cb9504 · 4cb9504
1 parent 3e114c7
commit 4cb9504
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 19 deletions.
diff --git a/components/approval/backend/pom.xml b/components/approval/backend/pom.xml
@@ -122,11 +122,11 @@
     <!-- Swagger  -->
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-kotlin</artifactId>
+      <artifactId>springdoc-openapi-starter-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.openapitools</groupId>

diff --git a/...polyflow/example/process/approval/adapter/rest/RequestApprovalProcessRestConfiguration.kt b/...polyflow/example/process/approval/adapter/rest/RequestApprovalProcessRestConfiguration.kt
@@ -2,7 +2,7 @@ package io.holunda.polyflow.example.process.approval.adapter.rest
 
 import io.holunda.polyflow.view.auth.UnknownUserException
 import io.swagger.v3.oas.models.info.Info
-import org.springdoc.core.GroupedOpenApi
+import org.springdoc.core.models.GroupedOpenApi
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
@@ -29,7 +29,7 @@ class RequestApprovalProcessRestConfiguration {
       .group("request-approval")
       .displayName("Request Approval")
       .pathsToMatch(Rest.REST_PREFIX + "/**")
-      .addOpenApiCustomiser { openApi ->
+      .addOpenApiCustomizer { openApi ->
         openApi
           .info(
             Info()

diff --git a/components/order-processing/backend/pom.xml b/components/order-processing/backend/pom.xml
@@ -103,7 +103,7 @@
     <!-- Swagger  -->
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
     <dependency>
       <groupId>org.openapitools</groupId>

diff --git a/components/tasklist-backend/pom.xml b/components/tasklist-backend/pom.xml
@@ -59,11 +59,11 @@
     </dependency>
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-kotlin</artifactId>
+      <artifactId>springdoc-openapi-starter-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
 
     <!-- Axon -->

diff --git a/...ain/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/TasklistRestConfiguration.kt b/...ain/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/TasklistRestConfiguration.kt
@@ -2,7 +2,7 @@ package io.holunda.polyflow.example.tasklist.adapter.rest
 
 import io.holunda.polyflow.view.auth.UnknownUserException
 import io.swagger.v3.oas.models.info.Info
-import org.springdoc.core.GroupedOpenApi
+import org.springdoc.core.models.GroupedOpenApi
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpStatus
@@ -22,7 +22,7 @@ class TasklistRestConfiguration {
     GroupedOpenApi.builder()
       .group("tasklist")
       .displayName("Task list")
-      .addOpenApiCustomiser { openApi ->
+      .addOpenApiCustomizer { openApi ->
         openApi
           .info(
             Info()

diff --git a/components/tasklist-reactive-backend/pom.xml b/components/tasklist-reactive-backend/pom.xml
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
     <!-- Axon -->
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,7 @@
     <camunda-bpm-mockito.version>7.20.0</camunda-bpm-mockito.version>
     <version.camunda.spin>1.23.0</version.camunda.spin>
     <camunda-bpm-data.version>1.5.0</camunda-bpm-data.version>
-    <springdoc.version>1.7.0</springdoc.version>
+    <springdoc.version>2.2.0</springdoc.version>
     <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
     <mockito-kotlin.version>5.2.1</mockito-kotlin.version>
     <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
@@ -147,12 +147,17 @@
       </dependency>
       <dependency>
         <groupId>org.springdoc</groupId>
-        <artifactId>springdoc-openapi-ui</artifactId>
+        <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
         <version>${springdoc.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springdoc</groupId>
-        <artifactId>springdoc-openapi-kotlin</artifactId>
+        <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+        <version>${springdoc.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springdoc</groupId>
+        <artifactId>springdoc-openapi-starter-common</artifactId>
         <version>${springdoc.version}</version>
       </dependency>
 

diff --git a/scenarios/distributed-axon-server-local-polyflow/process-platform-view-only/pom.xml b/scenarios/distributed-axon-server-local-polyflow/process-platform-view-only/pom.xml
@@ -70,7 +70,7 @@
     <!-- Spring-Doc -->
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml b/scenarios/distributed-axon-server/cockpit-application/backend/pom.xml
@@ -48,7 +48,7 @@
     </dependency>
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
 
     <!-- Jackson -->

diff --git a/scenarios/distributed-axon-server/process-platform-jpa/pom.xml b/scenarios/distributed-axon-server/process-platform-jpa/pom.xml
@@ -75,7 +75,7 @@
     <!-- Spring-Doc -->
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/scenarios/distributed-axon-server/process-platform-mem/pom.xml b/scenarios/distributed-axon-server/process-platform-mem/pom.xml
@@ -75,7 +75,7 @@
     <!-- Spring-Doc -->
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/scenarios/distributed-axon-server/process-platform-mongo/pom.xml b/scenarios/distributed-axon-server/process-platform-mongo/pom.xml
@@ -60,7 +60,7 @@
     <!-- Spring-Doc -->
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/scenarios/distributed-kafka/process-platform-view-only/pom.xml b/scenarios/distributed-kafka/process-platform-view-only/pom.xml
@@ -77,7 +77,7 @@
     <!-- Spring-Doc -->
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
   </dependencies>