Upgrade portal SDK

Change-Id: I177f419047a3bf3e61049884276f42d9242b5327
Issue-Id: VID-80
Signed-off-by: Ofir Sonsino <os0695@att.com>

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 5d37fd6..892ea12 100755 (executable)
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -17,7 +17,7 @@
                <encoding>UTF-8</encoding>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <epsdk.version>1.3.0-SNAPSHOT</epsdk.version>\r
+               <epsdk.version>1.3.1</epsdk.version>\r
                <springframework.version>4.2.0.RELEASE</springframework.version>\r
                <hibernate.version>4.3.11.Final</hibernate.version>\r
                <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->\r
@@ -172,7 +172,7 @@
                                                        <artifactId>vid-app-common</artifactId>\r
                                                </overlay>\r
                                                <overlay>\r
-                                                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                                                       <groupId>org.onap.portal.sdk</groupId>\r
                                                        <artifactId>epsdk-app-overlay</artifactId>\r
                                                </overlay>\r
                                        </overlays>\r
@@ -267,13 +267,13 @@
        <dependencies>\r
                <!-- SDK overlay war -->\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-app-overlay</artifactId>\r
                        <version>${epsdk.version}</version>\r
                        <type>war</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-app-common</artifactId>\r
                        <version>${epsdk.version}</version>\r
                        <type>jar</type>\r
@@ -293,17 +293,17 @@
                </dependency>\r
                <!-- SDK components -->\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-core</artifactId>\r
                        <version>${epsdk.version}</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-analytics</artifactId>\r
                        <version>${epsdk.version}</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-workflow</artifactId>\r
                        <version>${epsdk.version}</version>\r
                </dependency>\r
@@ -346,11 +346,6 @@
                        <artifactId>c3p0</artifactId>\r
                        <version>0.9.5.2</version>\r
                </dependency>\r
-               <dependency>\r
-                       <groupId>org.mariadb.jdbc</groupId>\r
-                       <artifactId>mariadb-java-client</artifactId>\r
-                       <version>1.5.8</version>\r
-               </dependency>\r
                <dependency>\r
                        <groupId>io.searchbox</groupId>\r
                        <artifactId>jest</artifactId>\r

diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
index 3c3dcb0..e004c24 100755 (executable)
--- a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
+++ b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
@@ -44,8 +44,7 @@ public class LoginStrategyImpl extends LoginStrategy {
                                if (cookie.getName().equals(USER_ID))\r
                                        userIdcookie = cookie;\r
                if(userIdcookie!=null){\r
-                       userId = CipherUtil.decrypt(userIdcookie.getValue(),\r
-                                       PortalApiProperties.getProperty(PortalApiConstants.Decryption_Key));\r
+                       userId = CipherUtil.decrypt(userIdcookie.getValue());\r
                }\r
                return userId;\r
        \r

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index d788575..2c98276 100755 (executable)
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -18,7 +18,7 @@
                <encoding>UTF-8</encoding>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <epsdk.version>1.3.0-SNAPSHOT</epsdk.version>\r
+               <epsdk.version>1.3.1</epsdk.version>\r
                <springframework.version>4.2.0.RELEASE</springframework.version>\r
                <hibernate.version>4.3.11.Final</hibernate.version>\r
                <!-- Skip assembling the zip by default -->\r
@@ -251,30 +251,30 @@
                <!-- SDK overlay war -->\r
 \r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-app-overlay</artifactId>\r
                        <version>${epsdk.version}</version>\r
                        <type>war</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-app-common</artifactId>\r
                        <version>${epsdk.version}</version>\r
                        <type>jar</type>\r
                </dependency>\r
 \r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-core</artifactId>\r
                        <version>${epsdk.version}</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-analytics</artifactId>\r
                        <version>${epsdk.version}</version>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.ecompsdkos</groupId>\r
+                       <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-workflow</artifactId>\r
                        <version>${epsdk.version}</version>\r
                </dependency>\r