Update docker-client to 7.0.3

eclipse-linuxtools · Jul 15, 2023 · 6191b1d · 6191b1d
1 parent 3fcb1cf
commit 6191b1d
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 142 deletions.
diff --git a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
@@ -14,22 +14,19 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.mandas.docker-client;bundle-version="3.2.1",
  com.github.jnr.unixsocket;bundle-version="0.28.0",
  com.github.jnr.enxio;bundle-version="0.25.0",
- org.glassfish.jersey.core.jersey-client;bundle-version="2.30.1",
- org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="2.30.1",
- org.glassfish.jersey.core.jersey-common;bundle-version="2.30.1",
- org.glassfish.jersey.containers.servlet;bundle-version="2.3.0.1",
- org.glassfish.jersey.inject.jersey-hk2;bundle-version="2.3.0.1",
  org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
- org.eclipse.debug.core;bundle-version="3.10.100",
- org.apache.httpcomponents.httpcore;bundle-version="4.4.12",
- org.apache.httpcomponents.httpclient;bundle-version="4.5.10"
+ org.eclipse.debug.core;bundle-version="3.10.100"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.linuxtools.docker.core,
  org.eclipse.linuxtools.internal.docker.core;x-friends:="org.eclipse.linuxtools.docker.ui,org.eclipse.linuxtools.docker.ui.tests,org.eclipse.linuxtools.docker.integration.tests"
 Import-Package: com.fasterxml.jackson.annotation;version="2.10.3",
- javax.ws.rs;version="2.0.1",
- javax.ws.rs.core;version="2.0.1",
- javax.xml.bind;version="2.3.3",
- javax.ws.rs.client;version="2.0.1"
+ org.glassfish.jersey,
+ org.glassfish.jersey.client,
+ org.glassfish.jersey.jackson,
+ org.apache.http.config,
+ jakarta.ws.rs;version="2.0.1",
+ jakarta.ws.rs.core;version="2.0.1",
+ jakarta.xml.bind;version="2.3.3",
+ jakarta.ws.rs.client;version="2.0.1"
 Automatic-Module-Name: org.eclipse.linuxtools.docker.core
diff --git a/...lipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/AbstractRegistry.java b/...lipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/AbstractRegistry.java
@@ -12,8 +12,8 @@
  *******************************************************************************/
 package org.eclipse.linuxtools.docker.core;
 
-import static javax.ws.rs.HttpMethod.GET;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import static jakarta.ws.rs.HttpMethod.GET;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,13 +24,6 @@
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
 import org.eclipse.linuxtools.internal.docker.core.DockerImageSearchResult;
 import org.eclipse.linuxtools.internal.docker.core.ImageSearchResultV1;
 import org.eclipse.linuxtools.internal.docker.core.ImageSearchResultV2;
@@ -44,6 +37,13 @@
 import org.mandas.docker.client.ObjectMapperProvider;
 import org.mandas.docker.client.messages.ImageSearchResult;
 
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+
 /**
  * @since 2.0
  */

diff --git a/...ools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java b/...ools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java
@@ -22,11 +22,11 @@
 import org.eclipse.linuxtools.docker.core.IDockerConnectionSettings;
 import org.eclipse.linuxtools.docker.core.IDockerConnectionSettings.BindingType;
 import org.eclipse.linuxtools.docker.core.IRegistryAccount;
-import org.mandas.docker.client.DefaultDockerClient;
-import org.mandas.docker.client.DefaultDockerClient.Builder;
 import org.mandas.docker.client.DockerCertificates;
 import org.mandas.docker.client.DockerClient;
 import org.mandas.docker.client.auth.FixedRegistryAuthSupplier;
+import org.mandas.docker.client.builder.DockerClientBuilder;
+import org.mandas.docker.client.builder.jersey.JerseyDockerClientBuilder;
 import org.mandas.docker.client.exceptions.DockerCertificateException;
 import org.mandas.docker.client.messages.RegistryAuth;
 import org.mandas.docker.client.messages.RegistryConfigs;
