Merge "Added catching error when calculating elapsedTime."

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 66f95dc..62d2c23 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -7,6 +7,117 @@
 
 Log Enhancements Release Notes
 ==============================
+Version: 5.0.1 El Alto Release
+------------------------------
+El Alto
+-------
+   - logging-analytics Version: 1.5.1
+
+:Release Date: 2019-10-04
+
+**New Features**
+      None
+
+**Bug Fixes**
+   - `LOG-826 <https://jira.onap.org/browse/LOG-826>`_ Vulnerability issue: removed jackson-databind
+   - `LOG-1060 <https://jira.onap.org/browse/LOG-1060>`_ Vulnerability issue: Logging CLM: fix/address/red-flag jackson-databind-2.8.6 SEC
+   - `LOG-836 <https://jira.onap.org/browse/LOG-836>`_ Vulnerability issue: glassfish bean-validator-2.4.0-b34.jar SEC
+   - `LOG-874 <https://jira.onap.org/browse/LOG-874>`_ Vulnerability issue: fix/address/red-flag License org.json:json-20140107.jar
+
+**Known Issues**
+   - `LOG-1159 <https://jira.onap.org/browse/LOG-1159>`_ Vulnerability issue: logging-analytics version 5.0.9.RELEASE
+
+**Known Security Issues**
+
+  - `OJSI-200 <https://jira.onap.org/browse/OJSI-200>`_ Logging exposes unprotected APIs/UIs (CVE-2019-12125)
+  - `OJSI-155 <https://jira.onap.org/browse/OJSI-155>`_ LOG demo target exposes plain text HTTP endpoint using port 30398
+  - `OJSI-125 <https://jira.onap.org/browse/OJSI-125>`_ log-es exposes plain text HTTP endpoint using port 30254
+  - `OJSI-124 <https://jira.onap.org/browse/OJSI-124>`_ log-kibana exposes plain text HTTP endpoint using port 30253
+  - `LOG-1114 <https://jira.onap.org/browse/LOG-1114>`_ Need for "ReadWriteMany" access on storage when deploying on Kubernetes?
+
+Quick Links:
+       - `LOG project page <https://wiki.onap.org/display/DW/Logging+Enhancements+Project>`_
+
+       - `Passing Badge information for LOG <https://bestpractices.coreinfrastructure.org/en/projects/1578>`_
+
+       - `Project Vulnerability Review Table for LOG <https://wiki.onap.org/pages/viewpage.action?pageId=68541351>`_
+
+**Upgrade Notes**
+      None
+
+**Deprecation Notes**
+      None
+
+**Other**
+      None
+
+
+POMBA Release Notes
+-------------------
+POMBA is sub-project of the Logging Enhancements Project.
+
+El Alto
+-------
+   - pomba-audit-common Version: 1.5.1
+   - pomba-aai-context-builder Version: 1.5.1
+   - pomba-context-aggregator Version: 1.5.1
+   - pomba-network-discovery-context-builder Version: 1.5.1
+   - pomba-sdc-context-builder Version: 1.5.1
+   - pomba-sdnc-context-builder Version: 1.5.1
+
+:Release Date:  2019-10-04
+
+**New Features**
+   - None
+
+**Bug Fixes**
+   - `LOG-826 <https://jira.onap.org/browse/LOG-826>`_ Vulnerability issue: upgraded jackson-databind to version 2.9.9
+   - `LOG-1067 <https://jira.onap.org/browse/LOG-1067>`_ Vulnerability issue: confirm rather or not commons-codec is needed for logging projects
+   - `LOG-832 <https://jira.onap.org/browse/LOG-832>`_ Vulnerability issue:  removed jackson-databind-2.4.5.jar from pomba-audit-common
+   - `LOG-831 <https://jira.onap.org/browse/LOG-831>`_ Vulnerability issue:  pomba-context-aggregator with javax.jms:jms-1.1.jar
+   - `LOG-1061 <https://jira.onap.org/browse/LOG-1061>`_ Vulnerability issue: POMBA-AUDIT-COMMON fix/address/red-flag jackson-databind-2.4.5
+   - `LOG-1063 <https://jira.onap.org/browse/LOG-1063>`_ Vulnerability issue: POMBA-SDNC-CONTEXT-BUILDER: upgraded plexus-utils to version 3.1.0
+   - `LOG-1064 <https://jira.onap.org/browse/LOG-1064>`_ Vulnerability issue: POMBA-SDNC-CONTEXT-BUILDER: removed commons-beanutils : 1.9.3
+   - `LOG-1116 <https://jira.onap.org/browse/LOG-1116>`_ Vulnerability issue: POMBA-SDNC-CONTEXT-BUILDER: removed commons-beanutils : 1.9.3
+   - `LOG-1062 <https://jira.onap.org/browse/LOG-1062>`_ Vulnerability issue: POMBA-SDNC-CONTEXT-BUILDER: removed struts-core
+   - `LOG-1121 <https://jira.onap.org/browse/LOG-1121>`_ Vulnerability issue: POMBA-CONTEXT-AGGREGATOR and POMBA-SDNC-CONTEXT-BUILDER: upgraded logback-classic to version 1.2.3
+   - `LOG-830 <https://jira.onap.org/browse/LOG-830>`_ Vulnerability issue: Logging/POMBA CLM: fix/address/red-flag License org.json:json-20140107.jar
+
+**Known Issues**
+
+   - `LOG-1017 <https://jira.onap.org/browse/LOG-1017>`_ Violations are thrown on attributes that are same (or missing)
+   - `LOG-1016 <https://jira.onap.org/browse/LOG-1016>`_ When comparing attributes from multiple sources, violations thrown do not accurately show the issue.
+   - `LOG-769 <https://jira.onap.org/browse/LOG-769>`_ POMBA aai ctx pod reports HD full - but DF shows HD is OK
+   - `LOG-827 <https://jira.onap.org/browse/LOG-827>`_ Vulnerability issue: POMBA-SDNC-CONTEXT-BUILDER handlebars 2.0.0
+   - `LOG-1118 <https://jira.onap.org/browse/LOG-1118>`_ Vulnerability issue: POMBA-SDNC-CONTEXT-BUILDER and POMBA-NETWORK-DISCOVERY-CONTEXT-BUILDER js-yaml
+   - `LOG-1117 <https://jira.onap.org/browse/LOG-1117>`_ Vulnerability issue: POMBA-SDNC-CONTEXT-BUILDER and POMBA-NETWORK-DISCOVERY-CONTEXT-BUILDER uikit
+   - `LOG-1160 <https://jira.onap.org/browse/LOG-1160>`_ Vulnerability issue: jackson-databind 2.9.9
+   - `LOG-1016 <https://jira.onap.org/browse/LOG-1016>`_ When comparing attributes from multiple sources, violations thrown do not accurately show the issue.
+   - `LOG-1017 <https://jira.onap.org/browse/LOG-1017>`_ Violations are thrown on attributes that are same (or missing)
+   - `LOG-1051 <https://jira.onap.org/browse/LOG-1051>`_ pomba-data-router do not start due to wrong AAi configuration (with Dublin release of the data router but works with the Casablanca version)
+   - `LOG-1084 <https://jira.onap.org/browse/LOG-1084>`_ Need authentication for pomba-kibana (node port = 30234)
+   - `LOG-1085 <https://jira.onap.org/browse/LOG-1085>`_ Need authentication for logging-elasticsearch (node port = 30254)
+   - `LOG-1086 <https://jira.onap.org/browse/LOG-1086>`_ Need authentication for logging-kibana (node port = 30253)
+   - `LOG-1114 <https://jira.onap.org/browse/LOG-1114>`_ Need for "ReadWriteMany" access on storage when deploying on Kubernetes?
+
+**Known Security Issues**
+   - `OJSI-123 <https://jira.onap.org/browse/OJSI-123>`_ pomba-data-router exposes plain text HTTP endpoint using port 30249
+   - `OJSI-115 <https://jira.onap.org/browse/OJSI-115>`_ pomba-kibana exposes plain text HTTP endpoint using port 30234
+
+POMBA 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 LOG open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/display/DW/El+Alto+Vulnerabilities>`_.
+
+Quick Links:
+   - `POMBA project page <https://wiki.onap.org/display/DW/POMBA>`_
+
+**Upgrade Notes**
+      None
+
+**Deprecation Notes**
+      None
+
+**Other**
+      None
+
 Version: 5.0.0 El Alto Early Drop Release
 -----------------------------------------
 El Alto Early Drop
