From 267ffcf3f3a23914083b52b3183fc41b53bf4038 Mon Sep 17 00:00:00 2001 From: Gabriel Barbier Date: Mon, 3 Apr 2023 17:28:07 +0200 Subject: [PATCH] Replace javax package by jakarta package --- pom.xml | 8 ++++---- .../java/org/gitlab4j/api/AbstractApi.java | 10 +++++----- .../gitlab4j/api/ApplicationSettingsApi.java | 2 +- .../org/gitlab4j/api/ApplicationsApi.java | 6 +++--- .../java/org/gitlab4j/api/AuditEventApi.java | 4 ++-- .../java/org/gitlab4j/api/AwardEmojiApi.java | 4 ++-- src/main/java/org/gitlab4j/api/BoardsApi.java | 8 ++++---- .../java/org/gitlab4j/api/CommitsApi.java | 8 ++++---- .../gitlab4j/api/ContainerRegistryApi.java | 4 ++-- .../java/org/gitlab4j/api/DeployKeysApi.java | 6 +++--- .../org/gitlab4j/api/DeployTokensApi.java | 2 +- .../java/org/gitlab4j/api/DeploymentsApi.java | 2 +- .../java/org/gitlab4j/api/DiscussionsApi.java | 4 ++-- .../org/gitlab4j/api/EnvironmentsApi.java | 2 +- src/main/java/org/gitlab4j/api/EpicsApi.java | 6 +++--- src/main/java/org/gitlab4j/api/EventsApi.java | 4 ++-- .../gitlab4j/api/ExternalStatusCheckApi.java | 4 ++-- src/main/java/org/gitlab4j/api/GitLabApi.java | 6 +++--- .../org/gitlab4j/api/GitLabApiClient.java | 20 +++++++++---------- .../org/gitlab4j/api/GitLabApiException.java | 6 +++--- .../java/org/gitlab4j/api/GitLabApiForm.java | 4 ++-- src/main/java/org/gitlab4j/api/GroupApi.java | 6 +++--- .../java/org/gitlab4j/api/HealthCheckApi.java | 2 +- .../java/org/gitlab4j/api/HookManager.java | 2 +- .../org/gitlab4j/api/ImportExportApi.java | 6 +++--- src/main/java/org/gitlab4j/api/IssuesApi.java | 4 ++-- src/main/java/org/gitlab4j/api/JobApi.java | 10 +++++----- src/main/java/org/gitlab4j/api/KeysApi.java | 6 +++--- src/main/java/org/gitlab4j/api/LabelsApi.java | 6 +++--- .../java/org/gitlab4j/api/LicenseApi.java | 2 +- .../org/gitlab4j/api/LicenseTemplatesApi.java | 2 +- .../java/org/gitlab4j/api/MarkdownApi.java | 2 +- .../org/gitlab4j/api/MergeRequestApi.java | 8 ++++---- .../java/org/gitlab4j/api/MilestonesApi.java | 6 +++--- .../java/org/gitlab4j/api/NamespaceApi.java | 4 ++-- src/main/java/org/gitlab4j/api/NotesApi.java | 4 ++-- .../gitlab4j/api/NotificationSettingsApi.java | 2 +- .../java/org/gitlab4j/api/PackagesApi.java | 6 +++--- src/main/java/org/gitlab4j/api/Pager.java | 4 ++-- .../java/org/gitlab4j/api/PipelineApi.java | 6 +++--- .../java/org/gitlab4j/api/ProjectApi.java | 8 ++++---- .../gitlab4j/api/ProtectedBranchesApi.java | 4 ++-- .../java/org/gitlab4j/api/ReleasesApi.java | 2 +- .../java/org/gitlab4j/api/RepositoryApi.java | 10 +++++----- .../org/gitlab4j/api/RepositoryFileApi.java | 6 +++--- .../gitlab4j/api/ResourceLabelEventsApi.java | 2 +- .../java/org/gitlab4j/api/RunnersApi.java | 4 ++-- .../java/org/gitlab4j/api/ServicesApi.java | 4 ++-- .../java/org/gitlab4j/api/SnippetsApi.java | 4 ++-- .../java/org/gitlab4j/api/SystemHooksApi.java | 4 ++-- src/main/java/org/gitlab4j/api/TagsApi.java | 6 +++--- src/main/java/org/gitlab4j/api/TodosApi.java | 2 +- src/main/java/org/gitlab4j/api/UserApi.java | 6 +++--- src/main/java/org/gitlab4j/api/WikisApi.java | 4 ++-- .../api/systemhooks/SystemHookManager.java | 2 +- .../org/gitlab4j/api/utils/FileUtils.java | 2 +- .../gitlab4j/api/utils/HttpRequestUtils.java | 4 ++-- .../org/gitlab4j/api/utils/JacksonJson.java | 6 +++--- .../api/utils/MaskingLoggingFilter.java | 20 +++++++++---------- .../api/utils/Oauth2LoginStreamingOutput.java | 4 ++-- .../gitlab4j/api/webhook/WebHookManager.java | 2 +- .../java/org/gitlab4j/api/MockResponse.java | 16 +++++++-------- .../gitlab4j/api/MockServletInputStream.java | 4 ++-- .../api/TestCommitDiscussionsApi.java | 2 +- .../java/org/gitlab4j/api/TestCommitsApi.java | 2 +- .../gitlab4j/api/TestEpicDiscussionsApi.java | 2 +- .../api/TestExternalStatusCheckApi.java | 2 +- .../org/gitlab4j/api/TestGitLabApiEvents.java | 4 ++-- .../gitlab4j/api/TestGitLabApiException.java | 2 +- .../java/org/gitlab4j/api/TestGroupApi.java | 2 +- .../gitlab4j/api/TestIssueDiscussionsApi.java | 2 +- .../java/org/gitlab4j/api/TestIssuesApi.java | 2 +- .../api/TestMergeRequestDiscussionsApi.java | 2 +- .../java/org/gitlab4j/api/TestProjectApi.java | 2 +- .../api/TestSnippetDiscussionsApi.java | 2 +- .../java/org/gitlab4j/api/TestStreams.java | 2 +- .../gitlab4j/api/TestUnitMergeRequestApi.java | 2 +- .../java/org/gitlab4j/api/TestUserApi.java | 2 +- 78 files changed, 183 insertions(+), 183 deletions(-) diff --git a/pom.xml b/pom.xml index 19ab9a2a..bcef7d5e 100644 --- a/pom.xml +++ b/pom.xml @@ -50,10 +50,10 @@ UTF-8 UTF-8 - 2.35 - 2.12.4 - 4.0.4 - 1.2.2 + 3.1.1 + 2.14.1 + 6.0.0 + 2.1.1 5.8.2 1.15.3 diff --git a/src/main/java/org/gitlab4j/api/AbstractApi.java b/src/main/java/org/gitlab4j/api/AbstractApi.java index 6381549f..16535d2b 100644 --- a/src/main/java/org/gitlab4j/api/AbstractApi.java +++ b/src/main/java/org/gitlab4j/api/AbstractApi.java @@ -4,11 +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; diff --git a/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java b/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java index 28ff1d71..ee76efcc 100644 --- a/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/ApplicationsApi.java b/src/main/java/org/gitlab4j/api/ApplicationsApi.java index b5c79370..c9c32409 100644 --- a/src/main/java/org/gitlab4j/api/ApplicationsApi.java +++ b/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 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>() {})); } diff --git a/src/main/java/org/gitlab4j/api/AuditEventApi.java b/src/main/java/org/gitlab4j/api/AuditEventApi.java index eebfb617..f5ed7013 100644 --- a/src/main/java/org/gitlab4j/api/AuditEventApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/AwardEmojiApi.java b/src/main/java/org/gitlab4j/api/AwardEmojiApi.java index dce6a130..57b6f478 100644 --- a/src/main/java/org/gitlab4j/api/AwardEmojiApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/BoardsApi.java b/src/main/java/org/gitlab4j/api/BoardsApi.java index 975cba5e..3070dfe9 100644 --- a/src/main/java/org/gitlab4j/api/BoardsApi.java +++ b/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 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>() {})); } @@ -206,7 +206,7 @@ public class BoardsApi extends AbstractApi { * @throws GitLabApiException if any exception occurs */ public List 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>() {})); } diff --git a/src/main/java/org/gitlab4j/api/CommitsApi.java b/src/main/java/org/gitlab4j/api/CommitsApi.java index c6cffde7..560261ac 100644 --- a/src/main/java/org/gitlab4j/api/CommitsApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/ContainerRegistryApi.java b/src/main/java/org/gitlab4j/api/ContainerRegistryApi.java index 87fc6289..8b16a12c 100644 --- a/src/main/java/org/gitlab4j/api/ContainerRegistryApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/DeployKeysApi.java b/src/main/java/org/gitlab4j/api/DeployKeysApi.java index c8525956..9236c1e5 100644 --- a/src/main/java/org/gitlab4j/api/DeployKeysApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/DeployTokensApi.java b/src/main/java/org/gitlab4j/api/DeployTokensApi.java index 214089f1..0821dcbb 100644 --- a/src/main/java/org/gitlab4j/api/DeployTokensApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/DeploymentsApi.java b/src/main/java/org/gitlab4j/api/DeploymentsApi.java index 299c7ce3..c05b24ca 100644 --- a/src/main/java/org/gitlab4j/api/DeploymentsApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/DiscussionsApi.java b/src/main/java/org/gitlab4j/api/DiscussionsApi.java index 687d5a83..2c1f6cf6 100644 --- a/src/main/java/org/gitlab4j/api/DiscussionsApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/EnvironmentsApi.java b/src/main/java/org/gitlab4j/api/EnvironmentsApi.java index 6eca5127..1b479404 100644 --- a/src/main/java/org/gitlab4j/api/EnvironmentsApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/EpicsApi.java b/src/main/java/org/gitlab4j/api/EpicsApi.java index 6eb59a1c..323c4c90 100644 --- a/src/main/java/org/gitlab4j/api/EpicsApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/EventsApi.java b/src/main/java/org/gitlab4j/api/EventsApi.java index cea0e62e..f34ecea3 100644 --- a/src/main/java/org/gitlab4j/api/EventsApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/ExternalStatusCheckApi.java b/src/main/java/org/gitlab4j/api/ExternalStatusCheckApi.java index e0d04a26..55a2f0ad 100644 --- a/src/main/java/org/gitlab4j/api/ExternalStatusCheckApi.java +++ b/src/main/java/org/gitlab4j/api/ExternalStatusCheckApi.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.stream.Collectors; 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.ExternalStatusCheck; import org.gitlab4j.api.models.ExternalStatusCheckProtectedBranch; diff --git a/src/main/java/org/gitlab4j/api/GitLabApi.java b/src/main/java/org/gitlab4j/api/GitLabApi.java index ecc65d3d..5ec08259 100644 --- a/src/main/java/org/gitlab4j/api/GitLabApi.java +++ b/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; @@ -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 public void close() { diff --git a/src/main/java/org/gitlab4j/api/GitLabApiClient.java b/src/main/java/org/gitlab4j/api/GitLabApiClient.java index 169e185c..c5dbfef6 100755 --- a/src/main/java/org/gitlab4j/api/GitLabApiClient.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/GitLabApiException.java b/src/main/java/org/gitlab4j/api/GitLabApiException.java index 8af8ee82..2e849cb0 100755 --- a/src/main/java/org/gitlab4j/api/GitLabApiException.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/GitLabApiForm.java b/src/main/java/org/gitlab4j/api/GitLabApiForm.java index b9c09e60..b86f1b21 100644 --- a/src/main/java/org/gitlab4j/api/GitLabApiForm.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/GroupApi.java b/src/main/java/org/gitlab4j/api/GroupApi.java index 4b37ff49..0b6484de 100644 --- a/src/main/java/org/gitlab4j/api/GroupApi.java +++ b/src/main/java/org/gitlab4j/api/GroupApi.java @@ -8,9 +8,9 @@ import java.util.Optional; import java.util.stream.Collectors; 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.GitLabApi.ApiVersion; import org.gitlab4j.api.models.AccessLevel; diff --git a/src/main/java/org/gitlab4j/api/HealthCheckApi.java b/src/main/java/org/gitlab4j/api/HealthCheckApi.java index 104f8d9d..f6ff0f4e 100644 --- a/src/main/java/org/gitlab4j/api/HealthCheckApi.java +++ b/src/main/java/org/gitlab4j/api/HealthCheckApi.java @@ -2,7 +2,7 @@ package org.gitlab4j.api; import org.gitlab4j.api.models.HealthCheckInfo; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/org/gitlab4j/api/HookManager.java b/src/main/java/org/gitlab4j/api/HookManager.java index e3c09887..51a090f6 100644 --- a/src/main/java/org/gitlab4j/api/HookManager.java +++ b/src/main/java/org/gitlab4j/api/HookManager.java @@ -1,7 +1,7 @@ package org.gitlab4j.api; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * This interface provides a base class handler for processing GitLab Web Hook and System Hook callouts. diff --git a/src/main/java/org/gitlab4j/api/ImportExportApi.java b/src/main/java/org/gitlab4j/api/ImportExportApi.java index 509eae1d..9246dbf0 100644 --- a/src/main/java/org/gitlab4j/api/ImportExportApi.java +++ b/src/main/java/org/gitlab4j/api/ImportExportApi.java @@ -9,9 +9,9 @@ import java.nio.file.StandardCopyOption; import java.util.Date; import java.util.Map; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.gitlab4j.api.models.ExportStatus; import org.gitlab4j.api.models.ImportStatus; diff --git a/src/main/java/org/gitlab4j/api/IssuesApi.java b/src/main/java/org/gitlab4j/api/IssuesApi.java index 2c8ee532..4c04e7f9 100644 --- a/src/main/java/org/gitlab4j/api/IssuesApi.java +++ b/src/main/java/org/gitlab4j/api/IssuesApi.java @@ -6,8 +6,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.GitLabApi.ApiVersion; import org.gitlab4j.api.models.Duration; diff --git a/src/main/java/org/gitlab4j/api/JobApi.java b/src/main/java/org/gitlab4j/api/JobApi.java index 6b2d4d4c..d3df97c1 100644 --- a/src/main/java/org/gitlab4j/api/JobApi.java +++ b/src/main/java/org/gitlab4j/api/JobApi.java @@ -9,11 +9,11 @@ import java.nio.file.StandardCopyOption; 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.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.gitlab4j.api.models.ArtifactsFile; import org.gitlab4j.api.models.Job; import org.gitlab4j.api.models.JobAttributes; diff --git a/src/main/java/org/gitlab4j/api/KeysApi.java b/src/main/java/org/gitlab4j/api/KeysApi.java index 29265ff8..f869e3e1 100644 --- a/src/main/java/org/gitlab4j/api/KeysApi.java +++ b/src/main/java/org/gitlab4j/api/KeysApi.java @@ -2,9 +2,9 @@ package org.gitlab4j.api; import org.gitlab4j.api.models.Key; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.Collections; /** diff --git a/src/main/java/org/gitlab4j/api/LabelsApi.java b/src/main/java/org/gitlab4j/api/LabelsApi.java index b8ba967f..6b84b692 100644 --- a/src/main/java/org/gitlab4j/api/LabelsApi.java +++ b/src/main/java/org/gitlab4j/api/LabelsApi.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.Label; @@ -359,7 +359,7 @@ public class LabelsApi extends AbstractApi { */ @Deprecated public List