You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ab...@apache.org on 2021/04/19 17:59:14 UTC

[kafka] branch 2.6 updated (f4eb389 -> c5171ff)

This is an automated email from the ASF dual-hosted git repository.

ableegoldman pushed a change to branch 2.6
in repository https://gitbox.apache.org/repos/asf/kafka.git.


    from f4eb389  KAFKA-12667: Fix incorrect error log on StateDirectory close (#10536)
     add da65af0  Bump version to 2.6.2
     new a9305b9  Merge branch '2.6' of https://github.com/apache/kafka into 2.6
     new c5171ff  Bump version to 2.6.3-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 +-
 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                                             | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

[kafka] 01/02: Merge branch '2.6' of https://github.com/apache/kafka into 2.6

Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ableegoldman pushed a commit to branch 2.6
in repository https://gitbox.apache.org/repos/asf/kafka.git

commit a9305b9a88ea9597d23790a30a3be6e1b9ed70dd
Merge: da65af0 f4eb389
Author: ableegoldman <so...@confluent.io>
AuthorDate: Mon Apr 19 10:57:10 2021 -0700

    Merge branch '2.6' of https://github.com/apache/kafka into 2.6

 gradle/dependencies.gradle                                              | 2 +-
 .../org/apache/kafka/streams/processor/internals/StateDirectory.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[kafka] 02/02: Bump version to 2.6.3-SNAPSHOT

Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ableegoldman pushed a commit to branch 2.6
in repository https://gitbox.apache.org/repos/asf/kafka.git

commit c5171ff495f2f49cfc557752b64cd5144ada1107
Author: ableegoldman <so...@confluent.io>
AuthorDate: Mon Apr 19 10:57:57 2021 -0700

    Bump version to 2.6.3-SNAPSHOT
---
 gradle.properties                                                      | 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                                             | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1ebda3f..a203064 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.2
+version=2.6.3-SNAPSHOT
 scalaVersion=2.13.2
 task=build
 org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index 3a7c44a..9d1fe73 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.2</version>
+        <version>2.6.3-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 7e5394f..791001b 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.2</kafka.version>
+        <kafka.version>2.6.3-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 7cfac55..4dfaaf3 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.2</version>
+    <version>2.6.3-SNAPSHOT</version>
 
     <name>Kafka Streams :: Quickstart</name>
 
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index a82b18d..be81d86 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.2'
+__version__ = '2.6.3.dev0'
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 1733aca..8f991e0 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -151,4 +151,5 @@ LATEST_2_5 = V_2_5_1
 
 # 2.6.x versions
 V_2_6_0 = KafkaVersion("2.6.0")
-LATEST_2_6 = V_2_6_0
+V_2_6_1 = KafkaVersion("2.6.1")
+LATEST_2_6 = V_2_6_1