@@ -92,8 +203,6 @@ POMBA code has been formally scanned during build time using NexusIQ and all Cri
 
 Quick Links:
    - `POMBA project page <https://wiki.onap.org/display/DW/POMBA>`_
-   - `See the result from LOG <https://bestpractices.coreinfrastructure.org/en/projects/1578>`_
-   - `See the result from LOG <https://wiki.onap.org/pages/viewpage.action?pageId=68541351>`_
 
 **Upgrade Notes**
       None
@@ -115,12 +224,11 @@ Dublin
 **New Features**
 
 **Bug Fixes**
-   
+
 **Known Issues**
 
 **Security Notes**
-
-LOG 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 LOG open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=64008625>`_.
+   - LOG 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 LOG open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=64008625>`_.
 
 Quick Links:
        - `LOG project page <https://wiki.onap.org/display/DW/Logging+Enhancements+Project>`_
@@ -186,8 +294,6 @@ POMBA code has been formally scanned during build time using NexusIQ and all Cri
 
 Quick Links:
    - `POMBA project page <https://wiki.onap.org/display/DW/POMBA>`_
-   - `See the result from LOG <https://bestpractices.coreinfrastructure.org/en/projects/1578>`_
-   - `See the result from LOG <https://wiki.onap.org/pages/viewpage.action?pageId=51282493>`_
 
 **Upgrade Notes**
       None
