This is an automated email from the ASF dual-hosted git repository.
rsivaram pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new c853ef7 MINOR: Bump version to 2.0.0-SNAPSHOT (#4804)
c853ef7 is described below
commit c853ef75a11663cbee3160e64e45f46f5a8ac78c
Author: Ismael Juma <[email protected]>
AuthorDate: Wed Apr 25 03:19:31 2018 -0700
MINOR: Bump version to 2.0.0-SNAPSHOT (#4804)
---
core/src/main/scala/kafka/api/ApiVersion.scala | 10 +++++++++-
gradle.properties | 2 +-
kafka-merge-pr.py | 2 +-
tests/kafkatest/__init__.py | 2 +-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/core/src/main/scala/kafka/api/ApiVersion.scala
b/core/src/main/scala/kafka/api/ApiVersion.scala
index 9270a7a..62b91a0 100644
--- a/core/src/main/scala/kafka/api/ApiVersion.scala
+++ b/core/src/main/scala/kafka/api/ApiVersion.scala
@@ -76,7 +76,9 @@ object ApiVersion {
// Introduced DeleteGroupsRequest V0 via KIP-229, plus KIP-227 incremental
fetch requests,
// and KafkaStorageException for fetch requests.
"1.1-IV0" -> KAFKA_1_1_IV0,
- "1.1" -> KAFKA_1_1_IV0
+ "1.1" -> KAFKA_1_1_IV0,
+ "2.0-IV0" -> KAFKA_2_0_IV0,
+ "2.0" -> KAFKA_2_0_IV0
)
private val versionPattern = "\\.".r
@@ -205,3 +207,9 @@ case object KAFKA_1_1_IV0 extends ApiVersion {
val messageFormatVersion = RecordFormat.V2
val id: Int = 14
}
+
+case object KAFKA_2_0_IV0 extends ApiVersion {
+ val version: String = "2.0-IV0"
+ val messageFormatVersion = RecordFormat.V2
+ val id: Int = 15
+}
diff --git a/gradle.properties b/gradle.properties
index 325a1d0..ab94b7b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@
group=org.apache.kafka
# NOTE: When you change this version number, you should also make sure to
update
# the version numbers in tests/kafkatest/__init__.py and kafka-merge-pr.py.
-version=1.2.0-SNAPSHOT
+version=2.0.0-SNAPSHOT
scalaVersion=2.11.12
task=build
org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx1024m -Xss2m
diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py
index 02cf6e0..b2c4688 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", "1.2.0")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "2.0.0")
def get_json(url):
try:
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index 935f20d..8f7aadd 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__ = '1.2.0.dev0'
+__version__ = '2.0.0.dev0'
--
To stop receiving notification emails like this one, please contact
[email protected].
