You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by va...@apache.org on 2019/06/02 05:57:11 UTC
[kafka] branch 2.2 updated (c450bfc -> 79a42ae)
This is an automated email from the ASF dual-hosted git repository.
vahid pushed a change to branch 2.2
in repository https://gitbox.apache.org/repos/asf/kafka.git.
from c450bfc KAFKA-8155: Add 2.1.1 release to system tests (#6596)
add 55783d3 Bump version to 2.2.1
new ed80742 Merge tag '2.2.1-rc1' into 2.2
new 79a42ae Update versions to 2.2.2-SNAPSHOT
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +-
7 files changed, 11 insertions(+), 11 deletions(-)
[kafka] 01/02: Merge tag '2.2.1-rc1' into 2.2
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vahid pushed a commit to branch 2.2
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit ed80742bedb51238b7a9fdaa115c93b761808f16
Merge: c450bfc 55783d3
Author: Vahid Hashemian <va...@gmail.com>
AuthorDate: Sat Jun 1 22:50:50 2019 -0700
Merge tag '2.2.1-rc1' into 2.2
2.2.1-rc1
gradle.properties | 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 +++++-----
5 files changed, 9 insertions(+), 9 deletions(-)
[kafka] 02/02: Update versions to 2.2.2-SNAPSHOT
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vahid pushed a commit to branch 2.2
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 79a42ae79358227a2df882d14f37a3da654249f0
Author: Vahid Hashemian <va...@gmail.com>
AuthorDate: Sat Jun 1 22:55:42 2019 -0700
Update versions to 2.2.2-SNAPSHOT
---
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 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index f23e15d..aed6519 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.2.1
+version=2.2.2-SNAPSHOT
scalaVersion=2.12.8
task=build
org.gradle.jvmargs=-Xmx1024m -Xss2m
diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py
index a366da3..4089bef 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.2.1")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "2.2.2")
def get_json(url):
try:
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index 83ee834..1dfdfbb 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.2.1</version>
+ <version>2.2.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 c293ca6..27dadf5 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.2.1</kafka.version>
+ <kafka.version>2.2.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 017b4dd..beea476 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.2.1</version>
+ <version>2.2.2-SNAPSHOT</version>
<name>Kafka Streams :: Quickstart</name>
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index b0c7e3e..0dc39e6 100644
--- a/tests/kafkatest/__init__.py
+++ b/tests/kafkatest/__init__.py
@@ -22,4 +22,4 @@
# Instead, in
#
# For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0
-__version__ = '2.2.1'
+__version__ = '2.2.2.dev0'
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 83fc716..5daa9c6 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -60,7 +60,7 @@ def get_version(node=None):
return DEV_BRANCH
DEV_BRANCH = KafkaVersion("dev")
-DEV_VERSION = KafkaVersion("2.2.1-SNAPSHOT")
+DEV_VERSION = KafkaVersion("2.2.2-SNAPSHOT")
# 0.8.2.x versions
V_0_8_2_1 = KafkaVersion("0.8.2.1")