diff --git a/artemis-boot/pom.xml b/artemis-boot/pom.xml
index aa19d222da..229a1a3e53 100644
--- a/artemis-boot/pom.xml
+++ b/artemis-boot/pom.xml
@@ -35,10 +35,6 @@
    </properties>
 
    <dependencies>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
diff --git a/artemis-cdi-client/pom.xml b/artemis-cdi-client/pom.xml
index babf3b6a04..f5e9ce9fcd 100644
--- a/artemis-cdi-client/pom.xml
+++ b/artemis-cdi-client/pom.xml
@@ -47,10 +47,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml
index 1f304a07d8..e92c2d4004 100644
--- a/artemis-cli/pom.xml
+++ b/artemis-cli/pom.xml
@@ -100,10 +100,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
index 32d08b202c..85493f1fa3 100644
--- a/artemis-commons/pom.xml
+++ b/artemis-commons/pom.xml
@@ -69,11 +69,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-         <scope>provided</scope>
-      </dependency>
       <dependency>
           <groupId>org.wildfly.common</groupId>
           <artifactId>wildfly-common</artifactId>
diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
index 0759351860..5e4f95006d 100644
--- a/artemis-core-client/pom.xml
+++ b/artemis-core-client/pom.xml
@@ -56,10 +56,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
           <groupId>org.wildfly.common</groupId>
           <artifactId>wildfly-common</artifactId>
diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml
index 45e1b2b57d..940b72480b 100644
--- a/artemis-dto/pom.xml
+++ b/artemis-dto/pom.xml
@@ -32,10 +32,6 @@
    </properties>
 
    <dependencies>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-commons</artifactId>
diff --git a/artemis-hawtio/activemq-branding/pom.xml b/artemis-hawtio/activemq-branding/pom.xml
index e1419d5a9c..b7c91f27d5 100644
--- a/artemis-hawtio/activemq-branding/pom.xml
+++ b/artemis-hawtio/activemq-branding/pom.xml
@@ -93,11 +93,6 @@
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
-
     </dependencies>
 
 
diff --git a/artemis-hawtio/artemis-plugin/pom.xml b/artemis-hawtio/artemis-plugin/pom.xml
index 80878f8088..aebba1d547 100644
--- a/artemis-hawtio/artemis-plugin/pom.xml
+++ b/artemis-hawtio/artemis-plugin/pom.xml
@@ -91,11 +91,6 @@
       <artifactId>slf4j-api</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-        <groupId>com.google.errorprone</groupId>
-        <artifactId>error_prone_core</artifactId>
-    </dependency>
-
   </dependencies>
 
 
diff --git a/artemis-jakarta-client/pom.xml b/artemis-jakarta-client/pom.xml
index 0fe90afded..dfb60e472d 100644
--- a/artemis-jakarta-client/pom.xml
+++ b/artemis-jakarta-client/pom.xml
@@ -39,10 +39,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-         <groupId>com.google.errorprone</groupId>
-         <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-core-client</artifactId>
diff --git a/artemis-jakarta-ra/pom.xml b/artemis-jakarta-ra/pom.xml
index be48b95cc8..8be9ecfb06 100644
--- a/artemis-jakarta-ra/pom.xml
+++ b/artemis-jakarta-ra/pom.xml
@@ -48,10 +48,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-         <groupId>com.google.errorprone</groupId>
-         <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-jakarta-server/pom.xml b/artemis-jakarta-server/pom.xml
index fbc3d31a11..09cac1c2f6 100644
--- a/artemis-jakarta-server/pom.xml
+++ b/artemis-jakarta-server/pom.xml
@@ -47,10 +47,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-jakarta-service-extensions/pom.xml b/artemis-jakarta-service-extensions/pom.xml
index bb84d34da2..f668816aec 100644
--- a/artemis-jakarta-service-extensions/pom.xml
+++ b/artemis-jakarta-service-extensions/pom.xml
@@ -65,10 +65,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logmanager</groupId>
          <artifactId>jboss-logmanager</artifactId>
diff --git a/artemis-jdbc-store/pom.xml b/artemis-jdbc-store/pom.xml
index 5ca637e9c5..cd74e6c740 100644
--- a/artemis-jdbc-store/pom.xml
+++ b/artemis-jdbc-store/pom.xml
@@ -40,10 +40,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-jms-client/pom.xml b/artemis-jms-client/pom.xml
index 47d1ce83b3..206fc2460e 100644
--- a/artemis-jms-client/pom.xml
+++ b/artemis-jms-client/pom.xml
@@ -38,10 +38,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-core-client</artifactId>
diff --git a/artemis-jms-server/pom.xml b/artemis-jms-server/pom.xml
index edddb8a102..05e721c55c 100644
--- a/artemis-jms-server/pom.xml
+++ b/artemis-jms-server/pom.xml
@@ -44,10 +44,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-journal/pom.xml b/artemis-journal/pom.xml
index 96131ff479..92798de109 100644
--- a/artemis-journal/pom.xml
+++ b/artemis-journal/pom.xml
@@ -44,12 +44,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-          <scope>provided</scope>
-          <optional>true</optional>
-      </dependency>
 
       <!--
           JBoss Logging
