diff --git a/instrumentation/benchmarks/pom.xml b/instrumentation/benchmarks/pom.xml
index cd7559942b..ab55dec57d 100644
--- a/instrumentation/benchmarks/pom.xml
+++ b/instrumentation/benchmarks/pom.xml
@@ -218,39 +218,24 @@
+
+ maven-compiler-plugin
+
+
+ default-compile
+ compile
+
+ compile
+
+
+
+ javac
+
+
+
+
+
+
-
-
-
- error-prone-off
-
-
- [1.8,10)
- false
-
-
-
-
- maven-compiler-plugin
-
-
- default-compile
- compile
-
- compile
-
-
- javac-with-errorprone
-
- -XepDisableAllChecks
-
-
-
-
-
-
-
-
-
diff --git a/instrumentation/kafka-clients/pom.xml b/instrumentation/kafka-clients/pom.xml
index 7c163549b5..7c74bc5704 100644
--- a/instrumentation/kafka-clients/pom.xml
+++ b/instrumentation/kafka-clients/pom.xml
@@ -15,6 +15,9 @@
1.8
java18
+
+ -Xep:MissingOverride:OFF
+
2.0.0
4.1.2
@@ -84,37 +87,4 @@
-
-
-
- error-prone-off
-
-
- [1.8,10)
- false
-
-
-
-
- maven-compiler-plugin
-
-
- default-compile
- compile
-
- compile
-
-
- javac-with-errorprone
-
- -Xep:MissingOverride:OFF
-
-
-
-
-
-
-
-
-
diff --git a/pom.xml b/pom.xml
index ab989df732..5b05e43e69 100755
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,10 @@
1.8
1.8
+
+
+ -XepDisableWarningsInGeneratedCode
+
2.10.4
2.7.7
@@ -596,10 +600,9 @@
- error-prone
+ error-prone-1.8
-
- [1.8,10)
+ 1.8
false
@@ -617,9 +620,8 @@
javac-with-errorprone
true
-
- -XepDisableWarningsInGeneratedCode
+ ${errorprone.args}
@@ -640,6 +642,44 @@
+
+ error-prone-9+
+
+ [9,)
+ false
+
+
+
+
+ maven-compiler-plugin
+
+
+
+ default-compile
+ compile
+
+ compile
+
+
+ true
+
+ -XDcompilePolicy=simple
+ -Xplugin:ErrorProne ${errorprone.args}
+
+
+
+ com.google.errorprone
+ error_prone_core
+ 2.3.1
+
+
+
+
+
+
+
+
+
release