Merge "CCVPN (East-west Interface)"

diff --git a/.gitignore b/.gitignore
index 8cb38f5..96b743f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,11 @@
 ### Linux related ###
 *~
 
+### Restructured Text ###
+conf.py
+__*
+_static
+
 # KDE directory preferences
 .directory
 

diff --git a/docs/index.rst b/docs/index.rst
index f420998..c6790b9 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -8,12 +8,13 @@ ONAP ExternalAPI / NBI
    :maxdepth: 1
 
    architecture/architecture.rst
+   architecture/NBI_Developer_Guide.rst
    offeredapis/offeredapis.rst
    consumedapis/consumedapis.rst
    delivery/delivery.rst
    logging/logging.rst
    installation/installation.rst
    configuration/configuration.rst
-   administation/administration.rst
+   administration/administration.rst
    humaninterfaces/humaninterfaces.rst
    releasenotes/releasenotes.rst

diff --git a/docs/releasenotes/releasenotes.rst b/docs/releasenotes/releasenotes.rst
index e3e190e..758124b 100755 (executable)
--- a/docs/releasenotes/releasenotes.rst
+++ b/docs/releasenotes/releasenotes.rst
@@ -1,9 +1,41 @@
 .. SPDX-License-Identifier: CC-BY-4.0
-.. Copyright 2018 ORANGE
+.. Copyright 2019 ORANGE
 
 Release Notes
 =============
 
+Version: 4.0.0
+--------------
+
+:Release Date: 2018-05-30
+
+**New Features**
+
+Main features are:
+
+Detail of features described in readTheDoc documentation.
+
+**Known Issues**
+
+
+**Security Notes**
+
+- `Dublin Vulnerability Report <https://wiki.onap.org/pages/viewpage.action?pageId=51282484>`_
+
+Quick Links:
+
+- `External API project page <https://wiki.onap.org/display/DW/External+API+Framework+Project>`_
+
+**Upgrade Notes**
+
+
+**Deprecation Notes**
+
+
+**Other**
+
+===========
+
 Version: 3.0.2
 --------------
 
@@ -24,13 +56,16 @@ No new issues
 
 **Security Notes**
 
-- `Vulnerability Report <https://wiki.onap.org/pages/viewpage.action?pageId=45310585>`_
+- `Casablanca Vulnerability Report <https://wiki.onap.org/pages/viewpage.action?pageId=45310585>`_
 
 Quick Links:
 
 - `External API project page <https://wiki.onap.org/display/DW/External+API+Framework+Project>`_
 
 
+https://wiki.onap.org/pages/viewpage.action?pageId=51282484
+
+===========
 
 Version: 3.0.1
 --------------

diff --git a/pom.xml b/pom.xml
index f8d8c9a..164d2ca 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>2.1.3.RELEASE</version>
+        <version>2.1.4.RELEASE</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -118,6 +118,18 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.tomcat.embed</groupId>
+          <artifactId>tomcat-embed-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+      <version>9.0.19</version>
     </dependency>
 
     <dependency>
@@ -199,9 +211,19 @@
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.12</version>
+    </dependency>
+
     <!-- jolt -->
 
     <dependency>
@@ -262,6 +284,10 @@
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -295,9 +321,19 @@
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.squareup.okhttp3</groupId>
+          <artifactId>okhttp</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>3.14.1</version>
+    </dependency>
+
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>