Merge pull request #947 from jmini/move-to-jakarta

Replace javax package by jakarta package

Author: jabby

pom.xml

@@ -50,10 +50,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.1.1</jersey.version>
+		<jackson.version>2.14.1</jackson.version>
+		<servlet.version>6.0.0</servlet.version>
+		<activation.version>2.1.1</activation.version>
 
 		<junit.version>5.8.2</junit.version>
 		<testcontainers.version>1.15.3</testcontainers.version>

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

@@ -6,10 +6,10 @@
 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.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;