From ddf28971fb60d988627b42fa47a2663623fb3655 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Fri, 18 Sep 2026 08:45:31 +0200
Subject: [PATCH 1/5] Reworks structure

---
 demos/pom.xml                                 |  19 +
 .../testcontainers-selenium-demo}/pom.xml     |  25 +-
 .../main/java/software/xdev/Application.java  |   0
 pom.xml                                       |  54 ++-
 src/pom.xml                                   | 269 ++++++++++++
 src/skip-publish.marker                       |   0
 src/testcontainers-selenium/pom.xml           | 133 ++++++
 .../browser/BrowserWebDriverContainer.java    |   0
 ...CapabilitiesBrowserWebDriverContainer.java |   0
 .../GenericContainerImageNameAccessor.java    |   0
 .../containers/browser/SeleniumUtils.java     |   0
 .../browser/SeleniumVersionDetector.java      |   0
 .../recorder/RecordingContainer.java          |   0
 .../recorder/SeleniumRecordingContainer.java  |   0
 .../selenium/SimpleContainerTest.java         |   0
 ...GenericContainerImageNameAccessorTest.java |   0
 testcontainers-selenium/pom.xml               | 384 ------------------
 17 files changed, 468 insertions(+), 416 deletions(-)
 create mode 100644 demos/pom.xml
 rename {testcontainers-selenium-demo => demos/testcontainers-selenium-demo}/pom.xml (81%)
 rename {testcontainers-selenium-demo => demos/testcontainers-selenium-demo}/src/main/java/software/xdev/Application.java (100%)
 create mode 100644 src/pom.xml
 create mode 100644 src/skip-publish.marker
 create mode 100644 src/testcontainers-selenium/pom.xml
 rename {testcontainers-selenium => src/testcontainers-selenium}/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java (100%)
 rename {testcontainers-selenium => src/testcontainers-selenium}/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java (100%)
 rename {testcontainers-selenium => src/testcontainers-selenium}/src/main/java/software/xdev/testcontainers/selenium/containers/browser/GenericContainerImageNameAccessor.java (100%)
 rename {testcontainers-selenium => src/testcontainers-selenium}/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumUtils.java (100%)
 rename {testcontainers-selenium => src/testcontainers-selenium}/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumVersionDetector.java (100%)
 rename {testcontainers-selenium => src/testcontainers-selenium}/src/main/java/software/xdev/testcontainers/selenium/containers/recorder/RecordingContainer.java (100%)
 rename {testcontainers-selenium => src/testcontainers-selenium}/src/main/java/software/xdev/testcontainers/selenium/containers/recorder/SeleniumRecordingContainer.java (100%)
 rename {testcontainers-selenium => src/testcontainers-selenium}/src/test/java/software/xdev/testcontainers/selenium/SimpleContainerTest.java (100%)
 rename {testcontainers-selenium => src/testcontainers-selenium}/src/test/java/software/xdev/testcontainers/selenium/containers/browser/GenericContainerImageNameAccessorTest.java (100%)
 delete mode 100644 testcontainers-selenium/pom.xml

diff --git a/demos/pom.xml b/demos/pom.xml
new file mode 100644
index 00000000..f204a45e
--- /dev/null
+++ b/demos/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>software.xdev</groupId>
+		<artifactId>root</artifactId>
+		<version>2.1.2-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>demos</artifactId>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>testcontainers-selenium-demo</module>
+	</modules>
+</project>
diff --git a/testcontainers-selenium-demo/pom.xml b/demos/testcontainers-selenium-demo/pom.xml
similarity index 81%
rename from testcontainers-selenium-demo/pom.xml
rename to demos/testcontainers-selenium-demo/pom.xml
index a8199b8e..33b00ed1 100644
--- a/testcontainers-selenium-demo/pom.xml
+++ b/demos/testcontainers-selenium-demo/pom.xml
@@ -6,26 +6,14 @@
 
 	<parent>
 		<groupId>software.xdev</groupId>
-		<artifactId>testcontainers-selenium-root</artifactId>
+		<artifactId>demos</artifactId>
 		<version>2.1.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>testcontainers-selenium-demo</artifactId>
-	<version>2.1.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<organization>
-		<name>XDEV Software</name>
-		<url>https://xdev.software</url>
-	</organization>
-
 	<properties>
