diff options
Diffstat (limited to 'catalog-model')
| -rw-r--r-- | catalog-model/pom.xml | 9 | ||||
| -rw-r--r-- | catalog-model/src/main/java/org/openecomp/sdc/be/model/User.java | 6 |
2 files changed, 6 insertions, 9 deletions
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 @@ -270,6 +270,10 @@ <scope>provided</scope> <exclusions> <exclusion> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + </exclusion> + <exclusion> <artifactId>slf4j-log4j12</artifactId> <groupId>org.slf4j</groupId> </exclusion> @@ -486,11 +490,6 @@ <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> <version>${project.version}</version> 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(); } } |