Skip to content

Commit 45ff580

Browse files
gmessnergmessner
committed
Removed use of JAXB (#327).
1 parent 7a0906f commit 45ff580

File tree

113 files changed

+178
-609
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+178
-609
lines changed

‎pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<jersey.version>2.27</jersey.version>
4444
<jackson.version>2.9.8</jackson.version>
4545
<javaServlet.version>4.0.1</javaServlet.version>
46-
<jaxbApi.version>2.3.1</jaxbApi.version>
4746
<junit.version>4.12</junit.version>
4847
<mockito.version>2.19.0</mockito.version>
4948
<hamcrest.version>1.3</hamcrest.version>
@@ -221,17 +220,6 @@
221220
</build>
222221

223222
<dependencies>
224-
<!-- jaxb-api and javax.activation added for Java 9 compatibility -->
225-
<dependency>
226-
<groupId>javax.xml.bind</groupId>
227-
<artifactId>jaxb-api</artifactId>
228-
<version>${jaxbApi.version}</version>
229-
</dependency>
230-
<dependency>
231-
<groupId>com.sun.activation</groupId>
232-
<artifactId>javax.activation</artifactId>
233-
<version>1.2.0</version>
234-
</dependency>
235223

236224
<dependency>
237225
<groupId>com.fasterxml.jackson.jaxrs</groupId>

‎src/main/java/org/gitlab4j/api/MergeRequestApi.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ public MergeRequest createMergeRequest(Object projectIdOrPath, String sourceBran
376376
}
377377

378378
/**
379-
* @param projectIdOrPath the project in the form of an Integer(ID), String(path), or Project instance
379+
* Creates a merge request and optionally assigns a reviewer to it.
380380
*
381381
* <pre><code>GitLab Endpoint: POST /projects/:id/merge_requests</code></pre>
382382
*
@@ -394,8 +394,7 @@ public MergeRequest createMergeRequest(Object projectIdOrPath, String sourceBran
394394
* @throws GitLabApiException if any exception occurs
395395
*/
396396
public MergeRequest createMergeRequest(Object projectIdOrPath, String sourceBranch, String targetBranch, String title, String description, Integer assigneeId,
397-
Integer targetProjectId, String[] labels, Integer milestoneId, Boolean removeSourceBranch)
398-
throws GitLabApiException {
397+
Integer targetProjectId, String[] labels, Integer milestoneId, Boolean removeSourceBranch) throws GitLabApiException {
399398
return createMergeRequest(projectIdOrPath, sourceBranch, targetBranch, title, description, assigneeId, targetProjectId, labels, milestoneId, removeSourceBranch, null);
400399
}
401400

‎src/main/java/org/gitlab4j/api/models/AbstractUser.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@
33
import java.util.Date;
44
import java.util.List;
55

6-
import javax.xml.bind.annotation.XmlAccessType;
7-
import javax.xml.bind.annotation.XmlAccessorType;
8-
96
import org.gitlab4j.api.utils.JacksonJson;
107

118
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
129

13-
@XmlAccessorType(XmlAccessType.FIELD)
1410
@JsonIgnoreProperties(ignoreUnknown = true)
1511
public abstract class AbstractUser<U extends AbstractUser<U>> {
1612

‎src/main/java/org/gitlab4j/api/models/Artifact.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
package org.gitlab4j.api.models;
22

3-
import javax.xml.bind.annotation.XmlAccessType;
4-
import javax.xml.bind.annotation.XmlAccessorType;
5-
import javax.xml.bind.annotation.XmlRootElement;
6-
73
import org.gitlab4j.api.utils.JacksonJson;
84
import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
95

106
import com.fasterxml.jackson.annotation.JsonCreator;
117
import com.fasterxml.jackson.annotation.JsonValue;
128

13-
@XmlRootElement
14-
@XmlAccessorType(XmlAccessType.FIELD)
159
public class Artifact {
1610

1711
public enum FileType {

‎src/main/java/org/gitlab4j/api/models/ArtifactsFile.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
package org.gitlab4j.api.models;
22

3-
import javax.xml.bind.annotation.XmlAccessType;
4-
import javax.xml.bind.annotation.XmlAccessorType;
5-
import javax.xml.bind.annotation.XmlRootElement;
6-
73
import org.gitlab4j.api.utils.JacksonJson;
84

9-
@XmlRootElement
10-
@XmlAccessorType(XmlAccessType.FIELD)
115
public class ArtifactsFile {
126

137
private String filename;

‎src/main/java/org/gitlab4j/api/models/Assignee.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11

22
package org.gitlab4j.api.models;
33

4-
import javax.xml.bind.annotation.XmlRootElement;
5-
6-
@XmlRootElement
74
public class Assignee extends AbstractUser<Assignee> {
85
}

‎src/main/java/org/gitlab4j/api/models/Author.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11

22
package org.gitlab4j.api.models;
33

4-
import javax.xml.bind.annotation.XmlRootElement;
5-
6-
@XmlRootElement
74
public class Author extends AbstractUser<Author> {
85
}

‎src/main/java/org/gitlab4j/api/models/AwardEmoji.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,12 @@
33

44
import java.util.Date;
55

6-
import javax.xml.bind.annotation.XmlAccessType;
7-
import javax.xml.bind.annotation.XmlAccessorType;
8-
import javax.xml.bind.annotation.XmlRootElement;
9-
106
import org.gitlab4j.api.utils.JacksonJson;
117
import org.gitlab4j.api.utils.JacksonJsonEnumHelper;
128

139
import com.fasterxml.jackson.annotation.JsonCreator;
1410
import com.fasterxml.jackson.annotation.JsonValue;
1511

16-
@XmlRootElement
17-
@XmlAccessorType(XmlAccessType.FIELD)
1812
public class AwardEmoji {
1913

2014
public enum AwardableType {

‎src/main/java/org/gitlab4j/api/models/Board.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@
22

33
import java.util.List;
44

5-
import javax.xml.bind.annotation.XmlAccessType;
6-
import javax.xml.bind.annotation.XmlAccessorType;
7-
import javax.xml.bind.annotation.XmlRootElement;
8-
95
import org.gitlab4j.api.utils.JacksonJson;
106

11-
@XmlRootElement
12-
@XmlAccessorType(XmlAccessType.FIELD)
137
public class Board {
148

159
private Integer id;

‎src/main/java/org/gitlab4j/api/models/BoardList.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
package org.gitlab4j.api.models;
22

3-
import javax.xml.bind.annotation.XmlAccessType;
4-
import javax.xml.bind.annotation.XmlAccessorType;
5-
import javax.xml.bind.annotation.XmlRootElement;
6-
73
import org.gitlab4j.api.utils.JacksonJson;
84

9-
@XmlRootElement
10-
@XmlAccessorType(XmlAccessType.FIELD)
115
public class BoardList {
126

137
private Integer id;

0 commit comments

Comments
 (0)