Skip to content

Commit e46184b

Browse files
author
Jan-Hendrik Diederich
committed
Migrated Jersey 2.30.1 to 3.0.5, meaning from Java EE to Jakarta
Packages changed from "javax" to "jakarta"
1 parent 8253a99 commit e46184b

10 files changed

Lines changed: 71 additions & 58 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ target
2323
#Ignore Test Output
2424
test-output
2525
/.checkstyle
26+
27+
# Ignore by ZeroDepdency generated POM
28+
/docker-java-transport-zerodep/dependency-reduced-pom.xml

‎docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import com.github.dockerjava.transport.DockerHttpClient;
1010
import org.glassfish.jersey.client.RequestEntityProcessing;
1111

12-
import javax.ws.rs.client.ClientRequestFilter;
13-
import javax.ws.rs.client.ClientResponseFilter;
12+
import jakarta.ws.rs.client.ClientRequestFilter;
13+
import jakarta.ws.rs.client.ClientResponseFilter;
1414

1515
//import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
1616
// see https://github.com/docker-java/docker-java/issues/196

‎docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,31 @@
11
package com.github.dockerjava.jaxrs;
22

3+
import java.io.InputStream;
4+
import java.net.InetSocketAddress;
5+
import java.net.Proxy;
6+
import java.net.ProxySelector;
7+
import java.net.URI;
8+
import java.net.URISyntaxException;
9+
import java.util.List;
10+
import java.util.Map;
11+
import java.util.Objects;
12+
13+
import javax.net.ssl.SSLContext;
14+
315
import com.github.dockerjava.api.exception.DockerClientException;
416
import com.github.dockerjava.api.exception.DockerException;
5-
import com.github.dockerjava.transport.DockerHttpClient;
6-
import com.github.dockerjava.transport.SSLConfig;
717
import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
818
import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
19+
import com.github.dockerjava.transport.DockerHttpClient;
20+
import com.github.dockerjava.transport.SSLConfig;
21+
import jakarta.ws.rs.ProcessingException;
22+
import jakarta.ws.rs.client.Client;
23+
import jakarta.ws.rs.client.ClientBuilder;
24+
import jakarta.ws.rs.client.ClientRequestFilter;
25+
import jakarta.ws.rs.client.ClientResponseFilter;
26+
import jakarta.ws.rs.client.Entity;
27+
import jakarta.ws.rs.client.Invocation;
28+
import jakarta.ws.rs.core.MediaType;
929
import org.apache.http.client.config.RequestConfig;
1030
import org.apache.http.config.Registry;
1131
import org.apache.http.config.RegistryBuilder;
@@ -23,25 +43,6 @@
2343
import org.slf4j.Logger;
2444
import org.slf4j.LoggerFactory;
2545

