enable integrationtest for testcontainers

dockerjava/bnd.bnd

@@ -26,9 +26,6 @@ Export-Package: \
 
 
 -privatepackage: \
-    com.fasterxml.jackson.databind*,\
-    com.fasterxml.jackson.core*,\
-    com.fasterxml.jackson.annotation*,\
     org.apache.commons.io*,\
     org.apache.commons.lang3*,\
     com.google.common.collect*,\
@@ -37,4 +34,5 @@ Export-Package: \
 Import-Package: \
     org.slf4j*,\
     com.sun*,\
-    javax.net*
+    javax.net*,\
+    com.fasterxml.jackson*

dockerjava/src/test/java/org/eclipse/daanse/tooling/dockerjava/Test.java

@@ -13,6 +13,8 @@
  */
 package org.eclipse.daanse.tooling.dockerjava;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.time.Duration;
 
 import com.github.dockerjava.api.DockerClient;
@@ -37,7 +39,8 @@ void testName() throws Exception {
         dc.pingCmd().exec();
 
         Info i = dc.infoCmd().exec();
-        System.out.println(i);
+
+        assertThat(i.getMemTotal()).isNotNull();
         System.out.println(i);
     }
 }

dockerjava/test.bndrun

@@ -41,14 +41,19 @@
 # -runbundles is calculated by the bnd-resolver-maven-plugin
 
 -runbundles: \
+	assertj-core;version='[3.26.0,3.26.1)',\
 	ch.qos.logback.classic;version='[1.5.6,1.5.7)',\
 	ch.qos.logback.core;version='[1.5.6,1.5.7)',\
+	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)',\
 	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)',\
+	net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\
 	org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
 	org.eclipse.daanse.tooling.dockerjava;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.tooling.dockerjava-tests;version='[0.0.1,0.0.2)',\

testcontainers/core/bnd.bnd

@@ -14,34 +14,26 @@
 
 -metainf-services: auto
 
-Export-Package: \
-    !org.testcontainers.shaded*,\
-    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
 
-DynamicImport-Package: *
-
--privatepackage: \
-    org.rnorth.ducttape*,\
-    com.fasterxml.jackson.annotation*,\
-    org.junit.rules*,\
-    org.junit.runners*,\
-    org.hamcrest*,\
-    org.apache.commons.compress
-
 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,17 +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/main/java/org/eclipse/daanse/tooling/testcontainers/core/Activator.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation.
+ *
+ * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   SmartCity Jena - initial
+ *   Stefan Bischof (bipolis.org) - initial
+ */
+package org.eclipse.daanse.tooling.testcontainers.core;
+
+import org.osgi.annotation.bundle.Header;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.dockerclient.DockerClientProviderStrategy;
+
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
+public class Activator implements BundleActivator {
+
+    @Override
+    public void start(BundleContext context) throws Exception {
+
+        ClassLoader originalCl = Thread.currentThread().getContextClassLoader();
+        ClassLoader bundleCl = DockerClientProviderStrategy.class.getClassLoader();
+
+        Thread.currentThread().setContextClassLoader(bundleCl);
+
+        DockerClientFactory.lazyClient().pingCmd();
+
+        Thread.currentThread().setContextClassLoader(originalCl);
+
+    }
+
+    @Override
+    public void stop(BundleContext context) throws Exception {
+        // TODO Auto-generated method stub
+
+    }
+
+}

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

@@ -19,19 +19,44 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.util.List;
+import java.util.ServiceLoader;
 
-import org.junit.jupiter.api.Disabled;
-import org.testcontainers.DockerClientFactory;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.dockerclient.DockerClientProviderStrategy;
 
 public class NginxRundAndConnectTest {
 
-    @Disabled
+//    @Test
+    void testName() throws Exception {
+
+        ClassLoader clOriginal = Thread.currentThread().getContextClassLoader();
+        ClassLoader testconCL = DockerClientProviderStrategy.class.getClassLoader();
+        Thread.currentThread().setContextClassLoader(testconCL);
+
+        System.out.println("------------");
+        ServiceLoader.load(DockerClientProviderStrategy.class).forEach(s -> System.out.println(s));
+        Thread.currentThread().setContextClassLoader(clOriginal);
+
+        System.out.println("------------");
+
+        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();
+
+        List<DockerClientProviderStrategy> strategies = List.of(s1, s2, s3, s4, s5, s6, s7);
+        DockerClientProviderStrategy s = DockerClientProviderStrategy.getFirstValidStrategy(strategies);
+
+    }
+
     @org.junit.jupiter.api.Test
     void startandConnectPortNginX() throws Exception {
 
-        DockerClientFactory.lazyClient().pingCmd();
-
         try (GenericContainer<?> nginx = new GenericContainer("nginx:alpine-slim").withExposedPorts(80)
 
         ) {

testcontainers/core/test.bndrun

@@ -43,15 +43,16 @@
 # -runbundles is calculated by the bnd-resolver-maven-plugin
 
 -runbundles: \
-	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)'