Актуализируем спринг для Spring Security ACL. Удаляем swagger

2022-02/spring-27/ACL/pom.xml

@@ -11,12 +11,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.6.RELEASE</version>
+        <version>2.6.7</version>
     </parent>
 
     <properties>
         <ehcache-core.version>2.6.11</ehcache-core.version>
-        <swagger.version>2.8.0</swagger.version>
+        <swagger.version>3.0.0</swagger.version>
     </properties>
 
     <dependencies>
@@ -60,15 +60,11 @@
         </dependency>
 
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.version}</version>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>1.6.9</version>
         </dependency>
+
     </dependencies>
 
     <build>

2022-02/spring-27/ACL/src/main/java/ru/otus/spring/config/SwaggerConfig.java

@@ -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();
-    }
-}

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: /**

2022-02/spring-27/WebFlux/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.6.RELEASE</version>
+        <version>2.6.7</version>
     </parent>
 
     <dependencies>