Merge branch 'fix-26232@@2' into 'master'

Remove the dependency on joda-time

See merge request zstackio/zstack!6115

Author: gitlab

header/src/main/java/org/zstack/header/storage/primary/PrimaryStorageLicenseInfo.java

@@ -1,8 +1,10 @@
 package org.zstack.header.storage.primary;
 
+import java.time.OffsetDateTime;
+
 public class PrimaryStorageLicenseInfo {
     private String uuid;
-    private String expireTime;
+    private OffsetDateTime expireTime;
     private String type;
 
     public String getUuid() {
@@ -21,11 +23,11 @@ public void setType(String type) {
         this.type = type;
     }
 
-    public String getExpireTime() {
+    public OffsetDateTime getExpireTime() {
         return expireTime;
     }
 
-    public void setExpireTime(String expireTime) {
+    public void setExpireTime(OffsetDateTime expireTime) {
         this.expireTime = expireTime;
     }
 

pom.xml

@@ -300,11 +300,6 @@
                 <artifactId>javax.mail</artifactId>
                 <version>1.5.5</version>
             </dependency>
-            <dependency>
-                <groupId>joda-time</groupId>
-                <artifactId>joda-time</artifactId>
-                <version>2.9.1</version>
-            </dependency>
             <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
             <dependency>
                 <groupId>commons-beanutils</groupId>

storage/src/main/java/org/zstack/storage/primary/PrimaryStorageManagerImpl.java

@@ -159,7 +159,7 @@ public void run(MessageReply reply) {
                     PrimaryStorageLicenseInfo info = r.getPrimaryStorageLicenseInfo();
                     if (info != null) {
                         sreply.setUuid(msg.getUuid());
-                        sreply.setExpireTime(info.getExpireTime());
+                        sreply.setExpireTime(info.getExpireTime().toString());
                         sreply.setName(vo.getName());
                     }
                 } else {