26-
import javax.net.ssl.SSLContext;
27-
import javax.ws.rs.ProcessingException;
28-
import javax.ws.rs.client.Client;
29-
import javax.ws.rs.client.ClientBuilder;
30-
import javax.ws.rs.client.ClientRequestFilter;
31-
import javax.ws.rs.client.ClientResponseFilter;
32-
import javax.ws.rs.client.Entity;
33-
import javax.ws.rs.client.Invocation;
34-
import javax.ws.rs.core.MediaType;
35-
import java.io.InputStream;
36-
import java.net.InetSocketAddress;
37-
import java.net.Proxy;
38-
import java.net.ProxySelector;
39-
import java.net.URI;
40-
import java.net.URISyntaxException;
41-
import java.util.List;
42-
import java.util.Map;
43-
import java.util.Objects;
44-
4546
public final class JerseyDockerHttpClient implements DockerHttpClient {
4647

4748
public static final class Builder {
@@ -357,9 +358,9 @@ public void close() {
357358

358359
private static class JerseyResponse implements Response {
359360

360-
private final javax.ws.rs.core.Response response;
361+
private final jakarta.ws.rs.core.Response response;
361362

362-
JerseyResponse(javax.ws.rs.core.Response response) {
363+
JerseyResponse(jakarta.ws.rs.core.Response response) {
363364
this.response = response;
364365
}
365366

‎docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import java.io.IOException;
44
import java.io.InputStream;
55

6-
import javax.ws.rs.client.ClientRequestContext;
7-
import javax.ws.rs.client.ClientResponseContext;
8-
import javax.ws.rs.client.ClientResponseFilter;
9-
import javax.ws.rs.core.Response;
6+
import jakarta.ws.rs.client.ClientRequestContext;
7+
import jakarta.ws.rs.client.ClientResponseContext;
8+
import jakarta.ws.rs.client.ClientResponseFilter;
9+
import jakarta.ws.rs.core.Response;
1010

1111
/**
1212
* Default implementation of RedirectStrategy honors the restrictions on automatic redirection of entity enclosing methods such as POST and

‎docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import java.io.IOException;
44

5-
import javax.ws.rs.client.ClientRequestContext;
6-
import javax.ws.rs.client.ClientResponseContext;
7-
import javax.ws.rs.client.ClientResponseFilter;
8-
import javax.ws.rs.core.MediaType;
5+
import jakarta.ws.rs.client.ClientRequestContext;
6+
import jakarta.ws.rs.client.ClientResponseContext;
7+
import jakarta.ws.rs.client.ClientResponseFilter;
8+
import jakarta.ws.rs.core.MediaType;
99

1010
/**
1111
*

‎docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@
5353
import java.util.TreeSet;
5454
import java.util.concurrent.atomic.AtomicLong;
5555

56-
import javax.annotation.Priority;
57-
import javax.ws.rs.WebApplicationException;
58-
import javax.ws.rs.client.ClientRequestContext;
59-
import javax.ws.rs.client.ClientRequestFilter;
60-
import javax.ws.rs.client.ClientResponseContext;
61-
import javax.ws.rs.client.ClientResponseFilter;
62-
import javax.ws.rs.container.ContainerRequestContext;
63-
import javax.ws.rs.container.ContainerRequestFilter;
64-
import javax.ws.rs.container.ContainerResponseContext;
65-
import javax.ws.rs.container.ContainerResponseFilter;
66-
import javax.ws.rs.container.PreMatching;
67-
import javax.ws.rs.core.MultivaluedMap;
68-
import javax.ws.rs.ext.WriterInterceptor;
69-
import javax.ws.rs.ext.WriterInterceptorContext;
56+
import jakarta.annotation.Priority;
57+
import jakarta.ws.rs.WebApplicationException;
58+
import jakarta.ws.rs.client.ClientRequestContext;
59+
import jakarta.ws.rs.client.ClientRequestFilter;
60+
import jakarta.ws.rs.client.ClientResponseContext;
61+
import jakarta.ws.rs.client.ClientResponseFilter;
62+
import jakarta.ws.rs.container.ContainerRequestContext;
63+
import jakarta.ws.rs.container.ContainerRequestFilter;
64+
import jakarta.ws.rs.container.ContainerResponseContext;
65+
import jakarta.ws.rs.container.ContainerResponseFilter;
66+
import jakarta.ws.rs.container.PreMatching;
67+
import jakarta.ws.rs.core.MultivaluedMap;
68+
import jakarta.ws.rs.ext.WriterInterceptor;
69+
import jakarta.ws.rs.ext.WriterInterceptorContext;
7070

7171
import org.slf4j.Logger;
7272
import org.slf4j.LoggerFactory;
@@ -289,8 +289,7 @@ public void filter(final ContainerRequestContext requestContext, final Container
289289
}
290290

291291
@Override
292-
public void aroundWriteTo(final WriterInterceptorContext writerInterceptorContext) throws IOException,
293-
WebApplicationException {
292+
public void aroundWriteTo(final WriterInterceptorContext writerInterceptorContext) throws IOException, WebApplicationException {
294293
final LoggingStream stream = (LoggingStream) writerInterceptorContext.getProperty(ENTITY_LOGGER_PROPERTY);
295294
writerInterceptorContext.proceed();
296295
if (stream != null) {

‎docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
1616

17-
import javax.ws.rs.client.ClientRequestContext;
18-
import javax.ws.rs.client.ClientResponseContext;
19-
import javax.ws.rs.client.ClientResponseFilter;
20-
import javax.ws.rs.core.MediaType;
17+
import jakarta.ws.rs.client.ClientRequestContext;
18+
import jakarta.ws.rs.client.ClientResponseContext;
19+
import jakarta.ws.rs.client.ClientResponseFilter;
20+
import jakarta.ws.rs.core.MediaType;
2121
import java.io.IOException;
2222
import java.io.InputStream;
2323
import java.nio.charset.Charset;

‎docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import java.util.HashSet;
66
import java.util.Set;
77

8-
import javax.ws.rs.client.ClientRequestContext;
9-
import javax.ws.rs.core.HttpHeaders;
10-
import javax.ws.rs.core.MediaType;
8+
import jakarta.ws.rs.client.ClientRequestContext;
9+
import jakarta.ws.rs.core.HttpHeaders;
10+
import jakarta.ws.rs.core.MediaType;
1111

1212
import org.slf4j.Logger;
1313

‎docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.io.IOException;
44
import java.io.InputStream;
55

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

88
/**
99
* This is a wrapper around {@link Response} that acts as a {@link InputStream}. When this {@link WrappedResponseInputStream} is closed it

‎pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<jdk.source>1.8</jdk.source>
5858
<jdk.target>1.8</jdk.target>
5959

60-
<jersey.version>2.30.1</jersey.version>
60+
<jersey.version>3.0.5</jersey.version>
6161
<jackson.version>2.10.3</jackson.version>
6262
<jackson-jaxrs.version>2.10.3</jackson-jaxrs.version>
6363
<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
@@ -253,6 +253,7 @@
253253
</file>
254254
</newVersion>
255255
<parameter>
256+
<!-- See https://siom79.github.io/japicmp/MavenPlugin.html -->
256257
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
257258
<accessModifier>public</accessModifier>
258259
<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
@@ -268,10 +269,19 @@
268269
<sourceCompatible>true</sourceCompatible>
269270
</overrideCompatibilityChangeParameter>
270271
</overrideCompatibilityChangeParameters>
272+
<ignoreMissingClassesByRegularExpressions>
273+
<!-- Ignore the outdated javax references from earlier versions -->
274+
<ignoreMissingClassesByRegularExpression>javax\.ws\.rs\..*</ignoreMissingClassesByRegularExpression>
275+
</ignoreMissingClassesByRegularExpressions>
276+
<excludes combine.children="append">
277+
<!-- Ignore the outdated javax references from earlier versions -->
278+
<exclude>com.github.dockerjava.jaxrs</exclude>
279+
</excludes>
271280
</parameter>
272281
</configuration>
273282
<executions>
274283
<execution>
284+
<id>japicmp</id>
275285
<phase>verify</phase>
276286
<goals>
277287
<goal>cmp</goal>

0 commit comments

Comments
 (0)