Merge "HealthCheckController up"

diff --git a/deliveries/.env b/deliveries/.env
index 0534141..6c3f824 100644 (file)
--- a/deliveries/.env
+++ b/deliveries/.env
@@ -38,7 +38,7 @@ CLI_IMG_NAME=onap/cli
 
 # This is the first portion of the Docker image tag
 # that is published to the ONAP registry.
-PORTAL_VERSION=3.4.0
+PORTAL_VERSION=3.5.0
 
 # This is used during builds and in docker-compose;
 # it is never published to the ONAP registry.

diff --git a/deliveries/Dockerfile.mariadb b/deliveries/Dockerfile.mariadb
index c20af0c..7310585 100644 (file)
--- a/deliveries/Dockerfile.mariadb
+++ b/deliveries/Dockerfile.mariadb
@@ -1,4 +1,4 @@
-FROM mariadb:10.4.14
+FROM mariadb:10.5.5
 
 ARG DB_SCRIPT_DIR=${DB_SCRIPT_DIR}
 

diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml
index 18f1a7c..6789b67 100644 (file)
--- a/ecomp-portal-BE-common/pom.xml
+++ b/ecomp-portal-BE-common/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.onap.portal</groupId>
                <artifactId>onap-portal-parent</artifactId>
-               <version>3.4.0</version>
+               <version>3.5.0</version>
        </parent>
 
        <artifactId>portal-be-common</artifactId>

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
index ad06dd9..acc8351 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
@@ -2812,6 +2812,11 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
                                                EPRole updateRoleInactive = roleList.get(0);
                                                updateRoleInactive.setActive(false);
                                                dataAccessService.saveDomainObject(updateRoleInactive, null);
+                                               
+                                               /**
+                                                * Newly Added - Deleting User Role association as this role is not present in AAF and got removed from AAF directly
+                                               */
+                                               deleteUserRoleAssociation(updateRoleInactive, app);
                                        }
                                }
                        } catch (Exception e) {
@@ -2820,6 +2825,25 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
                        }
                }
        }
+       
+       /**
+        * Delete User Role Association mapping in Portal DB - In case of particular role is already removed from AAF directly.
+        * @param epRole
+        */
+       private void deleteUserRoleAssociation(EPRole epRole, EPApp app) {              
+               Session localSession = sessionFactory.openSession();
+               Query query = null;
+               try {
+                       String sql = "DELETE FROM FN_USER_ROLE where role_id=" +epRole.getId() + " AND app_id=" +app.getId();
+                       logger.debug(EELFLoggerDelegate.debugLogger,"deleteUserRoleAssociation: sql :"+ sql);
+                       query = localSession.createSQLQuery(sql);
+                       query.executeUpdate();
+               } catch (Exception e) {
+                       logger.error(EELFLoggerDelegate.errorLogger, "deleteUserRoleAssociation: failed", e);
+               } finally {
+                       localSession.close();
+               }
+       }
 
        @Override
        @SuppressWarnings("unchecked")

diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 5372e0a..6d01488 100644 (file)
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal</groupId>
                <artifactId>onap-portal-parent</artifactId>
-               <version>3.4.0</version>
+               <version>3.5.0</version>
        </parent>
 
        <artifactId>portal-be-os</artifactId>

diff --git a/ecomp-portal-FE-os/pom.xml b/ecomp-portal-FE-os/pom.xml
index 29154e8..a3410ee 100644 (file)
--- a/ecomp-portal-FE-os/pom.xml
+++ b/ecomp-portal-FE-os/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal</groupId>
                <artifactId>onap-portal-parent</artifactId>
-               <version>3.4.0</version>
+               <version>3.5.0</version>
        </parent>
 
        <artifactId>portal-FE-os</artifactId>

diff --git a/ecomp-portal-widget-ms/common-widgets/pom.xml b/ecomp-portal-widget-ms/common-widgets/pom.xml
index 7844390..df214f5 100644 (file)
--- a/ecomp-portal-widget-ms/common-widgets/pom.xml
+++ b/ecomp-portal-widget-ms/common-widgets/pom.xml
@@ -6,7 +6,7 @@
         <parent>
                 <groupId>org.onap.portal</groupId>
                 <artifactId>widget-ms-parent</artifactId>
