pom, upgrade script changes, AAF role desc fix

Issue-ID: PORTAL-356

portal/SDK release 2.5.1, POM, upgrade script
Change-Id: I78bf5dbc5c7927eeb087431143711642ff0261ae
Signed-off-by: Kishore Reddy, Gujja (kg811t)
<kishore.reddy.gujja@att.com>

Change-Id: Ie0065f477a4004637cbb275ad079161be9ddfb41
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kishore.reddy.gujja@att.com>

diff --git a/ecomp-sdk/epsdk-aaf/pom.xml b/ecomp-sdk/epsdk-aaf/pom.xml
index 0ed95f0..3f1e017 100644 (file)
--- a/ecomp-sdk/epsdk-aaf/pom.xml
+++ b/ecomp-sdk/epsdk-aaf/pom.xml
@@ -7,12 +7,12 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
        </parent>
        
        <groupId>org.onap.portal.sdk</groupId>
        <artifactId>epsdk-aaf</artifactId>
-       <version>2.5.1</version>
+       <version>2.5.1-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <name>ONAP Portal SDK AAF Authorization</name>

diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml
index 5e442ac..c40488b 100644 (file)
--- a/ecomp-sdk/epsdk-analytics/pom.xml
+++ b/ecomp-sdk/epsdk-analytics/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
        </parent>
        
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml
index 6ae34ed..b649be5 100644 (file)
--- a/ecomp-sdk/epsdk-app-common/pom.xml
+++ b/ecomp-sdk/epsdk-app-common/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
        </parent>
 
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-app-os/.gitignore b/ecomp-sdk/epsdk-app-os/.gitignore
index 17cfade..1233294 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/.gitignore
+++ b/ecomp-sdk/epsdk-app-os/.gitignore
@@ -4,3 +4,4 @@
 .project
 .classpath
 /ngapp/
+ecomp-sdk/epsdk-app-os/*/ngapp/*

diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml
index 5c9dd42..67835ec 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/pom.xml
+++ b/ecomp-sdk/epsdk-app-os/pom.xml
@@ -9,7 +9,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
        </parent>
 
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-app-overlay/pom.xml b/ecomp-sdk/epsdk-app-overlay/pom.xml
index 036df01..173841d 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/pom.xml
+++ b/ecomp-sdk/epsdk-app-overlay/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
        </parent>
 
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index 6990268..78022a9 100644 (file)
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
        </parent>
 
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
index fd05c69..9c8a883 100644 (file)
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
@@ -191,11 +191,14 @@ public class UserApiServiceImpl implements UserApiService {
        private Set setUserApps(List<ExternalAccessUserRoleDetail> userRoleDetailList, String namespace, User user,
                        App app) {
                Set userApps = new TreeSet();
+               //As External Auth System does not provide roleId's we are setting counter value for roleId. These values should not be stored in DB.  
+               Long tempRoleId = 0l;
                for (ExternalAccessUserRoleDetail userRoleDetail : userRoleDetailList) {
                        ExternalAccessRole ecRole = userRoleDetail.getRole();
                        UserApp userApp = new UserApp();
                        Role role = new Role();
                        Set roleFunctions = new TreeSet<>();
+                       role.setId(tempRoleId);
                        role.setActive(true);
                        role.setName(ecRole.getName());
                        for (ExternalAccessPerms extPerm : ecRole.getPerms()) {
@@ -225,6 +228,7 @@ public class UserApiServiceImpl implements UserApiService {
                        userApp.setRole(role);
                        userApp.setUserId(user.getId());
                        userApps.add(userApp);
+                       tempRoleId++;
                }
                return userApps;
        }

diff --git a/ecomp-sdk/epsdk-domain/pom.xml b/ecomp-sdk/epsdk-domain/pom.xml
index 5bf776e..3ec2744 100644 (file)
--- a/ecomp-sdk/epsdk-domain/pom.xml
+++ b/ecomp-sdk/epsdk-domain/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.portal.sdk</groupId>
        <artifactId>epsdk-domain</artifactId>
-       <version>2.5.1</version>
+       <version>2.5.1-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>ONAP Portal SDK Domain</name>
 

diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml
index 019f19b..22b93cb 100644 (file)
--- a/ecomp-sdk/epsdk-fw/pom.xml
+++ b/ecomp-sdk/epsdk-fw/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
        </parent>
 
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/epsdk-logger/pom.xml b/ecomp-sdk/epsdk-logger/pom.xml
index a1f4c15..4f5549c 100644 (file)
--- a/ecomp-sdk/epsdk-logger/pom.xml
+++ b/ecomp-sdk/epsdk-logger/pom.xml
@@ -4,12 +4,12 @@
   <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.onap.portal.sdk</groupId>
   <artifactId>epsdk-logger</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.1-SNAPSHOT</version>
   
   <dependencies>
        <dependency>

diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml
index 86955e5..8ab9086 100644 (file)
--- a/ecomp-sdk/epsdk-music/pom.xml
+++ b/ecomp-sdk/epsdk-music/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
        </parent>
        
        <groupId>org.onap.portal.sdk</groupId>
        <artifactId>epsdk-music</artifactId>
-       <version>2.5.1</version>
+       <version>2.5.1-SNAPSHOT</version>
        <packaging>jar</packaging>
 
        <name>ONAP Portal SDK Music</name>

diff --git a/ecomp-sdk/epsdk-workflow/pom.xml b/ecomp-sdk/epsdk-workflow/pom.xml
index 8590501..3d31666 100644 (file)
--- a/ecomp-sdk/epsdk-workflow/pom.xml
+++ b/ecomp-sdk/epsdk-workflow/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.portal.sdk</groupId>
                <artifactId>epsdk-project</artifactId>
-               <version>2.5.1</version>
+               <version>2.5.1-SNAPSHOT</version>
        </parent>
        
        <!-- GroupId is inherited from parent -->

diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml
index d298b7b..1bf0c53 100644 (file)
--- a/ecomp-sdk/pom.xml
+++ b/ecomp-sdk/pom.xml
@@ -13,7 +13,7 @@
        <!-- Portal SDK Maven parent project -->
        <groupId>org.onap.portal.sdk</groupId>
        <artifactId>epsdk-project</artifactId>
-       <version>2.5.1</version>
+       <version>2.5.1-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>portal-sdk</name>
        <url>https://wiki.onap.org/display/DW/Portal</url>