diff --git a/artemis-junit/pom.xml b/artemis-junit/pom.xml
index 4b70579de1..638660376c 100644
--- a/artemis-junit/pom.xml
+++ b/artemis-junit/pom.xml
@@ -38,12 +38,6 @@
          <artifactId>junit</artifactId>
          <scope>provided</scope>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
-      <!--
-      -->
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-maven-plugin/pom.xml b/artemis-maven-plugin/pom.xml
index 8a00362fe3..e3a4978719 100644
--- a/artemis-maven-plugin/pom.xml
+++ b/artemis-maven-plugin/pom.xml
@@ -78,10 +78,6 @@
          <version>3.4</version>
          <scope>provided</scope>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
    </dependencies>
 
    <build>
diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml
index 4f6120eabe..e9a87caf5b 100644
--- a/artemis-protocols/artemis-amqp-protocol/pom.xml
+++ b/artemis-protocols/artemis-amqp-protocol/pom.xml
@@ -59,10 +59,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
 
       <!--
           JBoss Logging
diff --git a/artemis-protocols/artemis-hornetq-protocol/pom.xml b/artemis-protocols/artemis-hornetq-protocol/pom.xml
index 550c18aec1..4bb4e52428 100644
--- a/artemis-protocols/artemis-hornetq-protocol/pom.xml
+++ b/artemis-protocols/artemis-hornetq-protocol/pom.xml
@@ -79,10 +79,6 @@
          <artifactId>junit</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
    </dependencies>
 
 </project>
diff --git a/artemis-protocols/artemis-hqclient-protocol/pom.xml b/artemis-protocols/artemis-hqclient-protocol/pom.xml
index d06d4f9103..82911992cc 100644
--- a/artemis-protocols/artemis-hqclient-protocol/pom.xml
+++ b/artemis-protocols/artemis-hqclient-protocol/pom.xml
@@ -46,10 +46,6 @@
          <groupId>org.osgi</groupId>
          <artifactId>osgi.cmpn</artifactId>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
    </dependencies>
 
    <build>
diff --git a/artemis-protocols/artemis-mqtt-protocol/pom.xml b/artemis-protocols/artemis-mqtt-protocol/pom.xml
index 2fda300d28..f83d39c50f 100644
--- a/artemis-protocols/artemis-mqtt-protocol/pom.xml
+++ b/artemis-protocols/artemis-mqtt-protocol/pom.xml
@@ -40,10 +40,6 @@
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-annotations</artifactId>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-protocols/artemis-openwire-protocol/pom.xml b/artemis-protocols/artemis-openwire-protocol/pom.xml
index ead480cf84..3987f77553 100644
--- a/artemis-protocols/artemis-openwire-protocol/pom.xml
+++ b/artemis-protocols/artemis-openwire-protocol/pom.xml
@@ -38,10 +38,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-protocols/artemis-stomp-protocol/pom.xml b/artemis-protocols/artemis-stomp-protocol/pom.xml
index e678242d7c..e0e36dc17d 100644
--- a/artemis-protocols/artemis-stomp-protocol/pom.xml
+++ b/artemis-protocols/artemis-stomp-protocol/pom.xml
@@ -44,10 +44,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-quorum-api/pom.xml b/artemis-quorum-api/pom.xml
index bffd93573a..ca7930a50c 100644
--- a/artemis-quorum-api/pom.xml
+++ b/artemis-quorum-api/pom.xml
@@ -31,10 +31,4 @@
       <activemq.basedir>${project.basedir}/..</activemq.basedir>
    </properties>
 
-   <dependencies>
-      <dependency>
-         <groupId>com.google.errorprone</groupId>
-         <artifactId>error_prone_core</artifactId>
-      </dependency>
-   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/artemis-quorum-ri/pom.xml b/artemis-quorum-ri/pom.xml
index 9a15f84aad..9d5a5d6788 100644
--- a/artemis-quorum-ri/pom.xml
+++ b/artemis-quorum-ri/pom.xml
@@ -74,10 +74,7 @@
          <artifactId>artemis-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>com.google.errorprone</groupId>
