Skip to content

Commit b404e8a

Browse files
jabbyjabby
authored
Merge pull request #947 from jmini/move-to-jakarta
Replace javax package by jakarta package
2 parents 4289c1f + 1995a3f commit b404e8a

File tree

92 files changed

+716
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+716
-191
lines changed

Diff for: ‎pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5151
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5252

53-
<jersey.version>2.35</jersey.version>
54-
<jackson.version>2.12.4</jackson.version>
55-
<servlet.version>4.0.4</servlet.version>
56-
<activation.version>1.2.2</activation.version>
53+
<jersey.version>3.1.1</jersey.version>
54+
<jackson.version>2.14.1</jackson.version>
55+
<servlet.version>6.0.0</servlet.version>
56+
<activation.version>2.1.1</activation.version>
5757

5858
<junit.version>5.8.2</junit.version>
5959
<testcontainers.version>1.15.3</testcontainers.version>

Diff for: ‎src/main/java/org/gitlab4j/api/AbstractApi.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import java.io.InputStream;
55
import java.net.URL;
66

7-
import javax.ws.rs.NotAuthorizedException;
8-
import javax.ws.rs.core.Form;
9-
import javax.ws.rs.core.MultivaluedMap;
10-
import javax.ws.rs.core.Response;
11-
import javax.ws.rs.core.StreamingOutput;
7+
import jakarta.ws.rs.NotAuthorizedException;
8+
import jakarta.ws.rs.core.Form;
9+
import jakarta.ws.rs.core.MultivaluedMap;
10+
import jakarta.ws.rs.core.Response;
11+
import jakarta.ws.rs.core.StreamingOutput;
1212

1313
import org.gitlab4j.api.GitLabApi.ApiVersion;
1414
import org.gitlab4j.api.models.Group;

Diff for: ‎src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.text.ParseException;
44
import java.util.Iterator;
55

6-
import javax.ws.rs.core.Response;
6+
import jakarta.ws.rs.core.Response;
77

88
import org.gitlab4j.api.models.Setting;
99
import org.gitlab4j.api.models.ApplicationSettings;

Diff for: ‎src/main/java/org/gitlab4j/api/ApplicationsApi.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.util.stream.Collectors;
66
import java.util.stream.Stream;
77

8-
import javax.ws.rs.core.GenericType;
9-
import javax.ws.rs.core.Response;
8+
import jakarta.ws.rs.core.GenericType;
9+
import jakarta.ws.rs.core.Response;
1010

1111
import org.gitlab4j.api.models.Application;
1212

@@ -43,7 +43,7 @@ public List<Application> getApplications() throws GitLabApiException {
4343
* @throws GitLabApiException if any exception occurs
4444
*/
4545
public List<Application> getApplications(int page, int perPage) throws GitLabApiException {
46-
Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "applications");
46+
Response response = get(jakarta.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "applications");
4747
return (response.readEntity(new GenericType<List<Application>>() {}));
4848
}
4949

Diff for: ‎src/main/java/org/gitlab4j/api/AuditEventApi.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.List;
55
import java.util.stream.Stream;
66

7-
import javax.ws.rs.core.Form;
8-
import javax.ws.rs.core.Response;
7+
import jakarta.ws.rs.core.Form;
8+
import jakarta.ws.rs.core.Response;
99

1010
import org.gitlab4j.api.models.AuditEvent;
1111
import org.gitlab4j.api.utils.ISO8601;

Diff for: ‎src/main/java/org/gitlab4j/api/AwardEmojiApi.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.util.List;
44

5-
import javax.ws.rs.core.GenericType;
6-
import javax.ws.rs.core.Response;
5+
import jakarta.ws.rs.core.GenericType;
6+
import jakarta.ws.rs.core.Response;
77

88
import org.gitlab4j.api.models.AwardEmoji;
99

Diff for: ‎src/main/java/org/gitlab4j/api/BoardsApi.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.Optional;
55
import java.util.stream.Stream;
66

7-
import javax.ws.rs.core.GenericType;
8-
import javax.ws.rs.core.Response;
7+
import jakarta.ws.rs.core.GenericType;
8+
import jakarta.ws.rs.core.Response;
99

