diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1358b264..de889ab4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Set up Maven
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: 3.9.9
+          maven-version: 3.9.11
       - name: Build with Maven
         env:
           BROWSER: chrome-container
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 95fe8fb8..640de6af 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Set up Maven
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: 3.9.9
+          maven-version: 3.9.11
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
diff --git a/.github/workflows/update-badges.yml b/.github/workflows/update-badges.yml
index ea89aee9..5ae534ab 100644
--- a/.github/workflows/update-badges.yml
+++ b/.github/workflows/update-badges.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Set up Maven
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: 3.9.9
+          maven-version: 3.9.11
       - name: Build and test with Maven
         env:
           NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
diff --git a/pom.xml b/pom.xml
index b2ce9d12..e9e43dd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
     <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
     <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
     <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
-    <maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
+    <maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
     <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
     <maven-pmd-plugin.version>3.27.0</maven-pmd-plugin.version>
     <pmd.version>7.16.0</pmd.version>
@@ -87,7 +87,7 @@
     <spotbugs-maven-plugin.version>4.9.4.0</spotbugs-maven-plugin.version>
     <findsecbugs-plugin.version>1.14.0</findsecbugs-plugin.version>
     <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
-    <maven-pitest-plugin.version>1.20.2</maven-pitest-plugin.version>
+    <pitest-maven-plugin.version>1.20.2</pitest-maven-plugin.version>
     <pitest-junit5-plugin.version>1.2.3</pitest-junit5-plugin.version>
     <error-prone.version>2.41.0</error-prone.version>
     <nullaway.version>0.12.9</nullaway.version>
@@ -111,9 +111,6 @@
     <rewrite-static-analysis.version>2.15.0</rewrite-static-analysis.version>
     <rewrite-migrate-java.version>3.15.1</rewrite-migrate-java.version>
     <rewrite-recommendations.version>1.15.0</rewrite-recommendations.version>
-
-    <!-- Maven Surefire ArgLine -->
-    <argLine>-Djava.util.logging.config.file=logging.properties</argLine>
   </properties>
 
   <dependencyManagement>
@@ -353,6 +350,14 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${maven-surefire-plugin.version}</version>
+          <configuration>
+            <trimStackTrace>false</trimStackTrace> <!-- SUREFIRE-1798 -->
+            <excludes>
+              <exclude>**/*ITest.*</exclude>
+              <exclude>**/*ArchitectureRulesTest$*</exclude>
+            </excludes>
+            <argLine>@{argLine} -Djava.util.logging.config.file=logging.properties -javaagent:${org.mockito:mockito-core:jar}</argLine>
+          </configuration>
           <executions>
             <execution>
               <goals>
@@ -370,7 +375,7 @@
               <goals>
                 <goal>test</goal>
               </goals>
-              <id>architecture-tests</id>
+              <id>architecture-test</id>
               <phase>test</phase>
               <configuration>
                 <includes>
@@ -450,7 +455,7 @@
         <plugin>
           <groupId>org.pitest</groupId>
           <artifactId>pitest-maven</artifactId>
-          <version>${maven-pitest-plugin.version}</version>
+          <version>${pitest-maven-plugin.version}</version>
           <configuration>
             <outputFormats>XML,HTML</outputFormats>
             <excludedTestClasses>
@@ -903,19 +908,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <trimStackTrace>false</trimStackTrace>
-          <!-- SUREFIRE-1798 -->
-          <excludes>
-            <exclude>**/*ITest.*</exclude>
-            <exclude>**/*ArchitectureRulesTest$*</exclude>
-          </excludes>
-          <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-assertions-generator-maven-plugin</artifactId>
@@ -1070,6 +1062,7 @@
         <pmd.failOnViolation>false</pmd.failOnViolation>
         <spotbugs.failOnError>false</spotbugs.failOnError>
         <gpg.skip>true</gpg.skip>
+        <revapi.failBuildOnProblemsFound>false</revapi.failBuildOnProblemsFound>
       </properties>
     </profile>
     <profile>