diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8f549063d..fcd91ac85 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -38,6 +38,16 @@ jobs:
         with:
           distribution: adopt
           java-version: 17
+      - name: Install Maven 4
+        run: |
+          MAVEN_VERSION=4.0.0-rc-5
+          BASE_URL="https://dlcdn.apache.org/maven/maven-4/${MAVEN_VERSION}/binaries"
+          curl -fsSL "${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz" -o maven.tar.gz
+          mkdir -p "$HOME/maven"
+          tar -xzf maven.tar.gz -C "$HOME/maven"
+          echo "M2_HOME=$HOME/maven/apache-maven-${MAVEN_VERSION}" >> "$GITHUB_ENV"
+          echo "$HOME/maven/apache-maven-${MAVEN_VERSION}/bin" >> "$GITHUB_PATH"
+          rm maven.tar.gz
       - name: Build with Maven
         run: mvn -B --no-transfer-progress -Prat -DskipTests verify -Dskip.format.code=false
 
@@ -63,5 +73,15 @@ jobs:
       with:
         distribution: adopt
         java-version: ${{ matrix.java }}
+    - name: Install Maven 4
+      run: |
+        MAVEN_VERSION=4.0.0-rc-5
+        BASE_URL="https://dlcdn.apache.org/maven/maven-4/${MAVEN_VERSION}/binaries"
+        curl -fsSL "${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz" -o maven.tar.gz
+        mkdir -p "$HOME/maven"
+        tar -xzf maven.tar.gz -C "$HOME/maven"
+        echo "M2_HOME=$HOME/maven/apache-maven-${MAVEN_VERSION}" >> "$GITHUB_ENV"
+        echo "$HOME/maven/apache-maven-${MAVEN_VERSION}/bin" >> "$GITHUB_PATH"
+        rm maven.tar.gz
     - name: Build with Maven
-      run: mvn -B --no-transfer-progress package --file pom.xml -DCI_ENV=true verify
+      run: mvn -B --no-transfer-progress package --file pom.xml -DCI_ENV=true verify
\ No newline at end of file
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 1e9edcbdc..7aa999942 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -19,55 +19,52 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-    <artifactId>stormcrawler</artifactId>
-    <version>3.5.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>stormcrawler-archetype</artifactId>
-  <name>stormcrawler-archetype</name>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>archetype-resources/pom.xml</include>
-          <include>archetype-resources/crawler-conf.yaml</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-        <excludes>
-          <exclude>archetype-resources/pom.xml</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>3.4.1</version>
-      </extension>
-    </extensions>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>3.4.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.1</version>
-          <configuration>
-            <escapeString>\</escapeString>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent/>
+	
+	<artifactId>stormcrawler-archetype</artifactId>
+	<name>stormcrawler-archetype</name>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>archetype-resources/pom.xml</include>
+					<include>archetype-resources/crawler-conf.yaml</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<excludes>
+					<exclude>archetype-resources/pom.xml</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.archetype</groupId>
+				<artifactId>archetype-packaging</artifactId>
+				<version>3.4.1</version>
+			</extension>
+		</extensions>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-archetype-plugin</artifactId>
+					<version>3.4.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>3.3.1</version>
+					<configuration>
+						<escapeString>\</escapeString>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index b70d8439b..98f3fe8b4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -19,14 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-	</parent>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+
+	<parent/>
 
 	<artifactId>stormcrawler-core</artifactId>
 	<packaging>jar</packaging>