1010
import org.gitlab4j.api.models.Board;
1111
import org.gitlab4j.api.models.BoardList;
@@ -49,7 +49,7 @@ public List<Board> getBoards(Object projectIdOrPath) throws GitLabApiException {
4949
* @throws GitLabApiException if any exception occurs
5050
*/
5151
public List<Board> getBoards(Object projectIdOrPath, int page, int perPage) throws GitLabApiException {
52-
Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage),
52+
Response response = get(jakarta.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage),
5353
"projects", getProjectIdOrPath(projectIdOrPath), "boards");
5454
return (response.readEntity(new GenericType<List<Board>>() {}));
5555
}
@@ -206,7 +206,7 @@ public List<BoardList> getBoardLists(Object projectIdOrPath, Long boardId) throw
206206
* @throws GitLabApiException if any exception occurs
207207
*/
208208
public List<BoardList> getBoardLists(Object projectIdOrPath, Long boardId, int page, int perPage) throws GitLabApiException {
209-
Response response = get(javax.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage),
209+
Response response = get(jakarta.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage),
210210
"projects", getProjectIdOrPath(projectIdOrPath), "boards", boardId, "lists");
211211
return (response.readEntity(new GenericType<List<BoardList>>() {}));
212212
}

Diff for: ‎src/main/java/org/gitlab4j/api/CommitsApi.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import java.util.Optional;
77
import java.util.stream.Stream;
88

9-
import javax.ws.rs.core.Form;
10-
import javax.ws.rs.core.GenericType;
11-
import javax.ws.rs.core.MultivaluedMap;
12-
import javax.ws.rs.core.Response;
9+
import jakarta.ws.rs.core.Form;
10+
import jakarta.ws.rs.core.GenericType;
11+
import jakarta.ws.rs.core.MultivaluedMap;
12+
import jakarta.ws.rs.core.Response;
1313

1414
import org.gitlab4j.api.models.Comment;
1515
import org.gitlab4j.api.models.Commit;

Diff for: ‎src/main/java/org/gitlab4j/api/ContainerRegistryApi.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import java.util.Optional;
2828
import java.util.stream.Stream;
2929

30-
import javax.ws.rs.core.GenericType;
31-
import javax.ws.rs.core.Response;
30+
import jakarta.ws.rs.core.GenericType;
31+
import jakarta.ws.rs.core.Response;
3232

3333
import org.gitlab4j.api.models.RegistryRepository;
3434
import org.gitlab4j.api.models.RegistryRepositoryTag;

Diff for: ‎src/main/java/org/gitlab4j/api/DeployKeysApi.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import java.util.Optional;
55
import java.util.stream.Stream;
66

7-
import javax.ws.rs.core.Form;
8-
import javax.ws.rs.core.GenericType;
9-
import javax.ws.rs.core.Response;
7+
import jakarta.ws.rs.core.Form;
8+
import jakarta.ws.rs.core.GenericType;
9+
import jakarta.ws.rs.core.Response;
1010

1111
import org.gitlab4j.api.models.DeployKey;
1212

Diff for: ‎src/main/java/org/gitlab4j/api/DeployTokensApi.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.gitlab4j.api.models.DeployToken;
44

5-
import javax.ws.rs.core.Response;
5+
import jakarta.ws.rs.core.Response;
66
import java.util.Date;
77
import java.util.List;
88
import java.util.stream.Stream;

Diff for: ‎src/main/java/org/gitlab4j/api/DeploymentsApi.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Optional;
55
import java.util.stream.Stream;
66

7-
import javax.ws.rs.core.Response;
7+
import jakarta.ws.rs.core.Response;
88

99
import org.gitlab4j.api.models.Deployment;
1010
import org.gitlab4j.api.models.DeploymentFilter;

Diff for: ‎src/main/java/org/gitlab4j/api/DiscussionsApi.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.util.Optional;
66
import java.util.stream.Stream;
77

8-
import javax.ws.rs.core.GenericType;
9-
import javax.ws.rs.core.Response;
8+
import jakarta.ws.rs.core.GenericType;
9+
import jakarta.ws.rs.core.Response;
1010

1111
import org.gitlab4j.api.models.Discussion;
1212
import org.gitlab4j.api.models.Note;

Diff for: ‎src/main/java/org/gitlab4j/api/EnvironmentsApi.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Optional;
55
import java.util.stream.Stream;
66

7-
import javax.ws.rs.core.Response;
7+
import jakarta.ws.rs.core.Response;
88

99
import org.gitlab4j.api.models.Environment;
1010

Diff for: ‎src/main/java/org/gitlab4j/api/EpicsApi.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import java.util.Optional;
66
import java.util.stream.Stream;
77

