Fix breaking change in SpringFox 2.10.x
diff --git a/log4j-audit/log4j-audit-war/pom.xml b/log4j-audit/log4j-audit-war/pom.xml
index 1213a05..2460db6 100644
--- a/log4j-audit/log4j-audit-war/pom.xml
+++ b/log4j-audit/log4j-audit-war/pom.xml
@@ -166,6 +166,12 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-spring-webmvc</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/SwaggerConfig.java b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/SwaggerConfig.java
index 39d9bbf..080886d 100644
--- a/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/SwaggerConfig.java
+++ b/log4j-audit/log4j-audit-war/src/main/java/org/apache/logging/log4j/audit/service/config/SwaggerConfig.java
@@ -28,13 +28,13 @@
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
/**
* This will configure Swagger to produce an API for all of our REST endpoints.
*/
@Configuration
-@EnableSwagger2
+@EnableSwagger2WebMvc
@EnableWebMvc
public class SwaggerConfig {
@Bean
diff --git a/log4j-catalog/log4j-catalog-editor/pom.xml b/log4j-catalog/log4j-catalog-editor/pom.xml
index f129292..e5ccadd 100644
--- a/log4j-catalog/log4j-catalog-editor/pom.xml
+++ b/log4j-catalog/log4j-catalog-editor/pom.xml
@@ -128,6 +128,12 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-spring-webmvc</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.thymeleaf.extras</groupId>
diff --git a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/SwaggerConfig.java b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/SwaggerConfig.java
index 0a0dd7b..012fc42 100644
--- a/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/SwaggerConfig.java
+++ b/log4j-catalog/log4j-catalog-editor/src/main/java/org/apache/logging/log4j/catalog/config/SwaggerConfig.java
@@ -28,13 +28,13 @@
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
/**
* This will configure Swagger to produce an API for all of our REST endpoints.
*/
@Configuration
-@EnableSwagger2
+@EnableSwagger2WebMvc
@EnableWebMvc
public class SwaggerConfig {
@Bean
diff --git a/pom.xml b/pom.xml
index c999397..ccaa490 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,8 +184,7 @@
<spring.security.version>3.2.7.RELEASE</spring.security.version>
<spring.ws.version>2.2.2.RELEASE</spring.ws.version>
<spring.hateoas.version>0.23.0.RELEASE</spring.hateoas.version>
- <swagger.version>2.10.5</swagger.version>
- <swagger.ui.version>2.2.2</swagger.ui.version>
+ <springfox.version>2.10.5</springfox.version>
<swagger.annotations.version>1.6.12</swagger.annotations.version>
<thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version>
<thymeleaf-layout-dialect.version>3.3.0</thymeleaf-layout-dialect.version>
@@ -458,12 +457,17 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
- <version>${swagger.version}</version>
+ <version>${springfox.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
- <version>${swagger.ui.version}</version>
+ <version>${springfox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-spring-webmvc</artifactId>
+ <version>${springfox.version}</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
