From 87ff83a82efd64849b855b5397fb26ae17327010 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@confluent.io>
Date: Mon, 20 May 2019 12:47:21 -0700
Subject: [PATCH] MINOR: Bump version to 2.4.0-SNAPSHOT (#6774)

Reviewers: Jason Gustafson <jason@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                                  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/js/templateData.js b/docs/js/templateData.js
index e5d5f0b8d24..071fa941e58 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": "23",
-    "dotVersion": "2.3",
-    "fullDotVersion": "2.3.0",
+    "version": "24",
+    "dotVersion": "2.4",
+    "fullDotVersion": "2.4.0",
     "scalaVersion": "2.12"
 };
diff --git a/gradle.properties b/gradle.properties
index a7b31d96704..c4b58b94339 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,7 @@ group=org.apache.kafka
 #  - tests/kafkatest/__init__.py
 #  - tests/kafkatest/version.py (variable DEV_VERSION)
 #  - kafka-merge-pr.py
-version=2.3.0-SNAPSHOT
+version=2.4.0-SNAPSHOT
 scalaVersion=2.12.8
 task=build
 org.gradle.jvmargs=-Xmx1024m -Xss2m
diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py
index 1723fe36406..939fe9c9438 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", "2.3.0")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "2.4.0")
 
 def get_json(url):
     try:
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index bd0a8e13b5d..13425c05405 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>2.3.0-SNAPSHOT</version>
+        <version>2.4.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 0f186883219..300f72f0012 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>2.3.0-SNAPSHOT</kafka.version>
+        <kafka.version>2.4.0-SNAPSHOT</kafka.version>
         <slf4j.version>1.7.7</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
     </properties>
diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml
index edad6ba9d51..79deb93c74d 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>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
 
     <name>Kafka Streams :: Quickstart</name>
 
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index 2e86a3d8581..7083c2f1486 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__ = '2.3.0.dev0'
+__version__ = '2.4.0.dev0'
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index c4a958eb9b4..87fedeadfed 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -60,7 +60,7 @@ def get_version(node=None):
         return DEV_BRANCH
 
 DEV_BRANCH = KafkaVersion("dev")
-DEV_VERSION = KafkaVersion("2.3.0-SNAPSHOT")
+DEV_VERSION = KafkaVersion("2.4.0-SNAPSHOT")
 
 # 0.8.2.x versions
 V_0_8_2_1 = KafkaVersion("0.8.2.1")