8-
import javax.ws.rs.core.Form;
9-
import javax.ws.rs.core.GenericType;
10-
import javax.ws.rs.core.Response;
8+
import jakarta.ws.rs.core.Form;
9+
import jakarta.ws.rs.core.GenericType;
10+
import jakarta.ws.rs.core.Response;
1111

1212
import org.gitlab4j.api.models.Epic;
1313
import org.gitlab4j.api.models.EpicIssue;

Diff for: ‎src/main/java/org/gitlab4j/api/EventsApi.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.List;
55
import java.util.stream.Stream;
66

7-
import javax.ws.rs.core.GenericType;
8-
import javax.ws.rs.core.Response;
7+
import jakarta.ws.rs.core.GenericType;
8+
import jakarta.ws.rs.core.Response;
99

1010
import org.gitlab4j.api.models.Event;
1111

Diff for: ‎src/main/java/org/gitlab4j/api/ExternalStatusCheckApi.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.stream.Collectors;
55
import java.util.stream.Stream;
66

7-
import javax.ws.rs.core.Form;
8-
import javax.ws.rs.core.Response;
7+
import jakarta.ws.rs.core.Form;
8+
import jakarta.ws.rs.core.Response;
99

1010
import org.gitlab4j.api.models.ExternalStatusCheck;
1111
import org.gitlab4j.api.models.ExternalStatusCheckProtectedBranch;

Diff for: ‎src/main/java/org/gitlab4j/api/GitLabApi.java

+23-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import java.util.logging.Level;
1010
import java.util.logging.Logger;
1111

12-
import javax.ws.rs.core.MediaType;
13-
import javax.ws.rs.core.Response;
12+
import jakarta.ws.rs.core.MediaType;
13+
import jakarta.ws.rs.core.Response;
1414

