Migrate from javax to jakarta

pom.xml

@@ -7,7 +7,7 @@
 	<groupId>org.gitlab4j</groupId>
 	<artifactId>gitlab4j-api</artifactId>
 	<packaging>jar</packaging>
-	<version>5.1.0-SNAPSHOT</version>
+	<version>5.1.0-jakarta-SNAPSHOT</version>
 	<name>GitLab4J-API - GitLab API Java Client</name>
 	<description>GitLab4J-API (gitlab4j-api) provides a full featured Java client library for working with GitLab repositories and servers via the GitLab REST API.</description>
 	<url>https://github.com/gitlab4j/gitlab4j-api</url>
@@ -52,10 +52,10 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<jersey.version>2.35</jersey.version>
-		<jackson.version>2.12.4</jackson.version>
-		<servlet.version>4.0.4</servlet.version>
-		<activation.version>1.2.2</activation.version>
+		<jersey.version>3.0.4</jersey.version>
+		<jackson.version>2.13.2.2</jackson.version>
+		<servlet.version>9.1.0</servlet.version>
+		<activation.version>2.0.1</activation.version>
 
 		<junit.version>5.8.2</junit.version>
 		<testcontainers.version>1.15.3</testcontainers.version>
@@ -419,8 +419,8 @@
 			<version>${jersey.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
+			<groupId>jakarta.platform</groupId>
+			<artifactId>jakarta.jakartaee-api</artifactId>
 			<version>${servlet.version}</version>
 		</dependency>
 

src/main/java/org/gitlab4j/api/AbstractApi.java

@@ -4,11 +4,11 @@
 import java.io.InputStream;
 import java.net.URL;
 
-import javax.ws.rs.NotAuthorizedException;
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.NotAuthorizedException;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
 
 import org.gitlab4j.api.GitLabApi.ApiVersion;
 import org.gitlab4j.api.models.Group;

src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java

@@ -3,7 +3,7 @@
 import java.text.ParseException;
 import java.util.Iterator;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.Setting;
 import org.gitlab4j.api.models.ApplicationSettings;

src/main/java/org/gitlab4j/api/ApplicationsApi.java

@@ -5,8 +5,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.Application;
 
@@ -43,7 +43,7 @@ public List<Application> getApplications() throws GitLabApiException {
      * @throws GitLabApiException if any exception occurs
      */
     public List<Application> getApplications(int page, int perPage) throws GitLabApiException {
-        Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "applications");
+        Response response = get(jakarta.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "applications");
         return (response.readEntity(new GenericType<List<Application>>() {}));
     }
 

src/main/java/org/gitlab4j/api/AuditEventApi.java

@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.AuditEvent;
 import org.gitlab4j.api.utils.ISO8601;

src/main/java/org/gitlab4j/api/AwardEmojiApi.java

@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.AwardEmoji;
 

src/main/java/org/gitlab4j/api/BoardsApi.java

@@ -4,8 +4,8 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.Board;
 import org.gitlab4j.api.models.BoardList;
@@ -49,7 +49,7 @@ public List<Board> getBoards(Object projectIdOrPath) throws GitLabApiException {
      * @throws GitLabApiException if any exception occurs
      */
     public List<Board> getBoards(Object projectIdOrPath, int page, int perPage) throws GitLabApiException {
-        Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage),
+        Response response = get(jakarta.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage),
                 "projects", getProjectIdOrPath(projectIdOrPath), "boards");
         return (response.readEntity(new GenericType<List<Board>>() {}));
     }
@@ -206,7 +206,7 @@ public List<BoardList> getBoardLists(Object projectIdOrPath, Long boardId) throw
      * @throws GitLabApiException if any exception occurs
      */
     public List<BoardList> getBoardLists(Object projectIdOrPath, Long boardId, int page, int perPage) throws GitLabApiException {
-        Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage),
+        Response response = get(jakarta.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage),
                 "projects", getProjectIdOrPath(projectIdOrPath), "boards", boardId, "lists");
         return (response.readEntity(new GenericType<List<BoardList>>() {}));
     }

src/main/java/org/gitlab4j/api/CommitsApi.java

