root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MINOR: Bump version to 2.0.0-SNAPSHOT (#4804)

This commit is contained in:
Ismael Juma 2018-04-25 03:19:31 -07:00 committed by Rajini Sivaram
parent acd669e424
commit c853ef75a1
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/scala/kafka/api/ApiVersion.scala
View File

@ -76,7 +76,9 @@ object ApiVersion {
// Introduced DeleteGroupsRequest V0 via KIP-229, plus KIP-227 incremental fetch requests, // Introduced DeleteGroupsRequest V0 via KIP-229, plus KIP-227 incremental fetch requests,
// and KafkaStorageException for fetch requests. // and KafkaStorageException for fetch requests.
"1.1-IV0" -> KAFKA_1_1_IV0, "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 private val versionPattern = "\\.".r
@ -205,3 +207,9 @@ case object KAFKA_1_1_IV0 extends ApiVersion {
val messageFormatVersion = RecordFormat.V2 val messageFormatVersion = RecordFormat.V2
val id: Int = 14 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
}

2
gradle.properties
View File

@ -16,7 +16,7 @@
group=org.apache.kafka group=org.apache.kafka
# NOTE: When you change this version number, you should also make sure to update # 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. # 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 scalaVersion=2.11.12
task=build task=build
org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx1024m -Xss2m org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx1024m -Xss2m

2
kafka-merge-pr.py
View File

@ -70,7 +70,7 @@ TEMP_BRANCH_PREFIX = "PR_TOOL"
DEV_BRANCH_NAME = "trunk" 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): def get_json(url):
try: try:

2
tests/kafkatest/__init__.py
View File

@ -22,4 +22,4 @@
# Instead, in development branches, the version should have a suffix of the form ".devN" # 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" # 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'