Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to SpringDoc 2.2, this fixes #294 #295

Merged
merged 2 commits into from
Mar 21, 2024
Merged

Upgrade to SpringDoc 2.2, this fixes #294 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cb9504
Upgrade to SpringDoc 2.2, this fixes #294
p-wunderlich Mar 20, 2024
98dc487
Merge branch 'develop' into 294-swagger-ui-not-working-with-spring-bo…
p-wunderlich Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/approval/backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...polyflow/example/process/approval/adapter/rest/RequestApprovalProcessRestConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,7 +29,7 @@ class RequestApprovalProcessRestConfiguration {
.group("request-approval")
.displayName("Request Approval")
.pathsToMatch(Rest.REST_PREFIX + "/**")
.addOpenApiCustomiser { openApi ->
.addOpenApiCustomizer { openApi ->
openApi
.info(
Info()
Expand Down
2 changes: 1 addition & 1 deletion components/order-processing/backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions components/tasklist-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
4 changes: 2 additions & 2 deletions ...ain/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/TasklistRestConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,7 +22,7 @@ class TasklistRestConfiguration {
GroupedOpenApi.builder()
.group("tasklist")
.displayName("Task list")
.addOpenApiCustomiser { openApi ->
.addOpenApiCustomizer { openApi ->
openApi
.info(
Info()
Expand Down
2 changes: 1 addition & 1 deletion components/tasklist-reactive-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 8 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.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>
Expand Down Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion scenarios/distributed-axon-server-local-polyflow/process-platform-view-only/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion scenarios/distributed-axon-server/cockpit-application/backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
</dependency>

<!-- Jackson -->
Expand Down
2 changes: 1 addition & 1 deletion scenarios/distributed-axon-server/process-platform-jpa/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion scenarios/distributed-axon-server/process-platform-mem/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion scenarios/distributed-axon-server/process-platform-mongo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion scenarios/distributed-kafka/process-platform-view-only/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Loading