-		<javaVersion>17</javaVersion>
-		<maven.compiler.release>${javaVersion}</maven.compiler.release>
-
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
 		<mainClass>software.xdev.Application</mainClass>
 	</properties>
 
@@ -105,17 +93,6 @@
 		<finalName>${project.artifactId}</finalName>
 		
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.16.0</version>
-				<configuration>
-					<release>${maven.compiler.release}</release>
-					<compilerArgs>
-						<arg>-proc:none</arg>
-					</compilerArgs>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
diff --git a/testcontainers-selenium-demo/src/main/java/software/xdev/Application.java b/demos/testcontainers-selenium-demo/src/main/java/software/xdev/Application.java
similarity index 100%
rename from testcontainers-selenium-demo/src/main/java/software/xdev/Application.java
rename to demos/testcontainers-selenium-demo/src/main/java/software/xdev/Application.java
diff --git a/pom.xml b/pom.xml
index 3e51e0d9..e4ddddcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,25 +5,45 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>software.xdev</groupId>
-	<artifactId>testcontainers-selenium-root</artifactId>
+	<artifactId>root</artifactId>
 	<version>2.1.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<organization>
-		<name>XDEV Software</name>
-		<url>https://xdev.software</url>
-	</organization>
-
 	<modules>
-		<module>testcontainers-selenium</module>
-		<module>testcontainers-selenium-demo</module>
+		<module>src</module>
+		<module>demos</module>
 	</modules>
 
 	<properties>
+		<javaVersion>17</javaVersion>
+		<maven.compiler.release>${javaVersion}</maven.compiler.release>
+
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 
+	<url>https://github.com/xdev-software/testcontainers-selenium</url>
+
+	<scm>
+		<url>https://github.com/xdev-software/testcontainers-selenium</url>
+		<connection>scm:git:https://github.com/xdev-software/testcontainers-selenium.git</connection>
+	</scm>
+
+	<inceptionYear>2024</inceptionYear>
+
+	<organization>
+		<name>XDEV Software</name>
+		<url>https://xdev.software</url>
+	</organization>
+
+	<developers>
+		<developer>
+			<name>XDEV Software</name>
+			<organization>XDEV Software</organization>
+			<url>https://xdev.software</url>
+		</developer>
+	</developers>
+
 	<licenses>
 		<license>
 			<name>Apache-2.0</name>
@@ -32,6 +52,24 @@
 		</license>
 	</licenses>
 
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.16.0</version>
+					<configuration>
+						<release>${maven.compiler.release}</release>
+						<compilerArgs>
+							<arg>-proc:none</arg>
+						</compilerArgs>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
 	<profiles>
 		<profile>
 			<id>checkstyle</id>
