From 7db66ace08b9d6598cbb1f312f7d3f8b1b2ef165 Mon Sep 17 00:00:00 2001
From: Luke Chen <showuon@gmail.com>
Date: Tue, 7 Jun 2022 15:52:47 +0800
Subject: [PATCH 1/3] add java 8 deprecation info in doc

---
 docs/ops.html     | 3 ++-
 docs/upgrade.html | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/ops.html b/docs/ops.html
index 843c5cc59e375..3ee1216274129 100644
--- a/docs/ops.html
+++ b/docs/ops.html
@@ -1266,7 +1266,8 @@ <h4 class="anchor-heading"><a id="prodconfig" class="anchor-link"></a><a href="#
 
   <h3 class="anchor-heading"><a id="java" class="anchor-link"></a><a href="#java">6.6 Java Version</a></h3>
 
-  Java 8 and Java 11 are supported. Java 11 performs significantly better if TLS is enabled, so it is highly recommended (it also includes a number of other
+  Java 8, Java 11, and Java 17 are supported. Note that Java 8 support has been deprecated since Apache Kafka 3.0 and will be removed in Apache Kafka 4.0.
+  Java 11 and later versions performs significantly better if TLS is enabled, so it is highly recommended (it also includes a number of other
   performance improvements: G1GC, CRC32C, Compact Strings, Thread-Local Handshakes and more).
   
   From a security perspective, we recommend the latest released patch version as older freely available versions have disclosed security vulnerabilities.
diff --git a/docs/upgrade.html b/docs/upgrade.html
index 33971a79c10b6..d276353e9cc62 100644
--- a/docs/upgrade.html
+++ b/docs/upgrade.html
@@ -213,6 +213,9 @@ <h5><a id="upgrade_301_notable" href="#upgrade_301_notable">Notable changes in 3
 
 <h5><a id="upgrade_300_notable" href="#upgrade_300_notable">Notable changes in 3.0.0</a></h5>
 <ul>
+    <li>Java 8 and Scala 2.12 support have been deprecated since Apache Kafka 3.0 and will be removed in Apache Kafka 4.0.
+        See <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181308223">KIP-750</a>
+        and <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181308218">KIP-751</a> for more details.</li>
     <li>The producer has stronger delivery guarantees by default: <code>idempotence</code> is enabled and <code>acks</code> is set to <code>all</code> instead of <code>1</code>.
         See <a href="https://cwiki.apache.org/confluence/display/KAFKA/KIP-679%3A+Producer+will+enable+the+strongest+delivery+guarantee+by+default">KIP-679</a> for details.
 	In 3.0.0 and 3.1.0, a bug prevented the idempotence default from being applied which meant that it remained disabled unless the user had explicitly set

From ad5f8b887e3f2aa1b6e68d6f8451c8bb55311132 Mon Sep 17 00:00:00 2001
From: Luke Chen <showuon@gmail.com>
Date: Wed, 8 Jun 2022 09:46:25 +0800
Subject: [PATCH 2/3] address comments

---
 docs/ops.html     | 2 +-
 docs/upgrade.html | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/ops.html b/docs/ops.html
index 3ee1216274129..58299a9c92aac 100644
--- a/docs/ops.html
+++ b/docs/ops.html
@@ -1267,7 +1267,7 @@ <h4 class="anchor-heading"><a id="prodconfig" class="anchor-link"></a><a href="#
   <h3 class="anchor-heading"><a id="java" class="anchor-link"></a><a href="#java">6.6 Java Version</a></h3>
 
   Java 8, Java 11, and Java 17 are supported. Note that Java 8 support has been deprecated since Apache Kafka 3.0 and will be removed in Apache Kafka 4.0.
-  Java 11 and later versions performs significantly better if TLS is enabled, so it is highly recommended (it also includes a number of other
+  Java 11 and later versions performs significantly better if TLS is enabled, so they are highly recommended (it also includes a number of other
   performance improvements: G1GC, CRC32C, Compact Strings, Thread-Local Handshakes and more).
   
   From a security perspective, we recommend the latest released patch version as older freely available versions have disclosed security vulnerabilities.
diff --git a/docs/upgrade.html b/docs/upgrade.html
index d276353e9cc62..b29259aa2b8b0 100644
--- a/docs/upgrade.html
+++ b/docs/upgrade.html
@@ -213,14 +213,14 @@ <h5><a id="upgrade_301_notable" href="#upgrade_301_notable">Notable changes in 3
 
 <h5><a id="upgrade_300_notable" href="#upgrade_300_notable">Notable changes in 3.0.0</a></h5>
 <ul>
-    <li>Java 8 and Scala 2.12 support have been deprecated since Apache Kafka 3.0 and will be removed in Apache Kafka 4.0.
-        See <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181308223">KIP-750</a>
-        and <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181308218">KIP-751</a> for more details.</li>
     <li>The producer has stronger delivery guarantees by default: <code>idempotence</code> is enabled and <code>acks</code> is set to <code>all</code> instead of <code>1</code>.
         See <a href="https://cwiki.apache.org/confluence/display/KAFKA/KIP-679%3A+Producer+will+enable+the+strongest+delivery+guarantee+by+default">KIP-679</a> for details.
 	In 3.0.0 and 3.1.0, a bug prevented the idempotence default from being applied which meant that it remained disabled unless the user had explicitly set
 	<code>enable.idempotence</code> to true. Note that the bug did not affect the <code>acks=all</code> change. See <a href="https://issues.apache.org/jira/browse/KAFKA-13598">KAFKA-13598</a>for more details.
-        This issue was fixed and the default is properly applied in 3.0.1, 3.1.1, and 3.2.0.
+        This issue was fixed and the default is properly applied in 3.0.1, 3.1.1, and 3.2.0.</li>
+    <li>Java 8 and Scala 2.12 support have been deprecated since Apache Kafka 3.0 and will be removed in Apache Kafka 4.0.
+        See <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181308223">KIP-750</a>
+        and <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=181308218">KIP-751</a> for more details.</li>
     <li>ZooKeeper has been upgraded to version 3.6.3.</li>
     <li>A preview of KRaft mode is available, though upgrading to it from the 2.8 Early Access release is not possible. See
         the <code>config/kraft/README.md</code> file for details.</li>

From d696f60e3f9ed3a0986e25a0c596f4d0271ad2d5 Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Wed, 8 Jun 2022 07:48:17 -0700
Subject: [PATCH 3/3] Grammar tweaks

---
 docs/ops.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ops.html b/docs/ops.html
index 58299a9c92aac..a6a4296a0f58f 100644
--- a/docs/ops.html
+++ b/docs/ops.html
@@ -1267,7 +1267,7 @@ <h4 class="anchor-heading"><a id="prodconfig" class="anchor-link"></a><a href="#
   <h3 class="anchor-heading"><a id="java" class="anchor-link"></a><a href="#java">6.6 Java Version</a></h3>
 
   Java 8, Java 11, and Java 17 are supported. Note that Java 8 support has been deprecated since Apache Kafka 3.0 and will be removed in Apache Kafka 4.0.
-  Java 11 and later versions performs significantly better if TLS is enabled, so they are highly recommended (it also includes a number of other
+  Java 11 and later versions perform significantly better if TLS is enabled, so they are highly recommended (they also include a number of other
   performance improvements: G1GC, CRC32C, Compact Strings, Thread-Local Handshakes and more).
   
   From a security perspective, we recommend the latest released patch version as older freely available versions have disclosed security vulnerabilities.