diff --git a/dkpro-jwpl-api/pom.xml b/dkpro-jwpl-api/pom.xml
index 0d37ed16..d6f699d1 100644
--- a/dkpro-jwpl-api/pom.xml
+++ b/dkpro-jwpl-api/pom.xml
@@ -31,10 +31,10 @@
 
   <properties>
     <!--
-          By default, we skip the integration tests for regular contributors
-          as they might not have access to one of the two institution specific
-          MySQL resource profiles.
-      -->
+      By default, we skip the integration tests for regular contributors
+      as they might not have access to one of the two institution specific
+      MySQL resource profiles.
+    -->
     <skip.integration.tests>true</skip.integration.tests>
   </properties>
 
@@ -79,8 +79,12 @@
       <artifactId>nv-i18n</artifactId>
     </dependency>
     <dependency>
-      <groupId>jakarta.xml.bind</groupId>
-      <artifactId>jakarta.xml.bind-api</artifactId>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
 
     <!-- logger dependencies -->
@@ -88,33 +92,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- TEST dependencies -->
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <scope>test</scope>
-    </dependency>
 
     <!-- Used in Integration Tests only -->
     <dependency>
diff --git a/dkpro-jwpl-deps/dkpro-jwpl-swc-engine-shade/pom.xml b/dkpro-jwpl-deps/dkpro-jwpl-swc-engine-shade/pom.xml
index 682a09a7..37edd72f 100644
--- a/dkpro-jwpl-deps/dkpro-jwpl-swc-engine-shade/pom.xml
+++ b/dkpro-jwpl-deps/dkpro-jwpl-swc-engine-shade/pom.xml
@@ -15,132 +15,140 @@
   See the License for the 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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.dkpro.jwpl</groupId>