-         <artifactId>error_prone_core</artifactId>
-      </dependency>
+
       <!-- tests -->
       <dependency>
          <groupId>junit</groupId>
diff --git a/artemis-ra/pom.xml b/artemis-ra/pom.xml
index 26be8a6038..1ca019aea0 100644
--- a/artemis-ra/pom.xml
+++ b/artemis-ra/pom.xml
@@ -44,10 +44,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-rest/pom.xml b/artemis-rest/pom.xml
index 05fdfd0f5f..1bff2b13ba 100644
--- a/artemis-rest/pom.xml
+++ b/artemis-rest/pom.xml
@@ -48,10 +48,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml
index 3f6b4d0b4f..dc4d27d067 100644
--- a/artemis-selector/pom.xml
+++ b/artemis-selector/pom.xml
@@ -32,10 +32,6 @@
    </properties>
 
    <dependencies>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-commons</artifactId>
diff --git a/artemis-server-osgi/pom.xml b/artemis-server-osgi/pom.xml
index aadb1af9bf..dec42a0508 100644
--- a/artemis-server-osgi/pom.xml
+++ b/artemis-server-osgi/pom.xml
@@ -100,10 +100,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index 519ace3742..5e9043c12d 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -44,10 +44,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-         <groupId>com.google.errorprone</groupId>
-         <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>com.google.guava</groupId>
          <artifactId>guava</artifactId>
diff --git a/artemis-service-extensions/pom.xml b/artemis-service-extensions/pom.xml
index 40183c43a7..7710af6b97 100644
--- a/artemis-service-extensions/pom.xml
+++ b/artemis-service-extensions/pom.xml
@@ -63,10 +63,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logmanager</groupId>
          <artifactId>jboss-logmanager</artifactId>
diff --git a/artemis-web/pom.xml b/artemis-web/pom.xml
index e72b385300..af6bec6b3f 100644
--- a/artemis-web/pom.xml
+++ b/artemis-web/pom.xml
@@ -44,12 +44,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-          <scope>provided</scope>
-          <optional>true</optional>
-      </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/examples/pom.xml b/examples/pom.xml
index f891f10c5a..9f4edab3aa 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -60,19 +60,6 @@ under the License.
       </pluginRepository>
    </pluginRepositories>
 
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-               <compilerArgs combine.self="override">
-               </compilerArgs>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
-
    <profiles>
       <profile>
          <!-- specify -PnoServer if you don't want to start the servers on the tests -->
diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml
index dcfc9a433a..6a2310f4e2 100644
--- a/integration/activemq-spring-integration/pom.xml
+++ b/integration/activemq-spring-integration/pom.xml
@@ -48,10 +48,6 @@
          <groupId>org.springframework</groupId>
          <artifactId>spring-beans</artifactId>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
    </dependencies>
 
 </project>
diff --git a/pom.xml b/pom.xml
index a64e6d83df..5ca5d95b29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
       <jboss.logging.version>3.4.2.Final</jboss.logging.version>
       <jetty.version>9.4.44.v20210927</jetty.version>
       <jgroups.version>3.6.13.Final</jgroups.version>
-      <errorprone.version>2.9.0</errorprone.version>
+      <errorprone.version>2.10.0</errorprone.version>
       <maven.enforcer.plugin.version>3.0.0-M3</maven.enforcer.plugin.version>
       <maven.bundle.plugin.version>5.1.2</maven.bundle.plugin.version>
       <maven.shade.plugin.version>3.2.4</maven.shade.plugin.version>
@@ -390,7 +390,6 @@
              <artifactId>error_prone_core</artifactId>
              <version>${errorprone.version}</version>
              <scope>provided</scope>
-            <optional>true</optional>
          </dependency>
          <dependency>
             <groupId>org.springframework</groupId>
@@ -1008,6 +1007,12 @@
                   <name>errorprone</name>
               </property>
           </activation>
+          <dependencies>
+              <dependency>
+                  <groupId>com.google.errorprone</groupId>
+                  <artifactId>error_prone_core</artifactId>
+              </dependency>
+          </dependencies>
           <build>
               <plugins>
                   <plugin>
@@ -1034,6 +1039,12 @@
                   <name>errorprone</name>
               </property>
           </activation>
+          <dependencies>
+              <dependency>
+                  <groupId>com.google.errorprone</groupId>
+                  <artifactId>error_prone_core</artifactId>
+              </dependency>
+          </dependencies>
           <build>
               <plugins>
                   <plugin>
