Remove security vulnerabilities in runtime-api

Update springfox dependencies to 3.0.0

Add changelog

Issue-ID: DCAEGEN2-2595
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I1c7df7c5e5ad250f532ae07904cb16f4e1114063

diff --git a/mod/runtimeapi/Changelog.md b/mod/runtimeapi/Changelog.md
new file mode 100644 (file)
index 0000000..526159d
--- /dev/null
+++ b/mod/runtimeapi/Changelog.md
@@ -0,0 +1,10 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) 
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.2.2]
+- Update SpringFox dependencies to version 3.0.0
+  - Swagger documentation URL changed from: /swagger-ui.html to: /swagger-ui/index.html

diff --git a/mod/runtimeapi/pom.xml b/mod/runtimeapi/pom.xml
index f3d72da..77d73b9 100644 (file)
--- a/mod/runtimeapi/pom.xml
+++ b/mod/runtimeapi/pom.xml
@@ -34,7 +34,7 @@ limitations under the License.
        </parent>
        <groupId>org.onap.dcaegen2.platform.mod</groupId>
        <artifactId>runtimeapi</artifactId>
-       <version>1.2.1</version>
+       <version>1.2.2</version>
        <name>dcaegen2-platform-mod-runtimeapi</name>
        <description>MOD Runtime API</description>
        <properties>
@@ -108,6 +108,17 @@ limitations under the License.
                                <version>2.1.7.RELEASE</version>
                                <type>pom</type>
                                <scope>import</scope>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.springframework.plugin</groupId>
+                                               <artifactId>spring-plugin-core</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.plugin</groupId>
+                               <artifactId>spring-plugin-core</artifactId>
+                               <version>2.0.0.RELEASE</version>
                        </dependency>
                </dependencies>
        </dependencyManagement>

diff --git a/mod/runtimeapi/runtime-core/pom.xml b/mod/runtimeapi/runtime-core/pom.xml
index 9310bd3..a1b05e6 100644 (file)
--- a/mod/runtimeapi/runtime-core/pom.xml
+++ b/mod/runtimeapi/runtime-core/pom.xml
@@ -25,12 +25,12 @@ limitations under the License.
     <parent>
         <artifactId>runtimeapi</artifactId>
         <groupId>org.onap.dcaegen2.platform.mod</groupId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>runtime-core</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
 
     <dependencies>
         <dependency>

diff --git a/mod/runtimeapi/runtime-web/pom.xml b/mod/runtimeapi/runtime-web/pom.xml
index 44a1fd4..f33cee1 100644 (file)
--- a/mod/runtimeapi/runtime-web/pom.xml
+++ b/mod/runtimeapi/runtime-web/pom.xml
@@ -24,10 +24,10 @@ limitations under the License.
        <parent>
                <groupId>org.onap.dcaegen2.platform.mod</groupId>
                <artifactId>runtimeapi</artifactId>
-               <version>1.2.1</version>
+               <version>1.2.2</version>
        </parent>
        <artifactId>runtime-web</artifactId>
-       <version>1.2.1-SNAPSHOT</version>
+       <version>1.2.2-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>runtime-web</name>
        <description>MOD Runtime Web Module</description>
@@ -35,7 +35,7 @@ limitations under the License.
                <dependency>
                        <groupId>org.onap.dcaegen2.platform.mod</groupId>
                        <artifactId>runtime-core</artifactId>
-                       <version>1.2.1</version>
+                       <version>1.2.2</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework.boot</groupId>
@@ -65,13 +65,13 @@ limitations under the License.
                </dependency>
                <dependency>
                        <groupId>io.springfox</groupId>
-                       <artifactId>springfox-swagger2</artifactId>
-                       <version>2.10.5</version>
+                       <artifactId>springfox-boot-starter</artifactId>
+                       <version>3.0.0</version>
                </dependency>
                <dependency>
                        <groupId>io.springfox</groupId>
                        <artifactId>springfox-swagger-ui</artifactId>
-                       <version>2.10.5</version>
+                       <version>3.0.0</version>
                </dependency>
                <dependency>
                        <groupId>org.json</groupId>

diff --git a/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/RuntimeapiApplication.java b/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/RuntimeapiApplication.java
index 611b332..df79251 100644 (file)
--- a/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/RuntimeapiApplication.java
+++ b/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/RuntimeapiApplication.java
@@ -19,10 +19,8 @@ package org.onap.dcae.runtime.web;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 @SpringBootApplication
-@EnableSwagger2WebMvc
 public class RuntimeapiApplication {
 
        public static void main(String[] args) {

diff --git a/mod/runtimeapi/runtime-web/src/test/java/org/onap/dcae/runtime/web/controllers/TestFlowGraphController.java b/mod/runtimeapi/runtime-web/src/test/java/org/onap/dcae/runtime/web/controllers/TestFlowGraphController.java
index 60ff810..942d2fd 100644 (file)
--- a/mod/runtimeapi/runtime-web/src/test/java/org/onap/dcae/runtime/web/controllers/TestFlowGraphController.java
+++ b/mod/runtimeapi/runtime-web/src/test/java/org/onap/dcae/runtime/web/controllers/TestFlowGraphController.java
@@ -81,7 +81,7 @@ public class TestFlowGraphController {
 
     @Test
     public void testSwaggerUi() throws Exception {
-       mockMvc.perform(get("/swagger-ui.html"))
+       mockMvc.perform(get("/swagger-ui/index.html"))
                .andExpect(status().isOk());
     }