From ec232dc4cefacfe18ead54fcb45ea4f05efc159c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Sat, 4 Jan 2025 21:00:34 +0200 Subject: [PATCH] Move to docker-client 9.0 This implies switch from apache httpclient 4.x to 5.x --- .../META-INF/MANIFEST.MF | 6 ++---- .../internal/docker/core/DockerClientFactory.java | 7 ++++--- .../META-INF/MANIFEST.MF | 2 +- releng/org.eclipse.linuxtools.docker-site/category.xml | 8 +------- .../linuxtools-latest.target | 7 +++---- 5 files changed, 11 insertions(+), 19 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 index ccca8f2873..725aaed0a8 100644 --- a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF +++ b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF @@ -17,9 +17,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.28.0", org.glassfish.jersey.core.jersey-common;bundle-version="3.1.5", org.glassfish.jersey.inject.jersey-hk2;bundle-version="3.1.5", org.eclipse.tm.terminal.view.core;bundle-version="4.0.0", - org.eclipse.debug.core;bundle-version="3.21.100", - org.apache.httpcomponents.httpcore;bundle-version="4.4.16", - org.apache.httpcomponents.httpclient;bundle-version="4.5.14" + org.eclipse.debug.core;bundle-version="3.21.100" Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.linuxtools.docker.core, @@ -28,5 +26,5 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.10.3", jakarta.ws.rs;version="2.0.1", jakarta.ws.rs.core;version="2.0.1", jakarta.ws.rs.client;version="2.0.1", - org.glassfish.jersey.apache.connector + org.glassfish.jersey.apache5.connector Automatic-Module-Name: org.eclipse.linuxtools.docker.core diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java index e454842847..fd08883010 100644 --- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java +++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2023 Red Hat. + * Copyright (c) 2015, 2025 Red Hat. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -26,7 +26,7 @@ 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.jersey.JerseyDockerClientBuilder; +import org.mandas.docker.client.builder.DockerClientBuilder; import org.mandas.docker.client.exceptions.DockerCertificateException; import org.mandas.docker.client.messages.RegistryAuth; import org.mandas.docker.client.messages.RegistryConfigs; @@ -69,7 +69,8 @@ public DockerClient getClient( final IDockerConnectionSettings connectionSettings, final IRegistryAccount registryAccount) throws DockerCertificateException { - final JerseyDockerClientBuilder builder = new JerseyDockerClientBuilder(); + final DockerClientBuilder builder = DockerClientBuilder.fromEnv() + .uri((URI) null); if (connectionSettings .getType() == BindingType.UNIX_SOCKET_CONNECTION) { final UnixSocketConnectionSettings unixSocketConnectionSettings = (UnixSocketConnectionSettings) connectionSettings; 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 index bac68b477f..6ae9b64f38 100644 --- a/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF +++ b/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.linuxtools.docker.ui;bundle-version="1.0.0", 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: org.glassfish.jersey.apache.connector, +Import-Package: org.glassfish.jersey.apache5.connector, org.slf4j Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/releng/org.eclipse.linuxtools.docker-site/category.xml b/releng/org.eclipse.linuxtools.docker-site/category.xml index 4462b3f977..155cb7afea 100644 --- a/releng/org.eclipse.linuxtools.docker-site/category.xml +++ b/releng/org.eclipse.linuxtools.docker-site/category.xml @@ -37,12 +37,6 @@ - - - - - - @@ -109,7 +103,7 @@ - + diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-latest.target b/releng/org.eclipse.linuxtools.target/linuxtools-latest.target index 8e422a6ac8..fc4acc4f25 100644 --- a/releng/org.eclipse.linuxtools.target/linuxtools-latest.target +++ b/releng/org.eclipse.linuxtools.target/linuxtools-latest.target @@ -7,10 +7,9 @@ - - + @@ -228,7 +227,7 @@ org.glassfish.jersey.connectors - jersey-apache-connector + jersey-apache5-connector 3.1.9 jar @@ -277,7 +276,7 @@ org.mandas docker-client - 8.0.3 + 9.0.0 jar