@@ -1,30 +1,20 @@
 package org.gitlab4j.api;
 
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import org.gitlab4j.api.models.*;
+import org.gitlab4j.api.models.CommitAction.Action;
+import org.gitlab4j.api.models.CommitRef.RefType;
+import org.gitlab4j.api.utils.ISO8601;
+
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-
-import org.gitlab4j.api.models.Comment;
-import org.gitlab4j.api.models.Commit;
-import org.gitlab4j.api.models.CommitAction;
-import org.gitlab4j.api.models.CommitAction.Action;
-import org.gitlab4j.api.models.CommitPayload;
-import org.gitlab4j.api.models.CommitRef;
-import org.gitlab4j.api.models.CommitRef.RefType;
-import org.gitlab4j.api.models.CommitStatus;
-import org.gitlab4j.api.models.CommitStatusFilter;
-import org.gitlab4j.api.models.Diff;
-import org.gitlab4j.api.models.GpgSignature;
-import org.gitlab4j.api.models.MergeRequest;
-import org.gitlab4j.api.utils.ISO8601;
-
 /**
  * This class implements the client side API for the GitLab commits calls.
  * See <a href="https://docs.gitlab.com/ce/api/commits.html">Commits API at GitLab</a> for more information.

src/main/java/org/gitlab4j/api/ContainerRegistryApi.java

@@ -27,8 +27,8 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.RegistryRepository;
 import org.gitlab4j.api.models.RegistryRepositoryTag;

src/main/java/org/gitlab4j/api/DeployKeysApi.java

@@ -4,9 +4,9 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.DeployKey;
 
@@ -32,7 +32,7 @@ public List<DeployKey> getDeployKeys() throws GitLabApiException {
     }
 
     /**
-     * Get a list of all deploy keys across all projects of the GitLab instance using the specified page and per page settings. 
+     * Get a list of all deploy keys across all projects of the GitLab instance using the specified page and per page settings.
      * This method requires admin access.
      *
      * <pre><code>GitLab Endpoint: GET /deploy_keys</code></pre>
@@ -86,7 +86,7 @@ public List<DeployKey> getProjectDeployKeys(Object projectIdOrPath) throws GitLa
     }
 
     /**
-     * Get a list of the deploy keys for the specified project using the specified page and per page settings. 
+     * Get a list of the deploy keys for the specified project using the specified page and per page settings.
      * This method requires admin access.
      *
      * <pre><code>GitLab Endpoint: GET /projects/:id/deploy_keys</code></pre>

src/main/java/org/gitlab4j/api/DeployTokensApi.java

@@ -2,7 +2,7 @@
 
 import org.gitlab4j.api.models.DeployToken;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Stream;

src/main/java/org/gitlab4j/api/DeploymentsApi.java

@@ -4,7 +4,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.Deployment;
 import org.gitlab4j.api.models.DeploymentFilter;

src/main/java/org/gitlab4j/api/DiscussionsApi.java

@@ -5,8 +5,8 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.Discussion;
 import org.gitlab4j.api.models.Note;

src/main/java/org/gitlab4j/api/EnvironmentsApi.java

@@ -4,7 +4,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.Environment;
 
@@ -175,4 +175,4 @@ public Environment createEnvironment(Object projectIdOrPath, Long environmentId)
                 "projects", getProjectIdOrPath(projectIdOrPath), "environments", environmentId, "stop");
 	return (response.readEntity(Environment.class));
     }
-}
+}

src/main/java/org/gitlab4j/api/EpicsApi.java

@@ -5,9 +5,9 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.Epic;
 import org.gitlab4j.api.models.EpicIssue;

src/main/java/org/gitlab4j/api/EventsApi.java

@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.models.Event;
 
@@ -86,7 +86,7 @@ public List<Event> getAuthenticatedUserEvents(ActionType action, TargetType targ
      * @param sortOrder sort events in ASC or DESC order by created_at. Default is DESC, optional
      * @param page the page to get
      * @param perPage the number of projects per page
-     * @param scope include all events across a user’s projects, optional 
+     * @param scope include all events across a user’s projects, optional
      * @return a list of events for the authenticated user and matching the supplied parameters
      * @throws GitLabApiException if any exception occurs
      */
@@ -137,7 +137,7 @@ public Pager<Event> getAuthenticatedUserEvents(ActionType action, TargetType tar
      * @param after include only events created after a particular date, optional
      * @param sortOrder sort events in ASC or DESC order by created_at. Default is DESC, optional
      * @param itemsPerPage the number of Event instances that will be fetched per page
-     * @param scope include all events across a user’s projects, optional 
+     * @param scope include all events across a user’s projects, optional
      * @return a Pager of events for the authenticated user and matching the supplied parameters
      * @throws GitLabApiException if any exception occurs
      */

src/main/java/org/gitlab4j/api/GitLabApi.java

@@ -9,8 +9,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.gitlab4j.api.Constants.TokenType;
 import org.gitlab4j.api.models.OauthTokenResponse;
@@ -465,7 +465,7 @@ public final GitLabApi duplicate() {
     }
 
     /**
-     * Close the underlying {@link javax.ws.rs.client.Client} and its associated resources.
+     * Close the underlying {@link jakarta.ws.rs.client.Client} and its associated resources.
      */
     @Override
     public void close() {

src/main/java/org/gitlab4j/api/GitLabApiClient.java

@@ -20,16 +20,16 @@
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509ExtendedTrustManager;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.StreamingOutput;
 import org.gitlab4j.api.Constants.TokenType;
 import org.gitlab4j.api.GitLabApi.ApiVersion;
 import org.gitlab4j.api.utils.JacksonJson;

src/main/java/org/gitlab4j/api/GitLabApiException.java

@@ -7,9 +7,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.StatusType;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.StatusType;
 
 import org.gitlab4j.api.utils.JacksonJson;
 
@@ -26,7 +26,7 @@ public class GitLabApiException extends Exception {
     private int httpStatus;
     private String message;
     private Map<String, List<String>> validationErrors;
-    
+
     /**
      * Create a GitLabApiException instance with the specified message.
      *
@@ -87,7 +87,7 @@ public GitLabApiException(Response response) {
                             while(fields.hasNext()) {
 
                                 Entry<String, JsonNode> field = fields.next();
-                                String fieldName = field.getKey();                                
+                                String fieldName = field.getKey();
                                 List<String> values = new ArrayList<>();
                                 validationErrors.put(fieldName, values);
                                 for (JsonNode value : field.getValue()) {
@@ -186,10 +186,10 @@ public boolean hasValidationErrors() {
     }
 
     /**
-     * Returns a Map&lt;String, List&lt;String&gt;&gt; instance containing validation errors if this GitLabApiException 
+     * Returns a Map&lt;String, List&lt;String&gt;&gt; instance containing validation errors if this GitLabApiException
      * was caused by validation errors on the GitLab server, otherwise returns null.
      *
-     * @return a Map&lt;String, List&lt;String&gt;&gt; instance containing validation errors if this GitLabApiException 
+     * @return a Map&lt;String, List&lt;String&gt;&gt; instance containing validation errors if this GitLabApiException
      * was caused by validation errors on the GitLab server, otherwise returns null
      */
     public Map<String, List<String>> getValidationErrors() {