Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to docker-client 9.0 #446

Merged
merged 1 commit into from
Jan 5, 2025
Merged

Move to docker-client 9.0 #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
7 changes: 4 additions & 3 deletions ...ools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions releng/org.eclipse.linuxtools.docker-site/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@
<iu id="org.mandas.docker-client" version="0.0.0">
<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>
Expand Down Expand Up @@ -109,7 +103,7 @@
<iu id="org.glassfish.hk2.utils" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
<iu id="org.glassfish.jersey.connectors.jersey-apache-connector" version="0.0.0">
<iu id="org.glassfish.jersey.connectors.jersey-apache5-connector" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
<iu id="org.glassfish.jersey.core.jersey-client" version="0.0.0">
Expand Down
7 changes: 3 additions & 4 deletions releng/org.eclipse.linuxtools.target/linuxtools-latest.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
<unit id="com.github.jnr.x86asm" version="1.0.2.v20230715-0746"/>
<unit id="com.github.jnr.jffi.native" version="1.3.13.v20240215-1616"/>
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.codelibs.nekohtml" version="2.1.3.v20240413-0800"/>
<unit id="org.codelibs.nekohtml.source" version="2.1.3.v20240413-0800"/>
<unit id="org.apache.httpcomponents.client5.httpclient5" version="5.4.1.v20241029-1100" />
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
Expand Down Expand Up @@ -228,7 +227,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<artifactId>jersey-apache5-connector</artifactId>
<version>3.1.9</version>
<type>jar</type>
</dependency>
Expand Down Expand Up @@ -277,7 +276,7 @@
<dependency>
<groupId>org.mandas</groupId>
<artifactId>docker-client</artifactId>
<version>8.0.3</version>
<version>9.0.0</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
Loading