updated to reflect testing date time stamps

gitlab4j · Dec 11, 2024 · caa9359 · caa9359
1 parent 72e86a6
commit caa9359
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java
@@ -134,7 +134,7 @@ public class EventMergeRequest {
     private Long mergeUserId;
 
     @JsonProperty("deleted_at")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z")
     private Date deletedAt;
 
     @JsonProperty("in_progress_merge_commit_sha")
@@ -144,7 +144,7 @@ public class EventMergeRequest {
     private Integer lockVersion;
 
     @JsonProperty("last_edited_at")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss z")
     private Date lastEditedAt;
 
     @JsonProperty("last_edited_by_id")