From a8564de20b049a6d38e69413e51cf4d571e59355 Mon Sep 17 00:00:00 2001
From: Kirk True <kirk@kirktrue.pro>
Date: Mon, 6 Jan 2025 11:39:02 -0800
Subject: [PATCH 1/2] KAFKA-18400: Don't use YYYY when formatting/parsing dates
 in Java client

Correcting documented use of YYYY to be yyyy as used by SimpleDateFormat format.
---
 docs/ops.html                                                   | 2 +-
 docs/streams/developer-guide/app-reset-tool.html                | 2 +-
 tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java | 2 +-
 .../kafka/tools/consumer/group/ConsumerGroupCommandOptions.java | 2 +-
 .../kafka/tools/consumer/group/ShareGroupCommandOptions.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/ops.html b/docs/ops.html
index 02ea5bd788f5d..1e5b0affb1ed8 100644
--- a/docs/ops.html
+++ b/docs/ops.html
@@ -180,7 +180,7 @@ <h4 class="anchor-heading"><a id="basic_ops_consumer_group" class="anchor-link">
   --reset-offsets also has the following scenarios to choose from (at least one scenario must be selected):
   <ul>
     <li>
-      --to-datetime &lt;String: datetime&gt; : Reset offsets to offsets from datetime. Format: 'YYYY-MM-DDTHH:mm:SS.sss'
+      --to-datetime &lt;String: datetime&gt; : Reset offsets to offsets from datetime. Format: 'yyyy-MM-DDTHH:mm:SS.sss'
     </li>
     <li>
       --to-earliest : Reset offsets to earliest offset.
diff --git a/docs/streams/developer-guide/app-reset-tool.html b/docs/streams/developer-guide/app-reset-tool.html
index 253b89f722056..81d90e3b55a8a 100644
--- a/docs/streams/developer-guide/app-reset-tool.html
+++ b/docs/streams/developer-guide/app-reset-tool.html
@@ -101,7 +101,7 @@ <h2>Step 1: Run the application reset tool<a class="headerlink" href="#step-1-ru
                                         &#39;n&#39;, where &#39;n&#39; can be positive or
                                         negative
 --to-datetime &lt;String&gt;                Reset offsets to offset from datetime.
-                                        Format: &#39;YYYY-MM-DDTHH:mm:SS.sss&#39;
+                                        Format: &#39;yyyy-MM-DDTHH:mm:SS.sss&#39;
 --to-earliest                         Reset offsets to earliest offset.
 --to-latest                           Reset offsets to latest offset.
 --to-offset &lt;Long&gt;                    Reset offsets to a specific offset.
