Removed use of JAXB (#327).

src/main/java/org/gitlab4j/api/webhook/EventIssue.java

@@ -2,12 +2,8 @@ package org.gitlab4j.api.webhook;
 
 import java.util.Date;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class EventIssue {
 
     private Integer assigneeId;

src/main/java/org/gitlab4j/api/webhook/EventLabel.java

@@ -2,18 +2,12 @@ package org.gitlab4j.api.webhook;
 
 import java.util.Date;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.gitlab4j.api.utils.JacksonJson;
 import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 public class EventLabel {
 
     public enum LabelType {

src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java

 package org.gitlab4j.api.webhook;
 
 import java.util.Date;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import java.util.Map;
 
 import org.gitlab4j.api.models.Assignee;
+import org.gitlab4j.api.models.Duration;
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class EventMergeRequest {
     
     private Integer assigneeId;
@@ -42,6 +40,25 @@ public class EventMergeRequest {
     private String action;
     private Assignee assignee;
 
+    private Integer updatedById;
+    private String mergeError;
+    private Map<String, String> mergeParams;
+    private Boolean mergeWhenPipelineSucceeds;
+    private Integer mergeUserId;
+    private Date deletedAt;
+    private String inProgressMergeCommitSha;
+    private Integer lockVersion;
+
+    private Date last_editedAt;
+    private Integer lastEditedById;
+    private Integer headPipelineId;
+    private Boolean refFetched;
+    private Integer mergeIid;
+    private Integer totalTimeSpent;
+    private Duration humanTotalTimeSpent;
+    private Integer timeEstimate;
+    private Duration humanTimeEstimate;
+
     public Integer getAssigneeId() {
         return this.assigneeId;
     }
@@ -274,6 +291,142 @@ public class EventMergeRequest {
         this.assignee = assignee;
     }
 
+    public Integer getUpdatedById() {
+        return updatedById;
+    }
+
+    public void setUpdatedById(Integer updatedById) {
+        this.updatedById = updatedById;
+    }
+
+    public String getMergeError() {
+        return mergeError;
+    }
+
+    public void setMergeError(String mergeError) {
+        this.mergeError = mergeError;
+    }
+
+    public Map<String, String> getMergeParams() {
+        return mergeParams;
+    }
+
+    public void setMergeParams(Map<String, String> mergeParams) {
+        this.mergeParams = mergeParams;
+    }
+
+    public Boolean getMergeWhenPipelineSucceeds() {
+        return mergeWhenPipelineSucceeds;
+    }
+
+    public void setMergeWhenPipelineSucceeds(Boolean mergeWhenPipelineSucceeds) {
+        this.mergeWhenPipelineSucceeds = mergeWhenPipelineSucceeds;
+    }
+
+    public Integer getMergeUserId() {
+        return mergeUserId;
+    }
+
+    public void setMergeUserId(Integer mergeUserId) {
+        this.mergeUserId = mergeUserId;
+    }
+
+    public Date getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(Date deletedAt) {
+        this.deletedAt = deletedAt;
+    }
+
+    public String getInProgressMergeCommitSha() {
+        return inProgressMergeCommitSha;
+    }
+
+    public void setInProgressMergeCommitSha(String inProgressMergeCommitSha) {
+        this.inProgressMergeCommitSha = inProgressMergeCommitSha;
+    }
+
+    public Integer getLockVersion() {
+        return lockVersion;
+    }
+
+    public void setLockVersion(Integer lockVersion) {
+        this.lockVersion = lockVersion;
+    }
+
+    public Date getLast_editedAt() {
+        return last_editedAt;
+    }
+
+    public void setLast_editedAt(Date last_editedAt) {
+        this.last_editedAt = last_editedAt;
+    }
+
+    public Integer getLastEditedById() {
+        return lastEditedById;
+    }
+
+    public void setLastEditedById(Integer lastEditedById) {
+        this.lastEditedById = lastEditedById;
+    }
+
+    public Integer getHeadPipelineId() {
+        return headPipelineId;
+    }
+
+    public void setHeadPipelineId(Integer headPipelineId) {
+        this.headPipelineId = headPipelineId;
+    }
+
+    public Boolean getRefFetched() {
+        return refFetched;
+    }
+
+    public void setRefFetched(Boolean refFetched) {
+        this.refFetched = refFetched;
+    }
+
+    public Integer getMergeIid() {
+        return mergeIid;
+    }
+
+    public void setMergeIid(Integer mergeIid) {
+        this.mergeIid = mergeIid;
+    }
+
+    public Integer getTotalTimeSpent() {
+        return totalTimeSpent;
+    }
+
+    public void setTotalTimeSpent(Integer totalTimeSpent) {
+        this.totalTimeSpent = totalTimeSpent;
+    }
+
+    public Duration getHumanTotalTimeSpent() {
+        return humanTotalTimeSpent;
+    }
+
+    public void setHumanTotalTimeSpent(Duration humanTotalTimeSpent) {
+        this.humanTotalTimeSpent = humanTotalTimeSpent;
+    }
+
+    public Integer getTimeEstimate() {
+        return timeEstimate;
+    }
+
+    public void setTimeEstimate(Integer timeEstimate) {
+        this.timeEstimate = timeEstimate;
+    }
+
+    public Duration getHumanTimeEstimate() {
+        return humanTimeEstimate;
+    }
+
+    public void setHumanTimeEstimate(Duration humanTimeEstimate) {
+        this.humanTimeEstimate = humanTimeEstimate;
+    }
+
     @Override
     public String toString() {
         return (JacksonJson.toJsonString(this));

src/main/java/org/gitlab4j/api/webhook/EventProject.java

 package org.gitlab4j.api.webhook;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.models.AccessLevel;
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class EventProject {
 
     private Integer id;
@@ -20,6 +16,7 @@ public class EventProject {
     private AccessLevel visibilityLevel;
     private String pathWithNamespace;
     private String defaultBranch;
+    private String ciConfigPath;
     private String homepage;
     private String url;
     private String sshUrl;
@@ -113,6 +110,14 @@ public class EventProject {
         this.defaultBranch = defaultBranch;
     }
 
+    public String getCiConfigPath() {
+        return ciConfigPath;
+    }
+
+    public void setCiConfigPath(String ciConfigPath) {
+        this.ciConfigPath = ciConfigPath;
+    }
+
     public String getHomepage() {
         return homepage;
     }

src/main/java/org/gitlab4j/api/webhook/EventRepository.java

 package org.gitlab4j.api.webhook;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.models.AccessLevel;
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class EventRepository {
 
     private String name;

src/main/java/org/gitlab4j/api/webhook/EventSnippet.java

@@ -2,13 +2,9 @@ package org.gitlab4j.api.webhook;
 
 import java.util.Date;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.models.AccessLevel;
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class EventSnippet {
 
     private Integer id;

src/main/java/org/gitlab4j/api/webhook/IssueEvent.java

@@ -2,14 +2,10 @@ package org.gitlab4j.api.webhook;
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.models.Assignee;
 import org.gitlab4j.api.models.User;
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class IssueEvent extends AbstractEvent {
 
     public static final String X_GITLAB_EVENT = "Issue Hook";

src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java

@@ -2,13 +2,9 @@ package org.gitlab4j.api.webhook;
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.models.User;
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class MergeRequestEvent extends AbstractEvent {
 
     public static final String X_GITLAB_EVENT = "Merge Request Hook";
@@ -78,7 +74,6 @@ public class MergeRequestEvent extends AbstractEvent {
         this.changes = changes;
     }
 
-    @XmlAccessorType(XmlAccessType.FIELD)
     public static class ObjectAttributes extends EventMergeRequest {
     }
 

src/main/java/org/gitlab4j/api/webhook/NoteEvent.java

@@ -2,9 +2,6 @@ package org.gitlab4j.api.webhook;
 
 import java.util.Date;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.models.Diff;
 import org.gitlab4j.api.models.User;
 import org.gitlab4j.api.utils.JacksonJson;
@@ -13,7 +10,6 @@ import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class NoteEvent extends AbstractEvent {
 
     public static final String X_GITLAB_EVENT = "Note Hook";
@@ -131,7 +127,6 @@ public class NoteEvent extends AbstractEvent {
         }
     }
 
-    @XmlAccessorType(XmlAccessType.FIELD)
     public static class ObjectAttributes {
 
         private Integer id;

src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java

@@ -3,14 +3,10 @@ package org.gitlab4j.api.webhook;
 import java.util.Date;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.models.ArtifactsFile;
 import org.gitlab4j.api.models.User;
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class PipelineEvent extends AbstractEvent {
 
     public static final String X_GITLAB_EVENT = "Pipeline Hook";
@@ -71,7 +67,6 @@ public class PipelineEvent extends AbstractEvent {
         this.builds = builds;
     }
 
-    @XmlAccessorType(XmlAccessType.FIELD)
     public static class Build {
 
         private Integer id;
@@ -175,7 +170,6 @@ public class PipelineEvent extends AbstractEvent {
         }
     }
 
-    @XmlAccessorType(XmlAccessType.FIELD)
     public static class ObjectAttributes {
 
         private Integer id;

src/main/java/org/gitlab4j/api/webhook/PushEvent.java

 
 package org.gitlab4j.api.webhook;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class PushEvent extends AbstractPushEvent implements Event {
 
     public static final String X_GITLAB_EVENT = "Push Hook";

src/main/java/org/gitlab4j/api/webhook/TagPushEvent.java

 
 package org.gitlab4j.api.webhook;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class TagPushEvent extends AbstractPushEvent implements Event {
 
     public static final String X_GITLAB_EVENT = "Tag Push Hook";

src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java

 package org.gitlab4j.api.webhook;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
 import org.gitlab4j.api.models.User;
 import org.gitlab4j.api.utils.JacksonJson;
 
-@XmlAccessorType(XmlAccessType.FIELD)
 public class WikiPageEvent extends AbstractEvent {
 
     public static final String X_GITLAB_EVENT = "Wiki Page Hook";
@@ -58,7 +54,6 @@ public class WikiPageEvent extends AbstractEvent {
         this.objectAttributes = objectAttributes;
     }
 
-    @XmlAccessorType(XmlAccessType.FIELD)
     public static class Wiki {
 
         private String webUrl;
@@ -108,7 +103,6 @@ public class WikiPageEvent extends AbstractEvent {
         }
     }
 
-    @XmlAccessorType(XmlAccessType.FIELD)
     public static class ObjectAttributes {
 
         private String title;