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

# Conflicts:
#	src/main/java/org/gitlab4j/api/models/Link.java
#	src/main/java/org/gitlab4j/api/models/PackageFile.java

src/main/java/org/gitlab4j/api/models/Tag.java

@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
 
 import org.gitlab4j.api.utils.JacksonJson;
 
-public class Tag {
+import java.io.Serializable;
+
+public class Tag implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private Commit commit;
     private String message;

src/main/java/org/gitlab4j/api/models/TaskCompletionStatus.java

@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
 
 import org.gitlab4j.api.utils.JacksonJson;
 
-public class TaskCompletionStatus {
+import java.io.Serializable;
+
+public class TaskCompletionStatus implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private Integer count;
     private Integer completedCount;

src/main/java/org/gitlab4j/api/models/TimeStats.java

@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
 
 import org.gitlab4j.api.utils.JacksonJson;
 
-public class TimeStats {
+import java.io.Serializable;
+
+public class TimeStats implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private Integer timeEstimate;
     private Integer totalTimeSpent;

src/main/java/org/gitlab4j/api/models/Todo.java

 package org.gitlab4j.api.models;
 
-import java.io.IOException;
-import java.util.Date;
-
-import org.gitlab4j.api.Constants.TodoAction;
-import org.gitlab4j.api.Constants.TodoState;
-import org.gitlab4j.api.Constants.TodoType;
-import org.gitlab4j.api.utils.JacksonJson;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -16,8 +8,17 @@ import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.gitlab4j.api.Constants.TodoAction;
+import org.gitlab4j.api.Constants.TodoState;
+import org.gitlab4j.api.Constants.TodoType;
+import org.gitlab4j.api.utils.JacksonJson;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Date;
 
-public class Todo {
+public class Todo implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private Long id;
     private Project project;

src/main/java/org/gitlab4j/api/models/Topic.java

@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
 
 import org.gitlab4j.api.utils.JacksonJson;
 
-public class Topic {
+import java.io.Serializable;
+
+public class Topic implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private Integer id;
 

src/main/java/org/gitlab4j/api/models/TopicParams.java

@@ -4,6 +4,7 @@ import org.gitlab4j.api.GitLabApiForm;
 import org.gitlab4j.api.TopicsApi;
 
 import java.io.File;
+import java.io.Serializable;
 
 /**
  * This class is utilized by the {@link TopicsApi#createTopic(TopicParams)}
@@ -12,7 +13,8 @@ import java.io.File;
  *
  * Avatar Upload has its own Upload in {@link TopicsApi#updateTopicAvatar(Integer,File)}
  */
-public class TopicParams {
+public class TopicParams implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private String name;
     private String title;

src/main/java/org/gitlab4j/api/models/TreeItem.java

@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
 
 import org.gitlab4j.api.utils.JacksonJson;
 
-public class TreeItem {
+import java.io.Serializable;
+
+public class TreeItem implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     public enum Type {
         TREE, BLOB, COMMIT;

src/main/java/org/gitlab4j/api/models/Trigger.java

 package org.gitlab4j.api.models;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class Trigger {
+public class Trigger implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private Long id;
     private String description;

src/main/java/org/gitlab4j/api/models/User.java

 package org.gitlab4j.api.models;
 
+import org.gitlab4j.api.utils.JacksonJson;
+
 import java.util.Date;
 import java.util.List;
 
-import org.gitlab4j.api.utils.JacksonJson;
-
 public class User extends AbstractUser<User> {
+    private static final long serialVersionUID = 1L;
 
     private String bio;
     private Boolean bot;

src/main/java/org/gitlab4j/api/models/Variable.java

 package org.gitlab4j.api.models;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.gitlab4j.api.utils.JacksonJson;
-import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
+import org.gitlab4j.api.utils.JacksonJson;
+import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
-public class Variable {
+public class Variable implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     /**
      * Enum for the various Commit build status values.

src/main/java/org/gitlab4j/api/models/Version.java

@@ -2,7 +2,10 @@ package org.gitlab4j.api.models;
 
 import org.gitlab4j.api.utils.JacksonJson;
 
-public class Version {
+import java.io.Serializable;
+
+public class Version implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private String version;
     private String revision;

src/main/java/org/gitlab4j/api/models/WikiAttachment.java

@@ -2,9 +2,13 @@ package org.gitlab4j.api.models;
 
 import org.gitlab4j.api.utils.JacksonJson;
 
-public class WikiAttachment {
+import java.io.Serializable;
 
-    public static class Link {
+public class WikiAttachment implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    public static class Link implements Serializable {
+        private static final long serialVersionUID = 1L;
 
         private String url;
         private String markdown;
@@ -12,15 +16,15 @@ public class WikiAttachment {
         public String getUrl() {
             return url;
         }
-    
+
         public void setUrl(String url) {
             this.url = url;
         }
-    
+
         public String getMarkdown() {
             return markdown;
         }
-    
+
         public void setMarkdown(String markdown) {
             this.markdown = markdown;
         }

src/main/java/org/gitlab4j/api/models/WikiPage.java

@@ -25,7 +25,10 @@ package org.gitlab4j.api.models;
 
 import org.gitlab4j.api.utils.JacksonJson;
 
-public class WikiPage {
+import java.io.Serializable;
+
+public class WikiPage implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private String title;
     private String content;

src/main/java/org/gitlab4j/api/services/NotificationService.java

 package org.gitlab4j.api.services;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +10,8 @@ import org.gitlab4j.api.utils.JacksonJson;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-public abstract class NotificationService {
+public abstract class NotificationService implements Serializable{
+    private static final long serialVersionUID = 1L;
 
     public static final String NOTIFY_ONLY_BROKEN_PIPELINES_PROP = "notify_only_broken_pipelines";
     public static final String NOTIFY_ONLY_DEFAULT_BRANCH_PROP = "notify_only_default_branch";

src/main/java/org/gitlab4j/api/services/SlackService.java

@@ -5,7 +5,8 @@ import org.gitlab4j.api.GitLabApiForm;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class SlackService extends NotificationService {
-    
+    private static final long serialVersionUID = 1L;
+
     private String defaultChannel;
 
     /**

src/main/java/org/gitlab4j/api/systemhooks/AbstractSystemHookEvent.java

@@ -3,6 +3,7 @@ package org.gitlab4j.api.systemhooks;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public abstract class AbstractSystemHookEvent implements SystemHookEvent {
+    private static final long serialVersionUID = 1L;
 
     private String requestUrl;
     private String requestQueryString;

src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import org.gitlab4j.api.utils.JacksonJson;
 
 public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
+    private static final long serialVersionUID = 1L;
 
     public static final String NEW_GROUP_MEMBER_EVENT = "user_add_to_group";
     public static final String GROUP_MEMBER_REMOVED_EVENT = "user_remove_from_group";

src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import org.gitlab4j.api.utils.JacksonJson;
 
 public class GroupSystemHookEvent extends AbstractSystemHookEvent {
+    private static final long serialVersionUID = 1L;
 
     public static final String GROUP_CREATE_EVENT = "group_create";
     public static final String GROUP_DESTROY_EVENT = "group_destroy";

src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java

@@ -5,7 +5,8 @@ import java.util.Date;
 import org.gitlab4j.api.utils.JacksonJson;
 
 public class KeySystemHookEvent extends AbstractSystemHookEvent {
-    
+    private static final long serialVersionUID = 1L;
+
     public static final String KEY_CREATE_EVENT = "key_create";
     public static final String KEY_DESTROY_EVENT = "key_destroy";
     

src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java

@@ -3,6 +3,7 @@ package org.gitlab4j.api.systemhooks;
 import org.gitlab4j.api.webhook.MergeRequestEvent;
 
 public class MergeRequestSystemHookEvent extends MergeRequestEvent implements SystemHookEvent {
+    private static final long serialVersionUID = 1L;
 
     public static final String X_GITLAB_EVENT = "System Hook";
     public static final String MERGE_REQUEST_EVENT = "merge_request";