change javax to jakarta

pom.xml

@@ -45,16 +45,16 @@
 	</developers>
 
 	<properties>
-		<java.level>8</java.level>
-		<java.source.version>1.8</java.source.version>
-		<java.target.version>1.8</java.target.version>
+		<java.level>17</java.level>
+		<java.source.version>17</java.source.version>
+		<java.target.version>17</java.target.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<jersey.version>2.35</jersey.version>
+		<jersey.version>3.0.4</jersey.version>
 		<jackson.version>2.12.4</jackson.version>
-		<servlet.version>4.0.4</servlet.version>
+		<servlet.version>6.0.0</servlet.version>
 		<activation.version>1.2.2</activation.version>
 
 		<junit.version>5.8.2</junit.version>
@@ -387,6 +387,11 @@
 
 	<dependencies>
 
+		<dependency>
+			<groupId>jakarta.ws.rs</groupId>
+			<artifactId>jakarta.ws.rs-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>
 		<!-- javax.activation is present for Java 9+ compatibility -->
 		<dependency>
 			<groupId>jakarta.activation</groupId>

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

@@ -4,12 +4,11 @@ import java.io.File;
 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;
 import org.gitlab4j.api.models.Label;

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

@@ -3,7 +3,7 @@ package org.gitlab4j.api;
 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.List;
 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 class ApplicationsApi extends AbstractApi {
      * @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(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.Date;
 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 @@ package org.gitlab4j.api;
 
 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.List;
 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 class BoardsApi extends AbstractApi {
      * @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 class BoardsApi extends AbstractApi {
      * @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(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

@@ -6,10 +6,10 @@ 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 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.Comment;
 import org.gitlab4j.api.models.Commit;

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

@@ -27,8 +27,8 @@ import java.util.List;
 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.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.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 class DeployKeysApi extends AbstractApi {
     }
 
     /**
-     * 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 class DeployKeysApi extends AbstractApi {
     }
 
     /**
-     * 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 @@ package org.gitlab4j.api;
 
 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.List;
 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.List;
 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.List;
 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 class EnvironmentsApi extends AbstractApi {
                 "projects", getProjectIdOrPath(projectIdOrPath), "environments", environmentId, "stop");
 	return (response.readEntity(Environment.class));
     }
-}
\ No newline at end of file
+}

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

@@ -5,9 +5,9 @@ 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.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.Date;
 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 class EventsApi extends AbstractApi {
      * @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 class EventsApi extends AbstractApi {
      * @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.function.Supplier;
 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;

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

@@ -20,16 +20,16 @@ import javax.net.ssl.SSLEngine;
 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.List;
 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 class GitLabApiException extends Exception {
                             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 class GitLabApiException extends Exception {
     }
 
     /**
-     * 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() {

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

@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.MultivaluedHashMap;
 
 import org.gitlab4j.api.models.AccessLevel;
 import org.gitlab4j.api.models.Variable;
@@ -39,7 +39,7 @@ public class GitLabApiForm extends Form {
 
     /**
      * Fluent method for adding query and form parameters to a get() or post() call.
-     * 
+     *
      * @param name the name of the field/attribute to add
      * @param value the value of the field/attribute to add
      * @return this GitLabAPiForm instance
@@ -217,4 +217,4 @@ public class GitLabApiForm extends Form {
 
         return (this);
     }
-}
\ No newline at end of file
+}