diff --git a/pom.xml b/pom.xml index 9af847a97d7eed40063ba751ea91cfb58c76fbca..4e0e318170f2fccb928df4814cc22dee1d6f48b0 100644 --- a/pom.xml +++ b/pom.xml @@ -45,16 +45,16 @@ - 8 - 1.8 - 1.8 + 17 + 17 + 17 UTF-8 UTF-8 - 2.35 + 3.0.4 2.12.4 - 4.0.4 + 6.0.0 1.2.2 5.8.2 @@ -387,6 +387,11 @@ + + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 + jakarta.activation diff --git a/src/main/java/org/gitlab4j/api/AbstractApi.java b/src/main/java/org/gitlab4j/api/AbstractApi.java index 3fd19ddd57648a5f163e24129e5ec20177717d19..caaa7894833c40a4071cbf8156e6901db294f7c8 100644 --- a/src/main/java/org/gitlab4j/api/AbstractApi.java +++ b/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; diff --git a/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java b/src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java index 28ff1d7165ef40dbbbb997ef011bac676b8985d0..ee76efcc04ad9872226d5a577795a5b748aa9908 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 b5c793702d5ab3ce88e5cbe773446b890697af49..277c5d849dbd5388174a333542e32429b450bb61 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(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 eebfb6173a1953eaa3fe9d8f1654c1c9fa706588..f5ed70131f69fc9527ef336b493a7a98455f9c17 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 dce6a1306ae90bca62c5b570cae2a343c685ffa0..57b6f478eed57a6608ddb0bfe7019279699fc0d4 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 975cba5e493258283ed6621482405f412bfed1e6..112bc8540b88290cc94325526c09ca855a1cda4e 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(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 c6cffde7d15a358787af7c5c66eb3373c1c20cdc..560261ac47915aa951d02b7a2c1e8449f5e72076 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 87fc628928b5d30d5142f9f8d0b53464e27aa476..8b16a12c7546df0494362568947266b33efc9970 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 c8525956dde7cb7a51fd882b49e5358fe743c723..89a8e3cdb47f9b0db64b38092f751085f87c6550 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; @@ -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. * *
GitLab Endpoint: GET /deploy_keys
@@ -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. * *
GitLab Endpoint: GET /projects/:id/deploy_keys
diff --git a/src/main/java/org/gitlab4j/api/DeployTokensApi.java b/src/main/java/org/gitlab4j/api/DeployTokensApi.java index 214089f1a5d33a9bb27252e55d4f7a806f3b2334..0821dcbb80c942f90e7cb8067d52b10655de80e2 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 299c7ce3db2ffad4e74142ef402480c0615d101c..c05b24ca8b5a2aab5058b82607c722f69ccc3c04 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 687d5a8361ce1216e0188dcbebbac64424387938..2c1f6cf6f68c1d86ff16b66ab8ff3b284234dd2c 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 6eca51277f1413b31597a15a4097bb65d7a607aa..cea899d952602f513e9c49c9de93d49657609318 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; @@ -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 +} diff --git a/src/main/java/org/gitlab4j/api/EpicsApi.java b/src/main/java/org/gitlab4j/api/EpicsApi.java index 6eb59a1cf8d1fdbde324f3d3bb6bd2d0e6b3d5cd..323c4c90ecb694b0f7edf284464bf0d2ed29e36e 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 b4bed04dee3b3fe55593d075082537286f74b722..1a1eadaaf0b4bccba2ca0f6c377bee185e0f0919 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; @@ -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 */ diff --git a/src/main/java/org/gitlab4j/api/GitLabApi.java b/src/main/java/org/gitlab4j/api/GitLabApi.java index 051b736741580debe7e89c13919f143e1bcc890a..272f06e787e7b9156e08acd20278a8e145023c8e 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; diff --git a/src/main/java/org/gitlab4j/api/GitLabApiClient.java b/src/main/java/org/gitlab4j/api/GitLabApiClient.java index 3322e8ba1bd5e0be21fb3686d7a87c75ba571673..4d5d8dd43aa4da3c9fa4fa81c611e6bf05471b32 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 8af8ee82b49b5e916a77a8845aadf5fa7d0ce48a..f0e7993528dd96cdf706663ef80f7c58bbf293b0 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; @@ -26,7 +26,7 @@ public class GitLabApiException extends Exception { private int httpStatus; private String message; private Map> validationErrors; - + /** * Create a GitLabApiException instance with the specified message. * @@ -87,7 +87,7 @@ public class GitLabApiException extends Exception { while(fields.hasNext()) { Entry field = fields.next(); - String fieldName = field.getKey(); + String fieldName = field.getKey(); List values = new ArrayList<>(); validationErrors.put(fieldName, values); for (JsonNode value : field.getValue()) { @@ -186,10 +186,10 @@ public class GitLabApiException extends Exception { } /** - * Returns a Map<String, List<String>> instance containing validation errors if this GitLabApiException + * Returns a Map<String, List<String>> instance containing validation errors if this GitLabApiException * was caused by validation errors on the GitLab server, otherwise returns null. * - * @return a Map<String, List<String>> instance containing validation errors if this GitLabApiException + * @return a Map<String, List<String>> instance containing validation errors if this GitLabApiException * was caused by validation errors on the GitLab server, otherwise returns null */ public Map> getValidationErrors() { diff --git a/src/main/java/org/gitlab4j/api/GitLabApiForm.java b/src/main/java/org/gitlab4j/api/GitLabApiForm.java index b9c09e608b410654f9c5fac8193307e06b490293..bcc603e00d176e66636aacf6251a16ad7af5bba3 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; @@ -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 +} diff --git a/src/main/java/org/gitlab4j/api/GroupApi.java b/src/main/java/org/gitlab4j/api/GroupApi.java index c54bb5dcf014b6d4f8da33c9b66aac284e78ff56..168bd6b3dc29d8ab1ac8a2e3d11f3adb2ad712ad 100644 --- a/src/main/java/org/gitlab4j/api/GroupApi.java +++ b/src/main/java/org/gitlab4j/api/GroupApi.java @@ -7,9 +7,9 @@ import java.util.Objects; 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.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 104f8d9d23da849193c22116da5d708766283cd4..f6ff0f4e52a8ee2099da92f2f07662257b0122f7 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 e3c09887979732664986d95f23c9e7c54caaecba..7b92be1168ed3ff89a961953efa994fe2a3be079 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. @@ -26,7 +26,7 @@ public interface HookManager { * Validate the provided secret token against the reference secret token. Returns true if * the secret token is valid or there is no reference secret token to validate against, * otherwise returns false. - * + * * @param secretToken the token to validate * @return true if the secret token is valid or there is no reference secret token to validate against */ @@ -41,7 +41,7 @@ public interface HookManager { * Validate the provided secret token found in the HTTP header against the reference secret token. * Returns true if the secret token is valid or there is no reference secret token to validate * against, otherwise returns false. - * + * * @param request the HTTP request to verify the secret token * @return true if the secret token is valid or there is no reference secret token to validate against */ @@ -58,9 +58,9 @@ public interface HookManager { /** * Parses and verifies an Event instance from the HTTP request and * fires it off to the registered listeners. - * + * * @param request the HttpServletRequest to read the Event instance from * @throws GitLabApiException if the parsed event is not supported */ public void handleEvent(HttpServletRequest request) throws GitLabApiException; -} \ No newline at end of file +} diff --git a/src/main/java/org/gitlab4j/api/ImportExportApi.java b/src/main/java/org/gitlab4j/api/ImportExportApi.java index 509eae1ddef3f4852609f5e423b7494e2b8684e1..f352a9d281a287d71145aa6e048b97f1046782f9 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; @@ -251,7 +251,7 @@ public class ImportExportApi extends AbstractApi { * *
GitLab Endpoint: GET /projects/:id/import
* - * @param projectIdOrPath the new (imported) project identifier in the form of an Long(ID), String(path), or Project instance + * @param projectIdOrPath the new (imported) project identifier in the form of an Long(ID), String(path), or Project instance * @return an ImportStatus instance holding information on the import status * @throws GitLabApiException if any exception occurs */ diff --git a/src/main/java/org/gitlab4j/api/IssuesApi.java b/src/main/java/org/gitlab4j/api/IssuesApi.java index 02c01fa84b90a4cb93dc5acbe2811bb2155640b1..911373e861400cc166dab430904baf9444a83536 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 1c8a6e80aa0961ac001dc862ae79bb4de1c5dd23..d0b2f8bd429840a85f51f6a2536f408e468575e2 100644 --- a/src/main/java/org/gitlab4j/api/JobApi.java +++ b/src/main/java/org/gitlab4j/api/JobApi.java @@ -10,11 +10,11 @@ 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; diff --git a/src/main/java/org/gitlab4j/api/KeysApi.java b/src/main/java/org/gitlab4j/api/KeysApi.java index 29265ff811c158eff04a4ce2164bc42e75d609be..f869e3e133235bb3bb95f8e8baa23d81ad2b1c6f 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 b8ba967f5c00bfb78911ccde3555ea48e398fd30..6b84b69262fcea3aa4dfc4e0db521b3416753d9e 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