@@ -69,7 +69,7 @@ public DockerClient getClient(
 			final IDockerConnectionSettings connectionSettings,
 			final IRegistryAccount registryAccount)
 			throws DockerCertificateException {
-		final Builder builder = DefaultDockerClient.builder();
+		final DockerClientBuilder<JerseyDockerClientBuilder> builder = new JerseyDockerClientBuilder();
 		if (connectionSettings
 				.getType() == BindingType.UNIX_SOCKET_CONNECTION) {
 			final UnixSocketConnectionSettings unixSocketConnectionSettings = (UnixSocketConnectionSettings) connectionSettings;

diff --git a/...uxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java b/...uxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
@@ -38,8 +38,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.ws.rs.ProcessingException;
-
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -130,6 +128,8 @@
 import org.mandas.docker.client.messages.Volume;
 import org.mandas.docker.client.messages.VolumeList;
 
+import jakarta.ws.rs.ProcessingException;
+
 /**
  * A connection to a Docker daemon. The connection may rely on Unix Socket or TCP connection (using the REST API).
  * All low-level communication is delegated to a wrapped {@link DockerClient}.

diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF
@@ -19,19 +19,15 @@ Require-Bundle: org.eclipse.linuxtools.docker.ui;bundle-version="1.0.0",
  org.eclipse.ui.navigator;bundle-version="3.6.0",
  assertj-core,
  org.mockito.mockito-core,
- org.glassfish.hk2.api;bundle-version="2.3.0",
- org.glassfish.jersey.core.jersey-common;bundle-version="2.3.0",
- org.glassfish.jersey.containers.servlet.core;bundle-version="2.3.0",
- org.glassfish.jersey.inject.jersey-hk2;bundle-version="2.3.0",
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.5.0",
- com.fasterxml.jackson.core.jackson-databind;bundle-version="2.5.0",
  org.eclipse.ui.ide,
  org.eclipse.debug.ui,
  org.eclipse.ui.console;bundle-version="3.6.100",
  org.eclipse.launchbar.ui;bundle-version="2.0.1",
  org.eclipse.launchbar.ui.controls;bundle-version="1.0.0"
 Import-Package: javax.xml.bind;version="2.3.3",
  javax.annotation;version="1.3.5",
+ com.fasterxml.jackson.core,
+ com.fasterxml.jackson.databind,
  org.slf4j
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-17

diff --git a/releng/org.eclipse.linuxtools.docker-site/category.xml b/releng/org.eclipse.linuxtools.docker-site/category.xml
@@ -100,12 +100,6 @@
         <category name="Docker Client Dependencies"/>
    </iu>
 
-   <iu id="org.apache.httpcomponents.httpcore" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.apache.httpcomponents.httpclient" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
    <iu id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
@@ -115,18 +109,6 @@
    <iu id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
-   <iu id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="javax.ws.rs" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
    <iu id="jakarta.xml.bind" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
@@ -166,78 +148,12 @@
    <iu id="org.bouncycastle.bcpkix" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
-   <iu id="org.glassfish.hk2.api" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.hk2.locator" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.hk2.osgi-resource-locator" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.hk2.utils" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.jersey.apache.connector" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.jersey.core.jersey-client" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.jersey.core.jersey-common" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.jersey.media.jersey-media-json-jackson" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.jersey.ext.entityfiltering" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.jersey.core.jersey-server" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.jersey.containers.servlet.core" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.jersey.containers.servlet" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="org.glassfish.jersey.inject.jersey-hk2" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
    <iu id="javassist" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
    <iu id="com.google.guava" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
-   <iu id="com.google.auth.google-auth-library-credentials" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="com.google.auth.oauth2-http" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="com.google.http-client.google-http-client" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="com.google.http-client.google-http-client-jackson2" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="com.google.auto.value.auto-value-annotations" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="com.google.j2objc.j2objc-annotations" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="io.grpc.grpc-context" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="io.opencensus.opencensus-api" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-   <iu id="io.opencensus.opencensus-contrib-http-util" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
    <iu id="slf4j.api" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>