From dffdf560049dac56f2c7d35dffec0e009c7939af Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Thu, 18 May 2023 16:13:52 +0100
Subject: Update vulnerable dependencies

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Ifedc08763f6d46e3bcba0367a81edc8e219865d0
Issue-ID: SDC-4504
---
 catalog-model/pom.xml                                            | 9 ++++-----
 catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java | 6 ++----
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'catalog-model')

diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index eb09dc1796..2577bf01f7 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -269,6 +269,10 @@
             <version>${janusgraph.version}</version>
             <scope>provided</scope>
             <exclusions>
+                <exclusion>
+                    <groupId>joda-time</groupId>
+                    <artifactId>joda-time</artifactId>
+                </exclusion>
                 <exclusion>
                     <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
@@ -485,11 +489,6 @@
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
         </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${joda.time.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.openecomp.sdc.core</groupId>
             <artifactId>openecomp-tosca-lib</artifactId>
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java
index 72dc4aa7aa..0d44cff6e7 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java
@@ -20,13 +20,12 @@
 package org.openecomp.sdc.be.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import java.time.ZonedDateTime;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.openecomp.sdc.be.dao.utils.UserStatusEnum;
 import org.openecomp.sdc.common.util.NoHtml;
 
@@ -88,8 +87,7 @@ public class User {
     }
 
     public void setLastLoginTime() {
-        DateTime now = new DateTime(DateTimeZone.UTC);
-        this.lastLoginTime = now.getMillis();
+        this.lastLoginTime = ZonedDateTime.now().toInstant().toEpochMilli();
     }
 
 }
-- 
cgit 1.2.3-korg