This is an automated email from the ASF dual-hosted git repository. vvcephei pushed a commit to branch 2.5 in repository https://gitbox.apache.org/repos/asf/kafka.git
commit cd05b69c12c28b7f3cf600540eb7a3163cc3744e Author: John Roesler <[email protected]> AuthorDate: Mon Aug 10 09:49:04 2020 -0500 MINOR: Update 2.5 branch version to 2.5.2-SNAPSHOT --- docs/js/templateData.js | 2 +- 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 | 10 +++++----- tests/kafkatest/version.py | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/js/templateData.js b/docs/js/templateData.js index 3cc9733..d76e602 100644 --- a/docs/js/templateData.js +++ b/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" }; diff --git a/gradle.properties b/gradle.properties index 5dac221..bb63be8 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.5.1 +version=2.5.2-SNAPSHOT scalaVersion=2.12.10 task=build org.gradle.jvmargs=-Xmx1024m -Xss2m diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py index 9537eec..62722dc 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.5.1") +DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "2.5.2-SNAPSHOT") def get_json(url): try: diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml index 032e2b2..e48b6e0 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.5.1</version> + <version>2.5.2-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 c06bf3c..189d2d6 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.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> diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml index 759f3ea..1c10b5d 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.5.1</version> + <version>2.5.2-SNAPSHOT</version> <name>Kafka Streams :: Quickstart</name> diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py index b464468..dfedb63 100644 --- a/tests/kafkatest/__init__.py +++ b/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' diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py index 077b6ff..e23ba85 100644 --- a/tests/kafkatest/version.py +++ b/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")