diff --git a/src/pom.xml b/src/pom.xml
new file mode 100644
index 00000000..eb317565
--- /dev/null
+++ b/src/pom.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>software.xdev</groupId>
+		<artifactId>root</artifactId>
+		<version>2.1.2-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>src</artifactId>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>testcontainers-selenium</module>
+	</modules>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>4.0.0-M16</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-project-info-reports-plugin</artifactId>
+					<version>3.9.0</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>3.12.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>3.4.0</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>3.1.4</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>3.1.4</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>flatten-maven-plugin</artifactId>
+					<version>1.8.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-gpg-plugin</artifactId>
+					<version>3.2.8</version>
+				</plugin>
+				<plugin>
+					<groupId>org.sonatype.central</groupId>
+					<artifactId>central-publishing-maven-plugin</artifactId>
+					<version>0.11.0</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>com.mycila</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>5.1.2</version>
+				<configuration>
+					<properties>
+						<email>${project.organization.url}</email>
+					</properties>
+					<licenseSets>
+						<licenseSet>
+							<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
+							<includes>
+								<include>src/main/java/**</include>
+								<include>src/test/java/**</include>
+							</includes>
+						</licenseSet>
+					</licenseSets>
+				</configuration>
+				<executions>
+					<execution>
+						<id>first</id>
+						<goals>
+							<goal>format</goal>
+						</goals>
+						<phase>process-sources</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<quiet>true</quiet>
+					<doclint>none</doclint>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>do-not-publish-this</id>
+			<activation>
+				<file>
+					<exists>skip-publish.marker</exists>
+				</file>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>flatten-maven-plugin</artifactId>
+						<inherited>false</inherited>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<inherited>false</inherited>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<inherited>false</inherited>
+						<configuration>
+							<skipSource>true</skipSource>
+						</configuration>
+					</plugin>
+
+					<plugin>
+						<artifactId>maven-install-plugin</artifactId>
+						<inherited>false</inherited>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+					<plugin>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<inherited>false</inherited>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<inherited>false</inherited>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<inherited>false</inherited>
+						<configuration>
+							<skipPublishing>true</skipPublishing>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>publish</id>
+			<properties>
+				<license.skip>true</license.skip>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>flatten-maven-plugin</artifactId>
+						<configuration>
+							<flattenMode>ossrh</flattenMode>
+						</configuration>
+						<executions>
+							<execution>
+								<id>flatten</id>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>flatten</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+								<configuration>
+									<!-- Fixes "gpg: signing failed: Inappropriate ioctl for device" -->
+									<!-- Prevent `gpg` from using pinentry programs -->
+									<gpgArguments>
+										<arg>--pinentry-mode</arg>
+										<arg>loopback</arg>
+									</gpgArguments>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>publish-sonatype-central-portal</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<extensions>true</extensions>
+						<configuration>
+							<publishingServerId>sonatype-central-portal</publishingServerId>
+							<autoPublish>true</autoPublish>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
diff --git a/src/skip-publish.marker b/src/skip-publish.marker
new file mode 100644
index 00000000..e69de29b
diff --git a/src/testcontainers-selenium/pom.xml b/src/testcontainers-selenium/pom.xml
new file mode 100644
index 00000000..cc6d45ca
--- /dev/null
+++ b/src/testcontainers-selenium/pom.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>software.xdev</groupId>
+		<artifactId>src</artifactId>
+		<version>2.1.2-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>testcontainers-selenium</artifactId>
+	<packaging>jar</packaging>
+
+	<name>testcontainers-selenium</name>
+	<description>testcontainers-selenium</description>
+
+	<properties>
+		<!-- by default run no tests as Docker is required -->
+		<skipTests>true</skipTests>
+
+		<selenium.version>4.49.0</selenium.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers</artifactId>
+			<version>2.0.5</version>
+		</dependency>
+
+		<!-- Testcontainers is using outdated v1 -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>2.0.19</version>
+		</dependency>
+
+		<!-- Selenium API is optional -->
+		<dependency>
+			<groupId>org.seleniumhq.selenium</groupId>
+			<artifactId>selenium-api</artifactId>
+			<version>${selenium.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Tests -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>6.1.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>2.0.19</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.seleniumhq.selenium</groupId>
+			<artifactId>selenium-remote-driver</artifactId>
+			<version>${selenium.version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<!-- Tracing is not needed -->
+				<exclusion>
+					<groupId>io.opentelemetry</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<!-- No unused, beta-grade, RUST blobs -->
+				<exclusion>
+					<groupId>org.seleniumhq.selenium</groupId>
+					<artifactId>selenium-manager</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.seleniumhq.selenium</groupId>
+			<artifactId>selenium-support</artifactId>
+			<version>${selenium.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.seleniumhq.selenium</groupId>
+			<artifactId>selenium-firefox-driver</artifactId>
+			<version>${selenium.version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<!-- No unused, beta-grade, RUST blobs -->
+				<exclusion>
+					<groupId>org.seleniumhq.selenium</groupId>
+					<artifactId>selenium-manager</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.seleniumhq.selenium</groupId>
+			<artifactId>selenium-chrome-driver</artifactId>
+			<version>${selenium.version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<!-- No unused, beta-grade, RUST blobs -->
+				<exclusion>
+					<groupId>org.seleniumhq.selenium</groupId>
+					<artifactId>selenium-manager</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.6.0</version>
+				<configuration>
+					<skipTests>${skipTests}</skipTests>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>run-integration-tests</id>
+			<properties>
+				<skipTests>false</skipTests>
+			</properties>
+		</profile>
+	</profiles>
+</project>
diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java b/src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java
similarity index 100%
rename from testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java
rename to src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java
diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java b/src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java
similarity index 100%
rename from testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java
rename to src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java
diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/GenericContainerImageNameAccessor.java b/src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/GenericContainerImageNameAccessor.java
similarity index 100%
rename from testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/GenericContainerImageNameAccessor.java
rename to src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/GenericContainerImageNameAccessor.java
diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumUtils.java b/src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumUtils.java
similarity index 100%
rename from testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumUtils.java
rename to src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumUtils.java
diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumVersionDetector.java b/src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumVersionDetector.java
similarity index 100%
rename from testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumVersionDetector.java
rename to src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumVersionDetector.java
diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/recorder/RecordingContainer.java b/src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/recorder/RecordingContainer.java
similarity index 100%
rename from testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/recorder/RecordingContainer.java
rename to src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/recorder/RecordingContainer.java
diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/recorder/SeleniumRecordingContainer.java b/src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/recorder/SeleniumRecordingContainer.java
similarity index 100%
rename from testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/recorder/SeleniumRecordingContainer.java
rename to src/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/recorder/SeleniumRecordingContainer.java
diff --git a/testcontainers-selenium/src/test/java/software/xdev/testcontainers/selenium/SimpleContainerTest.java b/src/testcontainers-selenium/src/test/java/software/xdev/testcontainers/selenium/SimpleContainerTest.java
similarity index 100%
rename from testcontainers-selenium/src/test/java/software/xdev/testcontainers/selenium/SimpleContainerTest.java
rename to src/testcontainers-selenium/src/test/java/software/xdev/testcontainers/selenium/SimpleContainerTest.java
diff --git a/testcontainers-selenium/src/test/java/software/xdev/testcontainers/selenium/containers/browser/GenericContainerImageNameAccessorTest.java b/src/testcontainers-selenium/src/test/java/software/xdev/testcontainers/selenium/containers/browser/GenericContainerImageNameAccessorTest.java
similarity index 100%
rename from testcontainers-selenium/src/test/java/software/xdev/testcontainers/selenium/containers/browser/GenericContainerImageNameAccessorTest.java
rename to src/testcontainers-selenium/src/test/java/software/xdev/testcontainers/selenium/containers/browser/GenericContainerImageNameAccessorTest.java
diff --git a/testcontainers-selenium/pom.xml b/testcontainers-selenium/pom.xml
deleted file mode 100644
index 7ea7580a..00000000
--- a/testcontainers-selenium/pom.xml
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>software.xdev</groupId>
-	<artifactId>testcontainers-selenium</artifactId>
-	<version>2.1.2-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>testcontainers-selenium</name>
-	<description>testcontainers-selenium</description>
-	<url>https://github.com/xdev-software/testcontainers-selenium</url>
-
-	<scm>
-		<url>https://github.com/xdev-software/testcontainers-selenium</url>
-		<connection>scm:git:https://github.com/xdev-software/testcontainers-selenium.git</connection>
-	</scm>
-
-	<inceptionYear>2024</inceptionYear>
-
-	<organization>
-		<name>XDEV Software</name>
-		<url>https://xdev.software</url>
-	</organization>
-
-	<developers>
-		<developer>
-			<name>XDEV Software</name>
-			<organization>XDEV Software</organization>
-			<url>https://xdev.software</url>
-		</developer>
-	</developers>
-
-	<licenses>
-		<license>
-			<name>Apache-2.0</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
-	<properties>
-		<javaVersion>17</javaVersion>
-		<maven.compiler.release>${javaVersion}</maven.compiler.release>
-
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-		<!-- by default run no tests as Docker is required -->
-		<skipTests>true</skipTests>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
-			<version>2.0.5</version>
-		</dependency>
-
-		<!-- Testcontainers is using outdated v1 -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>2.0.19</version>
-		</dependency>
-
-		<!-- Selenium API is optional -->
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-api</artifactId>
-			<version>4.49.0</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- Tests -->
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<version>6.1.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>2.0.19</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-remote-driver</artifactId>
-			<version>4.49.0</version>
-			<scope>test</scope>
-			<exclusions>
-				<!-- Tracing is not needed -->
-				<exclusion>
-					<groupId>io.opentelemetry</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-				<!-- No unused, beta-grade, RUST blobs -->
-				<exclusion>
-					<groupId>org.seleniumhq.selenium</groupId>
-					<artifactId>selenium-manager</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-support</artifactId>
-			<version>4.49.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-firefox-driver</artifactId>
-			<version>4.49.0</version>
-			<scope>test</scope>
-			<exclusions>
-				<!-- No unused, beta-grade, RUST blobs -->
-				<exclusion>
-					<groupId>org.seleniumhq.selenium</groupId>
-					<artifactId>selenium-manager</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-chrome-driver</artifactId>
-			<version>4.49.0</version>
-			<scope>test</scope>
-			<exclusions>
-				<!-- No unused, beta-grade, RUST blobs -->
-				<exclusion>
-					<groupId>org.seleniumhq.selenium</groupId>
-					<artifactId>selenium-manager</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>4.0.0-M16</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.9.0</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>com.mycila</groupId>
-				<artifactId>license-maven-plugin</artifactId>
-				<version>5.1.2</version>
-				<configuration>
-					<properties>
-						<email>${project.organization.url}</email>
-					</properties>
-					<licenseSets>
-						<licenseSet>
-							<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
-							<includes>
-								<include>src/main/java/**</include>
-								<include>src/test/java/**</include>
-							</includes>
-						</licenseSet>
-					</licenseSets>
-				</configuration>
-				<executions>
-					<execution>
-						<id>first</id>
-						<goals>
-							<goal>format</goal>
-						</goals>
-						<phase>process-sources</phase>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.16.0</version>
-				<configuration>
-					<release>${maven.compiler.release}</release>
-					<compilerArgs>
-						<arg>-proc:none</arg>
-					</compilerArgs>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.12.0</version>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<quiet>true</quiet>
-					<doclint>none</doclint>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>3.4.0</version>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.6.0</version>
-				<configuration>
-					<skipTests>${skipTests}</skipTests>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<profiles>
-		<profile>
-			<id>run-integration-tests</id>
-			<properties>
-				<skipTests>false</skipTests>
-			</properties>
-		</profile>
-		<profile>
-			<id>publish</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>flatten-maven-plugin</artifactId>
-						<version>1.8.0</version>
-						<configuration>
-							<flattenMode>ossrh</flattenMode>
-						</configuration>
-						<executions>
-							<execution>
-								<id>flatten</id>
-								<phase>process-resources</phase>
-								<goals>
-									<goal>flatten</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.2.8</version>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-								<configuration>
-									<!-- Fixes "gpg: signing failed: Inappropriate ioctl for device" -->
-									<!-- Prevent `gpg` from using pinentry programs -->
-									<gpgArguments>
-										<arg>--pinentry-mode</arg>
-										<arg>loopback</arg>
-									</gpgArguments>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>publish-sonatype-central-portal</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.sonatype.central</groupId>
-						<artifactId>central-publishing-maven-plugin</artifactId>
-						<version>0.11.0</version>
-						<extensions>true</extensions>
-						<configuration>
-							<publishingServerId>sonatype-central-portal</publishingServerId>
-							<autoPublish>true</autoPublish>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>checkstyle</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-checkstyle-plugin</artifactId>
-						<version>3.6.0</version>
-						<dependencies>
-							<dependency>
-								<groupId>com.puppycrawl.tools</groupId>
-								<artifactId>checkstyle</artifactId>
-								<version>14.1.0</version>
-							</dependency>
-						</dependencies>
-						<configuration>
-							<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>check</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>pmd</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.28.0</version>
-						<configuration>
-							<analysisCache>true</analysisCache>
-							<includeTests>true</includeTests>
-							<printFailingErrors>true</printFailingErrors>
-							<rulesets>
-								<ruleset>../.config/pmd/java/ruleset.xml</ruleset>
-							</rulesets>
-						</configuration>
-						<dependencies>
-							<dependency>
-								<groupId>net.sourceforge.pmd</groupId>
-								<artifactId>pmd-core</artifactId>
-								<version>7.27.0</version>
-							</dependency>
-							<dependency>
-								<groupId>net.sourceforge.pmd</groupId>
-								<artifactId>pmd-java</artifactId>
-								<version>7.27.0</version>
-							</dependency>
-						</dependencies>
-					</plugin>
-				</plugins>
-			</build>
-			<reporting>
-				<plugins>
-					<!-- Required for reporting -->
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-jxr-plugin</artifactId>
-						<version>3.6.0</version>
-					</plugin>
-				</plugins>
-			</reporting>
-		</profile>
-	</profiles>
-</project>

From 3dd81be621a1f222d5391927d431c75a7c39f83c Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Fri, 18 Sep 2026 08:52:32 +0200
Subject: [PATCH 2/5] Fine tune pom, start editing workflows

---
 .github/workflows/check-build.yml |  4 ++--
 .github/workflows/test-deploy.yml | 11 ++++-------
 pom.xml                           |  3 +++
 src/pom.xml                       |  7 +++++++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
index d815c747..1f90f491 100644
--- a/.github/workflows/check-build.yml
+++ b/.github/workflows/check-build.yml
@@ -160,10 +160,10 @@ jobs:
             ${{ runner.os }}-pmd-
 
     - name: Run PMD
-      run: ./mvnw -B test pmd:aggregate-pmd-no-fork pmd:check -P pmd -DskipTests -T2C
+      run: ./mvnw -B test pmd:aggregate-pmd-no-fork pmd:check -P pmd -T2C
 
     - name: Run CPD (Copy Paste Detector)
-      run: ./mvnw -B pmd:aggregate-cpd pmd:cpd-check -P pmd -DskipTests -T2C
+      run: ./mvnw -B pmd:aggregate-cpd pmd:cpd-check -P pmd -T2C
 
     - name: Upload report
       if: ${{ !cancelled() }}
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
index 9f665060..e4dae054 100644
--- a/.github/workflows/test-deploy.yml
+++ b/.github/workflows/test-deploy.yml
@@ -3,9 +3,6 @@ name: Test Deployment
 on:
   workflow_dispatch:
 
-env:
-  PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
-
 jobs:
   publish-maven:
     runs-on: ubuntu-latest
@@ -24,8 +21,8 @@ jobs:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
 
     - name: Publish to GitHub Packages Central
-      run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
+      run: ../mvnw -B deploy -P publish -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
+      working-directory: src
       env:
         PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
@@ -41,8 +38,8 @@ jobs:
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
     - name: Publish to Central Portal
-      run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal -DskipTests
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
+      run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal
+      working-directory: src
       env:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
diff --git a/pom.xml b/pom.xml
index e4ddddcd..68d0687d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,9 @@
 		</profile>
 		<profile>
 			<id>pmd</id>
+			<properties>
+				<skipTests>true</skipTests>
+			</properties>
 			<build>
 				<plugins>
 					<plugin>
diff --git a/src/pom.xml b/src/pom.xml
index eb317565..1afb65ef 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -202,10 +202,17 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>pmd</id>
+			<properties>
+				<license.skip>true</license.skip>
+			</properties>
+		</profile>
 		<profile>
 			<id>publish</id>
 			<properties>
 				<license.skip>true</license.skip>
+				<skipTests>true</skipTests>
 			</properties>
 			<build>
 				<plugins>

From 02ca26826b30f257d7f17c52b5c24a798f653ac3 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Fri, 18 Sep 2026 09:16:13 +0200
Subject: [PATCH 3/5] Fix lanucher

---
 .run/Run Demo.run.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.run/Run Demo.run.xml b/.run/Run Demo.run.xml
index c7be02be..fabbaed4 100644
--- a/.run/Run Demo.run.xml	
+++ b/.run/Run Demo.run.xml	
@@ -2,7 +2,6 @@
   <configuration default="false" name="Run Demo" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="software.xdev.Application" />
     <module name="testcontainers-selenium-demo" />
-    <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="software.xdev.*" />

From 728faffc16a7307ebc2527d88560ff657f8482b8 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Fri, 18 Sep 2026 11:11:00 +0200
Subject: [PATCH 4/5] Remove unused

---
 .github/workflows/check-build.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
index 1f90f491..45499f9a 100644
--- a/.github/workflows/check-build.yml
+++ b/.github/workflows/check-build.yml
@@ -19,9 +19,6 @@ on:
       - '.idea/**'
       - 'assets/**'
 
-env:
-  DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
-
 jobs:
   build:
     runs-on: ubuntu-latest

From 537f51ec5a5e2a1e75dd9d372d40442fc93d0f02 Mon Sep 17 00:00:00 2001
From: AB <a.bierler@xdev-software.de>
Date: Fri, 18 Sep 2026 11:11:57 +0200
Subject: [PATCH 5/5] Site publishing + Inherit is not needed as this profile
 is executed conditionally

---
 .github/workflows/release.yml | 70 +++++++++++++++++++++++++----------
 src/pom.xml                   | 14 +++----
 2 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 008ec2ca..cbf4d187 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,13 +4,6 @@ on:
   push:
     branches: [ master ]
 
-env:
-  PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
-
-permissions:
-  contents: write
-  pull-requests: write
-
 # DO NOT RESTORE CACHE for critical release steps to prevent a (extremely unlikely) scenario 
 # where a supply chain attack could be achieved due to poisoned cache
 jobs:
@@ -37,7 +30,8 @@ jobs:
             ${{ runner.os }}-mvn-build-
 
     - name: Build with Maven
-      run: ./mvnw -B clean package -T2C
+      run: ../mvnw -B clean package -T2C
+      working-directory: src
       
     - name: Check for uncommited changes
       run: |
@@ -61,6 +55,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: [check-code]
     timeout-minutes: 10
+    permissions:
+      contents: write
     outputs:
       upload_url: ${{ steps.create-release.outputs.upload_url }}
     steps:
@@ -77,10 +73,9 @@ jobs:
     - name: Get version
       id: version
       run: |
-        version=$(../mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
+        version=$(mvnw -B help:evaluate -Dexpression=project.version -q -DforceStdout)
         echo "release=$version" >> $GITHUB_OUTPUT
         echo "releasenumber=${version//[!0-9]/}" >> $GITHUB_OUTPUT
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Commit and Push
       run: |
@@ -106,7 +101,7 @@ jobs:
           ```XML
           <dependency>
              <groupId>software.xdev</groupId>
-             <artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
+             <artifactId>${{ github.event.repository.name }}</artifactId>
              <version>${{ steps.version.outputs.release }}</version>
           </dependency>
           ```
@@ -135,8 +130,8 @@ jobs:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
 
     - name: Publish to GitHub Packages Central
-      run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
+      run: ../mvnw -B deploy -P publish -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
+      working-directory: src
       env:
         PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
@@ -152,14 +147,14 @@ jobs:
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
     - name: Publish to Central Portal
-      run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal -DskipTests
+      run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal
       env:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
+      working-directory: src
 
-  publish-pages:
+  build-pages:
     runs-on: ubuntu-latest
     needs: [prepare-release]
     timeout-minutes: 15
@@ -188,20 +183,57 @@ jobs:
           ${{ runner.os }}-mvn-build-
 
     - name: Build site
-      run: ../mvnw -B compile site -DskipTests -T2C
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
+      run: ../mvnw -B compile site -P site -T2C
+      working-directory: src
+    
+    - name: Aggregate site
+      run: |
+        module_dirs=$(../mvnw -B -q --also-make exec:exec -Dexec.executable="pwd")
+        for m in "${module_dirs[@]}"
+        do
+          echo "$m/target/site -> ./target/$m"
+          mkdir -p ./target/$m
+          cp -r $m/target/site ./target/$m
+        done
+      working-directory: src
+    
+    - name: Upload pages artifact
+      uses: actions/upload-pages-artifact@v5
+      with:
+        path: src/target/site
 
     - name: Deploy to Github pages
       uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site
+        publish_dir: ./src/target/site
         force_orphan: true
 
+  deploy-pages:
+    runs-on: ubuntu-latest
+    needs: [build-pages]
+    timeout-minutes: 10
+    concurrency:
+      group: 'pages'
+      cancel-in-progress: false
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+    - name: Deploy to GitHub Pages
+      id: deployment
+      uses: actions/deploy-pages@v5
+
   after-release:
     runs-on: ubuntu-latest
     needs: [publish-maven]
     timeout-minutes: 10
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
     - uses: actions/checkout@v7
 
diff --git a/src/pom.xml b/src/pom.xml
index 1afb65ef..0b74bb69 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -145,7 +145,6 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>flatten-maven-plugin</artifactId>
-						<inherited>false</inherited>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -154,7 +153,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<inherited>false</inherited>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -162,7 +160,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
-						<inherited>false</inherited>
 						<configuration>
 							<skipSource>true</skipSource>
 						</configuration>
@@ -170,14 +167,12 @@
 
 					<plugin>
 						<artifactId>maven-install-plugin</artifactId>
-						<inherited>false</inherited>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
 					</plugin>
 					<plugin>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<inherited>false</inherited>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -186,7 +181,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<inherited>false</inherited>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -194,7 +188,6 @@
 					<plugin>
 						<groupId>org.sonatype.central</groupId>
 						<artifactId>central-publishing-maven-plugin</artifactId>
-						<inherited>false</inherited>
 						<configuration>
 							<skipPublishing>true</skipPublishing>
 						</configuration>
@@ -272,5 +265,12 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>site</id>
+			<properties>
+				<license.skip>true</license.skip>
+				<skipTests>true</skipTests>
+			</properties>
+		</profile>
 	</profiles>
 </project>