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 15269301ac..3b55bfda87 100644 --- 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/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/AbstractRegistry.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/AbstractRegistry.java index 7655a97a76..a0b59a7a79 100644 --- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/AbstractRegistry.java +++ b/containers/org.eclipse.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/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 e3208deeb5..e08d584c2a 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 @@ -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 builder = new JerseyDockerClientBuilder(); if (connectionSettings .getType() == BindingType.UNIX_SOCKET_CONNECTION) { final UnixSocketConnectionSettings unixSocketConnectionSettings = (UnixSocketConnectionSettings) connectionSettings; diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java index 2dc8bb33f4..c201f1e4ae 100644 --- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java +++ b/containers/org.eclipse.linuxtools.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 index 96392beae0..dd4ff73994 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 @@ -19,12 +19,6 @@ 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", @@ -32,6 +26,8 @@ Require-Bundle: org.eclipse.linuxtools.docker.ui;bundle-version="1.0.0", 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 index 3d892a3a29..58741d8d1d 100644 --- a/releng/org.eclipse.linuxtools.docker-site/category.xml +++ b/releng/org.eclipse.linuxtools.docker-site/category.xml @@ -100,12 +100,6 @@ - - - - - - @@ -115,18 +109,6 @@ - - - - - - - - - - - - @@ -166,78 +148,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.29.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.29.target index 9f960a451c..68ab859521 100644 --- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.29.target +++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.29.target @@ -1,40 +1,17 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - + @@ -102,8 +79,32 @@ - + + + com.fasterxml.jackson.core + jackson-annotations + 2.15.2 + jar + + + com.fasterxml.jackson.core + jackson-core + 2.15.2 + jar + + + com.fasterxml.jackson.core + jackson-databind + 2.15.2 + jar + + + com.fasterxml.jackson.module + jackson-module-jakarta-xmlbind-annotations + 2.15.2 + jar + com.github.jnr jnr-constants @@ -140,12 +141,108 @@ 32.1.1-jre jar + + jakarta.activation + jakarta.activation-api + 2.1.2 + jar + + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + jar + + + jakarta.inject + jakarta.inject-api + 2.0.1 + jar + + + jakarta.ws.rs + jakarta.ws.rs-api + 2.1.6 + jar + + + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 + jar + + + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 + jar + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 + jar + + + org.apache.commons + commons-compress + 1.23.0 + jar + + + org.glassfish.hk2 + osgi-resource-locator + 1.0.3 + jar + + + org.glassfish.jersey.connectors + jersey-apache-connector + 3.1.2 + jar + + + org.glassfish.jersey.core + jersey-client + 3.1.2 + jar + + + org.glassfish.jersey.core + jersey-common + 3.1.2 + jar + + + org.glassfish.jersey.core + jersey-server + 3.1.2 + jar + + + org.glassfish.jersey.ext + jersey-entity-filtering + 3.1.2 + jar + + + org.glassfish.jersey.media + jersey-media-json-jackson + 3.1.2 + jar + org.javassist javassist 3.29.2-GA jar + + org.mandas + docker-client + 7.0.3 + jar +