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 1cce9f232d..51c7a1e1e1 100644 --- a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF +++ b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF @@ -12,8 +12,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.28.0", org.eclipse.equinox.security, org.eclipse.osgi, org.mandas.docker-client;bundle-version="4.0.3", - com.github.jnr.unixsocket;bundle-version="0.38.20", - com.github.jnr.enxio;bundle-version="0.32.15", org.glassfish.jersey.core.jersey-client;bundle-version="2.40", org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="2.40", org.glassfish.jersey.core.jersey-common;bundle-version="2.40", diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultUnixConnectionSettingsProvider.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultUnixConnectionSettingsProvider.java index e5196a94d4..409998273f 100644 --- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultUnixConnectionSettingsProvider.java +++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultUnixConnectionSettingsProvider.java @@ -1,6 +1,6 @@ /******************************************************************************* * Copyright (c) 2016, 2018 Red Hat. - * + * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -14,6 +14,9 @@ import java.io.File; import java.io.IOException; +import java.net.UnixDomainSocketAddress; +import java.nio.channels.SocketChannel; +import java.nio.file.Path; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -21,20 +24,18 @@ import org.eclipse.linuxtools.docker.core.IDockerConnectionSettings; import org.eclipse.linuxtools.docker.core.IDockerConnectionSettingsProvider; -import jnr.unixsocket.UnixSocketAddress; -import jnr.unixsocket.UnixSocketChannel; - -public class DefaultUnixConnectionSettingsProvider implements IDockerConnectionSettingsProvider { +public class DefaultUnixConnectionSettingsProvider + implements IDockerConnectionSettingsProvider { @Override public List getConnectionSettings() { - final File unixSocketFile = new File("/var/run/docker.sock"); //$NON-NLS-1$ + final Path unixSocketPath = Path.of("/var/run/docker.sock"); //$NON-NLS-1$ + File unixSocketFile = unixSocketPath.toFile(); if (unixSocketFile.exists() && unixSocketFile.canRead() && unixSocketFile.canWrite()) { - final UnixSocketAddress address = new UnixSocketAddress( - unixSocketFile); - try (final UnixSocketChannel channel = UnixSocketChannel - .open(address)) { + final UnixDomainSocketAddress address = UnixDomainSocketAddress + .of(unixSocketPath); + try (final SocketChannel channel = SocketChannel.open(address)) { // assume socket works final UnixSocketConnectionSettings socket = new UnixSocketConnectionSettings( DefaultDockerConnectionSettingsFinder.Defaults.DEFAULT_UNIX_SOCKET_PATH);