diff --git a/external/ai/pom.xml b/external/ai/pom.xml
index 34cfa79ff..900056bb4 100644
--- a/external/ai/pom.xml
+++ b/external/ai/pom.xml
@@ -19,44 +19,38 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-        <artifactId>stormcrawler-external</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-
-    <artifactId>stormcrawler-ai</artifactId>
-    <name>stormcrawler-ai</name>
-
-    <url>https://github.com/apache/stormcrawler/tree/master/external/ai</url>
-    <description>AI resources for StormCrawler</description>
-
-    <properties>
-        <langchain4j.version>1.8.0</langchain4j.version>
-        <langchain4j.openai.version>1.8.0</langchain4j.openai.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j</artifactId>
-            <version>${langchain4j.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.opennlp</groupId>
-                    <artifactId>opennlp-tools</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-open-ai</artifactId>
-            <version>${langchain4j.openai.version}</version>
-        </dependency>
-    </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent/>
+
+	<artifactId>stormcrawler-ai</artifactId>
+	<name>stormcrawler-ai</name>
+
+	<url>https://github.com/apache/stormcrawler/tree/master/external/ai</url>
+	<description>AI resources for StormCrawler</description>
+
+	<properties>
+		<langchain4j.version>1.8.0</langchain4j.version>
+		<langchain4j.openai.version>1.8.0</langchain4j.openai.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>dev.langchain4j</groupId>
+			<artifactId>langchain4j</artifactId>
+			<version>${langchain4j.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.opennlp</groupId>
+					<artifactId>opennlp-tools</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>dev.langchain4j</groupId>
+			<artifactId>langchain4j-open-ai</artifactId>
+			<version>${langchain4j.openai.version}</version>
+		</dependency>
+	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/external/aws/pom.xml b/external/aws/pom.xml
index a84b3ae82..d1999a81b 100644
--- a/external/aws/pom.xml
+++ b/external/aws/pom.xml
@@ -19,15 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler-external</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent/>
 
 	<artifactId>stormcrawler-aws</artifactId>
 	<packaging>jar</packaging>
diff --git a/external/langid/pom.xml b/external/langid/pom.xml
index ab8398d02..04549c477 100644
--- a/external/langid/pom.xml
+++ b/external/langid/pom.xml
@@ -19,15 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler-external</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent/>
 
 	<artifactId>stormcrawler-langid</artifactId>
 	<packaging>jar</packaging>
diff --git a/external/opensearch/archetype/pom.xml b/external/opensearch/archetype/pom.xml
index 237d9a2d1..2f77edbfa 100644
--- a/external/opensearch/archetype/pom.xml
+++ b/external/opensearch/archetype/pom.xml
@@ -19,54 +19,49 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent>
+		<relativePath>../../..</relativePath>
+	</parent>
 
-  <parent>
-    <groupId>org.apache.stormcrawler</groupId>
-    <artifactId>stormcrawler</artifactId>
-    <version>3.5.1-SNAPSHOT</version>
-    <relativePath>../../../pom.xml</relativePath>
-  </parent>
+	<artifactId>stormcrawler-opensearch-archetype</artifactId>
+	
+	<packaging>maven-archetype</packaging>
 
-  <artifactId>stormcrawler-opensearch-archetype</artifactId>
-  
-  <packaging>maven-archetype</packaging>
+	<build>
+		<resources>
+			<resource>
+					<directory>src/main/resources</directory>
+					<filtering>true</filtering>
+					<includes>
+							<include>META-INF/maven/archetype-metadata.xml</include>
+					</includes>
+			</resource>
+			<resource>
+					<directory>src/main/resources</directory>
+					<filtering>false</filtering>
+					<excludes>
+							<exclude>META-INF/maven/archetype-metadata.xml</exclude>
+					</excludes>
+			</resource>
+		</resources>
 
-  <build>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.archetype</groupId>
+				<artifactId>archetype-packaging</artifactId>
+				<version>3.4.1</version>
+			</extension>
+		</extensions>
 
-<resources>
-<resource>
-    <directory>src/main/resources</directory>
-    <filtering>true</filtering>
-    <includes>
-        <include>META-INF/maven/archetype-metadata.xml</include>
-    </includes>
-</resource>
-<resource>
-    <directory>src/main/resources</directory>
-    <filtering>false</filtering>
-    <excludes>
-        <exclude>META-INF/maven/archetype-metadata.xml</exclude>
-    </excludes>
-</resource>
-</resources>
-
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>3.4.1</version>
-      </extension>
-    </extensions>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>3.4.1</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-archetype-plugin</artifactId>
+					<version>3.4.1</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>
diff --git a/external/opensearch/pom.xml b/external/opensearch/pom.xml
index 536565b8c..d2be2f67f 100644
--- a/external/opensearch/pom.xml
+++ b/external/opensearch/pom.xml
@@ -19,15 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
 
-	<parent>
-		<groupId>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler-external</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+	<parent/>
 
 	<properties>
 		<opensearch.version>2.19.4</opensearch.version>
@@ -110,6 +104,6 @@ under the License.
 			<artifactId>slf4j-simple</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
+
 </project>
diff --git a/external/playwright/pom.xml b/external/playwright/pom.xml
index fa40b1ab4..8a03d70c1 100644
--- a/external/playwright/pom.xml
+++ b/external/playwright/pom.xml
@@ -19,15 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler-external</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent/>
 
 	<artifactId>stormcrawler-playwright</artifactId>
 	<packaging>jar</packaging>
diff --git a/external/pom.xml b/external/pom.xml
index 6324f5c9e..2cdb06ec8 100644
--- a/external/pom.xml
+++ b/external/pom.xml
@@ -19,20 +19,30 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent/>
 
 	<artifactId>stormcrawler-external</artifactId>
 	<packaging>pom</packaging>
 
-    <dependencies>
+	<subprojects>
+		<subproject>ai</subproject>
+		<subproject>aws</subproject>
+		<subproject>langid</subproject>
+		<subproject>opensearch</subproject>
+		<subproject>opensearch/archetype</subproject>
+		<subproject>playwright</subproject>
+		<subproject>selenium</subproject>
+		<subproject>solr</subproject>
+		<subproject>solr/archetype</subproject>
+		<subproject>sql</subproject>
+		<subproject>tika</subproject>
+		<subproject>urlfrontier</subproject>
+		<subproject>warc</subproject>
+	</subprojects>
+
+	<dependencies>
 		<dependency>
 			<groupId>org.apache.storm</groupId>
 			<artifactId>storm-client</artifactId>
@@ -62,7 +72,5 @@ under the License.
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
-
-
 	</dependencies>
 </project>
diff --git a/external/selenium/pom.xml b/external/selenium/pom.xml
index e36550a75..325e26ced 100644
--- a/external/selenium/pom.xml
+++ b/external/selenium/pom.xml
@@ -19,15 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler-external</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent/>
 
 	<artifactId>stormcrawler-selenium</artifactId>
 	<packaging>jar</packaging>
@@ -102,7 +96,6 @@ under the License.
 			<artifactId>junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/external/solr/archetype/pom.xml b/external/solr/archetype/pom.xml
index 5bd2f29da..200afd18b 100644
--- a/external/solr/archetype/pom.xml
+++ b/external/solr/archetype/pom.xml
@@ -19,54 +19,49 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
 
-    <parent>
-        <groupId>org.apache.stormcrawler</groupId>
-        <artifactId>stormcrawler</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
+	<parent>
+		<relativePath>../../..</relativePath>
+	</parent>
 
-    <artifactId>stormcrawler-solr-archetype</artifactId>
+	<artifactId>stormcrawler-solr-archetype</artifactId>
 
-    <packaging>maven-archetype</packaging>
+	<packaging>maven-archetype</packaging>
 
-    <build>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>META-INF/maven/archetype-metadata.xml</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<excludes>
+					<exclude>META-INF/maven/archetype-metadata.xml</exclude>
+				</excludes>
+			</resource>
+		</resources>
 
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>META-INF/maven/archetype-metadata.xml</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <excludes>
-                    <exclude>META-INF/maven/archetype-metadata.xml</exclude>
-                </excludes>
-            </resource>
-        </resources>
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.archetype</groupId>
+				<artifactId>archetype-packaging</artifactId>
+				<version>3.4.1</version>
+			</extension>
+		</extensions>
 
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.archetype</groupId>
-                <artifactId>archetype-packaging</artifactId>
-                <version>3.4.1</version>
-            </extension>
-        </extensions>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-archetype-plugin</artifactId>
-                    <version>3.4.1</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-archetype-plugin</artifactId>
+					<version>3.4.1</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>
diff --git a/external/solr/pom.xml b/external/solr/pom.xml
index d2759bd3f..e4d734b8d 100644
--- a/external/solr/pom.xml
+++ b/external/solr/pom.xml
@@ -19,15 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler-external</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent/>
 
 	<artifactId>stormcrawler-solr</artifactId>
 	<packaging>jar</packaging>
diff --git a/external/sql/pom.xml b/external/sql/pom.xml
index 0eece4e64..d0ce4285e 100644
--- a/external/sql/pom.xml
+++ b/external/sql/pom.xml
@@ -19,15 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler-external</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent/>
 
 	<artifactId>stormcrawler-sql</artifactId>
 	<packaging>jar</packaging>
diff --git a/external/tika/pom.xml b/external/tika/pom.xml
index b956dc812..6d1972b03 100644
--- a/external/tika/pom.xml
+++ b/external/tika/pom.xml
@@ -19,15 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
 
-	<parent>
-		<groupId>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler-external</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+	<parent/>
 
 	<artifactId>stormcrawler-tika</artifactId>
 	<packaging>jar</packaging>
diff --git a/external/urlfrontier/pom.xml b/external/urlfrontier/pom.xml
index e4d4d5c5b..eba8b7ec1 100644
--- a/external/urlfrontier/pom.xml
+++ b/external/urlfrontier/pom.xml
@@ -19,15 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
 
-	<parent>
-		<groupId>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler-external</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+	<parent/>
 
 	<artifactId>stormcrawler-urlfrontier</artifactId>
 	<packaging>jar</packaging>
diff --git a/external/warc/pom.xml b/external/warc/pom.xml
index 748333fcd..0a265219b 100644
--- a/external/warc/pom.xml
+++ b/external/warc/pom.xml
@@ -19,15 +19,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>org.apache.stormcrawler</groupId>
-		<artifactId>stormcrawler-external</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
+	<parent/>
 
 	<artifactId>stormcrawler-warc</artifactId>
 	<packaging>jar</packaging>
@@ -63,12 +57,12 @@ under the License.
 			<version>${storm-client.version}</version>
 			<exclusions>
 				<exclusion>
-				    <!-- not available with Java 9 and higher -->
+					<!-- not available with Java 9 and higher -->
 					<groupId>jdk.tools</groupId>
 					<artifactId>jdk.tools</artifactId>
 				</exclusion>
 				<exclusion>
-				    <!-- subdependency JMS can't be found -->
+					<!-- subdependency JMS can't be found -->
 					<groupId>org.apache.hive.hcatalog</groupId>
 					<artifactId>hive-webhcat-java-client</artifactId>
 				</exclusion>
@@ -96,6 +90,5 @@ under the License.
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 5a1407425..94535b4e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,8 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<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>
-
+<project xmlns="http://maven.apache.org/POM/4.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/xsd/maven-4.1.0.xsd">
+	
 	<parent>
 		<groupId>org.apache</groupId>
 		<artifactId>apache</artifactId>
@@ -73,8 +72,8 @@ under the License.
 		<slf4j-simple.version>2.0.17</slf4j-simple.version>
 		<jetbrains.annotations.version>26.0.2-1</jetbrains.annotations.version>
 		<commons.io.version>2.17.0</commons.io.version>
-        <commons.compress.version>1.28.0</commons.compress.version>
-        <commons.codec.version>1.20.0</commons.codec.version>
+		<commons.compress.version>1.28.0</commons.compress.version>
+		<commons.codec.version>1.20.0</commons.codec.version>
 		<git-code-format-maven-plugin.version>5.4</git-code-format-maven-plugin.version>
 		<testcontainers.version>1.21.3</testcontainers.version>
 		<maven.mojo.license.plugin>2.7.0</maven.mojo.license.plugin>
@@ -467,34 +466,34 @@ under the License.
 					  </execution>
 				  </executions>
 		   </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>${checkstyle-maven-plugin.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.puppycrawl.tools</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>${checkstyle.version}</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <configLocation>checkstyle.xml</configLocation>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>${checkstyle-maven-plugin.version}</version>
+				<dependencies>
+					<dependency>
+						<groupId>com.puppycrawl.tools</groupId>
+						<artifactId>checkstyle</artifactId>
+						<version>${checkstyle.version}</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<configLocation>checkstyle.xml</configLocation>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
 	<profiles>
 		<!-- Run Apache Rat license checks in a separate profile, because during local builds it doesn't skip files
-          that are not checked into Git -->
+		  that are not checked into Git -->
 		<profile>
 			<id>rat</id>
 			<build>
@@ -515,33 +514,33 @@ under the License.
 							<outputDirectory>${project.basedir}/rat</outputDirectory>
 							<excludes>
 								<exclude>**/*.ndjson</exclude>
-                                <exclude>**/*.mapping</exclude>
-                                <exclude>**/*.flux</exclude>
-                                <exclude>**/*.txt</exclude>
-                                <exclude>**/*.rss</exclude>
-                                <exclude>**/*.tar.gz</exclude>
-                                <exclude>**/README.md</exclude>
-                                <exclude>**/target/**</exclude>
-                                <exclude>**/warc.inputs</exclude>
-                                <exclude>**/llm-default-prompt.txt</exclude>
-                                <exclude>LICENSE</exclude>
-                                <exclude>NOTICE</exclude>
-                                <exclude>CONTRIBUTING.md</exclude>
-                                <exclude>RELEASING.md</exclude>
+								<exclude>**/*.mapping</exclude>
+								<exclude>**/*.flux</exclude>
+								<exclude>**/*.txt</exclude>
+								<exclude>**/*.rss</exclude>
+								<exclude>**/*.tar.gz</exclude>
+								<exclude>**/README.md</exclude>
+								<exclude>**/target/**</exclude>
+								<exclude>**/warc.inputs</exclude>
+								<exclude>**/llm-default-prompt.txt</exclude>
+								<exclude>LICENSE</exclude>
+								<exclude>NOTICE</exclude>
+								<exclude>CONTRIBUTING.md</exclude>
+								<exclude>RELEASING.md</exclude>
 								<exclude>external/opensearch/dashboards/**</exclude>
 								<exclude>external/solr/archetype/src/main/resources/archetype-resources/configsets/**</exclude>
-                                <exclude>THIRD-PARTY.properties</exclude>
-                                <exclude>THIRD-PARTY.txt</exclude>
+								<exclude>THIRD-PARTY.properties</exclude>
+								<exclude>THIRD-PARTY.txt</exclude>
 								<exclude>.github/ISSUE_TEMPLATE/*.yml</exclude>
-                                <exclude>.github/*.md</exclude>
-                                <exclude>.mvn/*.config</exclude>
-                                <exclude>.gitattributes</exclude>
-                                <exclude>**/dependency-reduced-pom.xml</exclude>
-                                <exclude>.editorconfig</exclude>
-                                <exclude>**/.settings/**/*</exclude> <!-- Eclipse -->
-                                <exclude>**/.classpath</exclude> <!-- Eclipse -->
-                                <exclude>**/.project</exclude> <!-- Eclipse -->
-                                <exclude>**/.idea</exclude> <!-- IntelliJ -->
+								<exclude>.github/*.md</exclude>
+								<exclude>.mvn/*.config</exclude>
+								<exclude>.gitattributes</exclude>
+								<exclude>**/dependency-reduced-pom.xml</exclude>
+								<exclude>.editorconfig</exclude>
+								<exclude>**/.settings/**/*</exclude> <!-- Eclipse -->
+								<exclude>**/.classpath</exclude> <!-- Eclipse -->
+								<exclude>**/.project</exclude> <!-- Eclipse -->
+								<exclude>**/.idea</exclude> <!-- IntelliJ -->
 							</excludes>
 						</configuration>
 					</plugin>
@@ -660,38 +659,18 @@ under the License.
 				<scope>import</scope>
 			</dependency>
 
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-compress</artifactId>
-                <version>${commons.compress.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>${commons.codec.version}</version>
-            </dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-compress</artifactId>
+				<version>${commons.compress.version}</version>
+			</dependency>
 
+			<dependency>
+				<groupId>commons-codec</groupId>
+				<artifactId>commons-codec</artifactId>
+				<version>${commons.codec.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
-	<modules>
-		<module>core</module>
-		<module>external</module>
-		<module>external/ai</module>
-		<module>external/aws</module>
-		<module>external/langid</module>
-		<module>external/opensearch</module>
-		<module>external/playwright</module>
-		<module>external/selenium</module>
-		<module>external/solr</module>
-		<module>external/sql</module>
-		<module>external/tika</module>
-		<module>external/urlfrontier</module>
-		<module>external/warc</module>
-		<module>archetype</module>
-		<module>external/opensearch/archetype</module>
-		<module>external/solr/archetype</module>
-    </modules>
-
 </project>