Merge "Fix for NullPointerException in ecomp-portal-BE-common"

diff --git a/deliveries/.env b/deliveries/.env
index babd90e..c5961d3 100644 (file)
--- a/deliveries/.env
+++ b/deliveries/.env
@@ -38,11 +38,11 @@ CLI_IMG_NAME=onap/cli
 
 # This is the first portion of the Docker image tag
 # that is published to the ONAP registry.
-PORTAL_VERSION=2.5.0
+PORTAL_VERSION=2.6.0
 
 # This is used during builds and in docker-compose;
 # it is never published to the ONAP registry.
-PORTAL_TAG=casablanca
+PORTAL_TAG=elalto
 
 # Name of directory in apps container (NOT host)
 WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps

diff --git a/deliveries/build_portalapps_dockers.sh b/deliveries/build_portalapps_dockers.sh
index 2a09997..fdaf9a1 100755 (executable)
--- a/deliveries/build_portalapps_dockers.sh
+++ b/deliveries/build_portalapps_dockers.sh
@@ -19,7 +19,6 @@ fi
 
 # Check for Jenkins build number
 if [ -n "$BUILD_NUMBER" ]; then
-    export PORTAL_TAG=$BUILD_NUMBER
     echo "Using Jenkins build number $BUILD_NUMBER; Docker Tag $PORTAL_TAG"
 else
     # This indicates a non-Jenkins build

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index a1b6e09..b1b0266 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -19,8 +19,11 @@ We worked on SDK upgrade to integrate with AAF. We partially implemented multi-l
             * Use of CADI
         * 68% JUnit Test Coverage
         * Addressing security issues
-        * Internationalization language support - partially implemented
+        * Angular 6 upgrade delivered foundation code with sample screen
+            * Documentation on the Angular 6 upgrade can be found `here <https://docs.onap.org/en/latest/submodules/portal.git/docs/tutorials/portal-sdk/your-angular-app.html>`_
+        * Internationalization language support - partially implemented.
         * Reporting feature enhancement in portal/sdk - design and partial code changes
+        * There is more information about new features at `DEMOS - R4 Dublin Demos <https://wiki.onap.org/display/DW/DEMOS+-+R4+Dublin+Demos>`_
 
 **Bug Fixes**
         * Fixed Sonar reported critical issues.
@@ -29,6 +32,7 @@ We worked on SDK upgrade to integrate with AAF. We partially implemented multi-l
         * Mismatch while displaying active online user in Portal.
         * Internationalization Language component partially completed.
         * Functional Menu change requires manual refresh.
+        * Modifying Onboarded App configurations from the onboarding page malfunctions but changes to the App configuration can be done through accessing the database (portal:fn_app table) directly.
 
 **Security Notes**
 
@@ -39,9 +43,9 @@ We worked on SDK upgrade to integrate with AAF. We partially implemented multi-l
         * CVE-2019-12317 - Number of XSS vulnerabilities in Portal [`OJSI-15 <https://jira.onap.org/browse/OJSI-15>`_]
         * CVE-2019-12122 - ONAP Portal allows to retrieve password of currently active user [`OJSI-65 <https://jira.onap.org/browse/OJSI-65>`_]
         * CVE-2019-12121 - ONAP Portal is vulnerable for Padding Oracle attack [`OJSI-92 <https://jira.onap.org/browse/OJSI-92>`_]
-        * In defult deployment PORTAL (portal-app) exposes HTTP port 8989 outside of cluster. [`OJSI-97 <https://jira.onap.org/browse/OJSI-97>`_]
-        * In defult deployment PORTAL (portal-app) exposes HTTP port 30215 outside of cluster. [`OJSI-105 <https://jira.onap.org/browse/OJSI-105>`_]
-        * In defult deployment PORTAL (portal-sdk) exposes HTTP port 30212 outside of cluster. [`OJSI-106 <https://jira.onap.org/browse/OJSI-106>`_]
+        * In default deployment PORTAL (portal-app) exposes HTTP port 8989 outside of cluster. [`OJSI-97 <https://jira.onap.org/browse/OJSI-97>`_]
+        * In default deployment PORTAL (portal-app) exposes HTTP port 30215 outside of cluster. [`OJSI-105 <https://jira.onap.org/browse/OJSI-105>`_]
+        * In default deployment PORTAL (portal-sdk) exposes HTTP port 30212 outside of cluster. [`OJSI-106 <https://jira.onap.org/browse/OJSI-106>`_]
         * CVE-2019-12318 - Number of SQL Injections in Portal [`OJSI-174 <https://jira.onap.org/browse/OJSI-174>`_]
         * Portal stores users passwords encrypted instead of hashed [`OJSI-190 <https://jira.onap.org/browse/OJSI-190>`_]
 

diff --git a/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/b2b-library.min.js b/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/b2b-library.min.js
index 7523824..ec955ed 100644 (file)
--- a/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/b2b-library.min.js
+++ b/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/b2b-library.min.js
@@ -12942,7 +12942,7 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js
                 });
             } else if (attrs.axis === 'y') {
                 visibleHeight = parseInt(attrs.height, 10) || b2bWhenScrollEndsConstants.height;
-                if (element.css('width')) {
+                if (element.css('height')) {
                     visibleHeight = element.css('height').split('px')[0]; 
                 }
 

diff --git a/pom.xml b/pom.xml
index 0ddeb31..3ea8ba4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
                <jacocoVersion>0.7.6.201602180812</jacocoVersion>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <encoding>UTF-8</encoding>
-               <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
+               <!-- <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>  -->
                <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
                <enforcer.skip>false</enforcer.skip>
        </properties>