diff --git a/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java b/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java
index 81cd6f9f993f2..140f743e059e9 100644
--- a/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java
+++ b/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java
@@ -610,7 +610,7 @@ public StreamsResetterOptions(String[] args) {
             toOffsetOption = parser.accepts("to-offset", "Reset offsets to a specific offset.")
                 .withRequiredArg()
                 .ofType(Long.class);
-            toDatetimeOption = parser.accepts("to-datetime", "Reset offsets to offset from datetime. Format: 'YYYY-MM-DDTHH:mm:SS.sss'")
+            toDatetimeOption = parser.accepts("to-datetime", "Reset offsets to offset from datetime. Format: 'yyyy-MM-DDTHH:mm:SS.sss'")
                 .withRequiredArg()
                 .ofType(String.class);
             byDurationOption = parser.accepts("by-duration", "Reset offsets to offset by duration from current timestamp. Format: 'PnDTnHnMnS'")
diff --git a/tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommandOptions.java b/tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommandOptions.java
index 48d51622e9cd5..64c93e4a7441c 100644
--- a/tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommandOptions.java
+++ b/tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommandOptions.java
@@ -62,7 +62,7 @@ public class ConsumerGroupCommandOptions extends CommandDefaultOptions {
     private static final String EXPORT_DOC = "Export operation execution to a CSV file. Supported operations: reset-offsets.";
     private static final String RESET_TO_OFFSET_DOC = "Reset offsets to a specific offset.";
     private static final String RESET_FROM_FILE_DOC = "Reset offsets to values defined in CSV file.";
-    private static final String RESET_TO_DATETIME_DOC = "Reset offsets to offset from datetime. Format: 'YYYY-MM-DDTHH:mm:SS.sss'";
+    private static final String RESET_TO_DATETIME_DOC = "Reset offsets to offset from datetime. Format: 'yyyy-MM-DDTHH:mm:SS.sss'";
     private static final String RESET_BY_DURATION_DOC = "Reset offsets to offset by duration from current timestamp. Format: 'PnDTnHnMnS'";
     private static final String RESET_TO_EARLIEST_DOC = "Reset offsets to earliest offset.";
     private static final String RESET_TO_LATEST_DOC = "Reset offsets to latest offset.";
diff --git a/tools/src/main/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandOptions.java b/tools/src/main/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandOptions.java
index f31f81a2f7663..2130ce3a4beb1 100644
--- a/tools/src/main/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandOptions.java
+++ b/tools/src/main/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandOptions.java
@@ -54,7 +54,7 @@ public class ShareGroupCommandOptions extends CommandDefaultOptions {
         "To define the scope use --all-topics or --topic.";
     private static final String DRY_RUN_DOC = "Only show results without executing changes on share groups. Supported operations: reset-offsets.";
     private static final String EXECUTE_DOC = "Execute operation. Supported operations: reset-offsets.";
-    private static final String RESET_TO_DATETIME_DOC = "Reset offsets to offset from datetime. Format: 'YYYY-MM-DDTHH:mm:SS.sss'";
+    private static final String RESET_TO_DATETIME_DOC = "Reset offsets to offset from datetime. Format: 'yyyy-MM-DDTHH:mm:SS.sss'";
     private static final String RESET_TO_EARLIEST_DOC = "Reset offsets to earliest offset.";
     private static final String RESET_TO_LATEST_DOC = "Reset offsets to latest offset.";
     private static final String MEMBERS_DOC = "Describe members of the group. This option may be used with the '--describe' option only.";

From e662a42bc5b323caa440ed7839f52bf014a69570 Mon Sep 17 00:00:00 2001
From: Kirk True <kirk@kirktrue.pro>
Date: Thu, 9 Jan 2025 14:08:01 -0800
Subject: [PATCH 2/2] Using ISO 8601 date time format instead of
 SimpleDateFormat format

---
 docs/ops.html                                                   | 2 +-
 docs/streams/developer-guide/app-reset-tool.html                | 2 +-
 tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java | 2 +-
 .../kafka/tools/consumer/group/ConsumerGroupCommandOptions.java | 2 +-
 .../kafka/tools/consumer/group/ShareGroupCommandOptions.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/ops.html b/docs/ops.html
index 1e5b0affb1ed8..3fb02a6ef6c11 100644
--- a/docs/ops.html
+++ b/docs/ops.html
@@ -180,7 +180,7 @@ <h4 class="anchor-heading"><a id="basic_ops_consumer_group" class="anchor-link">
   --reset-offsets also has the following scenarios to choose from (at least one scenario must be selected):
   <ul>
     <li>
-      --to-datetime &lt;String: datetime&gt; : Reset offsets to offsets from datetime. Format: 'yyyy-MM-DDTHH:mm:SS.sss'
+      --to-datetime &lt;String: datetime&gt; : Reset offsets to offsets from datetime. Format: 'YYYY-MM-DDThh:mm:ss.sss'
     </li>
     <li>
       --to-earliest : Reset offsets to earliest offset.
diff --git a/docs/streams/developer-guide/app-reset-tool.html b/docs/streams/developer-guide/app-reset-tool.html
index 81d90e3b55a8a..48a40043e701a 100644
--- a/docs/streams/developer-guide/app-reset-tool.html
+++ b/docs/streams/developer-guide/app-reset-tool.html
@@ -101,7 +101,7 @@ <h2>Step 1: Run the application reset tool<a class="headerlink" href="#step-1-ru
                                         &#39;n&#39;, where &#39;n&#39; can be positive or
                                         negative
 --to-datetime &lt;String&gt;                Reset offsets to offset from datetime.
-                                        Format: &#39;yyyy-MM-DDTHH:mm:SS.sss&#39;
+                                        Format: &#39;YYYY-MM-DDThh:mm:ss.sss&#39;
 --to-earliest                         Reset offsets to earliest offset.
 --to-latest                           Reset offsets to latest offset.
 --to-offset &lt;Long&gt;                    Reset offsets to a specific offset.
diff --git a/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java b/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java
index 140f743e059e9..d15d7dcde1328 100644
--- a/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java
+++ b/tools/src/main/java/org/apache/kafka/tools/StreamsResetter.java
@@ -610,7 +610,7 @@ public StreamsResetterOptions(String[] args) {
             toOffsetOption = parser.accepts("to-offset", "Reset offsets to a specific offset.")
                 .withRequiredArg()
                 .ofType(Long.class);
-            toDatetimeOption = parser.accepts("to-datetime", "Reset offsets to offset from datetime. Format: 'yyyy-MM-DDTHH:mm:SS.sss'")
+            toDatetimeOption = parser.accepts("to-datetime", "Reset offsets to offset from datetime. Format: 'YYYY-MM-DDThh:mm:ss.sss'")
                 .withRequiredArg()
                 .ofType(String.class);
             byDurationOption = parser.accepts("by-duration", "Reset offsets to offset by duration from current timestamp. Format: 'PnDTnHnMnS'")
diff --git a/tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommandOptions.java b/tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommandOptions.java
index 74fc753f6c592..553ea3acb8a91 100644
--- a/tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommandOptions.java
+++ b/tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommandOptions.java
@@ -62,7 +62,7 @@ public class ConsumerGroupCommandOptions extends CommandDefaultOptions {
     private static final String EXPORT_DOC = "Export operation execution to a CSV file. Supported operations: reset-offsets.";
     private static final String RESET_TO_OFFSET_DOC = "Reset offsets to a specific offset.";
     private static final String RESET_FROM_FILE_DOC = "Reset offsets to values defined in CSV file.";
-    private static final String RESET_TO_DATETIME_DOC = "Reset offsets to offset from datetime. Format: 'yyyy-MM-DDTHH:mm:SS.sss'";
+    private static final String RESET_TO_DATETIME_DOC = "Reset offsets to offset from datetime. Format: 'YYYY-MM-DDThh:mm:ss.sss'";
     private static final String RESET_BY_DURATION_DOC = "Reset offsets to offset by duration from current timestamp. Format: 'PnDTnHnMnS'";
     private static final String RESET_TO_EARLIEST_DOC = "Reset offsets to earliest offset.";
     private static final String RESET_TO_LATEST_DOC = "Reset offsets to latest offset.";
diff --git a/tools/src/main/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandOptions.java b/tools/src/main/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandOptions.java
index 2130ce3a4beb1..2852725a5d172 100644
--- a/tools/src/main/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandOptions.java
+++ b/tools/src/main/java/org/apache/kafka/tools/consumer/group/ShareGroupCommandOptions.java
@@ -54,7 +54,7 @@ public class ShareGroupCommandOptions extends CommandDefaultOptions {
         "To define the scope use --all-topics or --topic.";
     private static final String DRY_RUN_DOC = "Only show results without executing changes on share groups. Supported operations: reset-offsets.";
     private static final String EXECUTE_DOC = "Execute operation. Supported operations: reset-offsets.";
-    private static final String RESET_TO_DATETIME_DOC = "Reset offsets to offset from datetime. Format: 'yyyy-MM-DDTHH:mm:SS.sss'";
+    private static final String RESET_TO_DATETIME_DOC = "Reset offsets to offset from datetime. Format: 'YYYY-MM-DDThh:mm:ss.sss'";
     private static final String RESET_TO_EARLIEST_DOC = "Reset offsets to earliest offset.";
     private static final String RESET_TO_LATEST_DOC = "Reset offsets to latest offset.";
     private static final String MEMBERS_DOC = "Describe members of the group. This option may be used with the '--describe' option only.";