You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by rh...@apache.org on 2020/08/04 23:08:06 UTC
[kafka] branch 2.6 updated: Bump dev version to 2.6.1-SNAPSHOT
(#9115)
This is an automated email from the ASF dual-hosted git repository.
rhauch pushed a commit to branch 2.6
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/2.6 by this push:
new 2744c42 Bump dev version to 2.6.1-SNAPSHOT (#9115)
2744c42 is described below
commit 2744c423e1075a93a0b451fc371d8bc5053fe2d8
Author: Randall Hauch <rh...@gmail.com>
AuthorDate: Tue Aug 4 18:07:33 2020 -0500
Bump dev version to 2.6.1-SNAPSHOT (#9115)
Author: Randall Hauch <rh...@gmail.com>
Reviewer: Ismael Juma <is...@confluent.io>
---
docs/js/templateData.js | 2 +-
gradle.properties | 2 +-
kafka-merge-pr.py | 2 +-
streams/quickstart/java/pom.xml | 2 +-
streams/quickstart/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, 8 insertions(+), 8 deletions(-)
diff --git a/docs/js/templateData.js b/docs/js/templateData.js
index 4e51947..eac63ec 100644
--- a/docs/js/templateData.js
+++ b/docs/js/templateData.js
@@ -19,6 +19,6 @@ limitations under the License.
var context={
"version": "26",
"dotVersion": "2.6",
- "fullDotVersion": "2.6.0",
+ "fullDotVersion": "2.6.1",
"scalaVersion": "2.13"
};
diff --git a/gradle.properties b/gradle.properties
index e742057..236a8ce 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.6.0-SNAPSHOT
+version=2.6.1-SNAPSHOT
scalaVersion=2.13.2
task=build
org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py
index 39f3daf..73a81ec 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.6.0")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "2.6.1")
def get_json(url):
try:
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index d61d4af..46b4e14 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.6.0-SNAPSHOT</version>
+ <version>2.6.1-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 e376e8a..db80689 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.6.0-SNAPSHOT</kafka.version>
+ <kafka.version>2.6.1-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 c307b93..ff7ef91 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.6.0-SNAPSHOT</version>
+ <version>2.6.1-SNAPSHOT</version>
<name>Kafka Streams :: Quickstart</name>
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index cc2dc9f..cda3855 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.6.0.dev0'
+__version__ = '2.6.1.dev0'
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index e9758d2..8408890 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -69,7 +69,7 @@ def get_version(node=None):
return DEV_BRANCH
DEV_BRANCH = KafkaVersion("dev")
-DEV_VERSION = KafkaVersion("2.6.0-SNAPSHOT")
+DEV_VERSION = KafkaVersion("2.6.1-SNAPSHOT")
# 0.8.2.x versions
V_0_8_2_1 = KafkaVersion("0.8.2.1")