This is an automated email from the ASF dual-hosted git repository.

junrao pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 45f932819e9 KAFKA-18864:remove the Evolving tag from stable public 
interfaces (#19036)
45f932819e9 is described below

commit 45f932819e9c61fea4b6dc39ec736f88b17f637d
Author: Xuan-Zhang Gong <[email protected]>
AuthorDate: Sat Mar 1 05:24:24 2025 +0800

    KAFKA-18864:remove the Evolving tag from stable public interfaces (#19036)
    
    The purpose of this PR is to remove the `@InterfaceStability.Evolving` from 
classes that were created over a year ago.
    
    Reviewers: Jun Rao <[email protected]>
---
 .../org/apache/kafka/clients/admin/AbortTransactionOptions.java  | 3 ---
 .../org/apache/kafka/clients/admin/AbortTransactionResult.java   | 4 ----
 .../org/apache/kafka/clients/admin/AbortTransactionSpec.java     | 2 --
 clients/src/main/java/org/apache/kafka/clients/admin/Admin.java  | 5 -----
 .../org/apache/kafka/clients/admin/AlterClientQuotasOptions.java | 5 -----
 .../org/apache/kafka/clients/admin/AlterClientQuotasResult.java  | 4 ----
 .../main/java/org/apache/kafka/clients/admin/AlterConfigOp.java  | 7 +------
 .../java/org/apache/kafka/clients/admin/AlterConfigsOptions.java | 5 -----
 .../java/org/apache/kafka/clients/admin/AlterConfigsResult.java  | 4 ----
 .../kafka/clients/admin/AlterConsumerGroupOffsetsOptions.java    | 5 -----
 .../kafka/clients/admin/AlterConsumerGroupOffsetsResult.java     | 4 ----
 .../kafka/clients/admin/AlterPartitionReassignmentsOptions.java  | 5 -----
 .../kafka/clients/admin/AlterPartitionReassignmentsResult.java   | 4 ----
 .../apache/kafka/clients/admin/AlterReplicaLogDirsOptions.java   | 3 ---
 .../apache/kafka/clients/admin/AlterReplicaLogDirsResult.java    | 2 --
 .../kafka/clients/admin/AlterUserScramCredentialsOptions.java    | 5 -----
 .../kafka/clients/admin/AlterUserScramCredentialsResult.java     | 4 ----
 .../apache/kafka/clients/admin/ClientMetricsResourceListing.java | 3 ---
 clients/src/main/java/org/apache/kafka/clients/admin/Config.java | 4 ----
 .../main/java/org/apache/kafka/clients/admin/ConfigEntry.java    | 5 -----
 .../java/org/apache/kafka/clients/admin/CreateAclsOptions.java   | 5 -----
 .../java/org/apache/kafka/clients/admin/CreateAclsResult.java    | 4 ----
 .../apache/kafka/clients/admin/CreateDelegationTokenOptions.java | 4 ----
 .../apache/kafka/clients/admin/CreateDelegationTokenResult.java  | 4 ----
 .../org/apache/kafka/clients/admin/CreatePartitionsOptions.java  | 5 -----
 .../org/apache/kafka/clients/admin/CreatePartitionsResult.java   | 4 ----
 .../java/org/apache/kafka/clients/admin/CreateTopicsOptions.java | 5 -----
 .../java/org/apache/kafka/clients/admin/CreateTopicsResult.java  | 4 ----
 .../java/org/apache/kafka/clients/admin/DeleteAclsOptions.java   | 5 -----
 .../java/org/apache/kafka/clients/admin/DeleteAclsResult.java    | 4 ----
 .../kafka/clients/admin/DeleteConsumerGroupOffsetsOptions.java   | 5 -----
 .../kafka/clients/admin/DeleteConsumerGroupOffsetsResult.java    | 4 ----
 .../apache/kafka/clients/admin/DeleteConsumerGroupsOptions.java  | 5 -----
 .../org/apache/kafka/clients/admin/DeleteRecordsOptions.java     | 5 -----
 .../java/org/apache/kafka/clients/admin/DeleteRecordsResult.java | 4 ----
 .../java/org/apache/kafka/clients/admin/DeleteTopicsOptions.java | 5 -----
 .../java/org/apache/kafka/clients/admin/DeleteTopicsResult.java  | 4 ----
 .../main/java/org/apache/kafka/clients/admin/DeletedRecords.java | 5 -----
 .../java/org/apache/kafka/clients/admin/DescribeAclsOptions.java | 4 ----
 .../java/org/apache/kafka/clients/admin/DescribeAclsResult.java  | 4 ----
 .../apache/kafka/clients/admin/DescribeClientQuotasOptions.java  | 4 ----
 .../apache/kafka/clients/admin/DescribeClientQuotasResult.java   | 4 ----
 .../org/apache/kafka/clients/admin/DescribeClusterOptions.java   | 5 -----
 .../org/apache/kafka/clients/admin/DescribeClusterResult.java    | 4 ----
 .../org/apache/kafka/clients/admin/DescribeConfigsOptions.java   | 5 -----
 .../org/apache/kafka/clients/admin/DescribeConfigsResult.java    | 4 ----
 .../kafka/clients/admin/DescribeConsumerGroupsOptions.java       | 6 +-----
 .../apache/kafka/clients/admin/DescribeConsumerGroupsResult.java | 5 -----
 .../kafka/clients/admin/DescribeDelegationTokenOptions.java      | 4 ----
 .../kafka/clients/admin/DescribeDelegationTokenResult.java       | 4 ----
 .../org/apache/kafka/clients/admin/DescribeFeaturesOptions.java  | 5 -----
 .../org/apache/kafka/clients/admin/DescribeLogDirsOptions.java   | 6 ------
 .../org/apache/kafka/clients/admin/DescribeLogDirsResult.java    | 5 -----
 .../org/apache/kafka/clients/admin/DescribeProducersOptions.java | 5 -----
 .../org/apache/kafka/clients/admin/DescribeProducersResult.java  | 2 --
 .../kafka/clients/admin/DescribeReplicaLogDirsOptions.java       | 5 -----
 .../apache/kafka/clients/admin/DescribeReplicaLogDirsResult.java | 5 -----
 .../org/apache/kafka/clients/admin/DescribeTopicsOptions.java    | 5 -----
 .../org/apache/kafka/clients/admin/DescribeTopicsResult.java     | 4 ----
 .../apache/kafka/clients/admin/DescribeTransactionsOptions.java  | 5 -----
 .../apache/kafka/clients/admin/DescribeTransactionsResult.java   | 2 --
 .../kafka/clients/admin/DescribeUserScramCredentialsOptions.java | 5 -----
 .../kafka/clients/admin/DescribeUserScramCredentialsResult.java  | 4 ----
 .../java/org/apache/kafka/clients/admin/ElectLeadersOptions.java | 2 --
 .../java/org/apache/kafka/clients/admin/ElectLeadersResult.java  | 2 --
 .../apache/kafka/clients/admin/ExpireDelegationTokenOptions.java | 5 -----
 .../apache/kafka/clients/admin/ExpireDelegationTokenResult.java  | 4 ----
 .../org/apache/kafka/clients/admin/FenceProducersOptions.java    | 5 -----
 .../org/apache/kafka/clients/admin/FenceProducersResult.java     | 4 ----
 .../java/org/apache/kafka/clients/admin/KafkaAdminClient.java    | 3 ---
 .../kafka/clients/admin/ListClientMetricsResourcesOptions.java   | 5 -----
 .../kafka/clients/admin/ListClientMetricsResourcesResult.java    | 3 ---
 .../kafka/clients/admin/ListConsumerGroupOffsetsOptions.java     | 5 -----
 .../kafka/clients/admin/ListConsumerGroupOffsetsResult.java      | 3 ---
 .../apache/kafka/clients/admin/ListConsumerGroupOffsetsSpec.java | 4 ----
 .../apache/kafka/clients/admin/ListConsumerGroupsOptions.java    | 4 ----
 .../org/apache/kafka/clients/admin/ListConsumerGroupsResult.java | 3 ---
 .../java/org/apache/kafka/clients/admin/ListOffsetsOptions.java  | 4 ----
 .../java/org/apache/kafka/clients/admin/ListOffsetsResult.java   | 4 ----
 .../kafka/clients/admin/ListPartitionReassignmentsOptions.java   | 5 -----
 .../java/org/apache/kafka/clients/admin/ListTopicsOptions.java   | 5 -----
 .../java/org/apache/kafka/clients/admin/ListTopicsResult.java    | 4 ----
 .../org/apache/kafka/clients/admin/ListTransactionsOptions.java  | 5 -----
 .../org/apache/kafka/clients/admin/ListTransactionsResult.java   | 3 ---
 .../main/java/org/apache/kafka/clients/admin/NewPartitions.java  | 5 -----
 .../java/org/apache/kafka/clients/admin/RecordsToDelete.java     | 5 -----
 .../clients/admin/RemoveMembersFromConsumerGroupOptions.java     | 5 -----
 .../apache/kafka/clients/admin/RenewDelegationTokenOptions.java  | 5 -----
 .../apache/kafka/clients/admin/RenewDelegationTokenResult.java   | 4 ----
 .../org/apache/kafka/clients/admin/TransactionDescription.java   | 2 --
 .../java/org/apache/kafka/clients/admin/TransactionListing.java  | 3 ---
 .../java/org/apache/kafka/clients/admin/TransactionState.java    | 3 ---
 .../org/apache/kafka/clients/admin/UnregisterBrokerOptions.java  | 5 -----
 .../org/apache/kafka/clients/admin/UpdateFeaturesOptions.java    | 5 -----
 clients/src/main/java/org/apache/kafka/common/ElectionType.java  | 5 -----
 .../java/org/apache/kafka/common/acl/AccessControlEntry.java     | 5 -----
 .../org/apache/kafka/common/acl/AccessControlEntryFilter.java    | 5 -----
 .../src/main/java/org/apache/kafka/common/acl/AclBinding.java    | 4 ----
 .../main/java/org/apache/kafka/common/acl/AclBindingFilter.java  | 4 ----
 .../src/main/java/org/apache/kafka/common/acl/AclOperation.java  | 4 ----
 .../main/java/org/apache/kafka/common/acl/AclPermissionType.java | 5 -----
 .../org/apache/kafka/common/annotation/InterfaceStability.java   | 1 -
 .../apache/kafka/common/errors/FencedMemberEpochException.java   | 3 ---
 .../apache/kafka/common/errors/StaleMemberEpochException.java    | 3 ---
 .../kafka/common/errors/UnreleasedInstanceIdException.java       | 3 ---
 .../apache/kafka/common/errors/UnsupportedAssignorException.java | 3 ---
 .../java/org/apache/kafka/common/metrics/MetricsContext.java     | 3 ---
 .../java/org/apache/kafka/common/metrics/MetricsReporter.java    | 2 --
 .../main/java/org/apache/kafka/common/resource/PatternType.java  | 3 ---
 .../src/main/java/org/apache/kafka/common/resource/Resource.java | 5 -----
 .../java/org/apache/kafka/common/resource/ResourcePattern.java   | 5 -----
 .../org/apache/kafka/common/resource/ResourcePatternFilter.java  | 5 -----
 .../main/java/org/apache/kafka/common/resource/ResourceType.java | 5 -----
 .../kafka/common/security/auth/SecurityProviderCreator.java      | 2 --
 .../kafka/common/security/oauthbearer/OAuthBearerToken.java      | 9 ---------
 .../common/security/oauthbearer/OAuthBearerTokenCallback.java    | 9 ---------
 .../security/oauthbearer/OAuthBearerValidatorCallback.java       | 9 ---------
 .../kafka/common/security/token/delegation/DelegationToken.java  | 3 ---
 .../kafka/common/security/token/delegation/TokenInformation.java | 2 --
 .../java/org/apache/kafka/server/authorizer/AclCreateResult.java | 2 --
 .../java/org/apache/kafka/server/authorizer/AclDeleteResult.java | 2 --
 .../src/main/java/org/apache/kafka/server/authorizer/Action.java | 2 --
 .../kafka/server/authorizer/AuthorizableRequestContext.java      | 2 --
 .../org/apache/kafka/server/authorizer/AuthorizationResult.java  | 3 ---
 .../main/java/org/apache/kafka/server/authorizer/Authorizer.java | 2 --
 .../org/apache/kafka/server/authorizer/AuthorizerServerInfo.java | 2 --
 .../java/org/apache/kafka/server/telemetry/ClientTelemetry.java  | 2 --
 .../apache/kafka/server/telemetry/ClientTelemetryPayload.java    | 2 --
 .../apache/kafka/server/telemetry/ClientTelemetryReceiver.java   | 2 --
 .../java/org/apache/kafka/connect/mirror/ReplicationPolicy.java  | 3 ---
 .../org/apache/kafka/connect/mirror/ConfigPropertyFilter.java    | 2 --
 .../main/java/org/apache/kafka/connect/mirror/GroupFilter.java   | 2 --
 .../main/java/org/apache/kafka/connect/mirror/TopicFilter.java   | 2 --
 .../src/main/java/org/apache/kafka/metadata/BrokerState.java     | 3 ---
 .../apache/kafka/server/log/remote/storage/LogSegmentData.java   | 5 +----
 .../kafka/server/log/remote/storage/RemoteLogMetadata.java       | 2 --
 .../server/log/remote/storage/RemoteLogMetadataManager.java      | 4 +---
 .../kafka/server/log/remote/storage/RemoteLogSegmentId.java      | 2 --
 .../server/log/remote/storage/RemoteLogSegmentMetadata.java      | 2 --
 .../log/remote/storage/RemoteLogSegmentMetadataUpdate.java       | 2 --
 .../kafka/server/log/remote/storage/RemoteLogSegmentState.java   | 3 ---
 .../server/log/remote/storage/RemotePartitionDeleteMetadata.java | 4 +---
 .../server/log/remote/storage/RemotePartitionDeleteState.java    | 5 +----
 .../kafka/server/log/remote/storage/RemoteStorageManager.java    | 4 +---
 144 files changed, 7 insertions(+), 565 deletions(-)

diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionOptions.java
index 52dc6b10bb9..26674e1ccc1 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionOptions.java
@@ -16,9 +16,6 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
[email protected]
 public class AbortTransactionOptions extends 
AbstractOptions<AbortTransactionOptions> {
 
     @Override
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionResult.java
index e16d2c390f9..602c4f96443 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionResult.java
@@ -18,16 +18,12 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Map;
 
 /**
  * The result of {@link Admin#abortTransaction(AbortTransactionSpec, 
AbortTransactionOptions)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class AbortTransactionResult {
     private final Map<TopicPartition, KafkaFuture<Void>> futures;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionSpec.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionSpec.java
index 9eb7057b6b8..6af55978726 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionSpec.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AbortTransactionSpec.java
@@ -17,11 +17,9 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Objects;
 
[email protected]
 public class AbortTransactionSpec {
     private final TopicPartition topicPartition;
     private final long producerId;
diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/Admin.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/Admin.java
index d7479b5ba1a..dcffef60d09 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/Admin.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/Admin.java
@@ -120,12 +120,7 @@ import java.util.Set;
  * The minimum broker version required is 0.10.0.0. Methods with stricter 
requirements will specify the minimum broker
  * version required.
  * <p>
- * This client was introduced in 0.11.0.0 and the API is still evolving. We 
will try to evolve the API in a compatible
- * manner, but we reserve the right to make breaking changes in minor 
releases, if necessary. We will update the
- * {@code InterfaceStability} annotation and this notice once the API is 
considered stable.
- * <p>
  */
[email protected]
 public interface Admin extends AutoCloseable {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterClientQuotasOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterClientQuotasOptions.java
index c005cb31ec1..027ccd1e9e0 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterClientQuotasOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterClientQuotasOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for {@link Admin#alterClientQuotas(Collection, 
AlterClientQuotasOptions)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class AlterClientQuotasOptions extends 
AbstractOptions<AlterClientQuotasOptions> {
 
     private boolean validateOnly = false;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterClientQuotasResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterClientQuotasResult.java
index 742ab390162..4906184b3c9 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterClientQuotasResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterClientQuotasResult.java
@@ -18,7 +18,6 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.quota.ClientQuotaEntity;
 
 import java.util.Collection;
@@ -26,10 +25,7 @@ import java.util.Map;
 
 /**
  * The result of the {@link Admin#alterClientQuotas(Collection, 
AlterClientQuotasOptions)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class AlterClientQuotasResult {
 
     private final Map<ClientQuotaEntity, KafkaFuture<Void>> futures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigOp.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigOp.java
index d2d2889a24b..48d5646764d 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigOp.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigOp.java
@@ -17,8 +17,6 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
@@ -27,11 +25,8 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
- * A class representing a alter configuration entry containing name, value and 
operation type.
- *
- * The API of this class is evolving, see {@link Admin} for details.
+ * A class representing an alter configuration entry containing name, value 
and operation type.
  */
[email protected]
 public class AlterConfigOp {
 
     public enum OpType {
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigsOptions.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigsOptions.java
index b2e85b9e813..31812bbfc16 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Map;
 
 /**
  * Options for {@link Admin#incrementalAlterConfigs(Map)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class AlterConfigsOptions extends AbstractOptions<AlterConfigsOptions> {
 
     private boolean validateOnly = false;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigsResult.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigsResult.java
index 11e264d6556..cd9279300de 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConfigsResult.java
@@ -18,17 +18,13 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.config.ConfigResource;
 
 import java.util.Map;
 
 /**
  * The result of the {@link Admin#incrementalAlterConfigs(Map, 
AlterConfigsOptions)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class AlterConfigsResult {
 
     private final Map<ConfigResource, KafkaFuture<Void>> futures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsOptions.java
index f630b4847c4..c2428b6430a 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsOptions.java
@@ -16,15 +16,10 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Map;
 
 /**
  * Options for the {@link AdminClient#alterConsumerGroupOffsets(String, Map, 
AlterConsumerGroupOffsetsOptions)} call.
- *
- * The API of this class is evolving, see {@link AdminClient} for details.
  */
[email protected]
 public class AlterConsumerGroupOffsetsOptions extends 
AbstractOptions<AlterConsumerGroupOffsetsOptions> {
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsResult.java
index 32e54de0a7f..0dc1bd14e18 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterConsumerGroupOffsetsResult.java
@@ -18,7 +18,6 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.internals.KafkaFutureImpl;
 import org.apache.kafka.common.protocol.Errors;
 
@@ -28,10 +27,7 @@ import java.util.stream.Collectors;
 
 /**
  * The result of the {@link AdminClient#alterConsumerGroupOffsets(String, 
Map)} call.
- *
- * The API of this class is evolving, see {@link AdminClient} for details.
  */
[email protected]
 public class AlterConsumerGroupOffsetsResult {
 
     private final KafkaFuture<Map<TopicPartition, Errors>> future;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterPartitionReassignmentsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterPartitionReassignmentsOptions.java
index bee9c70ab0b..166e90404c3 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterPartitionReassignmentsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterPartitionReassignmentsOptions.java
@@ -17,15 +17,10 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Map;
 
 /**
  * Options for {@link AdminClient#alterPartitionReassignments(Map, 
AlterPartitionReassignmentsOptions)}
- *
- * The API of this class is evolving. See {@link AdminClient} for details.
  */
[email protected]
 public class AlterPartitionReassignmentsOptions extends 
AbstractOptions<AlterPartitionReassignmentsOptions> {
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterPartitionReassignmentsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterPartitionReassignmentsResult.java
index e49d65a3d66..f918074af77 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterPartitionReassignmentsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterPartitionReassignmentsResult.java
@@ -19,16 +19,12 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Map;
 
 /**
  * The result of {@link AdminClient#alterPartitionReassignments(Map, 
AlterPartitionReassignmentsOptions)}.
- *
- * The API of this class is evolving. See {@link AdminClient} for details.
  */
[email protected]
 public class AlterPartitionReassignmentsResult {
     private final Map<TopicPartition, KafkaFuture<Void>> futures;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsOptions.java
index 02f2186b1f7..b6cca48ec8d 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsOptions.java
@@ -17,14 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Map;
 
 /**
  * Options for {@link Admin#alterReplicaLogDirs(Map, 
AlterReplicaLogDirsOptions)}.
  */
[email protected]
 public class AlterReplicaLogDirsOptions extends 
AbstractOptions<AlterReplicaLogDirsOptions> {
 
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsResult.java
index 3ceacd80136..6b6a98e20f6 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterReplicaLogDirsResult.java
@@ -18,7 +18,6 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartitionReplica;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.errors.ClusterAuthorizationException;
 import org.apache.kafka.common.errors.InvalidTopicException;
 import org.apache.kafka.common.errors.KafkaStorageException;
@@ -36,7 +35,6 @@ import java.util.concurrent.ExecutionException;
  * To retrieve the detailed result per specified {@link 
TopicPartitionReplica}, use {@link #values()}. To retrieve the
  * overall result only, use {@link #all()}.
  */
[email protected]
 public class AlterReplicaLogDirsResult {
     private final Map<TopicPartitionReplica, KafkaFuture<Void>> futures;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterUserScramCredentialsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterUserScramCredentialsOptions.java
index 23a0b0a4338..9ead2ee0912 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterUserScramCredentialsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterUserScramCredentialsOptions.java
@@ -17,15 +17,10 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.List;
 
 /**
  * Options for {@link AdminClient#alterUserScramCredentials(List, 
AlterUserScramCredentialsOptions)}
- *
- * The API of this class is evolving. See {@link AdminClient} for details.
  */
[email protected]
 public class AlterUserScramCredentialsOptions extends 
AbstractOptions<AlterUserScramCredentialsOptions> {
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterUserScramCredentialsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterUserScramCredentialsResult.java
index 770e7a79885..d61d3958863 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/AlterUserScramCredentialsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/AlterUserScramCredentialsResult.java
@@ -18,7 +18,6 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collections;
 import java.util.List;
@@ -27,10 +26,7 @@ import java.util.Objects;
 
 /**
  * The result of the {@link Admin#alterUserScramCredentials(List)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class AlterUserScramCredentialsResult {
     private final Map<String, KafkaFuture<Void>> futures;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ClientMetricsResourceListing.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ClientMetricsResourceListing.java
index 873175db34c..b5c85b58732 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ClientMetricsResourceListing.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ClientMetricsResourceListing.java
@@ -16,11 +16,8 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Objects;
 
[email protected]
 public class ClientMetricsResourceListing {
     private final String name;
 
diff --git a/clients/src/main/java/org/apache/kafka/clients/admin/Config.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/Config.java
index ae7c03a5d66..59f6f12e266 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/Config.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/Config.java
@@ -17,8 +17,6 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -27,9 +25,7 @@ import java.util.Map;
 /**
  * A configuration object containing the configuration entries for a resource.
  * <p>
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class Config {
 
     private final Map<String, ConfigEntry> entries = new HashMap<>();
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ConfigEntry.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/ConfigEntry.java
index 18b3bb41f8a..cde99ffb852 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/ConfigEntry.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/ConfigEntry.java
@@ -17,18 +17,13 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
 /**
  * A class representing a configuration entry containing name, value and 
additional metadata.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ConfigEntry {
 
     private final String name;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateAclsOptions.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateAclsOptions.java
index ad4ae74ff26..e9f771ebd9f 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateAclsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateAclsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for {@link Admin#createAcls(Collection)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class CreateAclsOptions extends AbstractOptions<CreateAclsOptions> {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateAclsResult.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateAclsResult.java
index 6631cb1c49f..de57fbb8911 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/CreateAclsResult.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/CreateAclsResult.java
@@ -19,17 +19,13 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.acl.AclBinding;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 import java.util.Map;
 
 /**
  * The result of the {@link Admin#createAcls(Collection)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class CreateAclsResult {
     private final Map<AclBinding, KafkaFuture<Void>> futures;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenOptions.java
index 8e5c24aa6fc..f7ef1d4619d 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenOptions.java
@@ -17,7 +17,6 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.security.auth.KafkaPrincipal;
 
 import java.util.LinkedList;
@@ -26,10 +25,7 @@ import java.util.Optional;
 
 /**
  * Options for {@link 
Admin#createDelegationToken(CreateDelegationTokenOptions)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class CreateDelegationTokenOptions extends 
AbstractOptions<CreateDelegationTokenOptions> {
     private long maxLifetimeMs = -1;
     private List<KafkaPrincipal> renewers =  new LinkedList<>();
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenResult.java
index 7aa48049226..b8b1a5694f6 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateDelegationTokenResult.java
@@ -18,15 +18,11 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.security.token.delegation.DelegationToken;
 
 /**
  * The result of the {@link 
KafkaAdminClient#createDelegationToken(CreateDelegationTokenOptions)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class CreateDelegationTokenResult {
     private final KafkaFuture<DelegationToken> delegationToken;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreatePartitionsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreatePartitionsOptions.java
index 5a183bd3dfd..ccdbe6d52ca 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreatePartitionsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreatePartitionsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Map;
 
 /**
  * Options for {@link Admin#createPartitions(Map)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class CreatePartitionsOptions extends 
AbstractOptions<CreatePartitionsOptions> {
 
     private boolean validateOnly = false;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreatePartitionsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreatePartitionsResult.java
index aa68976d95f..21d26a62467 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreatePartitionsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreatePartitionsResult.java
@@ -18,16 +18,12 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Map;
 
 /**
  * The result of the {@link Admin#createPartitions(Map)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class CreatePartitionsResult {
 
     private final Map<String, KafkaFuture<Void>> values;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsOptions.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsOptions.java
index c897f03ca08..c81f6e41a90 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for {@link Admin#createTopics(Collection)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class CreateTopicsOptions extends AbstractOptions<CreateTopicsOptions> {
 
     private boolean validateOnly = false;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsResult.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsResult.java
index 8b335bf1bce..6cf794c65ee 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/CreateTopicsResult.java
@@ -18,7 +18,6 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.Uuid;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.errors.ApiException;
 
 import java.util.Collection;
@@ -27,10 +26,7 @@ import java.util.stream.Collectors;
 
 /**
  * The result of {@link Admin#createTopics(Collection)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class CreateTopicsResult {
     static final int UNKNOWN = -1;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteAclsOptions.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteAclsOptions.java
index 7c250e10b3e..59d5ce2bb19 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteAclsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteAclsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for the {@link Admin#deleteAcls(Collection)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DeleteAclsOptions extends AbstractOptions<DeleteAclsOptions> {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteAclsResult.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteAclsResult.java
index 2428a6c9a35..db43ac3f047 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteAclsResult.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteAclsResult.java
@@ -21,7 +21,6 @@ import org.apache.kafka.common.KafkaException;
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.acl.AclBinding;
 import org.apache.kafka.common.acl.AclBindingFilter;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.errors.ApiException;
 
 import java.util.ArrayList;
@@ -31,10 +30,7 @@ import java.util.Map;
 
 /**
  * The result of the {@link Admin#deleteAcls(Collection)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DeleteAclsResult {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsOptions.java
index 74aadea29ca..014b9fa9d4f 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsOptions.java
@@ -16,16 +16,11 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Set;
 
 /**
  * Options for the {@link Admin#deleteConsumerGroupOffsets(String, Set)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DeleteConsumerGroupOffsetsOptions extends 
AbstractOptions<DeleteConsumerGroupOffsetsOptions> {
 
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResult.java
index 238dfe56234..80aaeb2a4bc 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupOffsetsResult.java
@@ -18,7 +18,6 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.internals.KafkaFutureImpl;
 import org.apache.kafka.common.protocol.Errors;
 
@@ -27,10 +26,7 @@ import java.util.Set;
 
 /**
  * The result of the {@link Admin#deleteConsumerGroupOffsets(String, Set)} 
call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DeleteConsumerGroupOffsetsResult {
     private final KafkaFuture<Map<TopicPartition, Errors>> future;
     private final Set<TopicPartition> partitions;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupsOptions.java
index 081aeab6e75..b8bc1ecba74 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteConsumerGroupsOptions.java
@@ -16,16 +16,11 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for the {@link Admin#deleteConsumerGroups(Collection)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DeleteConsumerGroupsOptions extends 
AbstractOptions<DeleteConsumerGroupsOptions> {
 
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteRecordsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteRecordsOptions.java
index 34af759559a..320d3d8cb6c 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteRecordsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteRecordsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Map;
 
 /**
  * Options for {@link Admin#deleteRecords(Map, DeleteRecordsOptions)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DeleteRecordsOptions extends 
AbstractOptions<DeleteRecordsOptions> {
 
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteRecordsResult.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteRecordsResult.java
index 2217e7244bd..061403eeb16 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteRecordsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteRecordsResult.java
@@ -19,16 +19,12 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Map;
 
 /**
  * The result of the {@link Admin#deleteRecords(Map)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DeleteRecordsResult {
 
     private final Map<TopicPartition, KafkaFuture<DeletedRecords>> futures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteTopicsOptions.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteTopicsOptions.java
index 2711aff5c9c..6f5e9f069e0 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteTopicsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteTopicsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for {@link Admin#deleteTopics(Collection)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DeleteTopicsOptions extends AbstractOptions<DeleteTopicsOptions> {
 
     private boolean retryOnQuotaViolation = true;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteTopicsResult.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteTopicsResult.java
index b058ebd42ee..eefdbdf9da1 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeleteTopicsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeleteTopicsResult.java
@@ -20,17 +20,13 @@ package org.apache.kafka.clients.admin;
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicCollection;
 import org.apache.kafka.common.Uuid;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 import java.util.Map;
 
 /**
  * The result of the {@link Admin#deleteTopics(Collection)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DeleteTopicsResult {
     private final Map<Uuid, KafkaFuture<Void>> topicIdFutures;
     private final Map<String, KafkaFuture<Void>> nameFutures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DeletedRecords.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/DeletedRecords.java
index 983ae288c92..97d83a77758 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/DeletedRecords.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/DeletedRecords.java
@@ -17,14 +17,9 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 /**
  * Represents information about deleted records
- *
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public class DeletedRecords {
 
     private final long lowWatermark;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeAclsOptions.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeAclsOptions.java
index e44d58473df..f310b6bb73b 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeAclsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeAclsOptions.java
@@ -18,14 +18,10 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.acl.AclBindingFilter;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 /**
  * Options for {@link Admin#describeAcls(AclBindingFilter)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeAclsOptions extends AbstractOptions<DescribeAclsOptions> {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeAclsResult.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeAclsResult.java
index fb16222487f..df86515d3ba 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeAclsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeAclsResult.java
@@ -20,16 +20,12 @@ package org.apache.kafka.clients.admin;
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.acl.AclBinding;
 import org.apache.kafka.common.acl.AclBindingFilter;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 
 /**
  * The result of the {@link KafkaAdminClient#describeAcls(AclBindingFilter)} 
call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeAclsResult {
     private final KafkaFuture<Collection<AclBinding>> future;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClientQuotasOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClientQuotasOptions.java
index c3bdc7b3ffb..9030378e222 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClientQuotasOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClientQuotasOptions.java
@@ -17,14 +17,10 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.quota.ClientQuotaFilter;
 
 /**
  * Options for {@link Admin#describeClientQuotas(ClientQuotaFilter, 
DescribeClientQuotasOptions)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeClientQuotasOptions extends 
AbstractOptions<DescribeClientQuotasOptions> {
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClientQuotasResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClientQuotasResult.java
index 0e41bc7f78e..192918a414f 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClientQuotasResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClientQuotasResult.java
@@ -18,7 +18,6 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.quota.ClientQuotaEntity;
 import org.apache.kafka.common.quota.ClientQuotaFilter;
 
@@ -26,10 +25,7 @@ import java.util.Map;
 
 /**
  * The result of the {@link Admin#describeClientQuotas(ClientQuotaFilter, 
DescribeClientQuotasOptions)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeClientQuotasResult {
 
     private final KafkaFuture<Map<ClientQuotaEntity, Map<String, Double>>> 
entities;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClusterOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClusterOptions.java
index a6ef6f7f0f3..b62cefcdb44 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClusterOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClusterOptions.java
@@ -17,14 +17,9 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 /**
  * Options for {@link Admin#describeCluster()}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeClusterOptions extends 
AbstractOptions<DescribeClusterOptions> {
 
     private boolean includeAuthorizedOperations;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClusterResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClusterResult.java
index d307d255fe2..3113608a007 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClusterResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeClusterResult.java
@@ -20,17 +20,13 @@ package org.apache.kafka.clients.admin;
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.Node;
 import org.apache.kafka.common.acl.AclOperation;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 import java.util.Set;
 
 /**
  * The result of the {@link KafkaAdminClient#describeCluster()} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeClusterResult {
     private final KafkaFuture<Collection<Node>> nodes;
     private final KafkaFuture<Node> controller;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConfigsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConfigsOptions.java
index bfb9c18b022..6586b1ff84d 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConfigsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConfigsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for {@link Admin#describeConfigs(Collection)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeConfigsOptions extends 
AbstractOptions<DescribeConfigsOptions> {
 
     private boolean includeSynonyms = false;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConfigsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConfigsResult.java
index e81a5eb3187..72cdaf098a3 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConfigsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConfigsResult.java
@@ -18,7 +18,6 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.config.ConfigResource;
 
 import java.util.Collection;
@@ -28,10 +27,7 @@ import java.util.concurrent.ExecutionException;
 
 /**
  * The result of the {@link KafkaAdminClient#describeConfigs(Collection)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeConfigsResult {
 
     private final Map<ConfigResource, KafkaFuture<Config>> futures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConsumerGroupsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConsumerGroupsOptions.java
index 70238a8b1d5..574a8f07fa6 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConsumerGroupsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConsumerGroupsOptions.java
@@ -17,16 +17,12 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for {@link Admin#describeConsumerGroups(Collection, 
DescribeConsumerGroupsOptions)}.
  * <p>
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeConsumerGroupsOptions extends 
AbstractOptions<DescribeConsumerGroupsOptions> {
     private boolean includeAuthorizedOperations;
 
@@ -38,4 +34,4 @@ public class DescribeConsumerGroupsOptions extends 
AbstractOptions<DescribeConsu
     public boolean includeAuthorizedOperations() {
         return includeAuthorizedOperations;
     }
-}
\ No newline at end of file
+}
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConsumerGroupsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConsumerGroupsResult.java
index dd5a2f5d4db..f01a6c7b814 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConsumerGroupsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeConsumerGroupsResult.java
@@ -18,20 +18,15 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-
 /**
  * The result of the {@link 
KafkaAdminClient#describeConsumerGroups(Collection, 
DescribeConsumerGroupsOptions)}} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeConsumerGroupsResult {
 
     private final Map<String, KafkaFuture<ConsumerGroupDescription>> futures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenOptions.java
index fd57ad45f23..52fad07eae6 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenOptions.java
@@ -17,17 +17,13 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.security.auth.KafkaPrincipal;
 
 import java.util.List;
 
 /**
  * Options for {@link 
Admin#describeDelegationToken(DescribeDelegationTokenOptions)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeDelegationTokenOptions extends 
AbstractOptions<DescribeDelegationTokenOptions> {
     private List<KafkaPrincipal> owners;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenResult.java
index 0c856933c86..01355c0385f 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeDelegationTokenResult.java
@@ -18,17 +18,13 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.security.token.delegation.DelegationToken;
 
 import java.util.List;
 
 /**
  * The result of the {@link 
KafkaAdminClient#describeDelegationToken(DescribeDelegationTokenOptions)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeDelegationTokenResult {
     private final KafkaFuture<List<DelegationToken>> delegationTokens;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeFeaturesOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeFeaturesOptions.java
index a51ca74eb64..7b477c1bc0d 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeFeaturesOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeFeaturesOptions.java
@@ -16,13 +16,8 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 /**
  * Options for {@link AdminClient#describeFeatures(DescribeFeaturesOptions)}.
- *
- * The API of this class is evolving. See {@link Admin} for details.
  */
[email protected]
 public class DescribeFeaturesOptions extends 
AbstractOptions<DescribeFeaturesOptions> {
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsOptions.java
index 17890cad300..41cbf3f6d9c 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsOptions.java
@@ -17,17 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
-
 /**
  * Options for {@link Admin#describeLogDirs(Collection)}
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeLogDirsOptions extends 
AbstractOptions<DescribeLogDirsOptions> {
 
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsResult.java
index faab52bf22c..cd2e37d7c86 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeLogDirsResult.java
@@ -18,20 +18,15 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-
 /**
  * The result of the {@link Admin#describeLogDirs(Collection)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeLogDirsResult {
     private final Map<Integer, KafkaFuture<Map<String, LogDirDescription>>> 
futures;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeProducersOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeProducersOptions.java
index 0776e401bbc..6ce4680f986 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeProducersOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeProducersOptions.java
@@ -16,18 +16,13 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 import java.util.Objects;
 import java.util.OptionalInt;
 
 /**
  * Options for {@link Admin#describeProducers(Collection)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeProducersOptions extends 
AbstractOptions<DescribeProducersOptions> {
     private OptionalInt brokerId = OptionalInt.empty();
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeProducersResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeProducersResult.java
index ecf4b246bfa..597c59b8fff 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeProducersResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeProducersResult.java
@@ -19,14 +19,12 @@ package org.apache.kafka.clients.admin;
 import org.apache.kafka.common.KafkaException;
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
[email protected]
 public class DescribeProducersResult {
 
     private final Map<TopicPartition, KafkaFuture<PartitionProducerState>> 
futures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsOptions.java
index 00accc2e99f..62b665658ad 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for {@link Admin#describeReplicaLogDirs(Collection)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeReplicaLogDirsOptions extends 
AbstractOptions<DescribeReplicaLogDirsOptions> {
 
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsResult.java
index 61d94889e72..8e01bf80a91 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeReplicaLogDirsResult.java
@@ -18,7 +18,6 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartitionReplica;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.requests.DescribeLogDirsResponse;
 
 import java.util.Collection;
@@ -26,13 +25,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-
 /**
  * The result of {@link Admin#describeReplicaLogDirs(Collection)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeReplicaLogDirsResult {
     private final Map<TopicPartitionReplica, KafkaFuture<ReplicaLogDirInfo>> 
futures;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTopicsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTopicsOptions.java
index e73f12082d4..831e4297fef 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTopicsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTopicsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for {@link Admin#describeTopics(Collection)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeTopicsOptions extends 
AbstractOptions<DescribeTopicsOptions> {
 
     private boolean includeAuthorizedOperations;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTopicsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTopicsResult.java
index af4f858699d..300b67f9082 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTopicsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTopicsResult.java
@@ -20,7 +20,6 @@ package org.apache.kafka.clients.admin;
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicCollection;
 import org.apache.kafka.common.Uuid;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -29,10 +28,7 @@ import java.util.concurrent.ExecutionException;
 
 /**
  * The result of the {@link KafkaAdminClient#describeTopics(Collection)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeTopicsResult {
     private final Map<Uuid, KafkaFuture<TopicDescription>> topicIdFutures;
     private final Map<String, KafkaFuture<TopicDescription>> nameFutures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTransactionsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTransactionsOptions.java
index 47beb7f343c..9f3bd39b8fe 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTransactionsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTransactionsOptions.java
@@ -16,16 +16,11 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for {@link Admin#describeTransactions(Collection)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeTransactionsOptions extends 
AbstractOptions<DescribeTransactionsOptions> {
 
     @Override
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTransactionsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTransactionsResult.java
index 0b9fc1edb60..316c5e1c6d4 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTransactionsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeTransactionsResult.java
@@ -18,14 +18,12 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.clients.admin.internals.CoordinatorKey;
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
[email protected]
 public class DescribeTransactionsResult {
     private final Map<CoordinatorKey, KafkaFuture<TransactionDescription>> 
futures;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsOptions.java
index 1d1af47288c..34177fd7d23 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsOptions.java
@@ -17,15 +17,10 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.List;
 
 /**
  * Options for {@link AdminClient#describeUserScramCredentials(List, 
DescribeUserScramCredentialsOptions)}
- *
- * The API of this class is evolving. See {@link AdminClient} for details.
  */
[email protected]
 public class DescribeUserScramCredentialsOptions extends 
AbstractOptions<DescribeUserScramCredentialsOptions> {
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsResult.java
index f13fd2a8e7d..5a2f55c544f 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/DescribeUserScramCredentialsResult.java
@@ -18,7 +18,6 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.errors.ResourceNotFoundException;
 import org.apache.kafka.common.internals.KafkaFutureImpl;
 import 
org.apache.kafka.common.message.DescribeUserScramCredentialsResponseData;
@@ -33,10 +32,7 @@ import java.util.stream.Collectors;
 
 /**
  * The result of the {@link Admin#describeUserScramCredentials()} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class DescribeUserScramCredentialsResult {
     private final KafkaFuture<DescribeUserScramCredentialsResponseData> 
dataFuture;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersOptions.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersOptions.java
index afb41bbbf94..ccdc0853d98 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersOptions.java
@@ -18,7 +18,6 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.ElectionType;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Set;
 
@@ -27,6 +26,5 @@ import java.util.Set;
  *
  * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public final class ElectLeadersOptions extends 
AbstractOptions<ElectLeadersOptions> {
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersResult.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersResult.java
index 4b050d652c2..f568d78c668 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ElectLeadersResult.java
@@ -21,7 +21,6 @@ package org.apache.kafka.clients.admin;
 import org.apache.kafka.common.ElectionType;
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.internals.KafkaFutureImpl;
 
 import java.util.Map;
@@ -33,7 +32,6 @@ import java.util.Set;
  *
  * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public final class ElectLeadersResult {
     private final KafkaFuture<Map<TopicPartition, Optional<Throwable>>> 
electionFuture;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ExpireDelegationTokenOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ExpireDelegationTokenOptions.java
index a3f1462f628..17dfbf4f514 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ExpireDelegationTokenOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ExpireDelegationTokenOptions.java
@@ -17,14 +17,9 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 /**
  * Options for {@link Admin#expireDelegationToken(byte[], 
ExpireDelegationTokenOptions)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ExpireDelegationTokenOptions extends 
AbstractOptions<ExpireDelegationTokenOptions> {
     private long expiryTimePeriodMs = -1L;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ExpireDelegationTokenResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ExpireDelegationTokenResult.java
index 59b17140ae7..aefeb9a9139 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ExpireDelegationTokenResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ExpireDelegationTokenResult.java
@@ -18,14 +18,10 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 /**
  * The result of the {@link KafkaAdminClient#expireDelegationToken(byte[], 
ExpireDelegationTokenOptions)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ExpireDelegationTokenResult {
     private final KafkaFuture<Long> expiryTimestamp;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/FenceProducersOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/FenceProducersOptions.java
index 4e38281809b..fe9df10f20d 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/FenceProducersOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/FenceProducersOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 
 /**
  * Options for {@link Admin#fenceProducers(Collection, FenceProducersOptions)}
- *
- * The API of this class is evolving. See {@link Admin} for details.
  */
[email protected]
 public class FenceProducersOptions extends 
AbstractOptions<FenceProducersOptions> {
 
     @Override
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/FenceProducersResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/FenceProducersResult.java
index aef7bdeeda1..c1954f308ac 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/FenceProducersResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/FenceProducersResult.java
@@ -19,7 +19,6 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.clients.admin.internals.CoordinatorKey;
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.utils.ProducerIdAndEpoch;
 
 import java.util.Collection;
@@ -28,10 +27,7 @@ import java.util.stream.Collectors;
 
 /**
  * The result of the {@link Admin#fenceProducers(Collection)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class FenceProducersResult {
 
     private final Map<CoordinatorKey, KafkaFuture<ProducerIdAndEpoch>> futures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
index 3b31efec17a..7737625078d 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
@@ -85,7 +85,6 @@ import org.apache.kafka.common.Uuid;
 import org.apache.kafka.common.acl.AclBinding;
 import org.apache.kafka.common.acl.AclBindingFilter;
 import org.apache.kafka.common.acl.AclOperation;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.config.ConfigException;
 import org.apache.kafka.common.config.ConfigResource;
 import org.apache.kafka.common.errors.ApiException;
@@ -313,9 +312,7 @@ import static 
org.apache.kafka.common.utils.Utils.closeQuietly;
  * <p>
  * This class is thread-safe.
  * </p>
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class KafkaAdminClient extends AdminClient {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListClientMetricsResourcesOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListClientMetricsResourcesOptions.java
index ca45c58bde1..7b6dbf302c6 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListClientMetricsResourcesOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListClientMetricsResourcesOptions.java
@@ -17,13 +17,8 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 /**
  * Options for {@link Admin#listClientMetricsResources()}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListClientMetricsResourcesOptions extends 
AbstractOptions<ListClientMetricsResourcesOptions> {
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListClientMetricsResourcesResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListClientMetricsResourcesResult.java
index b939a2c5e21..4a63e31c238 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListClientMetricsResourcesResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListClientMetricsResourcesResult.java
@@ -18,7 +18,6 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.internals.KafkaFutureImpl;
 
 import java.util.Collection;
@@ -26,9 +25,7 @@ import java.util.Collection;
 /**
  * The result of the {@link Admin#listClientMetricsResources()} call.
  * <p>
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListClientMetricsResourcesResult {
     private final KafkaFuture<Collection<ClientMetricsResourceListing>> future;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsOptions.java
index 936f4a82a9a..0a9aeddfded 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsOptions.java
@@ -17,15 +17,10 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
-
 /**
  * Options for {@link Admin#listConsumerGroupOffsets(java.util.Map)} and 
{@link Admin#listConsumerGroupOffsets(String)}.
  * <p>
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListConsumerGroupOffsetsOptions extends 
AbstractOptions<ListConsumerGroupOffsetsOptions> {
 
     private boolean requireStable = false;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsResult.java
index ea774cd7108..13797d1e9bb 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsResult.java
@@ -21,7 +21,6 @@ import 
org.apache.kafka.clients.admin.internals.CoordinatorKey;
 import org.apache.kafka.clients.consumer.OffsetAndMetadata;
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,9 +32,7 @@ import java.util.stream.Collectors;
  * The result of the {@link Admin#listConsumerGroupOffsets(Map)} and
  * {@link Admin#listConsumerGroupOffsets(String)} call.
  * <p>
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListConsumerGroupOffsetsResult {
 
     final Map<String, KafkaFuture<Map<TopicPartition, OffsetAndMetadata>>> 
futures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsSpec.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsSpec.java
index 83858e49c81..f2b92627611 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsSpec.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupOffsetsSpec.java
@@ -18,17 +18,13 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 import java.util.Objects;
 
 /**
  * Specification of consumer group offsets to list using {@link 
Admin#listConsumerGroupOffsets(java.util.Map)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListConsumerGroupOffsetsSpec {
 
     private Collection<TopicPartition> topicPartitions;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsOptions.java
index b63ad77c59a..52828cb16e2 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsOptions.java
@@ -20,7 +20,6 @@ package org.apache.kafka.clients.admin;
 import org.apache.kafka.common.ConsumerGroupState;
 import org.apache.kafka.common.GroupState;
 import org.apache.kafka.common.GroupType;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -29,10 +28,7 @@ import java.util.stream.Collectors;
 
 /**
  * Options for {@link Admin#listConsumerGroups()}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListConsumerGroupsOptions extends 
AbstractOptions<ListConsumerGroupsOptions> {
 
     private Set<GroupState> groupStates = Collections.emptySet();
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsResult.java
index c4402d0c8ba..e4394e13a86 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListConsumerGroupsResult.java
@@ -18,7 +18,6 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.internals.KafkaFutureImpl;
 
 import java.util.ArrayList;
@@ -27,9 +26,7 @@ import java.util.Collection;
 /**
  * The result of the {@link Admin#listConsumerGroups()} call.
  * <p>
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListConsumerGroupsResult {
     private final KafkaFutureImpl<Collection<ConsumerGroupListing>> all;
     private final KafkaFutureImpl<Collection<ConsumerGroupListing>> valid;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsOptions.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsOptions.java
index 684ad265de7..1da66716ea4 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsOptions.java
@@ -17,16 +17,12 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.IsolationLevel;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Map;
 
 /**
  * Options for {@link AdminClient#listOffsets(Map)}.
- *
- * The API of this class is evolving, see {@link AdminClient} for details.
  */
[email protected]
 public class ListOffsetsOptions extends AbstractOptions<ListOffsetsOptions> {
 
     private final IsolationLevel isolationLevel;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsResult.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsResult.java
index 104045715e1..3d72409a72a 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListOffsetsResult.java
@@ -18,7 +18,6 @@ package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,10 +26,7 @@ import java.util.concurrent.ExecutionException;
 
 /**
  * The result of the {@link AdminClient#listOffsets(Map)} call.
- *
- * The API of this class is evolving, see {@link AdminClient} for details.
  */
[email protected]
 public class ListOffsetsResult {
 
     private final Map<TopicPartition, KafkaFuture<ListOffsetsResultInfo>> 
futures;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListPartitionReassignmentsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListPartitionReassignmentsOptions.java
index 7dcc7a6c3e6..2a456d920bf 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListPartitionReassignmentsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListPartitionReassignmentsOptions.java
@@ -17,13 +17,8 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 /**
  * Options for {@link 
AdminClient#listPartitionReassignments(ListPartitionReassignmentsOptions)}
- *
- * The API of this class is evolving. See {@link AdminClient} for details.
  */
[email protected]
 public class ListPartitionReassignmentsOptions extends 
AbstractOptions<ListPartitionReassignmentsOptions> {
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListTopicsOptions.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListTopicsOptions.java
index 4ffa66de8f2..62ecc286698 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListTopicsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListTopicsOptions.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Objects;
 
 /**
  * Options for {@link Admin#listTopics()}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListTopicsOptions extends AbstractOptions<ListTopicsOptions> {
 
     private boolean listInternal = false;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListTopicsResult.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListTopicsResult.java
index 15ea042eb1f..bf7ce6ef1a5 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/ListTopicsResult.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/ListTopicsResult.java
@@ -18,7 +18,6 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 import java.util.Map;
@@ -26,10 +25,7 @@ import java.util.Set;
 
 /**
  * The result of the {@link Admin#listTopics()} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListTopicsResult {
     final KafkaFuture<Map<String, TopicListing>> future;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListTransactionsOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListTransactionsOptions.java
index ba950566d25..0768b1a75a7 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListTransactionsOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListTransactionsOptions.java
@@ -17,8 +17,6 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -27,10 +25,7 @@ import java.util.Set;
 
 /**
  * Options for {@link Admin#listTransactions()}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListTransactionsOptions extends 
AbstractOptions<ListTransactionsOptions> {
     private Set<TransactionState> filteredStates = Collections.emptySet();
     private Set<Long> filteredProducerIds = Collections.emptySet();
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListTransactionsResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListTransactionsResult.java
index c22f8b7791b..7c48912bb44 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/ListTransactionsResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/ListTransactionsResult.java
@@ -17,7 +17,6 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.internals.KafkaFutureImpl;
 
 import java.util.ArrayList;
@@ -31,9 +30,7 @@ import java.util.Set;
 /**
  * The result of the {@link Admin#listTransactions()} call.
  * <p>
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class ListTransactionsResult {
     private final KafkaFuture<Map<Integer, 
KafkaFutureImpl<Collection<TransactionListing>>>> future;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/NewPartitions.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/NewPartitions.java
index 7690264443b..53514adccea 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/NewPartitions.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/NewPartitions.java
@@ -17,17 +17,12 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.List;
 import java.util.Map;
 
 /**
  * Describes new partitions for a particular topic in a call to {@link 
Admin#createPartitions(Map)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class NewPartitions {
 
     private final int totalCount;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/RecordsToDelete.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/RecordsToDelete.java
index 1eaa2a53331..d3da26b03bb 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/RecordsToDelete.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/RecordsToDelete.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Map;
 
 /**
  * Describe records to delete in a call to {@link Admin#deleteRecords(Map)}
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class RecordsToDelete {
 
     private final long offset;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupOptions.java
index 945c2ff03f8..3cd625d8237 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/RemoveMembersFromConsumerGroupOptions.java
@@ -16,8 +16,6 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -26,10 +24,7 @@ import java.util.Set;
 /**
  * Options for {@link AdminClient#removeMembersFromConsumerGroup(String, 
RemoveMembersFromConsumerGroupOptions)}.
  * It carries the members to be removed from the consumer group.
- *
- * The API of this class is evolving, see {@link AdminClient} for details.
  */
[email protected]
 public class RemoveMembersFromConsumerGroupOptions extends 
AbstractOptions<RemoveMembersFromConsumerGroupOptions> {
 
     private final Set<MemberToRemove> members;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/RenewDelegationTokenOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/RenewDelegationTokenOptions.java
index 5c2b0d1afce..17f387cef70 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/RenewDelegationTokenOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/RenewDelegationTokenOptions.java
@@ -17,14 +17,9 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 /**
  * Options for {@link Admin#renewDelegationToken(byte[], 
RenewDelegationTokenOptions)}.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class RenewDelegationTokenOptions extends 
AbstractOptions<RenewDelegationTokenOptions> {
     private long renewTimePeriodMs = -1;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/RenewDelegationTokenResult.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/RenewDelegationTokenResult.java
index 74725d4d633..69b15fe1f01 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/RenewDelegationTokenResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/RenewDelegationTokenResult.java
@@ -18,14 +18,10 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 /**
  * The result of the {@link KafkaAdminClient#expireDelegationToken(byte[], 
ExpireDelegationTokenOptions)} call.
- *
- * The API of this class is evolving, see {@link Admin} for details.
  */
[email protected]
 public class RenewDelegationTokenResult {
     private final KafkaFuture<Long> expiryTimestamp;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/TransactionDescription.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/TransactionDescription.java
index 5a16919848f..9139f5d3444 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/TransactionDescription.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/TransactionDescription.java
@@ -17,13 +17,11 @@
 package org.apache.kafka.clients.admin;
 
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Objects;
 import java.util.OptionalLong;
 import java.util.Set;
 
[email protected]
 public class TransactionDescription {
     private final int coordinatorId;
     private final TransactionState state;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/TransactionListing.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/TransactionListing.java
index e8e7eb6143b..fab2648f912 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/TransactionListing.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/TransactionListing.java
@@ -16,11 +16,8 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Objects;
 
[email protected]
 public class TransactionListing {
     private final String transactionalId;
     private final long producerId;
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/TransactionState.java 
b/clients/src/main/java/org/apache/kafka/clients/admin/TransactionState.java
index 17ec5a26056..fc7740f8428 100644
--- a/clients/src/main/java/org/apache/kafka/clients/admin/TransactionState.java
+++ b/clients/src/main/java/org/apache/kafka/clients/admin/TransactionState.java
@@ -16,14 +16,11 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Arrays;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
[email protected]
 public enum TransactionState {
     ONGOING("Ongoing"),
     PREPARE_ABORT("PrepareAbort"),
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/UnregisterBrokerOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/UnregisterBrokerOptions.java
index 1935b79c1ba..bb814d51e74 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/UnregisterBrokerOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/UnregisterBrokerOptions.java
@@ -17,13 +17,8 @@
 
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 /**
  * Options for {@link Admin#unregisterBroker(int, UnregisterBrokerOptions)}.
- *
- * The API of this class is evolving. See {@link Admin} for details.
  */
[email protected]
 public class UnregisterBrokerOptions extends 
AbstractOptions<UpdateFeaturesOptions> {
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesOptions.java
 
b/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesOptions.java
index b4819ce77a3..af161fda07e 100644
--- 
a/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesOptions.java
+++ 
b/clients/src/main/java/org/apache/kafka/clients/admin/UpdateFeaturesOptions.java
@@ -16,16 +16,11 @@
  */
 package org.apache.kafka.clients.admin;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Map;
 
 /**
  * Options for {@link AdminClient#updateFeatures(Map, UpdateFeaturesOptions)}.
- *
- * The API of this class is evolving. See {@link Admin} for details.
  */
[email protected]
 public class UpdateFeaturesOptions extends 
AbstractOptions<UpdateFeaturesOptions> {
     private boolean validateOnly = false;
 
diff --git a/clients/src/main/java/org/apache/kafka/common/ElectionType.java 
b/clients/src/main/java/org/apache/kafka/common/ElectionType.java
index 55331c5ea9e..8de7af65e7b 100644
--- a/clients/src/main/java/org/apache/kafka/common/ElectionType.java
+++ b/clients/src/main/java/org/apache/kafka/common/ElectionType.java
@@ -17,17 +17,12 @@
 
 package org.apache.kafka.common;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Arrays;
 import java.util.Set;
 
 /**
  * Options for {@link 
org.apache.kafka.clients.admin.Admin#electLeaders(ElectionType, Set, 
org.apache.kafka.clients.admin.ElectLeadersOptions)}.
- *
- * The API of this class is evolving, see {@link 
org.apache.kafka.clients.admin.Admin} for details.
  */
[email protected]
 public enum ElectionType {
     PREFERRED((byte) 0), UNCLEAN((byte) 1);
 
diff --git 
a/clients/src/main/java/org/apache/kafka/common/acl/AccessControlEntry.java 
b/clients/src/main/java/org/apache/kafka/common/acl/AccessControlEntry.java
index d5e05dffa8f..9f315e18492 100644
--- a/clients/src/main/java/org/apache/kafka/common/acl/AccessControlEntry.java
+++ b/clients/src/main/java/org/apache/kafka/common/acl/AccessControlEntry.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.common.acl;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Objects;
 
 /**
  * Represents an access control entry.  ACEs are a tuple of principal, host, 
operation, and permissionType.
- *
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public class AccessControlEntry {
     final AccessControlEntryData data;
 
diff --git 
a/clients/src/main/java/org/apache/kafka/common/acl/AccessControlEntryFilter.java
 
b/clients/src/main/java/org/apache/kafka/common/acl/AccessControlEntryFilter.java
index 6a880275503..d220f94b192 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/acl/AccessControlEntryFilter.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/acl/AccessControlEntryFilter.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.common.acl;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Objects;
 
 /**
  * Represents a filter which matches access control entries.
- *
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public class AccessControlEntryFilter {
     private final AccessControlEntryData data;
 
diff --git a/clients/src/main/java/org/apache/kafka/common/acl/AclBinding.java 
b/clients/src/main/java/org/apache/kafka/common/acl/AclBinding.java
index c3234265fb9..750066db91c 100644
--- a/clients/src/main/java/org/apache/kafka/common/acl/AclBinding.java
+++ b/clients/src/main/java/org/apache/kafka/common/acl/AclBinding.java
@@ -17,17 +17,13 @@
 
 package org.apache.kafka.common.acl;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.resource.ResourcePattern;
 
 import java.util.Objects;
 
 /**
  * Represents a binding between a resource pattern and an access control entry.
- *
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public class AclBinding {
     private final ResourcePattern pattern;
     private final AccessControlEntry entry;
diff --git 
a/clients/src/main/java/org/apache/kafka/common/acl/AclBindingFilter.java 
b/clients/src/main/java/org/apache/kafka/common/acl/AclBindingFilter.java
index 7682386be9a..b4fcddc5536 100644
--- a/clients/src/main/java/org/apache/kafka/common/acl/AclBindingFilter.java
+++ b/clients/src/main/java/org/apache/kafka/common/acl/AclBindingFilter.java
@@ -17,17 +17,13 @@
 
 package org.apache.kafka.common.acl;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.resource.ResourcePatternFilter;
 
 import java.util.Objects;
 
 /**
  * A filter which can match AclBinding objects.
- *
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public class AclBindingFilter {
     private final ResourcePatternFilter patternFilter;
     private final AccessControlEntryFilter entryFilter;
diff --git 
a/clients/src/main/java/org/apache/kafka/common/acl/AclOperation.java 
b/clients/src/main/java/org/apache/kafka/common/acl/AclOperation.java
index 875d7a8f7f8..7fbbfa519d1 100644
--- a/clients/src/main/java/org/apache/kafka/common/acl/AclOperation.java
+++ b/clients/src/main/java/org/apache/kafka/common/acl/AclOperation.java
@@ -17,8 +17,6 @@
 
 package org.apache.kafka.common.acl;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.HashMap;
 import java.util.Locale;
 
@@ -38,9 +36,7 @@ import java.util.Locale;
  *
  * <li><code>ALLOW ALTER_CONFIGS</code> implies <code>ALLOW 
DESCRIBE_CONFIGS</code>
  * </ul>
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public enum AclOperation {
     /**
      * Represents any AclOperation which this client cannot understand, 
perhaps because this
diff --git 
a/clients/src/main/java/org/apache/kafka/common/acl/AclPermissionType.java 
b/clients/src/main/java/org/apache/kafka/common/acl/AclPermissionType.java
index a0beab9f2d0..42a6303f97e 100644
--- a/clients/src/main/java/org/apache/kafka/common/acl/AclPermissionType.java
+++ b/clients/src/main/java/org/apache/kafka/common/acl/AclPermissionType.java
@@ -17,17 +17,12 @@
 
 package org.apache.kafka.common.acl;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.HashMap;
 import java.util.Locale;
 
 /**
  * Represents whether an ACL grants or denies permissions.
- *
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public enum AclPermissionType {
     /**
      * Represents any AclPermissionType which this client cannot understand,
diff --git 
a/clients/src/main/java/org/apache/kafka/common/annotation/InterfaceStability.java
 
b/clients/src/main/java/org/apache/kafka/common/annotation/InterfaceStability.java
index 25e30adcadf..9624ae8b575 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/annotation/InterfaceStability.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/annotation/InterfaceStability.java
@@ -24,7 +24,6 @@ import java.lang.annotation.RetentionPolicy;
  * Annotation to inform users of how much to rely on a particular package, 
class or method not changing over time.
  * Currently the stability can be {@link Stable}, {@link Evolving} or {@link 
Unstable}.
  */
[email protected]
 public class InterfaceStability {
     /**
      * Compatibility is maintained in major, minor and patch releases with one 
exception: compatibility may be broken
diff --git 
a/clients/src/main/java/org/apache/kafka/common/errors/FencedMemberEpochException.java
 
b/clients/src/main/java/org/apache/kafka/common/errors/FencedMemberEpochException.java
index 82b61eedcf3..69e2df9ba77 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/errors/FencedMemberEpochException.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/errors/FencedMemberEpochException.java
@@ -16,9 +16,6 @@
  */
 package org.apache.kafka.common.errors;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
[email protected]
 public class FencedMemberEpochException extends ApiException {
     public FencedMemberEpochException(String message) {
         super(message);
diff --git 
a/clients/src/main/java/org/apache/kafka/common/errors/StaleMemberEpochException.java
 
b/clients/src/main/java/org/apache/kafka/common/errors/StaleMemberEpochException.java
index 7b373c5b5c1..d574965e527 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/errors/StaleMemberEpochException.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/errors/StaleMemberEpochException.java
@@ -16,15 +16,12 @@
  */
 package org.apache.kafka.common.errors;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 /**
  * The StaleMemberEpochException is used in the context of the new
  * consumer group protocol (KIP-848). This error is returned in the
  * OffsetCommit/Fetch APIs when the member epoch received does not
  * match the current member epoch.
  */
[email protected]
 public class StaleMemberEpochException extends ApiException {
     public StaleMemberEpochException(String message) {
         super(message);
diff --git 
a/clients/src/main/java/org/apache/kafka/common/errors/UnreleasedInstanceIdException.java
 
b/clients/src/main/java/org/apache/kafka/common/errors/UnreleasedInstanceIdException.java
index 0802f54151a..d62df8bd60b 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/errors/UnreleasedInstanceIdException.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/errors/UnreleasedInstanceIdException.java
@@ -16,9 +16,6 @@
  */
 package org.apache.kafka.common.errors;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
[email protected]
 public class UnreleasedInstanceIdException extends ApiException {
     public UnreleasedInstanceIdException(String message) {
         super(message);
diff --git 
a/clients/src/main/java/org/apache/kafka/common/errors/UnsupportedAssignorException.java
 
b/clients/src/main/java/org/apache/kafka/common/errors/UnsupportedAssignorException.java
index c3859ccbfce..f16441783d3 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/errors/UnsupportedAssignorException.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/errors/UnsupportedAssignorException.java
@@ -16,9 +16,6 @@
  */
 package org.apache.kafka.common.errors;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
[email protected]
 public class UnsupportedAssignorException extends ApiException {
     public UnsupportedAssignorException(String message) {
         super(message);
diff --git 
a/clients/src/main/java/org/apache/kafka/common/metrics/MetricsContext.java 
b/clients/src/main/java/org/apache/kafka/common/metrics/MetricsContext.java
index 080aae673eb..f9ee6badfa0 100644
--- a/clients/src/main/java/org/apache/kafka/common/metrics/MetricsContext.java
+++ b/clients/src/main/java/org/apache/kafka/common/metrics/MetricsContext.java
@@ -16,8 +16,6 @@
  */
 package org.apache.kafka.common.metrics;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Map;
 
 /**
@@ -42,7 +40,6 @@ import java.util.Map;
  *   <dd>connect.kafka.cluster.id, connect.group.id</dd>
  * </dl>
  */
[email protected]
 public interface MetricsContext {
     /* predefined fields */
     String NAMESPACE = "_namespace"; // metrics namespace, formerly jmx prefix
diff --git 
a/clients/src/main/java/org/apache/kafka/common/metrics/MetricsReporter.java 
b/clients/src/main/java/org/apache/kafka/common/metrics/MetricsReporter.java
index 74ab062bbd7..0b6e47ee2f5 100644
--- a/clients/src/main/java/org/apache/kafka/common/metrics/MetricsReporter.java
+++ b/clients/src/main/java/org/apache/kafka/common/metrics/MetricsReporter.java
@@ -17,7 +17,6 @@
 package org.apache.kafka.common.metrics;
 
 import org.apache.kafka.common.Reconfigurable;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.config.ConfigException;
 
 import java.util.Collections;
@@ -71,7 +70,6 @@ public interface MetricsReporter extends Reconfigurable, 
AutoCloseable {
      *
      * @param metricsContext the metric context
      */
-    @InterfaceStability.Evolving
     default void contextChange(MetricsContext metricsContext) {
     }
 }
diff --git 
a/clients/src/main/java/org/apache/kafka/common/resource/PatternType.java 
b/clients/src/main/java/org/apache/kafka/common/resource/PatternType.java
index e9c7da65c57..74d9ad1f0fc 100644
--- a/clients/src/main/java/org/apache/kafka/common/resource/PatternType.java
+++ b/clients/src/main/java/org/apache/kafka/common/resource/PatternType.java
@@ -17,8 +17,6 @@
 
 package org.apache.kafka.common.resource;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
@@ -28,7 +26,6 @@ import java.util.stream.Collectors;
 /**
  * Resource pattern type.
  */
[email protected]
 public enum PatternType {
     /**
      * Represents any PatternType which this client cannot understand, perhaps 
because this client is too old.
diff --git 
a/clients/src/main/java/org/apache/kafka/common/resource/Resource.java 
b/clients/src/main/java/org/apache/kafka/common/resource/Resource.java
index 571ec6481e8..9b9ca279355 100644
--- a/clients/src/main/java/org/apache/kafka/common/resource/Resource.java
+++ b/clients/src/main/java/org/apache/kafka/common/resource/Resource.java
@@ -17,16 +17,11 @@
 
 package org.apache.kafka.common.resource;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Objects;
 
 /**
  * Represents a cluster resource with a tuple of (type, name).
- *
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public class Resource {
     private final ResourceType resourceType;
     private final String name;
diff --git 
a/clients/src/main/java/org/apache/kafka/common/resource/ResourcePattern.java 
b/clients/src/main/java/org/apache/kafka/common/resource/ResourcePattern.java
index b3dfc4937f0..70c479588a8 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/resource/ResourcePattern.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/resource/ResourcePattern.java
@@ -17,17 +17,12 @@
 
 package org.apache.kafka.common.resource;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Objects;
 
 /**
  * Represents a pattern that is used by ACLs to match zero or more
  * {@link org.apache.kafka.common.resource.Resource Resources}.
- *
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public class ResourcePattern {
     /**
      * A special literal resource name that corresponds to 'all resources of a 
certain type'.
diff --git 
a/clients/src/main/java/org/apache/kafka/common/resource/ResourcePatternFilter.java
 
b/clients/src/main/java/org/apache/kafka/common/resource/ResourcePatternFilter.java
index 6f511c9a345..93f3061cc46 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/resource/ResourcePatternFilter.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/resource/ResourcePatternFilter.java
@@ -17,18 +17,13 @@
 
 package org.apache.kafka.common.resource;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Objects;
 
 import static 
org.apache.kafka.common.resource.ResourcePattern.WILDCARD_RESOURCE;
 
 /**
  * Represents a filter that can match {@link ResourcePattern}.
- * <p>
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public class ResourcePatternFilter {
     /**
      * Matches any resource pattern.
diff --git 
a/clients/src/main/java/org/apache/kafka/common/resource/ResourceType.java 
b/clients/src/main/java/org/apache/kafka/common/resource/ResourceType.java
index b31ca852427..289000e99e8 100644
--- a/clients/src/main/java/org/apache/kafka/common/resource/ResourceType.java
+++ b/clients/src/main/java/org/apache/kafka/common/resource/ResourceType.java
@@ -17,17 +17,12 @@
 
 package org.apache.kafka.common.resource;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.HashMap;
 import java.util.Locale;
 
 /**
  * Represents a type of resource which an ACL can be applied to.
- *
- * The API for this class is still evolving and we may break compatibility in 
minor releases, if necessary.
  */
[email protected]
 public enum ResourceType {
     /**
      * Represents any ResourceType which this client cannot understand,
diff --git 
a/clients/src/main/java/org/apache/kafka/common/security/auth/SecurityProviderCreator.java
 
b/clients/src/main/java/org/apache/kafka/common/security/auth/SecurityProviderCreator.java
index ae56f9a3520..a22e4dbb2c9 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/security/auth/SecurityProviderCreator.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/security/auth/SecurityProviderCreator.java
@@ -17,7 +17,6 @@
 package org.apache.kafka.common.security.auth;
 
 import org.apache.kafka.common.Configurable;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.security.Provider;
 import java.util.Map;
@@ -25,7 +24,6 @@ import java.util.Map;
 /**
  * An interface for generating security providers.
  */
[email protected]
 public interface SecurityProviderCreator extends Configurable {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerToken.java
 
b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerToken.java
index 63491dd0ab1..6e9dd84cd4c 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerToken.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerToken.java
@@ -16,8 +16,6 @@
  */
 package org.apache.kafka.common.security.oauthbearer;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Set;
 
 /**
@@ -35,19 +33,12 @@ import java.util.Set;
  * a constructor might declare {@code throws IOException} in such a case.
  * Alternatively, the retrievers could throw unchecked exceptions.
  * <p>
- * This interface was introduced in 2.0.0 and, while it feels stable, it could
- * evolve. We will try to evolve the API in a compatible manner (easier now 
that
- * Java 7 and its lack of default methods doesn't have to be supported), but we
- * reserve the right to make breaking changes in minor releases, if necessary.
- * We will update the {@code InterfaceStability} annotation and this notice 
once
- * the API is considered stable.
  * 
  * @see <a href="https://tools.ietf.org/html/rfc6749#section-1.4";>RFC 6749
  *      Section 1.4</a> and
  *      <a href="https://tools.ietf.org/html/rfc6750#section-2.1";>RFC 6750
  *      Section 2.1</a>
  */
[email protected]
 public interface OAuthBearerToken {
     /**
      * The <code>b64token</code> value as defined in
diff --git 
a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallback.java
 
b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallback.java
index b0c3846d66f..c72a5d54719 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallback.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerTokenCallback.java
@@ -16,8 +16,6 @@
  */
 package org.apache.kafka.common.security.oauthbearer;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Objects;
 
 import javax.security.auth.callback.Callback;
@@ -30,14 +28,7 @@ import javax.security.auth.callback.Callback;
  * <a href="https://tools.ietf.org/html/rfc6749#section-5.2";>RFC 6749: The 
OAuth
  * 2.0 Authorization Framework</a>. Callback handlers should communicate other
  * problems by raising an {@code IOException}.
- * <p>
- * This class was introduced in 2.0.0 and, while it feels stable, it could
- * evolve. We will try to evolve the API in a compatible manner, but we reserve
- * the right to make breaking changes in minor releases, if necessary. We will
- * update the {@code InterfaceStability} annotation and this notice once the 
API
- * is considered stable.
  */
[email protected]
 public class OAuthBearerTokenCallback implements Callback {
     private OAuthBearerToken token = null;
     private String errorCode = null;
diff --git 
a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallback.java
 
b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallback.java
index dc7ca43a016..1b8e50c909a 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallback.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/OAuthBearerValidatorCallback.java
@@ -16,8 +16,6 @@
  */
 package org.apache.kafka.common.security.oauthbearer;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Objects;
 
 import javax.security.auth.callback.Callback;
@@ -33,14 +31,7 @@ import javax.security.auth.callback.Callback;
  * 
"https://www.iana.org/assignments/oauth-parameters/oauth-parameters.xhtml#extensions-error";>IANA
  * OAuth Extensions Error Registry</a>. Callback handlers should communicate
  * other problems by raising an {@code IOException}.
- * <p>
- * This class was introduced in 2.0.0 and, while it feels stable, it could
- * evolve. We will try to evolve the API in a compatible manner, but we reserve
- * the right to make breaking changes in minor releases, if necessary. We will
- * update the {@code InterfaceStability} annotation and this notice once the 
API
- * is considered stable.
  */
[email protected]
 public class OAuthBearerValidatorCallback implements Callback {
     private final String tokenValue;
     private OAuthBearerToken token = null;
diff --git 
a/clients/src/main/java/org/apache/kafka/common/security/token/delegation/DelegationToken.java
 
b/clients/src/main/java/org/apache/kafka/common/security/token/delegation/DelegationToken.java
index a2d8e6d3824..27f0f65c3a9 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/security/token/delegation/DelegationToken.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/security/token/delegation/DelegationToken.java
@@ -16,8 +16,6 @@
  */
 package org.apache.kafka.common.security.token.delegation;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.security.MessageDigest;
 import java.util.Arrays;
 import java.util.Base64;
@@ -27,7 +25,6 @@ import java.util.Objects;
  * A class representing a delegation token.
  *
  */
[email protected]
 public class DelegationToken {
     private final TokenInformation tokenInformation;
     private final byte[] hmac;
diff --git 
a/clients/src/main/java/org/apache/kafka/common/security/token/delegation/TokenInformation.java
 
b/clients/src/main/java/org/apache/kafka/common/security/token/delegation/TokenInformation.java
index c2478747a2b..0b639d345c7 100644
--- 
a/clients/src/main/java/org/apache/kafka/common/security/token/delegation/TokenInformation.java
+++ 
b/clients/src/main/java/org/apache/kafka/common/security/token/delegation/TokenInformation.java
@@ -16,7 +16,6 @@
  */
 package org.apache.kafka.common.security.token.delegation;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.security.auth.KafkaPrincipal;
 
 import java.util.ArrayList;
@@ -27,7 +26,6 @@ import java.util.Objects;
  * A class representing a delegation token details.
  *
  */
[email protected]
 public class TokenInformation {
 
     private final KafkaPrincipal owner;
diff --git 
a/clients/src/main/java/org/apache/kafka/server/authorizer/AclCreateResult.java 
b/clients/src/main/java/org/apache/kafka/server/authorizer/AclCreateResult.java
index 70b9c00b364..34f7f2f4d3b 100644
--- 
a/clients/src/main/java/org/apache/kafka/server/authorizer/AclCreateResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/server/authorizer/AclCreateResult.java
@@ -17,12 +17,10 @@
 
 package org.apache.kafka.server.authorizer;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.errors.ApiException;
 
 import java.util.Optional;
 
[email protected]
 public class AclCreateResult {
     public static final AclCreateResult SUCCESS = new AclCreateResult();
 
diff --git 
a/clients/src/main/java/org/apache/kafka/server/authorizer/AclDeleteResult.java 
b/clients/src/main/java/org/apache/kafka/server/authorizer/AclDeleteResult.java
index 26dffd84e26..e3ff64d6109 100644
--- 
a/clients/src/main/java/org/apache/kafka/server/authorizer/AclDeleteResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/server/authorizer/AclDeleteResult.java
@@ -18,14 +18,12 @@
 package org.apache.kafka.server.authorizer;
 
 import org.apache.kafka.common.acl.AclBinding;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.errors.ApiException;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
 
[email protected]
 public class AclDeleteResult {
     private final ApiException exception;
     private final Collection<AclBindingDeleteResult> aclBindingDeleteResults;
diff --git 
a/clients/src/main/java/org/apache/kafka/server/authorizer/Action.java 
b/clients/src/main/java/org/apache/kafka/server/authorizer/Action.java
index 1c3d492991a..d80dce52ac3 100644
--- a/clients/src/main/java/org/apache/kafka/server/authorizer/Action.java
+++ b/clients/src/main/java/org/apache/kafka/server/authorizer/Action.java
@@ -18,12 +18,10 @@
 package org.apache.kafka.server.authorizer;
 
 import org.apache.kafka.common.acl.AclOperation;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.resource.ResourcePattern;
 
 import java.util.Objects;
 
[email protected]
 public class Action {
 
     private final ResourcePattern resourcePattern;
diff --git 
a/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizableRequestContext.java
 
b/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizableRequestContext.java
index 19e3e09b934..c560d58ca93 100644
--- 
a/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizableRequestContext.java
+++ 
b/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizableRequestContext.java
@@ -17,7 +17,6 @@
 
 package org.apache.kafka.server.authorizer;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.security.auth.KafkaPrincipal;
 import org.apache.kafka.common.security.auth.SecurityProtocol;
 
@@ -27,7 +26,6 @@ import java.net.InetAddress;
  * Request context interface that provides data from request header as well as 
connection
  * and authentication information to plugins.
  */
[email protected]
 public interface AuthorizableRequestContext {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizationResult.java
 
b/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizationResult.java
index d4ad15d6b03..1e066c366bb 100644
--- 
a/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizationResult.java
+++ 
b/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizationResult.java
@@ -17,9 +17,6 @@
 
 package org.apache.kafka.server.authorizer;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
[email protected]
 public enum AuthorizationResult {
     ALLOWED,
     DENIED
diff --git 
a/clients/src/main/java/org/apache/kafka/server/authorizer/Authorizer.java 
b/clients/src/main/java/org/apache/kafka/server/authorizer/Authorizer.java
index 6dcc80f1e1d..8bbb8662f46 100644
--- a/clients/src/main/java/org/apache/kafka/server/authorizer/Authorizer.java
+++ b/clients/src/main/java/org/apache/kafka/server/authorizer/Authorizer.java
@@ -24,7 +24,6 @@ import org.apache.kafka.common.acl.AclBinding;
 import org.apache.kafka.common.acl.AclBindingFilter;
 import org.apache.kafka.common.acl.AclOperation;
 import org.apache.kafka.common.acl.AclPermissionType;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.resource.PatternType;
 import org.apache.kafka.common.resource.ResourcePattern;
 import org.apache.kafka.common.resource.ResourcePatternFilter;
@@ -75,7 +74,6 @@ import java.util.concurrent.CompletionStage;
  * </ul>
  * </p>
  */
[email protected]
 public interface Authorizer extends Configurable, Closeable {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizerServerInfo.java
 
b/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizerServerInfo.java
index 9650337f4de..d9923c604ee 100644
--- 
a/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizerServerInfo.java
+++ 
b/clients/src/main/java/org/apache/kafka/server/authorizer/AuthorizerServerInfo.java
@@ -19,14 +19,12 @@ package org.apache.kafka.server.authorizer;
 
 import org.apache.kafka.common.ClusterResource;
 import org.apache.kafka.common.Endpoint;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Collection;
 
 /**
  * Runtime broker configuration metadata provided to authorizers during start 
up.
  */
[email protected]
 public interface AuthorizerServerInfo {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetry.java 
b/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetry.java
index 82ef6dd9269..d179a55a911 100644
--- 
a/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetry.java
+++ 
b/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetry.java
@@ -17,14 +17,12 @@
 
 package org.apache.kafka.server.telemetry;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.common.metrics.MetricsReporter;
 
 /**
  * A {@link MetricsReporter} may implement this interface to indicate support 
for collecting client
  * telemetry on the server side.
  */
[email protected]
 public interface ClientTelemetry {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetryPayload.java
 
b/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetryPayload.java
index 96eac20125f..96383668602 100644
--- 
a/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetryPayload.java
+++ 
b/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetryPayload.java
@@ -18,7 +18,6 @@
 package org.apache.kafka.server.telemetry;
 
 import org.apache.kafka.common.Uuid;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.nio.ByteBuffer;
 
@@ -26,7 +25,6 @@ import java.nio.ByteBuffer;
  * A client telemetry payload as sent by the client to the telemetry receiver. 
The payload is
  * received by the broker's {@link ClientTelemetryReceiver} implementation.
  */
[email protected]
 public interface ClientTelemetryPayload {
 
     /**
diff --git 
a/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetryReceiver.java
 
b/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetryReceiver.java
index 18eb5e0f9f8..eb603556762 100644
--- 
a/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetryReceiver.java
+++ 
b/clients/src/main/java/org/apache/kafka/server/telemetry/ClientTelemetryReceiver.java
@@ -17,14 +17,12 @@
 
 package org.apache.kafka.server.telemetry;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
 import org.apache.kafka.server.authorizer.AuthorizableRequestContext;
 
 /**
  * {@code ClientTelemetryReceiver} defines the behaviour for telemetry 
receiver on the broker side
  * which receives client telemetry metrics.
  */
[email protected]
 public interface ClientTelemetryReceiver {
     /**
      * Called by the broker when a client reports telemetry metrics. The 
associated request context
diff --git 
a/connect/mirror-client/src/main/java/org/apache/kafka/connect/mirror/ReplicationPolicy.java
 
b/connect/mirror-client/src/main/java/org/apache/kafka/connect/mirror/ReplicationPolicy.java
index 34d33445097..cb0fbe9910d 100644
--- 
a/connect/mirror-client/src/main/java/org/apache/kafka/connect/mirror/ReplicationPolicy.java
+++ 
b/connect/mirror-client/src/main/java/org/apache/kafka/connect/mirror/ReplicationPolicy.java
@@ -17,12 +17,9 @@
 
 package org.apache.kafka.connect.mirror;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 /**
  * An interface used by the MirrorMaker connectors to manage topics names 
between source and target clusters.
  */
[email protected]
 public interface ReplicationPolicy {
 
     /**
diff --git 
a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/ConfigPropertyFilter.java
 
b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/ConfigPropertyFilter.java
index bb4ace9a6a9..5dbf2659f96 100644
--- 
a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/ConfigPropertyFilter.java
+++ 
b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/ConfigPropertyFilter.java
@@ -18,12 +18,10 @@
 package org.apache.kafka.connect.mirror;
 
 import org.apache.kafka.common.Configurable;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Map;
 
 /** Defines which topic configuration properties should be replicated. */
[email protected]
 public interface ConfigPropertyFilter extends Configurable, AutoCloseable {
 
     /**
diff --git 
a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/GroupFilter.java 
b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/GroupFilter.java
index d54274523a0..8e02f4cade9 100644
--- 
a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/GroupFilter.java
+++ 
b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/GroupFilter.java
@@ -18,12 +18,10 @@
 package org.apache.kafka.connect.mirror;
 
 import org.apache.kafka.common.Configurable;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Map;
 
 /** Defines which consumer groups should be replicated. */
[email protected]
 public interface GroupFilter extends Configurable, AutoCloseable {
 
     boolean shouldReplicateGroup(String group);
diff --git 
a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/TopicFilter.java 
b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/TopicFilter.java
index 902b0928780..ce56413c41a 100644
--- 
a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/TopicFilter.java
+++ 
b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/TopicFilter.java
@@ -18,12 +18,10 @@
 package org.apache.kafka.connect.mirror;
 
 import org.apache.kafka.common.Configurable;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Map;
 
 /** Defines which topics should be replicated. */
[email protected]
 public interface TopicFilter extends Configurable, AutoCloseable {
 
     boolean shouldReplicateTopic(String topic);
diff --git a/metadata/src/main/java/org/apache/kafka/metadata/BrokerState.java 
b/metadata/src/main/java/org/apache/kafka/metadata/BrokerState.java
index eb96cf9235a..50ad5f6433b 100644
--- a/metadata/src/main/java/org/apache/kafka/metadata/BrokerState.java
+++ b/metadata/src/main/java/org/apache/kafka/metadata/BrokerState.java
@@ -17,8 +17,6 @@
 
 package org.apache.kafka.metadata;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,7 +40,6 @@ import java.util.Map;
  *     ↓
  * SHUTTING_DOWN
  */
[email protected]
 public enum BrokerState {
     /**
      * The state the broker is in when it first starts up.
diff --git 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/LogSegmentData.java
 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/LogSegmentData.java
index 905bfd0b7c1..78ebc657aa9 100644
--- 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/LogSegmentData.java
+++ 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/LogSegmentData.java
@@ -16,8 +16,6 @@
  */
 package org.apache.kafka.server.log.remote.storage;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.nio.ByteBuffer;
 import java.nio.file.Path;
 import java.util.Objects;
@@ -28,7 +26,6 @@ import java.util.Optional;
  * storage. This is passed with {@link 
RemoteStorageManager#copyLogSegmentData(RemoteLogSegmentMetadata, 
LogSegmentData)}
  * while copying a specific log segment to the remote storage.
  */
[email protected]
 public class LogSegmentData {
 
     private final Path logSegment;
@@ -137,4 +134,4 @@ public class LogSegmentData {
                ", leaderEpochIndex=" + leaderEpochIndex +
                '}';
     }
-}
\ No newline at end of file
+}
diff --git 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadata.java
 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadata.java
index 4d8eaa95bcb..a5ce5779196 100644
--- 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadata.java
+++ 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadata.java
@@ -17,13 +17,11 @@
 package org.apache.kafka.server.log.remote.storage;
 
 import org.apache.kafka.common.TopicIdPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 /**
  * Base class for remote log metadata objects like {@link 
RemoteLogSegmentMetadata}, {@link RemoteLogSegmentMetadataUpdate},
  * and {@link RemotePartitionDeleteMetadata}.
  */
[email protected]
 public abstract class RemoteLogMetadata {
 
     /**
diff --git 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadataManager.java
 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadataManager.java
index efc37128ab2..2cc581dbfec 100644
--- 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadataManager.java
+++ 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadataManager.java
@@ -18,7 +18,6 @@ package org.apache.kafka.server.log.remote.storage;
 
 import org.apache.kafka.common.Configurable;
 import org.apache.kafka.common.TopicIdPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.io.Closeable;
 import java.util.Iterator;
@@ -49,7 +48,6 @@ import java.util.concurrent.CompletableFuture;
  * (default value is "rlmm.config.") are passed when {@link #configure(Map)} 
is invoked on this instance.
  * <p>
  */
[email protected]
 public interface RemoteLogMetadataManager extends Configurable, Closeable {
 
     /**
@@ -240,4 +238,4 @@ public interface RemoteLogMetadataManager extends 
Configurable, Closeable {
     default boolean isReady(TopicIdPartition topicIdPartition) {
         return true;
     }
-}
\ No newline at end of file
+}
diff --git 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentId.java
 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentId.java
index 2803a2375c2..f1d30a62753 100644
--- 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentId.java
+++ 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentId.java
@@ -18,7 +18,6 @@ package org.apache.kafka.server.log.remote.storage;
 
 import org.apache.kafka.common.TopicIdPartition;
 import org.apache.kafka.common.Uuid;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Objects;
 
@@ -27,7 +26,6 @@ import java.util.Objects;
  * regenerated for every attempt of copying a specific log segment in {@link 
RemoteStorageManager#copyLogSegmentData(RemoteLogSegmentMetadata, 
LogSegmentData)}.
  * Once it is stored in remote storage, it is used to access that segment 
later from remote log metadata storage.
  */
[email protected]
 public class RemoteLogSegmentId {
 
     private final TopicIdPartition topicIdPartition;
diff --git 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadata.java
 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadata.java
index 02918d90625..37aeccdcc68 100644
--- 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadata.java
+++ 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadata.java
@@ -17,7 +17,6 @@
 package org.apache.kafka.server.log.remote.storage;
 
 import org.apache.kafka.common.TopicIdPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -35,7 +34,6 @@ import java.util.TreeMap;
  * updated by applying {@link RemoteLogSegmentMetadataUpdate} for the 
respective {@link RemoteLogSegmentId} of the
  * {@code RemoteLogSegmentMetadata}.
  */
[email protected]
 public class RemoteLogSegmentMetadata extends RemoteLogMetadata {
 
     /**
diff --git 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadataUpdate.java
 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadataUpdate.java
index 210615ef53f..977713b2338 100644
--- 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadataUpdate.java
+++ 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadataUpdate.java
@@ -17,7 +17,6 @@
 package org.apache.kafka.server.log.remote.storage;
 
 import org.apache.kafka.common.TopicIdPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import 
org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata.CustomMetadata;
 
 import java.util.Objects;
@@ -28,7 +27,6 @@ import java.util.Optional;
  * state of the remote log segment by using {@link 
RemoteLogMetadataManager#updateRemoteLogSegmentMetadata(RemoteLogSegmentMetadataUpdate)}.
  * This also includes the timestamp of this event.
  */
[email protected]
 public class RemoteLogSegmentMetadataUpdate extends RemoteLogMetadata {
 
     /**
diff --git 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentState.java
 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentState.java
index c618321c5cc..8418f817deb 100644
--- 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentState.java
+++ 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentState.java
@@ -16,8 +16,6 @@
  */
 package org.apache.kafka.server.log.remote.storage;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
@@ -50,7 +48,6 @@ import java.util.stream.Collectors;
  *                  +-----------------------+
  * </pre>
  */
[email protected]
 public enum RemoteLogSegmentState {
 
     /**
diff --git 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemotePartitionDeleteMetadata.java
 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemotePartitionDeleteMetadata.java
index c84e1d78408..22c7a70abdb 100644
--- 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemotePartitionDeleteMetadata.java
+++ 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemotePartitionDeleteMetadata.java
@@ -17,7 +17,6 @@
 package org.apache.kafka.server.log.remote.storage;
 
 import org.apache.kafka.common.TopicIdPartition;
-import org.apache.kafka.common.annotation.InterfaceStability;
 
 import java.util.Objects;
 
@@ -25,7 +24,6 @@ import java.util.Objects;
  * This class represents the metadata about the remote partition. It can be 
created/updated with {@link 
RemoteLogMetadataManager#putRemotePartitionDeleteMetadata(RemotePartitionDeleteMetadata)}.
  * Possible state transitions are mentioned at {@link 
RemotePartitionDeleteState}.
  */
[email protected]
 public class RemotePartitionDeleteMetadata extends RemoteLogMetadata {
 
     private final TopicIdPartition topicIdPartition;
@@ -91,4 +89,4 @@ public class RemotePartitionDeleteMetadata extends 
RemoteLogMetadata {
     public int hashCode() {
         return Objects.hash(topicIdPartition, state, eventTimestampMs(), 
brokerId());
     }
-}
\ No newline at end of file
+}
diff --git 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemotePartitionDeleteState.java
 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemotePartitionDeleteState.java
index e2fad1ace08..108acf05504 100644
--- 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemotePartitionDeleteState.java
+++ 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemotePartitionDeleteState.java
@@ -16,8 +16,6 @@
  */
 package org.apache.kafka.server.log.remote.storage;
 
-import org.apache.kafka.common.annotation.InterfaceStability;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
@@ -48,7 +46,6 @@ import java.util.stream.Collectors;
  * </PRE>
  * </P>
  */
[email protected]
 public enum RemotePartitionDeleteState {
 
     /**
@@ -106,4 +103,4 @@ public enum RemotePartitionDeleteState {
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageManager.java
 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageManager.java
index f05983c7588..03eeebcfa1d 100644
--- 
a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageManager.java
+++ 
b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageManager.java
@@ -17,7 +17,6 @@
 package org.apache.kafka.server.log.remote.storage;
 
 import org.apache.kafka.common.Configurable;
-import org.apache.kafka.common.annotation.InterfaceStability;
 import 
org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata.CustomMetadata;
 
 import java.io.Closeable;
@@ -41,7 +40,6 @@ import java.util.Optional;
  * All properties prefixed with the config: 
"remote.log.storage.manager.impl.prefix"
  * (default value is "rsm.config.") are passed when {@link #configure(Map)} is 
invoked on this instance.
  */
[email protected]
 public interface RemoteStorageManager extends Configurable, Closeable {
 
     /**
@@ -150,4 +148,4 @@ public interface RemoteStorageManager extends Configurable, 
Closeable {
      * @throws RemoteStorageException          if there are any storage 
related errors occurred.
      */
     void deleteLogSegmentData(RemoteLogSegmentMetadata 
remoteLogSegmentMetadata) throws RemoteStorageException;
-}
\ No newline at end of file
+}


Reply via email to