-        <artifactId>dkpro-jwpl-deps</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>dkpro-jwpl-swc-engine-shade</artifactId>
-    <name>Dependencies :: Jakarta :: swc-engine</name>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.dkpro.jwpl</groupId>
+    <artifactId>dkpro-jwpl-deps</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>dkpro-jwpl-swc-engine-shade</artifactId>
+  <name>Dependencies :: Jakarta :: swc-engine</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.sweble.wikitext</groupId>
-            <artifactId>swc-engine</artifactId>
-            <version>${org.sweble.wikitext.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>de.fau.cs.osr.ptk</groupId>
-            <artifactId>ptk-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>de.fau.cs.osr.utils</groupId>
-            <artifactId>utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.sweble.wikitext</groupId>
-            <artifactId>swc-parser-lazy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xtc</groupId>
-            <artifactId>rats-runtime</artifactId>
-            <version>1.15.0</version>
-        </dependency>
-    </dependencies>
+  <properties>
+    <mdep.analyze.skip>true</mdep.analyze.skip>
+  </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <useBaseVersion>true</useBaseVersion>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <artifactSet>
-                                <includes>
-                                    <include>org.sweble.wikitext:swc-engine:*</include> <!-- only sweble engine to make sure we don't add other things -->
-                                </includes>
-                            </artifactSet>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                            </transformers>
-                            <relocations>
-                                <relocation>
-                                    <pattern>javax.xml.bind</pattern>
-                                    <shadedPattern>jakarta.xml.bind</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <!--
-                Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees shaded classes.
-                When navigating over to java classes, the shaded imported classes will
-                show as resolved instead of unknown.
-                The artifact specified below is created when this module built.
-                But is also used to resolve classes in IntelliJ.
-                "phase" is set to "none" - with this setting, the artifact jar will not be uploaded to repo
-                when running standalone "mvn install" command.
+  <dependencies>
+    <dependency>
+      <groupId>org.sweble.wikitext</groupId>
+      <artifactId>swc-engine</artifactId>
+      <version>${org.sweble.wikitext.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.4</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>de.fau.cs.osr.ptk</groupId>
+      <artifactId>ptk-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>de.fau.cs.osr.utils</groupId>
+      <artifactId>utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.sweble.wikitext</groupId>
+      <artifactId>swc-parser-lazy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xtc</groupId>
+      <artifactId>rats-runtime</artifactId>
+      <version>1.15.0</version>
+    </dependency>
+  </dependencies>
 
-                build-helper-maven-plugin can be removed completely with no effect on the "mvn clean" and "mvn install",
-                which is handled by maven-shade-plugin.
-                -->
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.4.0</version>
-                <executions>
-                    <execution>
-                        <id>workaround-makeItVisibleOnIntellij</id>
-                        <phase>none</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/${project.build.finalName}.jar</file>
-                                    <type>jar</type>
-                                    <classifier>optional</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.5.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <createSourcesJar>true</createSourcesJar>
+              <useBaseVersion>true</useBaseVersion>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
+              <artifactSet>
+                <includes>
+                  <!-- only sweble engine to make sure we don't add other things -->
+                  <include>org.sweble.wikitext:swc-engine:*</include> 
+                </includes>
+              </artifactSet>
+              <transformers>
+                <transformer
+                  implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+              </transformers>
+              <relocations>
+                <relocation>
+                  <pattern>javax.xml.bind</pattern>
+                  <shadedPattern>jakarta.xml.bind</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <!--
+          Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees shaded
+          classes.
+          When navigating over to java classes, the shaded imported classes will
+          show as resolved instead of unknown.
+          The artifact specified below is created when this module built.
+          But is also used to resolve classes in IntelliJ.
+          "phase" is set to "none" - with this setting, the artifact jar will not be
+          uploaded to repo
+          when running standalone "mvn install" command.
+          build-helper-maven-plugin can be removed completely with no effect on the 
+          "mvn clean" and "mvn install",
+          which is handled by maven-shade-plugin.
+        -->
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.4.0</version>
+        <executions>
+          <execution>
+            <id>workaround-makeItVisibleOnIntellij</id>
+            <phase>none</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
+                  <type>jar</type>
+                  <classifier>optional</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/dkpro-jwpl-revisionmachine/pom.xml b/dkpro-jwpl-revisionmachine/pom.xml
index f46ba28c..a72d4f87 100644
--- a/dkpro-jwpl-revisionmachine/pom.xml
+++ b/dkpro-jwpl-revisionmachine/pom.xml
@@ -38,6 +38,11 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -71,8 +76,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
+      <groupId>org.mariadb.jdbc</groupId>
+      <artifactId>mariadb-java-client</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/dkpro-jwpl-util/pom.xml b/dkpro-jwpl-util/pom.xml
index 14dd71bc..1f925a67 100644
--- a/dkpro-jwpl-util/pom.xml
+++ b/dkpro-jwpl-util/pom.xml
@@ -47,11 +47,6 @@
     <dependency>
       <groupId>com.googlecode.java-diff-utils</groupId>
       <artifactId>diffutils</artifactId>
-      <version>1.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.dkpro.jwpl</groupId>
@@ -80,6 +75,15 @@
       <groupId>org.sweble.wikitext</groupId>
       <artifactId>swc-parser-lazy</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/dkpro-jwpl-wikimachine/pom.xml b/dkpro-jwpl-wikimachine/pom.xml
index 08856596..b6b53fbe 100644
--- a/dkpro-jwpl-wikimachine/pom.xml
+++ b/dkpro-jwpl-wikimachine/pom.xml
@@ -28,10 +28,6 @@
   <name>WikiMachine</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
@@ -45,6 +41,10 @@
       <artifactId>dkpro-jwpl-mwdumper</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+    </dependency>
 
     <!-- logger dependencies -->
     <dependency>
diff --git a/pom.xml b/pom.xml
index 8c7be9fc..323366fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,35 @@
       <email>richard.eckart@googlemail.com</email>
     </developer>
   </developers>
+  
+  <dependencies>
+    <!-- Common test dependencies -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
   <dependencyManagement>
     <dependencies>
@@ -237,11 +266,21 @@
         <artifactId>commons-lang</artifactId>
         <version>2.6</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.persistence</groupId>
+        <artifactId>jakarta.persistence-api</artifactId>
+        <version>3.0.0</version>
+      </dependency>
       <dependency>
         <groupId>jakarta.xml.bind</groupId>
         <artifactId>jakarta.xml.bind-api</artifactId>
         <version>4.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.googlecode.java-diff-utils</groupId>
+        <artifactId>diffutils</artifactId>
+        <version>1.2.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -265,6 +304,53 @@
   </issueManagement>
 
   <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>analyze-only</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <failOnWarning>true</failOnWarning>
+          <ignoredUnusedDeclaredDependencies combine.children="append">
+            <!--
+              - Logging is used via reflection and cannot be detected by Maven
+            -->
+            <dependency>org.apache.logging.log4j:log4j-slf4j-impl</dependency>
+            <dependency>org.apache.logging.log4j:log4j-core</dependency>
+            <dependency>org.slf4j:log4j-over-slf4j</dependency>
+            <dependency>org.slf4j:jcl-over-slf4j</dependency>
+            <dependency>commons-logging:commons-logging</dependency>
+            <!--
+              - JAXB is used via reflection and cannot be detected by Maven
+            -->
+            <dependency>javax.xml.bind:jaxb-api</dependency>
+            <dependency>com.sun.xml.bind:jaxb-core</dependency>
+            <dependency>com.sun.xml.bind:jaxb-impl</dependency>
+            <dependency>javax.activation:javax.activation-api</dependency>
+            <!-- 
+              - Common test dependencies
+            -->
+            <dependency>org.hsqldb:hsqldb</dependency>
+            <dependency>org.mariadb.jdbc:mariadb-java-client</dependency>
+            <dependency>org.junit.jupiter:*</dependency>
+            <dependency>org.junit.platform:*</dependency>
+            <dependency>org.assertj:*</dependency>
+            <dependency>org.mockito:*</dependency>
+            <dependency>org.xmlunit:*</dependency>
+            <dependency>org.awaitility:awaitility</dependency>
+          </ignoredUnusedDeclaredDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+
     <pluginManagement>
       <plugins>
         <plugin>