diff --git a/build.gradle b/build.gradle
index 5470533eb4..22cd4ed27b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -264,10 +264,7 @@ subprojects {
       options.compilerArgs << "-Xlint:-rawtypes"
     options.compilerArgs << "-Xlint:-serial"
     options.compilerArgs << "-Xlint:-try"
-    // AutoMQ inject start
-    // TODO: remove me, when upgrade to 4.x
-//    options.compilerArgs << "-Werror"
-    // AutoMQ inject start
+    options.compilerArgs << "-Werror"
 
     // --release is the recommended way to select the target release, but it's only supported in Java 9 so we also
     // set --source and --target via `sourceCompatibility` and `targetCompatibility` a couple of lines below
diff --git a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientCallbackHandler.java
index fc27feb050..38fc16e005 100644
--- a/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientCallbackHandler.java
+++ b/clients/src/main/java/org/apache/kafka/common/security/authenticator/SaslClientCallbackHandler.java
@@ -53,6 +53,7 @@ public void configure(Map<String, ?> configs, String saslMechanism, List<AppConf
         this.mechanism  = saslMechanism;
     }
 
+    @SuppressWarnings("removal")
     @Override
     public void handle(Callback[] callbacks) throws UnsupportedCallbackException {
         Subject subject = Subject.getSubject(AccessController.getContext());
diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientCallbackHandler.java
index e4e845a8de..869922a0a3 100644
--- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientCallbackHandler.java
+++ b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/internals/OAuthBearerSaslClientCallbackHandler.java
@@ -75,6 +75,7 @@ public void configure(Map<String, ?> configs, String saslMechanism, List<AppConf
         configured = true;
     }
 
+    @SuppressWarnings("removal")
     @Override
     public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
         if (!configured())
@@ -94,6 +95,7 @@ public void close() {
         // empty
     }
 
+    @SuppressWarnings("removal")
     private void handleCallback(OAuthBearerTokenCallback callback) throws IOException {
         if (callback.token() != null)
             throw new IllegalArgumentException("Callback had a token already");
diff --git a/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapper.java b/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapper.java
index cae9e19ad2..dabc3e2c75 100644
--- a/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapper.java
+++ b/clients/src/main/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapper.java
@@ -320,6 +320,7 @@ public int getBasicConstraints() {
             return this.origCertificate.getBasicConstraints();
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public Principal getIssuerDN() {
             return this.origCertificate.getIssuerDN();
@@ -370,6 +371,7 @@ public byte[] getSignature() {
             return this.origCertificate.getSignature();
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public Principal getSubjectDN() {
             return this.origCertificate.getSubjectDN();
diff --git a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerSaslClientCallbackHandlerTest.java b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerSaslClientCallbackHandlerTest.java
index 98b9544a5b..3da3c61b6c 100644
--- a/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerSaslClientCallbackHandlerTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerSaslClientCallbackHandlerTest.java
@@ -76,6 +76,7 @@ public void testWithZeroTokens() {
         assertEquals(IOException.class, e.getCause().getClass());
     }
 
+    @SuppressWarnings("removal")
     @Test()
     public void testWithPotentiallyMultipleTokens() throws Exception {
         OAuthBearerSaslClientCallbackHandler handler = createCallbackHandler();
diff --git a/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java b/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java
index 85ddaf4917..2b4d566f75 100644
--- a/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java
@@ -66,6 +66,7 @@ public void setUpOnce() throws CertificateException, NoSuchAlgorithmException {
         chainWithValidAndInvalidEndCertificates = generateKeyChainIncludingCA(false, true, true, false);
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     void testNeverExpiringX509Certificate() throws Exception {
         final KeyPair keyPair = TestSslUtils.generateKeyPair("RSA");
diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java
index 2ec2399c5a..3f869831ee 100644
--- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java
+++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java
@@ -255,6 +255,7 @@ public class DistributedHerder extends AbstractHerder implements Runnable {
      * @param uponShutdown       any {@link AutoCloseable} objects that should be closed when this herder is {@link #stop() stopped},
      *                           after all services and resources owned by this herder are stopped
      */
+    @SuppressWarnings("this-escape")
     public DistributedHerder(DistributedConfig config,
                              Time time,
                              Worker worker,
@@ -272,6 +273,7 @@ public DistributedHerder(DistributedConfig config,
     }
 
     // visible for testing
+    @SuppressWarnings("this-escape")
     DistributedHerder(DistributedConfig config,
                       Worker worker,
                       String workerId,
diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/isolation/ClassLoaderFactory.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/isolation/ClassLoaderFactory.java
index 9de24f796d..43b71f51a1 100644
--- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/isolation/ClassLoaderFactory.java
+++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/isolation/ClassLoaderFactory.java
@@ -26,12 +26,14 @@
  */
 public class ClassLoaderFactory implements PluginClassLoaderFactory {
 
+    @SuppressWarnings("removal")
     public DelegatingClassLoader newDelegatingClassLoader(ClassLoader parent) {
         return AccessController.doPrivileged(
                 (PrivilegedAction<DelegatingClassLoader>) () -> new DelegatingClassLoader(parent)
         );
     }
 
+    @SuppressWarnings("removal")
     public PluginClassLoader newPluginClassLoader(URL pluginLocation, URL[] urls, ClassLoader parent) {
         return AccessController.doPrivileged(
                 (PrivilegedAction<PluginClassLoader>) () -> new PluginClassLoader(pluginLocation, urls, parent)
diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/isolation/PluginScanner.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/isolation/PluginScanner.java
index 9ca1e5aad9..b6dca716e8 100644
--- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/isolation/PluginScanner.java
+++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/isolation/PluginScanner.java
@@ -90,6 +90,7 @@ private PluginScanResult scanUrlsAndAddPlugins(PluginSource source) {
      */
     protected abstract PluginScanResult scanPlugins(PluginSource source);
 
+    @SuppressWarnings("removal")
     private void loadJdbcDrivers(final ClassLoader loader) {
         // Apply here what java.sql.DriverManager does to discover and register classes
         // implementing the java.sql.Driver interface.
diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java
index fa1f734c1c..94e3a152b0 100644
--- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java
+++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/runtime/MultiThreadedEventProcessor.java
@@ -91,6 +91,7 @@ public MultiThreadedEventProcessor(
      * @param time              The time.
      * @param eventAccumulator  The event accumulator.
      */
+    @SuppressWarnings("this-escape")
     public MultiThreadedEventProcessor(
         LogContext logContext,
         String threadPrefix,