MINOR: Update 2.5 branch version to 2.5.2-SNAPSHOT

docs/js/templateData.js

@@ -19,6 +19,6 @@ limitations under the License.
 var context={
     "version": "25",
     "dotVersion": "2.5",
-    "fullDotVersion": "2.5.1",
+    "fullDotVersion": "2.5.2-SNAPSHOT",
     "scalaVersion": "2.12"
 };

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.5.1
+version=2.5.2-SNAPSHOT
 scalaVersion=2.12.10
 task=build
 org.gradle.jvmargs=-Xmx1024m -Xss2m

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.5.1")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "2.5.2-SNAPSHOT")
 
 def get_json(url):
     try:

streams/quickstart/java/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.kafka</groupId>
         <artifactId>streams-quickstart</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

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.5.1</kafka.version>
+        <kafka.version>2.5.2-SNAPSHOT</kafka.version>
         <slf4j.version>1.7.7</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
     </properties>

streams/quickstart/pom.xml

@@ -22,7 +22,7 @@
     <groupId>org.apache.kafka</groupId>
     <artifactId>streams-quickstart</artifactId>
     <packaging>pom</packaging>
-    <version>2.5.1</version>
+    <version>2.5.2-SNAPSHOT</version>
 
     <name>Kafka Streams :: Quickstart</name>
 

tests/kafkatest/__init__.py

@@ -15,11 +15,11 @@
 
 # This determines the version of kafkatest that can be published to PyPi and installed with pip
 #
-# Note that in
+# Note that in development, this version name can't follow Kafka's convention of having a trailing "-SNAPSHOT"
 # due to python version naming restrictions, which are enforced by python packaging tools
-# (see  https://www.python.org
+# (see  https://www.python.org/dev/peps/pep-0440/)
 #
-# Instead, in
+# 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
-__version__ = '2.5.1'
+# For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0.dev0"
+__version__ = '2.5.2.dev0'

tests/kafkatest/version.py

@@ -65,7 +65,7 @@ def get_version(node=None):
         return DEV_BRANCH
 
 DEV_BRANCH = KafkaVersion("dev")
-DEV_VERSION = KafkaVersion("2.5.1-SNAPSHOT")
+DEV_VERSION = KafkaVersion("2.5.2-SNAPSHOT")
 
 # 0.8.2.x versions
 V_0_8_2_1 = KafkaVersion("0.8.2.1")