Commit 267ffcf3 authored by Gabriel Barbier's avatar Gabriel Barbier Committed by Jeremie Bresson
Browse files

Replace javax package by jakarta package

parent 47a47358
...@@ -50,10 +50,10 @@ ...@@ -50,10 +50,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jersey.version>2.35</jersey.version> <jersey.version>3.1.1</jersey.version>
<jackson.version>2.12.4</jackson.version> <jackson.version>2.14.1</jackson.version>
<servlet.version>4.0.4</servlet.version> <servlet.version>6.0.0</servlet.version>
<activation.version>1.2.2</activation.version> <activation.version>2.1.1</activation.version>
<junit.version>5.8.2</junit.version> <junit.version>5.8.2</junit.version>
<testcontainers.version>1.15.3</testcontainers.version> <testcontainers.version>1.15.3</testcontainers.version>
......
...@@ -4,11 +4,11 @@ import java.io.File; ...@@ -4,11 +4,11 @@ import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
import javax.ws.rs.NotAuthorizedException; import jakarta.ws.rs.NotAuthorizedException;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput; import jakarta.ws.rs.core.StreamingOutput;
import org.gitlab4j.api.GitLabApi.ApiVersion; import org.gitlab4j.api.GitLabApi.ApiVersion;
import org.gitlab4j.api.models.Group; import org.gitlab4j.api.models.Group;
......
...@@ -3,7 +3,7 @@ package org.gitlab4j.api; ...@@ -3,7 +3,7 @@ package org.gitlab4j.api;
import java.text.ParseException; import java.text.ParseException;
import java.util.Iterator; 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.Setting;
import org.gitlab4j.api.models.ApplicationSettings; import org.gitlab4j.api.models.ApplicationSettings;
......
...@@ -5,8 +5,8 @@ import java.util.List; ...@@ -5,8 +5,8 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Application; import org.gitlab4j.api.models.Application;
...@@ -43,7 +43,7 @@ public class ApplicationsApi extends AbstractApi { ...@@ -43,7 +43,7 @@ public class ApplicationsApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs * @throws GitLabApiException if any exception occurs
*/ */
public List<Application> getApplications(int page, int perPage) throws GitLabApiException { 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>>() {})); return (response.readEntity(new GenericType<List<Application>>() {}));
} }
......
...@@ -4,8 +4,8 @@ import java.util.Date; ...@@ -4,8 +4,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.AuditEvent; import org.gitlab4j.api.models.AuditEvent;
import org.gitlab4j.api.utils.ISO8601; import org.gitlab4j.api.utils.ISO8601;
......
...@@ -2,8 +2,8 @@ package org.gitlab4j.api; ...@@ -2,8 +2,8 @@ package org.gitlab4j.api;
import java.util.List; import java.util.List;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.AwardEmoji; import org.gitlab4j.api.models.AwardEmoji;
......
...@@ -4,8 +4,8 @@ import java.util.List; ...@@ -4,8 +4,8 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Board; import org.gitlab4j.api.models.Board;
import org.gitlab4j.api.models.BoardList; import org.gitlab4j.api.models.BoardList;
...@@ -49,7 +49,7 @@ public class BoardsApi extends AbstractApi { ...@@ -49,7 +49,7 @@ public class BoardsApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs * @throws GitLabApiException if any exception occurs
*/ */
public List<Board> getBoards(Object projectIdOrPath, int page, int perPage) throws GitLabApiException { 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"); "projects", getProjectIdOrPath(projectIdOrPath), "boards");
return (response.readEntity(new GenericType<List<Board>>() {})); return (response.readEntity(new GenericType<List<Board>>() {}));
} }
...@@ -206,7 +206,7 @@ public class BoardsApi extends AbstractApi { ...@@ -206,7 +206,7 @@ public class BoardsApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs * @throws GitLabApiException if any exception occurs
*/ */
public List<BoardList> getBoardLists(Object projectIdOrPath, Long boardId, int page, int perPage) throws GitLabApiException { 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"); "projects", getProjectIdOrPath(projectIdOrPath), "boards", boardId, "lists");
return (response.readEntity(new GenericType<List<BoardList>>() {})); return (response.readEntity(new GenericType<List<BoardList>>() {}));
} }
......
...@@ -6,10 +6,10 @@ import java.util.List; ...@@ -6,10 +6,10 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Comment; import org.gitlab4j.api.models.Comment;
import org.gitlab4j.api.models.Commit; import org.gitlab4j.api.models.Commit;
......
...@@ -27,8 +27,8 @@ import java.util.List; ...@@ -27,8 +27,8 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.RegistryRepository; import org.gitlab4j.api.models.RegistryRepository;
import org.gitlab4j.api.models.RegistryRepositoryTag; import org.gitlab4j.api.models.RegistryRepositoryTag;
......
...@@ -4,9 +4,9 @@ import java.util.List; ...@@ -4,9 +4,9 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.DeployKey; import org.gitlab4j.api.models.DeployKey;
......
...@@ -2,7 +2,7 @@ package org.gitlab4j.api; ...@@ -2,7 +2,7 @@ package org.gitlab4j.api;
import org.gitlab4j.api.models.DeployToken; 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.Date;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
......
...@@ -4,7 +4,7 @@ import java.util.List; ...@@ -4,7 +4,7 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; 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.Deployment;
import org.gitlab4j.api.models.DeploymentFilter; import org.gitlab4j.api.models.DeploymentFilter;
......
...@@ -5,8 +5,8 @@ import java.util.List; ...@@ -5,8 +5,8 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Discussion; import org.gitlab4j.api.models.Discussion;
import org.gitlab4j.api.models.Note; import org.gitlab4j.api.models.Note;
......
...@@ -4,7 +4,7 @@ import java.util.List; ...@@ -4,7 +4,7 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Environment; import org.gitlab4j.api.models.Environment;
......
...@@ -5,9 +5,9 @@ import java.util.List; ...@@ -5,9 +5,9 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Epic; import org.gitlab4j.api.models.Epic;
import org.gitlab4j.api.models.EpicIssue; import org.gitlab4j.api.models.EpicIssue;
......
...@@ -4,8 +4,8 @@ import java.util.Date; ...@@ -4,8 +4,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.GenericType; import jakarta.ws.rs.core.GenericType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.Event; import org.gitlab4j.api.models.Event;
......
...@@ -4,8 +4,8 @@ import java.util.List; ...@@ -4,8 +4,8 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.models.ExternalStatusCheck; import org.gitlab4j.api.models.ExternalStatusCheck;
import org.gitlab4j.api.models.ExternalStatusCheckProtectedBranch; import org.gitlab4j.api.models.ExternalStatusCheckProtectedBranch;
......
...@@ -9,8 +9,8 @@ import java.util.function.Supplier; ...@@ -9,8 +9,8 @@ import java.util.function.Supplier;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.gitlab4j.api.Constants.TokenType; import org.gitlab4j.api.Constants.TokenType;
import org.gitlab4j.api.models.OauthTokenResponse; import org.gitlab4j.api.models.OauthTokenResponse;
...@@ -466,7 +466,7 @@ public class GitLabApi implements AutoCloseable { ...@@ -466,7 +466,7 @@ public class GitLabApi implements AutoCloseable {
} }
/** /**
* 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 @Override
public void close() { public void close() {
......
...@@ -20,16 +20,16 @@ import javax.net.ssl.SSLEngine; ...@@ -20,16 +20,16 @@ import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManager;
import javax.net.ssl.X509ExtendedTrustManager; import javax.net.ssl.X509ExtendedTrustManager;
import javax.ws.rs.client.Client; import jakarta.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity; import jakarta.ws.rs.client.Entity;
import javax.ws.rs.client.Invocation; import jakarta.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget; import jakarta.ws.rs.client.WebTarget;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput; import jakarta.ws.rs.core.StreamingOutput;
import org.gitlab4j.api.Constants.TokenType; import org.gitlab4j.api.Constants.TokenType;
import org.gitlab4j.api.GitLabApi.ApiVersion; import org.gitlab4j.api.GitLabApi.ApiVersion;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
......
...@@ -7,9 +7,9 @@ import java.util.List; ...@@ -7,9 +7,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import javax.ws.rs.core.Response.StatusType; import jakarta.ws.rs.core.Response.StatusType;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment