summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-09-17 00:47:17 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-17 00:47:17 +0000
commitbe1fecf35c4661f58ae91aad20cc1ad7a510da94 (patch)
treecbf29944a01f62db2c312892339072dd7db912dd
parent4e089ab6271e00389ea2c4e995d785acf2046720 (diff)
parentaf874e388ae170ec4e8f54d0d7212883932acac4 (diff)
Merge "Fix spring fox swagger snapshot version."
-rw-r--r--ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/cds/blueprintsprocessor/SwaggerConfig.java3
-rwxr-xr-xms/blueprintsprocessor/parent/pom.xml32
2 files changed, 17 insertions, 18 deletions
diff --git a/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/cds/blueprintsprocessor/SwaggerConfig.java b/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/cds/blueprintsprocessor/SwaggerConfig.java
index 82693c4fd..ce802b7b5 100644
--- a/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/cds/blueprintsprocessor/SwaggerConfig.java
+++ b/ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/cds/blueprintsprocessor/SwaggerConfig.java
@@ -28,7 +28,6 @@ import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import java.util.Collections;
-import springfox.documentation.swagger2.annotations.EnableSwagger2WebFlux;
/**
* SwaggerConfig
@@ -36,7 +35,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2WebFlux;
* @author Brinda Santh 8/13/2018
*/
@Configuration
-@EnableSwagger2WebFlux
+//@EnableSwagger2WebFlux
public class SwaggerConfig {
@Bean
diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index a8eb0d0e0..cd4056485 100755
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -37,7 +37,7 @@
<jython.version>2.7.1</jython.version>
<!-- Should be using released artifact as soon as available:-->
<!-- https://github.com/springfox/springfox/milestone/44-->
- <springfox.swagger2.version>3.0.0-SNAPSHOT</springfox.swagger2.version>
+ <springfox.swagger2.version>2.9.2</springfox.swagger2.version>
<h2database.version>1.4.197</h2database.version>
<onap.logger.slf4j>1.2.2</onap.logger.slf4j>
<powermock.version>1.7.4</powermock.version>
@@ -96,17 +96,17 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-spring-webflux</artifactId>
- <version>${springfox.swagger2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>io.springfox</groupId>-->
+<!-- <artifactId>springfox-spring-webflux</artifactId>-->
+<!-- <version>${springfox.swagger2.version}</version>-->
+<!-- <exclusions>-->
+<!-- <exclusion>-->
+<!-- <groupId>org.slf4j</groupId>-->
+<!-- <artifactId>slf4j-api</artifactId>-->
+<!-- </exclusion>-->
+<!-- </exclusions>-->
+<!-- </dependency>-->
<!-- Common Utils Dependencies -->
<dependency>
@@ -576,10 +576,10 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-spring-webflux</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>io.springfox</groupId>-->
+<!-- <artifactId>springfox-spring-webflux</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>