1515
import org.gitlab4j.api.Constants.TokenType;
1616
import org.gitlab4j.api.models.OauthTokenResponse;
@@ -83,6 +83,7 @@ public String getApiNamespace() {
8383
private PipelineApi pipelineApi;
8484
private ProjectApi projectApi;
8585
private ProtectedBranchesApi protectedBranchesApi;
86+
private ReleaseLinksApi releaseLinksApi;
8687
private ReleasesApi releasesApi;
8788
private RepositoryApi repositoryApi;
8889
private RepositoryFileApi repositoryFileApi;
@@ -466,7 +467,7 @@ public final GitLabApi duplicate() {
466467
}
467468

468469
/**
469-
* Close the underlying {@link javax.ws.rs.client.Client} and its associated resources.
470+
* Close the underlying {@link jakarta.ws.rs.client.Client} and its associated resources.
470471
*/
471472
@Override
472473
public void close() {
@@ -1444,6 +1445,25 @@ public ProtectedBranchesApi getProtectedBranchesApi() {
14441445
return (this.protectedBranchesApi);
14451446
}
14461447

1448+
/**
1449+
* Gets the ReleaseLinksApi instance owned by this GitLabApi instance. The ReleaseLinksApi is used
1450+
* to perform all Release Links related API calls.
1451+
*
1452+
* @return the ReleaseLinksApi instance owned by this GitLabApi instance
1453+
*/
1454+
public ReleaseLinksApi getReleaseLinksApi() {
1455+
1456+
if (releaseLinksApi == null) {
1457+
synchronized (this) {
1458+
if (releaseLinksApi == null) {
1459+
releaseLinksApi = new ReleaseLinksApi(this);
1460+
}
1461+
}
1462+
}
1463+
1464+
return releaseLinksApi;
1465+
}
1466+
14471467
/**
14481468
* Gets the ReleasesApi instance owned by this GitLabApi instance. The ReleasesApi is used
14491469
* to perform all release related API calls.

Diff for: ‎src/main/java/org/gitlab4j/api/GitLabApiClient.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
import javax.net.ssl.SSLSession;
2121
import javax.net.ssl.TrustManager;
2222
import javax.net.ssl.X509ExtendedTrustManager;
23-
import javax.ws.rs.client.Client;
24-
import javax.ws.rs.client.ClientBuilder;
25-
import javax.ws.rs.client.Entity;
26-
import javax.ws.rs.client.Invocation;
27-
import javax.ws.rs.client.WebTarget;
28-
import javax.ws.rs.core.Form;
29-
import javax.ws.rs.core.MediaType;
30-
import javax.ws.rs.core.MultivaluedMap;
31-
import javax.ws.rs.core.Response;
32-
import javax.ws.rs.core.StreamingOutput;
23+
import jakarta.ws.rs.client.Client;
24+
import jakarta.ws.rs.client.ClientBuilder;
25+
import jakarta.ws.rs.client.Entity;
26+
import jakarta.ws.rs.client.Invocation;
27+
import jakarta.ws.rs.client.WebTarget;
28+
import jakarta.ws.rs.core.Form;
29+
import jakarta.ws.rs.core.MediaType;
30+
import jakarta.ws.rs.core.MultivaluedMap;
31+
import jakarta.ws.rs.core.Response;
32+
import jakarta.ws.rs.core.StreamingOutput;
3333
import org.gitlab4j.api.Constants.TokenType;
3434
import org.gitlab4j.api.GitLabApi.ApiVersion;
3535
import org.gitlab4j.api.utils.JacksonJson;

Diff for: ‎src/main/java/org/gitlab4j/api/GitLabApiException.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import java.util.Map;
88
import java.util.Map.Entry;
99

10-
import javax.ws.rs.core.MediaType;
11-
import javax.ws.rs.core.Response;
12-
import javax.ws.rs.core.Response.StatusType;
10+
import jakarta.ws.rs.core.MediaType;
11+
import jakarta.ws.rs.core.Response;
12+
import jakarta.ws.rs.core.Response.StatusType;
1313

1414
import org.gitlab4j.api.utils.JacksonJson;
1515

Diff for: ‎src/main/java/org/gitlab4j/api/GitLabApiForm.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.util.Map;
66
import java.util.Map.Entry;
77

8-
import javax.ws.rs.core.Form;
9-
import javax.ws.rs.core.MultivaluedHashMap;
8+
import jakarta.ws.rs.core.Form;
9+
import jakarta.ws.rs.core.MultivaluedHashMap;
1010

1111
import org.gitlab4j.api.models.AccessLevel;
1212
import org.gitlab4j.api.models.Variable;

Diff for: ‎src/main/java/org/gitlab4j/api/GroupApi.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import java.util.stream.Collectors;
99
import java.util.stream.Stream;
1010

11-
import javax.ws.rs.core.Form;
12-
import javax.ws.rs.core.GenericType;
13-
import javax.ws.rs.core.Response;
11+
import jakarta.ws.rs.core.Form;
12+
import jakarta.ws.rs.core.GenericType;
13+
import jakarta.ws.rs.core.Response;
1414

1515
import org.gitlab4j.api.GitLabApi.ApiVersion;
1616
import org.gitlab4j.api.models.AccessLevel;

Diff for: ‎src/main/java/org/gitlab4j/api/HealthCheckApi.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.gitlab4j.api.models.HealthCheckInfo;
44

5-
import javax.ws.rs.core.Response;
5+
import jakarta.ws.rs.core.Response;
66
import java.io.IOException;
77
import java.net.URL;
88

Diff for: ‎src/main/java/org/gitlab4j/api/HookManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
package org.gitlab4j.api;
33

4-
import javax.servlet.http.HttpServletRequest;
4+
import jakarta.servlet.http.HttpServletRequest;
55

66
/**
77
* This interface provides a base class handler for processing GitLab Web Hook and System Hook callouts.

Diff for: ‎src/main/java/org/gitlab4j/api/ImportExportApi.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import java.util.Date;
1010
import java.util.Map;
1111

12-
import javax.ws.rs.core.Form;
13-
import javax.ws.rs.core.MediaType;
14-
import javax.ws.rs.core.Response;
12+
import jakarta.ws.rs.core.Form;
13+
import jakarta.ws.rs.core.MediaType;
14+
import jakarta.ws.rs.core.Response;
1515

1616
import org.gitlab4j.api.models.ExportStatus;
1717
import org.gitlab4j.api.models.ImportStatus;

Diff for: ‎src/main/java/org/gitlab4j/api/IssuesApi.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import java.util.Optional;
77
import java.util.stream.Stream;
88

9-
import javax.ws.rs.core.GenericType;
10-
import javax.ws.rs.core.Response;
9+
import jakarta.ws.rs.core.GenericType;
10+
import jakarta.ws.rs.core.Response;
1111

1212
import org.gitlab4j.api.GitLabApi.ApiVersion;
1313
import org.gitlab4j.api.models.Duration;

0 commit comments

Comments
 (0)