diff options
| author |   Ofir Sonsino <os0695@att.com> | 2017-10-22 17:03:35 +0300 |
|---|---|---|
| committer | Ofir Sonsino <os0695@att.com> | 2017-10-22 17:03:35 +0300 |
| commit | 564a0d70f57acfb87b1b832e02323b9a523278fe (patch) | |
| tree | d4efe3ed07f9e1181826059b77b4e362adb1b649 | |
| parent | 923c589c833a633b059ecae1774a2fa59964ea73 (diff) | |
Upgrade portal SDK
Change-Id: I177f419047a3bf3e61049884276f42d9242b5327
Issue-Id: VID-80
Signed-off-by: Ofir Sonsino <os0695@att.com>
| -rwxr-xr-x | epsdk-app-onap/pom.xml | 19 | ||||
| -rwxr-xr-x | epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java | 3 | ||||
| -rwxr-xr-x | vid-app-common/pom.xml | 12 |
3 files changed, 14 insertions, 20 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index 5d37fd60..892ea126 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -17,7 +17,7 @@ <encoding>UTF-8</encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <epsdk.version>1.3.0-SNAPSHOT</epsdk.version>
+ <epsdk.version>1.3.1</epsdk.version>
<springframework.version>4.2.0.RELEASE</springframework.version>
<hibernate.version>4.3.11.Final</hibernate.version>
<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
@@ -172,7 +172,7 @@ <artifactId>vid-app-common</artifactId>
</overlay>
<overlay>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-app-overlay</artifactId>
</overlay>
</overlays>
@@ -267,13 +267,13 @@ <dependencies>
<!-- SDK overlay war -->
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-app-overlay</artifactId>
<version>${epsdk.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-app-common</artifactId>
<version>${epsdk.version}</version>
<type>jar</type>
@@ -293,17 +293,17 @@ </dependency>
<!-- SDK components -->
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-core</artifactId>
<version>${epsdk.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-analytics</artifactId>
<version>${epsdk.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-workflow</artifactId>
<version>${epsdk.version}</version>
</dependency>
@@ -347,11 +347,6 @@ <version>0.9.5.2</version>
</dependency>
<dependency>
- <groupId>org.mariadb.jdbc</groupId>
- <artifactId>mariadb-java-client</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
<groupId>io.searchbox</groupId>
<artifactId>jest</artifactId>
<version>2.0.0</version>
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 3c3dcb06..e004c241 100755 --- 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))
userIdcookie = cookie;
if(userIdcookie!=null){
- userId = CipherUtil.decrypt(userIdcookie.getValue(),
- PortalApiProperties.getProperty(PortalApiConstants.Decryption_Key));
+ userId = CipherUtil.decrypt(userIdcookie.getValue());
}
return userId;
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index d7885759..2c98276c 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -18,7 +18,7 @@ <encoding>UTF-8</encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <epsdk.version>1.3.0-SNAPSHOT</epsdk.version>
+ <epsdk.version>1.3.1</epsdk.version>
<springframework.version>4.2.0.RELEASE</springframework.version>
<hibernate.version>4.3.11.Final</hibernate.version>
<!-- Skip assembling the zip by default -->
@@ -251,30 +251,30 @@ <!-- SDK overlay war -->
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-app-overlay</artifactId>
<version>${epsdk.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-app-common</artifactId>
<version>${epsdk.version}</version>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-core</artifactId>
<version>${epsdk.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-analytics</artifactId>
<version>${epsdk.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-workflow</artifactId>
<version>${epsdk.version}</version>
</dependency>
|