From dc1ede8d89d0964783302e0da9ead7fa1d76fbe4 Mon Sep 17 00:00:00 2001
From: Mickael Maison <mimaison@users.noreply.github.com>
Date: Fri, 14 Apr 2023 14:17:07 +0200
Subject: [PATCH] MINOR: Bump trunk to 3.6.0-SNAPSHOT (#13570)

Reviewers: David Jacot <djacot@confluent.io>
---
 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 e23d6ba56d3..1bb959e3460 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": "35",
-    "dotVersion": "3.5",
-    "fullDotVersion": "3.5.0",
+    "version": "36",
+    "dotVersion": "3.6",
+    "fullDotVersion": "3.6.0",
     "scalaVersion": "2.13"
 };
diff --git a/gradle.properties b/gradle.properties
index f6093c3b63a..d4bcddfd169 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.5.0-SNAPSHOT
+version=3.6.0-SNAPSHOT
 scalaVersion=2.13.10
 task=build
 org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py
index 7c4f6620373..ae560c7709c 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.5.0")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "3.6.0")
 
 ORIGINAL_HEAD = ""
 
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index 104d4e6c929..fc7436f1b35 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.5.0-SNAPSHOT</version>
+        <version>3.6.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 64b06a40287..2a31d66c013 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.5.0-SNAPSHOT</kafka.version>
+        <kafka.version>3.6.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 05435be22be..9a8b617ac39 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.5.0-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
 
     <name>Kafka Streams :: Quickstart</name>
 
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index 74ec83d9bf7..a52cc8ebbd9 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.5.0.dev0'
+__version__ = '3.6.0.dev0'
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 5ffc325904b..c31adc256ba 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -248,4 +248,8 @@ LATEST_3_4 = V_3_4_0
 
 # 3.5.x versions
 V_3_5_0 = KafkaVersion("3.5.0")
-LATEST_3_5 = V_3_5_0
\ No newline at end of file
+LATEST_3_5 = V_3_5_0
+
+# 3.6.x versions
+V_3_6_0 = KafkaVersion("3.6.0")
+LATEST_3_6 = V_3_6_0