Merge remote-tracking branch 'origin/main' into 6.x

gitlab4j · Aug 16, 2023 · 046172f · 046172f
2 parents 61df75e + c393d43
commit 046172f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/main/java/org/gitlab4j/api/models/Package.java b/src/main/java/org/gitlab4j/api/models/Package.java
@@ -1,5 +1,7 @@
 package org.gitlab4j.api.models;
 
+import java.util.Date;
+
 import org.gitlab4j.api.utils.JacksonJson;
 
 public class Package {
@@ -8,6 +10,7 @@ public class Package {
     private String name;
     private String version;
     private PackageType packageType;
+    private Date createdAt;
 
     public Long getId() {
         return id;
@@ -41,6 +44,14 @@ public void setPackageType(PackageType packageType) {
         this.packageType = packageType;
     }
 
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
     @Override
     public String toString() {
         return (JacksonJson.toJsonString(this));

diff --git a/src/test/resources/org/gitlab4j/api/packages.json b/src/test/resources/org/gitlab4j/api/packages.json
@@ -3,12 +3,14 @@
     "id": 1,
     "name": "com/mycompany/my-app",
     "version": "1.0-SNAPSHOT",
-    "package_type": "maven"
+    "package_type": "maven",
+    "created_at": "2012-10-22T14:13:35Z"
   },
   {
     "id": 2,
     "name": "@foo/bar",
     "version": "1.0.3",
-    "package_type": "npm"
+    "package_type": "npm",
+    "created_at": "2012-10-22T14:13:35Z"
   }
 ]