You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by sa...@apache.org on 2023/10/03 21:11:34 UTC

[kafka] branch 3.6 updated (00229492819 -> 2edd22bcab0)

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

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


    from 00229492819 KAFKA-15483: Add KIP-938 and KIP-866 metrics to bundled docs (#14421)
     add 60e845626d8 Bump version to 3.6.0
     new 2097c8fa4c1 Merge tag '3.6.0-rc2' into 3.6
     new 2edd22bcab0 MINOR Update 3.6 branch version to 3.6.1-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:
 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(-)


[kafka] 01/02: Merge tag '3.6.0-rc2' into 3.6

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

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

commit 2097c8fa4c1cb83031246d3f9194221af7dd876e
Merge: 00229492819 60e845626d8
Author: Satish Duggana <sa...@apache.org>
AuthorDate: Tue Oct 3 13:41:20 2023 -0700

    Merge tag '3.6.0-rc2' into 3.6
    
    3.6.0-rc2

 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 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


[kafka] 02/02: MINOR Update 3.6 branch version to 3.6.1-SNAPSHOT

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

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

commit 2edd22bcab09cc026c15a0481f8cdbb85fa3033d
Author: Satish Duggana <sa...@apache.org>
AuthorDate: Tue Oct 3 14:04:42 2023 -0700

    MINOR Update 3.6 branch version to 3.6.1-SNAPSHOT
---
 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 1bb959e3460..fc357a2dc12 100644
--- a/docs/js/templateData.js
+++ b/docs/js/templateData.js
@@ -19,6 +19,6 @@ limitations under the License.
 var context={
     "version": "36",
     "dotVersion": "3.6",
-    "fullDotVersion": "3.6.0",
+    "fullDotVersion": "3.6.1-SNAPSHOT",
     "scalaVersion": "2.13"
 };
diff --git a/gradle.properties b/gradle.properties
index abe468e098f..62aeaa008a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,7 +23,7 @@ group=org.apache.kafka
 #  - streams/quickstart/pom.xml
 #  - streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
 #  - streams/quickstart/java/pom.xml
-version=3.6.0
+version=3.6.1-SNAPSHOT
 scalaVersion=2.13.11
 task=build
 org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py
index 5368172485b..13924a0a188 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", "3.6.0")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "3.6.1-SNAPSHOT")
 
 ORIGINAL_HEAD = ""
 
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index 7bcf5892a74..c174578ca04 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>3.6.0</version>
+        <version>3.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 44f209da10e..6c163d8d5d9 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>3.6.0</kafka.version>
+        <kafka.version>3.6.1-SNAPSHOT</kafka.version>
         <slf4j.version>1.7.36</slf4j.version>
     </properties>
 
diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml
index c7c3caeefe3..9a7ebd99859 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>3.6.0</version>
+    <version>3.6.1-SNAPSHOT</version>
 
     <name>Kafka Streams :: Quickstart</name>
 
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index d56b076e3e9..19df9452667 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__ = '3.6.0'
+__version__ = '3.6.1-SNAPSHOT'
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 0656d767fe2..adc0b4e924a 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -120,7 +120,7 @@ def get_version(node=None):
         return DEV_BRANCH
 
 DEV_BRANCH = KafkaVersion("dev")
-DEV_VERSION = KafkaVersion("3.6.0-SNAPSHOT")
+DEV_VERSION = KafkaVersion("3.6.1-SNAPSHOT")
 
 LATEST_METADATA_VERSION = "3.6"