-                               <version>3.4.0</version>
+                               <version>3.5.0</version>
         </parent>
 
        <artifactId>common-widgets</artifactId>

diff --git a/ecomp-portal-widget-ms/pom.xml b/ecomp-portal-widget-ms/pom.xml
index 913ac44..67032ea 100644 (file)
--- a/ecomp-portal-widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.onap.portal</groupId>
                <artifactId>onap-portal-parent</artifactId>
-               <version>3.4.0</version>
+               <version>3.5.0</version>
        </parent>
 
        <artifactId>widget-ms-parent</artifactId>

diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml
index a601dbe..caf2f65 100644 (file)
--- a/ecomp-portal-widget-ms/widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/widget-ms/pom.xml
@@ -14,7 +14,7 @@
 
        <groupId>org.onap.portal</groupId>
        <artifactId>widget-ms</artifactId>
-       <version>3.4.0</version>
+       <version>3.5.0</version>
        <packaging>jar</packaging>
        <name>widget-microservice</name>
 

diff --git a/pom.xml b/pom.xml
index a202821..0bc01c8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
        <groupId>org.onap.portal</groupId>
        <artifactId>onap-portal-parent</artifactId>
-       <version>3.4.0</version>
+       <version>3.5.0</version>
 
        <packaging>pom</packaging>
        <name>portal</name>

diff --git a/portal-FE-os/pom.xml b/portal-FE-os/pom.xml
index 257e26d..7f6a02f 100644 (file)
--- a/portal-FE-os/pom.xml
+++ b/portal-FE-os/pom.xml
@@ -4,7 +4,7 @@
 
        <groupId>org.onap.portal</groupId>
        <artifactId>portal-FE-os</artifactId>
-       <version>3.4.0</version>
+       <version>3.5.0</version>
 
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -20,7 +20,7 @@
                <sonar.tests>src</sonar.tests>
                <sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
                <sonar.nodejs.executable>${project.basedir}\node\</sonar.nodejs.executable>
-                <epsdk.version>3.4.0-SNAPSHOT</epsdk.version>
+        <epsdk.version>3.4.0-SNAPSHOT</epsdk.version>
 
        </properties>
 

diff --git a/releases/3.4.0-container-portal-docker.yaml b/releases/3.4.0-container-portal-docker.yaml
new file mode 100644 (file)
index 0000000..101733d
--- /dev/null
+++ b/releases/3.4.0-container-portal-docker.yaml
@@ -0,0 +1,13 @@
+distribution_type: container
+container_release_tag: 3.4.0
+project: portal
+ref: 10d101e44b4164744d381946893cd71a78353631
+containers:
+    - name: portal-app
+      version: 3.4.0-STAGING-latest
+    - name: portal-sdk
+      version: 3.4.0-STAGING-latest
+    - name: portal-wms
+      version: 3.4.0-STAGING-latest
+    - name: portal-db
+      version: 3.4.0-STAGING-latest
\ No newline at end of file

diff --git a/releases/3.4.1-container-portal-docker.yaml b/releases/3.4.1-container-portal-docker.yaml
new file mode 100644 (file)
index 0000000..7f92848
--- /dev/null
+++ b/releases/3.4.1-container-portal-docker.yaml
@@ -0,0 +1,13 @@
+distribution_type: container
+container_release_tag: 3.4.1
+project: portal
+ref: 10d101e44b4164744d381946893cd71a78353631
+containers:
+    - name: portal-app
+      version: 3.4.0-STAGING-latest
+    - name: portal-sdk
+      version: 3.4.0-STAGING-latest
+    - name: portal-wms
+      version: 3.4.0-STAGING-latest
+    - name: portal-db
+      version: 3.4.0-STAGING-latest
\ No newline at end of file

diff --git a/version.properties b/version.properties
index 75658f7..3670162 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,7 +3,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=3
-minor=4
+minor=5
 patch=0
 
 base_version=${major}.${minor}.${patch}