testcontainers incude dockerjava

Signed-off-by: Stefan Bischof <[email protected]>

Author: stbischof

testcontainers/core/bnd.bnd

@@ -14,33 +14,26 @@
 
 -metainf-services: auto
 
-
--exportcontents: \
-    !org.testcontainers.shaded*,\
-    org.testcontainers*
-
--conditionalpackage: org.testcontainers*
-
 -includeresource: \
-    @testcontainers-1.21.3.jar,\
+    @testcontainers-1.21.3.jar, \
+    @docker-java-api-3.4.2.jar, \
+    @docker-java-transport-zerodep-3.4.2.jar, \
+    @docker-java-transport-3.4.2.jar, \
     @duct-tape-1.0.8.jar
 
--privatepackage: \
-    org.rnorth.ducttape*,\
-    org.junit.rules*,\
-    org.junit.runners*,\
-    org.hamcrest*,\
-
 Import-Package: \
     !android.os.*,\
+    !com.github.dockerjava.zerodep.*,\
     !com.google.appengine.*,\
     !com.google.apphosting.*,\
     !com.google.cloud.*,\
     !io.r2dbc.*,\
     !javax.annotation.*, \
     !org.conscrypt, \
     !org.testcontainers.r2dbc.*, \
-    !org.junit*,\
-    !sun.nio.ch*,\
-    com.github.dockerjava*,\
+    !sun.nio.ch, \
     *
+
+Export-Package: \
+    org.testcontainers.containers,\
+    org.testcontainers.dockerclient

testcontainers/core/pom.xml

@@ -27,18 +27,12 @@
 
   <dependencies>
 
-
-    <dependency>
-      <groupId>org.eclipse.daanse</groupId>
-      <artifactId>org.eclipse.daanse.tooling.dockerjava</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
       <version>1.21.3</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
+
 </project>

testcontainers/core/src/test/java/org/eclipse/daanse/tooling/testcontainers/core/NginxRundAndConnectTest.java

@@ -19,16 +19,31 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.util.List;
 
-import org.testcontainers.DockerClientFactory;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.dockerclient.DockerClientProviderStrategy;
 
 public class NginxRundAndConnectTest {
 
-    @org.junit.jupiter.api.Test
-    void startandConnectPortNginX() throws Exception {
+    @Test
+    void testName() throws Exception {
+
+        DockerClientProviderStrategy s1=    new    org.testcontainers.dockerclient.TestcontainersHostPropertyClientProviderStrategy();
+        DockerClientProviderStrategy s2=    new    org.testcontainers.dockerclient.EnvironmentAndSystemPropertyClientProviderStrategy();
+        DockerClientProviderStrategy s3=    new    org.testcontainers.dockerclient.UnixSocketClientProviderStrategy();
+        DockerClientProviderStrategy s4=     new   org.testcontainers.dockerclient.DockerMachineClientProviderStrategy();
+        DockerClientProviderStrategy s5=    new   org.testcontainers.dockerclient.NpipeSocketClientProviderStrategy();
+        DockerClientProviderStrategy s6=    new   org.testcontainers.dockerclient.RootlessDockerClientProviderStrategy();
+        DockerClientProviderStrategy s7=     new   org.testcontainers.dockerclient.DockerDesktopClientProviderStrategy();
 
-        DockerClientFactory.lazyClient().pingCmd();
+   List<DockerClientProviderStrategy> strategies=     List.of(s1, s2, s3, s4, s5, s6, s7);
+        DockerClientProviderStrategy.getFirstValidStrategy(strategies);
+    }
+
+//    @org.junit.jupiter.api.Test
+    void startandConnectPortNginX() throws Exception {
 
         try (GenericContainer<?> nginx = new GenericContainer("nginx:alpine-slim").withExposedPorts(80)
 

testcontainers/core/test.bndrun

@@ -43,18 +43,16 @@
 # -runbundles is calculated by the bnd-resolver-maven-plugin
 
 -runbundles: \
-	com.fasterxml.jackson.core.jackson-annotations;version='[2.18.4,2.18.5)',\
-	com.fasterxml.jackson.core.jackson-core;version='[2.18.4,2.18.5)',\
-	com.fasterxml.jackson.core.jackson-databind;version='[2.18.4,2.18.5)',\
-	com.sun.jna;version='[5.11.0,5.11.1)',\
+	com.fasterxml.jackson.core.jackson-annotations;version='[2.10.3,2.10.4)',\
+	com.sun.jna;version='[5.13.0,5.13.1)',\
 	junit-jupiter-api;version='[5.10.2,5.10.3)',\
 	junit-jupiter-engine;version='[5.10.2,5.10.3)',\
 	junit-platform-commons;version='[1.10.2,1.10.3)',\
 	junit-platform-engine;version='[1.10.2,1.10.3)',\
 	junit-platform-launcher;version='[1.10.2,1.10.3)',\
 	org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
 	org.apache.commons.commons-compress;version='[1.24.0,1.24.1)',\
-	org.eclipse.daanse.tooling.dockerjava;version='[0.0.1,0.0.2)',\
+	org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
 	org.eclipse.daanse.tooling.testcontainers.core;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.tooling.testcontainers.core-tests;version='[0.0.1,0.0.2)',\
 	org.opentest4j;version='[1.3.0,1.3.1)'