From 0ec520a2af05ecd6956b5e645e257d72ad5b8fbd Mon Sep 17 00:00:00 2001
From: "Colin P. McCabe" <cmccabe@apache.org>
Date: Mon, 29 Jul 2024 15:51:47 -0700
Subject: [PATCH] Bump trunk to 4.0.0-SNAPSHOT

---
 docs/js/templateData.js                                     | 6 +++---
 gradle.properties                                           | 2 +-
 kafka-merge-pr.py                                           | 2 +-
 streams/quickstart/java/pom.xml                             | 2 +-
 .../java/src/main/resources/archetype-resources/pom.xml     | 2 +-
 streams/quickstart/pom.xml                                  | 2 +-
 tests/kafkatest/__init__.py                                 | 2 +-
 tests/kafkatest/version.py                                  | 6 +++++-
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/docs/js/templateData.js b/docs/js/templateData.js
index 13d352fc70d..34c8a96b7c2 100644
--- a/docs/js/templateData.js
+++ b/docs/js/templateData.js
@@ -17,8 +17,8 @@ limitations under the License.
 
 // Define variables for doc templates
 var context={
-    "version": "39",
-    "dotVersion": "3.9",
-    "fullDotVersion": "3.9.0",
+    "version": "40",
+    "dotVersion": "4.0",
+    "fullDotVersion": "4.0.0",
     "scalaVersion": "2.13"
 };
diff --git a/gradle.properties b/gradle.properties
index 88d63be5509..ecbc9eede8f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,7 +23,7 @@ group=org.apache.kafka
 #  - streams/quickstart/pom.xml
 #  - streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
 #  - streams/quickstart/java/pom.xml
-version=3.9.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 scalaVersion=2.13.14
 # Adding swaggerVersion in gradle.properties to have a single version in place for swagger
 # New version of Swagger 2.2.14 requires minimum JDK 11.
diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py
index a775a384356..63439f3e0e4 100755
--- a/kafka-merge-pr.py
+++ b/kafka-merge-pr.py
@@ -70,7 +70,7 @@ TEMP_BRANCH_PREFIX = "PR_TOOL"
 
 DEV_BRANCH_NAME = "trunk"
 
-DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "3.9.0")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "4.0.0")
 
 ORIGINAL_HEAD = ""
 
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index 3cf31f12883..e58187bb6e3 100644
--- a/streams/quickstart/java/pom.xml
+++ b/streams/quickstart/java/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.kafka</groupId>
         <artifactId>streams-quickstart</artifactId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
index f6034a115ec..3dad3ae7f8e 100644
--- a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
+++ b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
@@ -29,7 +29,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <kafka.version>3.9.0-SNAPSHOT</kafka.version>
+        <kafka.version>4.0.0-SNAPSHOT</kafka.version>
         <slf4j.version>1.7.36</slf4j.version>
     </properties>
 
diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml
index 46cdea42fc4..aa7f1884d19 100644
--- a/streams/quickstart/pom.xml
+++ b/streams/quickstart/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.kafka</groupId>
     <artifactId>streams-quickstart</artifactId>
     <packaging>pom</packaging>
-    <version>3.9.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
 
     <name>Kafka Streams :: Quickstart</name>
 
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index a4a73838de0..cf5a5d17f59 100644
--- a/tests/kafkatest/__init__.py
+++ b/tests/kafkatest/__init__.py
@@ -22,4 +22,4 @@
 # Instead, in development branches, the version should have a suffix of the form ".devN"
 #
 # For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0.dev0"
-__version__ = '3.9.0.dev0'
+__version__ = '4.0.0.dev0'
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index bacbedbb487..763896fa652 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -122,7 +122,7 @@ def get_version(node=None):
         return DEV_BRANCH
 
 DEV_BRANCH = KafkaVersion("dev")
-DEV_VERSION = KafkaVersion("3.8.0-SNAPSHOT")
+DEV_VERSION = KafkaVersion("4.0.0-SNAPSHOT")
 
 # This should match the LATEST_PRODUCTION version defined in MetadataVersion.java
 LATEST_STABLE_METADATA_VERSION = "3.8"
@@ -274,3 +274,7 @@ LATEST_3_7 = V_3_7_1
 # 3.8.x version
 V_3_8_0 = KafkaVersion("3.8.0")
 LATEST_3_8 = V_3_8_0
+
+# 4.0.x version
+V_4_0_0 = KafkaVersion("4.0.0")
+LATEST_4_0 = V_4_0_0