@@ -204,7 +310,6 @@ Casablanca
 -----------
    - logging-analytics Version: 1.2.6
 
---------------
 :Release Date: 2019-02-08
 
 **New Features**
@@ -252,7 +357,6 @@ Casablanca
    - pomba-network-discovery-context-builder Version: 1.3.1
    - pomba-sdc-context-builder Version: 1.3.2
 
---------------
 :Release Date:  2019-02-08
 
 **New Features**
@@ -275,8 +379,6 @@ POMBA code has been formally scanned during build time using NexusIQ and all Cri
 
 Quick Links:
    - `POMBA project page <https://wiki.onap.org/display/DW/POMBA>`_
-   - `See the result from LOG <https://bestpractices.coreinfrastructure.org/en/projects/1578>`_
-   - `See the result from LOG <https://wiki.onap.org/pages/viewpage.action?pageId=28378692>`_
 
 **Upgrade Notes**
       None
@@ -357,8 +459,6 @@ POMBA code has been formally scanned during build time using NexusIQ and all Cri
 
 Quick Links:
    - `POMBA project page <https://wiki.onap.org/display/DW/POMBA>`_
-   - `See the result from LOG <https://bestpractices.coreinfrastructure.org/en/projects/1578>`_
-   - `See the result from LOG <https://wiki.onap.org/pages/viewpage.action?pageId=28378692>`_
 
 **Upgrade Notes**
       None

diff --git a/pom.xml b/pom.xml
index 390c076..e7fc23d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <groupId>org.onap.logging-analytics</groupId>
   <artifactId>logging-analytics</artifactId>
   <packaging>pom</packaging>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.1-SNAPSHOT</version>
   <name>logging-analytics</name>
   <url>http://maven.apache.org</url>
   <modules>

diff --git a/pylog/pom.xml b/pylog/pom.xml
index da24408..ad631bd 100644 (file)
--- a/pylog/pom.xml
+++ b/pylog/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.onap.logging-analytics</groupId>  
     <modelVersion>4.0.0</modelVersion>
     <artifactId>logging-pylog</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <packaging>pom</packaging>
     <name>logging-pylog</name>
     <description>onap python logging library</description>

diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml
index 3a784bd..9e8ecaa 100644 (file)
--- a/reference/logging-demo/pom.xml
+++ b/reference/logging-demo/pom.xml
@@ -3,7 +3,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>logging-demo</artifactId>
   <packaging>war</packaging>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-mock-service</artifactId>
-            <version>1.5.0-SNAPSHOT</version>
+            <version>1.5.1-SNAPSHOT</version>
         </dependency>
        
         

diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml
index e411aba..d47f4b7 100644 (file)
--- a/reference/logging-docker-root/pom.xml
+++ b/reference/logging-docker-root/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.5.1-SNAPSHOT</version>
   </parent>  
   <artifactId>logging-docker-root</artifactId>
   <packaging>pom</packaging>

diff --git a/reference/logging-filter/logging-filter-base/pom.xml b/reference/logging-filter/logging-filter-base/pom.xml
index d275833..2f93b01 100644 (file)
--- a/reference/logging-filter/logging-filter-base/pom.xml
+++ b/reference/logging-filter/logging-filter-base/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.logging-analytics</groupId>
                <artifactId>logging-filter-parent</artifactId>
-               <version>1.5.0-SNAPSHOT</version>
+               <version>1.5.1-SNAPSHOT</version>
        </parent>
 
        <artifactId>logging-filter-base</artifactId>

diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/ONAPComponents.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/ONAPComponents.java
index 06fbba9..563d686 100644 (file)
--- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/ONAPComponents.java
+++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/ONAPComponents.java
@@ -51,7 +51,8 @@ public enum ONAPComponents implements ONAPComponentsList {
     DBC,
     DR,
     MR,
-    OPTF;
+    OPTF,
+    OOF;
 
 
     public static Set<ONAPComponents> getSOInternalComponents() {

diff --git a/reference/logging-filter/logging-filter-spring/pom.xml b/reference/logging-filter/logging-filter-spring/pom.xml
index e7ae8f8..6229e15 100644 (file)
--- a/reference/logging-filter/logging-filter-spring/pom.xml
+++ b/reference/logging-filter/logging-filter-spring/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.logging-analytics</groupId>
                <artifactId>logging-filter-parent</artifactId>
-               <version>1.5.0-SNAPSHOT</version>
+               <version>1.5.1-SNAPSHOT</version>
        </parent>
 
        <artifactId>logging-filter-spring</artifactId>

diff --git a/reference/logging-filter/pom.xml b/reference/logging-filter/pom.xml
index aef5327..aef2e19 100644 (file)
--- a/reference/logging-filter/pom.xml
+++ b/reference/logging-filter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.logging-analytics</groupId>
         <artifactId>logging-reference</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>logging-filter-parent</artifactId>
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>org.onap.logging-analytics</groupId>
                 <artifactId>logging-slf4j</artifactId>
-                <version>1.5.0-SNAPSHOT</version>
+                <version>1.5.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>

diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml
index 8a19753..da7b248 100644 (file)
--- a/reference/logging-kubernetes/pom.xml
+++ b/reference/logging-kubernetes/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>logging-kubernetes</artifactId>
   <packaging>pom</packaging>

diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml
index e23e644..c4781cc 100644 (file)
--- a/reference/logging-library/pom.xml
+++ b/reference/logging-library/pom.xml
@@ -3,7 +3,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>logging-library</artifactId>
   <packaging>jar</packaging>
@@ -65,7 +65,7 @@
        <dependency>
            <groupId>org.onap.logging-analytics</groupId>
            <artifactId>logging-slf4j</artifactId>
-           <version>1.5.0-SNAPSHOT</version>
+           <version>1.5.1-SNAPSHOT</version>
        </dependency>
        <!--  decouple HttpServlet parameters from both this project and slf4j later -->
        <dependency>

diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml
index e7a042d..1359a5d 100644 (file)
--- a/reference/logging-mock-service/pom.xml
+++ b/reference/logging-mock-service/pom.xml
@@ -3,7 +3,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>logging-mock-service</artifactId>
   <packaging>jar</packaging>
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-library</artifactId>
-            <version>1.5.0-SNAPSHOT</version>
+            <version>1.5.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/reference/logging-slf4j-demo/pom.xml b/reference/logging-slf4j-demo/pom.xml
index 4dff5a0..c0b8d00 100644 (file)
--- a/reference/logging-slf4j-demo/pom.xml
+++ b/reference/logging-slf4j-demo/pom.xml
@@ -3,7 +3,7 @@
     <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.5.1-SNAPSHOT</version>
       <relativePath>..</relativePath>
     </parent>   
     <artifactId>logging-slf4j-demo</artifactId>

diff --git a/reference/logging-slf4j/pom.xml b/reference/logging-slf4j/pom.xml
index 8ebeb7f..ea5478f 100644 (file)
--- a/reference/logging-slf4j/pom.xml
+++ b/reference/logging-slf4j/pom.xml
@@ -3,7 +3,7 @@
     <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>logging-slf4j</artifactId>
     <name>logging-slf4j</name>

diff --git a/reference/pom.xml b/reference/pom.xml
index f3fc852..c055794 100644 (file)
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-analytics</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>logging-reference</artifactId>
   <packaging>pom</packaging>

diff --git a/reference/provider/pom.xml b/reference/provider/pom.xml
index 98a15cd..92ea1ae 100644 (file)
--- a/reference/provider/pom.xml
+++ b/reference/provider/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.5.1-SNAPSHOT</version>
   </parent>  
   <artifactId>logging-provider</artifactId>
   <packaging>pom</packaging>

diff --git a/releases/1.5.1.yaml b/releases/1.5.1.yaml
new file mode 100644 (file)
index 0000000..5c265c8
--- /dev/null
+++ b/releases/1.5.1.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.5.1'
+project: 'logging-analytics'
+log_dir: 'logging-analytics-maven-stage-master/166/'

diff --git a/version.properties b/version.properties
index fbfa6f5..004e715 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 # 1.2.6-SNAPSHOT is off 1.2.5
 major=1
 minor=5
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}