diff --git a/2022-02/spring-27/ACL/pom.xml b/2022-02/spring-27/ACL/pom.xml index 4939fe4b..2bfc4e24 100644 --- a/2022-02/spring-27/ACL/pom.xml +++ b/2022-02/spring-27/ACL/pom.xml @@ -11,12 +11,12 @@ org.springframework.boot spring-boot-starter-parent - 2.2.6.RELEASE + 2.6.7 2.6.11 - 2.8.0 + 3.0.0 @@ -60,15 +60,11 @@ - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.springfox - springfox-swagger-ui - ${swagger.version} + org.springdoc + springdoc-openapi-ui + 1.6.9 + diff --git a/2022-02/spring-27/ACL/src/main/java/ru/otus/spring/config/SwaggerConfig.java b/2022-02/spring-27/ACL/src/main/java/ru/otus/spring/config/SwaggerConfig.java deleted file mode 100644 index 92854b5f..00000000 --- a/2022-02/spring-27/ACL/src/main/java/ru/otus/spring/config/SwaggerConfig.java +++ /dev/null @@ -1,23 +0,0 @@ -package ru.otus.spring.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import ru.otus.spring.rest.NoticeMessageController; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -@Configuration -@EnableSwagger2 -public class SwaggerConfig { - - @Bean - public Docket productApi() { - return new Docket(DocumentationType.SWAGGER_2) - .useDefaultResponseMessages(false) - .select() - .apis(RequestHandlerSelectors.basePackage(NoticeMessageController.class.getPackage().getName())) - .build(); - } -} diff --git a/2022-02/spring-27/ACL/src/main/resources/application.yml b/2022-02/spring-27/ACL/src/main/resources/application.yml index 9a70d12a..2e266da8 100644 --- a/2022-02/spring-27/ACL/src/main/resources/application.yml +++ b/2022-02/spring-27/ACL/src/main/resources/application.yml @@ -5,3 +5,7 @@ spring: jpa: hibernate: ddl-auto: none + +springdoc: + packages-to-scan: ru.otus.spring.rest + paths-to-match: /** \ No newline at end of file diff --git a/2022-02/spring-27/WebFlux/pom.xml b/2022-02/spring-27/WebFlux/pom.xml index f3160a4d..62ea62b6 100644 --- a/2022-02/spring-27/WebFlux/pom.xml +++ b/2022-02/spring-27/WebFlux/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.6.RELEASE + 2.6.7