diff --git a/tests/artemis-test-support/pom.xml b/tests/artemis-test-support/pom.xml
index 5f8973600c..a0a811d44d 100644
--- a/tests/artemis-test-support/pom.xml
+++ b/tests/artemis-test-support/pom.xml
@@ -89,10 +89,6 @@
          <groupId>org.fusesource.hawtbuf</groupId>
          <artifactId>hawtbuf</artifactId>
       </dependency>
-      <dependency>
-         <groupId>com.google.errorprone</groupId>
-         <artifactId>error_prone_core</artifactId>
-      </dependency>
    </dependencies>
 
 </project>
diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml
index 43c1879e4b..1b13b0ac96 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -32,10 +32,6 @@
    </properties>
 
    <dependencies>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-server</artifactId>
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index 70eac22dfa..a1f1fc5d4f 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -41,10 +41,6 @@
    </properties>
 
    <dependencies>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.jboss.byteman</groupId>
          <artifactId>byteman</artifactId>
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index e937b54144..cd95d3b984 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -33,10 +33,6 @@
    </properties>
 
    <dependencies>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-server</artifactId>
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
index 26c637b9a8..c2d77952d0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
@@ -71,9 +71,10 @@ public abstract class StorageManagerTestBase extends ActiveMQTestBase {
 
    @Override
    @Before
+   @SuppressWarnings("unused")
    public void setUp() throws Exception {
       if (storeType == StoreConfiguration.StoreType.DATABASE) {
-         Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
+         Object unused = Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
       }
 
       super.setUp();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
index 19c2054911..9aec571d80 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
@@ -91,11 +91,12 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
 
    @Override
    @Before
+   @SuppressWarnings("unused")
    public void setUp() throws Exception {
       super.setUp();
 
       if (storeType == StoreConfiguration.StoreType.DATABASE) {
-         Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
+         Object unused = Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
       }
 
       addressSettings.clear();
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 0cfca96166..64825cc615 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -112,10 +112,6 @@
           <groupId>org.wildfly.common</groupId>
           <artifactId>wildfly-common</artifactId>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
    </dependencies>
 
    <build>
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index 04df465d3f..59d81fc7e8 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -102,10 +102,6 @@
           <groupId>org.wildfly.common</groupId>
           <artifactId>wildfly-common</artifactId>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
 
       <!-- The johnzon-core and json-api contents are repackaged in -commons,
            However maven can still need them during tests, which run against
diff --git a/tests/karaf-client-integration-tests/pom.xml b/tests/karaf-client-integration-tests/pom.xml
index 05d5debe7f..d9f0e8c1f0 100644
--- a/tests/karaf-client-integration-tests/pom.xml
+++ b/tests/karaf-client-integration-tests/pom.xml
@@ -36,10 +36,6 @@
    </properties>
 
    <dependencies>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>jakarta.jms</groupId>
          <artifactId>jakarta.jms-api</artifactId>
diff --git a/tests/performance-jmh/pom.xml b/tests/performance-jmh/pom.xml
index f04cc12360..675988a206 100644
--- a/tests/performance-jmh/pom.xml
+++ b/tests/performance-jmh/pom.xml
@@ -34,10 +34,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>artemis-core-client</artifactId>
diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml
index cd64f4b9f4..a846c00add 100644
--- a/tests/performance-tests/pom.xml
+++ b/tests/performance-tests/pom.xml
@@ -32,10 +32,6 @@
    </properties>
 
    <dependencies>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-core-client</artifactId>
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index 5622308470..bb574eca0d 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -91,10 +91,6 @@
          <scope>provided</scope>
          <optional>true</optional>
       </dependency>
-      <dependency>
-         <groupId>com.google.errorprone</groupId>
-         <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.apache.qpid</groupId>
          <artifactId>qpid-jms-client</artifactId>
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index 8847b3af35..98a51a6b58 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -33,10 +33,6 @@
    </properties>
 
    <dependencies>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-core-client</artifactId>
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index 64c8ab2a3f..1b1ce934c6 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -119,10 +119,6 @@
          <scope>test</scope>
          <type>test-jar</type>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
    </dependencies>
 
    <build>
diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml
index 9b29dfa453..d5d91f97b8 100644
--- a/tests/timing-tests/pom.xml
+++ b/tests/timing-tests/pom.xml
@@ -102,10 +102,6 @@
          <scope>test</scope>
          <type>test-jar</type>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
    </dependencies>
 
    <build>
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index fe6c3945a6..405eb14c81 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -170,11 +170,6 @@
          <version>${netty-tcnative-version}</version>
          <scope>test</scope>
       </dependency>
-      <dependency>
-          <groupId>com.google.errorprone</groupId>
-          <artifactId>error_prone_core</artifactId>
-      </dependency>
-
    </dependencies>
 
    <build>