From: Ram Koya <rk541m@att.com>
Date: Fri, 8 Mar 2019 03:15:30 +0000 (+0000)
Subject: Merge "Update INFO.yaml file"
X-Git-Tag: 2.1.0~31
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=commitdiff_plain;h=7744ccb9eb0a755c1dad8fc8ec42e4ad645d20d6;hp=af4c0b6f98297a9c39a8e7f60358937f150479fa

Merge "Update INFO.yaml file"
---

diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java
index fae2c1f6..35b29064 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java
@@ -67,7 +67,7 @@ public class NodeServlet extends HttpServlet {
     //Adding EELF Logger Rally:US664892
     private static EELFLogger eelflogger = EELFManager.getInstance()
             .getLogger(NodeServlet.class);
-    private Delivery delivery;
+    private final Delivery delivery;
 
     static {
         final String ws = "\\s*";
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
index 8a1a4ba5..c58bda8e 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
@@ -69,7 +69,7 @@ public class LogServlet extends BaseServlet {
     private static final String FMT_1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";
     private static final String FMT_2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
 
-    private boolean isfeedlog;
+    private final boolean isfeedlog;
 
     public abstract class RowHandler {
         private final ServletOutputStream out;
diff --git a/docs/data-router/release-notes.rst b/docs/data-router/release-notes.rst
index ecb1cc46..b879c6bc 100644
--- a/docs/data-router/release-notes.rst
+++ b/docs/data-router/release-notes.rst
@@ -53,5 +53,101 @@ N/A
 Deprecation Notes
 N/A
 
+Other
+N/A
+
+Version: 1.0.8 (Casablanca)
+---------------------------
+
+:Release Date: 2019-02-28
+
+The DataRouter(DR) provisioning API is a HTTPS-based, REST-like API for creating and managing DR feeds and
+subscriptions.
+
+New Features:
+
++--------------+------------------------------------------------------------------+
+| JIRA ID      | Description                                                      |
++==============+==================================================================+
++--------------+------------------------------------------------------------------+
+
+Bug Fixes:
+
++----------------+--------------------------------------------------------------------------------------------------+
+| JIRA ID        | Description                                                                                      |
++================+==================================================================================================+
+| DMAAP-1065     | [DR] Casablanca - AAF certs expired on dmaap-dr-prov and dmaap-dr-node                           |
++----------------+--------------------------------------------------------------------------------------------------+
+
+Known Issues
+N/A
+
+Security Issues
+DMAAP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been
+addressed, items that remain open have been assessed for risk and determined to be false positive. The DMAAP open
+Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=42598688>`_.
+
+- `DMAAP Project Page <https://wiki.onap.org/display/DW/DMaaP+Planning>`_
+- `Passing Badge information for DMAAP DataRouter <https://bestpractices.coreinfrastructure.org/en/projects/2192>`_
+- `Project Vulnerability Review Table for DMAAP <https://wiki.onap.org/pages/viewpage.action?pageId=42598688>`_
+
+Upgrade Notes
+N/A
+
+Deprecation Notes
+N/A
+
+Other
+N/A
+
+
+Version: 2.0.1 (Dublin)
+---------------------------
+
+:Release Date: 2019-02-28
+
+The DataRouter(DR) provisioning API is a HTTPS-based, REST-like API for creating and managing DR feeds and
+subscriptions.
+
+New Features:
+
++--------------+------------------------------------------------------------------+
+| JIRA ID      | Description                                                      |
++==============+==================================================================+
+| DMAAP-988    | Update to new oparent                                            |
++--------------+------------------------------------------------------------------+
+
+Bug Fixes:
+
++----------------+--------------------------------------------------------------------------------------------------+
+| JIRA ID        | Description                                                                                      |
++================+==================================================================================================+
+| DMAAP-964      | DMAAP deployment failures starting 20190115 on casablanca branch                                 |
++----------------+--------------------------------------------------------------------------------------------------+
+| DMAAP-1047     | Data Router docker version missing explicit version number                                       |
++----------------+--------------------------------------------------------------------------------------------------+
+| DMAAP-1048     | [DR] AAF certs expired on dmaap-dr-prov and dmaap-dr-node                                        |
++----------------+--------------------------------------------------------------------------------------------------+
+| DMAAP-1064     | [DR] Update datarouter POM version following AAF cert updates                                    |
++----------------+--------------------------------------------------------------------------------------------------+
+
+Known Issues
+N/A
+
+Security Issues
+DMAAP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been
+addressed, items that remain open have been assessed for risk and determined to be false positive. The DMAAP open
+Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=42598688>`_.
+
+- `DMAAP Project Page <https://wiki.onap.org/display/DW/DMaaP+Planning>`_
+- `Passing Badge information for DMAAP DataRouter <https://bestpractices.coreinfrastructure.org/en/projects/2192>`_
+- `Project Vulnerability Review Table for DMAAP <https://wiki.onap.org/pages/viewpage.action?pageId=42598688>`_
+
+Upgrade Notes
+N/A
+
+Deprecation Notes
+N/A
+
 Other
 N/A
\ No newline at end of file