extract dockerjava in extra module and use in testcontainer

.editorconfig

@@ -37,3 +37,6 @@ insert_final_newline = unset
 trim_trailing_whitespace = unset
 indent_style = unset
 indent_size = unset
+
+[.flattened-pom.xml]
+insert_final_newline = false

dockerjava/bnd.bnd

@@ -0,0 +1,40 @@
+#*******************************************************************************
+# Copyright (c)  2004 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
+#*******************************************************************************
+
+Export-Package: \
+    com.github.dockerjava.api*,\
+    com.github.dockerjava.core*,\
+    com.github.dockerjava.transport*,\
+    com.github.dockerjava.zerodep*,\
+    com.github.dockerjava.httpclient5
+
+-includeresource: \
+    @docker-java-api-3.5.3.jar, \
+    @docker-java-transport-zerodep-3.5.3.jar, \
+    @docker-java-transport-3.5.3.jar
+
+
+-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*,\
+    com.google.common*
+
+Import-Package: \
+    org.slf4j*,\
+    com.sun*,\
+    javax.net*

dockerjava/pom.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+/*********************************************************************
+* 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
+**********************************************************************/
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.daanse</groupId>
+    <artifactId>org.eclipse.daanse.tooling</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.eclipse.daanse.tooling.dockerjava</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+
+  <name>Eclipse Daanse Docker Java</name>
+  <description>Repackaged version of docker-java as a connector to Docker for
+    Eclipse Daanse</description>
+
+  <properties>
+    <docker-java.version>3.5.3</docker-java.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>5.11.0</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.docker-java</groupId>
+      <artifactId>docker-java</artifactId>
+      <version>${docker-java.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.github.docker-java</groupId>
+      <artifactId>docker-java-core</artifactId>
+      <version>${docker-java.version}</version>
+      <!--    <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>-->
+    </dependency>
+    <dependency>
+      <groupId>com.github.docker-java</groupId>
+      <artifactId>docker-java-api</artifactId>
+      <version>${docker-java.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.github.docker-java</groupId>
+      <artifactId>docker-java-transport</artifactId>
+      <version>${docker-java.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.github.docker-java</groupId>
+      <artifactId>docker-java-transport-zerodep</artifactId>
+      <version>${docker-java.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
+</project>

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 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.dockerjava;
+
+import java.time.Duration;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.transport.DockerHttpClient;
+import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
+
+public class Test {
+
+    @org.junit.jupiter.api.Test
+    void testName() throws Exception {
+
+        DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
+        DockerHttpClient client = new ZerodepDockerHttpClient.Builder().dockerHost(config.getDockerHost())
+                .sslConfig(config.getSSLConfig()).maxConnections(100).connectionTimeout(Duration.ofSeconds(30))
+                .responseTimeout(Duration.ofSeconds(45)).build();
+
+        DockerClient dc = DockerClientImpl.getInstance(config, client);
+        dc.pingCmd().exec();
+
+        Info i = dc.infoCmd().exec();
+        System.out.println(i);
+        System.out.println(i);
+    }
+}

dockerjava/test.bndrun

@@ -0,0 +1,56 @@
+#*******************************************************************************
+# Copyright (c)  2004 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
+#*******************************************************************************
+
+
+-runstartlevel: \
+	order=sortbynameversion,\
+	begin=-1
+
+-runtrace: true
+
+-tester: biz.aQute.tester.junit-platform
+
+
+
+
+-runsystemcapabilities: ${native_capability}
+
+-runproperties: \
+	org.slf4j.simpleLogger.defaultLogLevel=debug
+
+-runfw: org.apache.felix.framework
+
+-runee: JavaSE-21
+
+-runrequires: \
+	bnd.identity;id='${project.artifactId}-tests',\
+	bnd.identity;id=junit-jupiter-engine,\
+	bnd.identity;id=junit-platform-launcher
+
+# -runbundles is calculated by the bnd-resolver-maven-plugin
+
+-runbundles: \
+	ch.qos.logback.classic;version='[1.5.6,1.5.7)',\
+	ch.qos.logback.core;version='[1.5.6,1.5.7)',\
+	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)',\
+	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)',\
+	org.opentest4j;version='[1.3.0,1.3.1)',\
+	slf4j.api;version='[2.0.12,2.0.13)'

pom.xml

@@ -30,9 +30,11 @@
 
   <name>Eclipse Daanse Tooling Aggregator</name>
 
-  <description></description>
+  <description>Eclipse Daanse tooling modules including Docker Java connector
+    and Testcontainers integration</description>
 
   <modules>
+    <module>dockerjava</module>
     <module>testcontainers</module>
   </modules>
 </project>

testcontainers/core/bnd.bnd

@@ -16,15 +16,11 @@
 
 Export-Package: \
     !org.testcontainers.shaded*,\
-    com.github.dockerjava.api*,\
     org.testcontainers*
 
 -includeresource: \
     @testcontainers-1.21.3.jar,\
-    @duct-tape-1.0.8.jar,\
-    @docker-java-api-3.4.2.jar,\
-    @docker-java-transport-3.4.2.jar,\
-    @docker-java-transport-zerodep-3.4.2.jar
+    @duct-tape-1.0.8.jar
 
 DynamicImport-Package: *
 
@@ -34,12 +30,10 @@ DynamicImport-Package: *
     org.junit.rules*,\
     org.junit.runners*,\
     org.hamcrest*,\
-    org.apache.commons.compress,\
-    com.github.dockerjava.zerodep*
+    org.apache.commons.compress
 
 Import-Package: \
     !android.os.*,\
-    !com.github.dockerjava*,\
     !com.google.appengine.*,\
     !com.google.apphosting.*,\
     !com.google.cloud.*,\
@@ -49,4 +43,5 @@ Import-Package: \
     !org.testcontainers.r2dbc.*, \
     !org.junit*,\
     !sun.nio.ch*,\
+    com.github.dockerjava*,\
     *

testcontainers/core/pom.xml

@@ -21,8 +21,18 @@
   </parent>
   <artifactId>org.eclipse.daanse.tooling.testcontainers.core</artifactId>
 
+  <name>Eclipse Daanse Testcontainers Core</name>
+  <description>Core Testcontainers module providing Docker container testing
+    capabilities</description>
 
   <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>

testcontainers/core/test.bndrun

@@ -43,14 +43,15 @@
 # -runbundles is calculated by the bnd-resolver-maven-plugin
 
 -runbundles: \
-	com.sun.jna;version='[5.13.0,5.13.1)',\
+	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)',\
 	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.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)'

testcontainers/pom.xml

@@ -21,6 +21,10 @@
   </parent>
   <artifactId>org.eclipse.daanse.tooling.testcontainers</artifactId>
   <packaging>pom</packaging>
+
+  <name>Eclipse Daanse Testcontainers</name>
+  <description>Testcontainers integration modules for Eclipse Daanse</description>
+
   <modules>
     <module>core</module>
   </modules>