You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by di...@apache.org on 2023/07/20 13:21:33 UTC
[kafka] branch 3.5 updated (9a31f484343 -> 9f9cfbd6fab)
This is an automated email from the ASF dual-hosted git repository.
divijv pushed a change to branch 3.5
in repository https://gitbox.apache.org/repos/asf/kafka.git
from 9a31f484343 MINOR: Update docs to include ZK deprecation notice and information (#14031)
add 2c6fb6c5447 Bump version to 3.5.1
new 4ca2c84a2ba Merge tag '3.5.1-rc1' into 3.5
new 9f9cfbd6fab MINOR: Update 3.5 branch version to 3.5.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:
docs/js/templateData.js | 2 +-
gradle.properties | 2 +-
kafka-merge-pr.py | 2 +-
streams/quickstart/java/pom.xml | 2 +-
.../quickstart/java/src/main/resources/archetype-resources/pom.xml | 2 +-
streams/quickstart/pom.xml | 2 +-
tests/kafkatest/__init__.py | 2 +-
tests/kafkatest/version.py | 5 +++--
8 files changed, 10 insertions(+), 9 deletions(-)
[kafka] 01/02: Merge tag '3.5.1-rc1' into 3.5
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
divijv pushed a commit to branch 3.5
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 4ca2c84a2ba2afb4bd35b44d65339d3c2129b60b
Merge: 9a31f484343 2c6fb6c5447
Author: Divij Vaidya <di...@amazon.com>
AuthorDate: Thu Jul 20 11:50:50 2023 +0000
Merge tag '3.5.1-rc1' into 3.5
3.5.1-rc1
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.5 branch version to 3.5.2-SNAPSHOT
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
divijv pushed a commit to branch 3.5
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 9f9cfbd6fabfb50cd4e9dacb4e8b9d88265f91e6
Author: Divij Vaidya <di...@amazon.com>
AuthorDate: Thu Jul 20 13:17:54 2023 +0000
MINOR: Update 3.5 branch version to 3.5.2-SNAPSHOT
---
docs/js/templateData.js | 2 +-
gradle.properties | 2 +-
kafka-merge-pr.py | 2 +-
streams/quickstart/java/pom.xml | 2 +-
.../quickstart/java/src/main/resources/archetype-resources/pom.xml | 2 +-
streams/quickstart/pom.xml | 2 +-
tests/kafkatest/__init__.py | 2 +-
tests/kafkatest/version.py | 5 +++--
8 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/docs/js/templateData.js b/docs/js/templateData.js
index 946be6e381c..0de237968ad 100644
--- a/docs/js/templateData.js
+++ b/docs/js/templateData.js
@@ -19,6 +19,6 @@ limitations under the License.
var context={
"version": "35",
"dotVersion": "3.5",
- "fullDotVersion": "3.5.1",
+ "fullDotVersion": "3.5.2",
"scalaVersion": "2.13"
};
diff --git a/gradle.properties b/gradle.properties
index 3d920a522a6..a51985db68a 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.5.1
+version=3.5.2-SNAPSHOT
scalaVersion=2.13.10
task=build
org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py
index 04dba2cd462..8f252f8ff71 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.5.1")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "3.5.2")
ORIGINAL_HEAD = ""
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index acd3a1b2855..03866a61536 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.5.1</version>
+ <version>3.5.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 e2f40466462..8cb3459f8d8 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.5.1</kafka.version>
+ <kafka.version>3.5.2-SNAPSHOT</kafka.version>
<slf4j.version>1.7.36</slf4j.version>
</properties>
diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml
index b44c2772cf1..ca95f8ebedc 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.5.1</version>
+ <version>3.5.2-SNAPSHOT</version>
<name>Kafka Streams :: Quickstart</name>
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index 63c5c1c6e35..70a8fd7871e 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.5.1'
+__version__ = '3.5.2.dev0'
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 060c963e207..3fd30a799d7 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.5.1-SNAPSHOT")
+DEV_VERSION = KafkaVersion("3.5.2-SNAPSHOT")
LATEST_METADATA_VERSION = "3.3"
@@ -250,4 +250,5 @@ LATEST_3_4 = V_3_4_0
# 3.5.x versions
V_3_5_0 = KafkaVersion("3.5.0")
V_3_5_1 = KafkaVersion("3.5.1")
-LATEST_3_5 = V_3_5_1
+V_3_5_2 = KafkaVersion("3.5.2")
+LATEST_3_5 = V_3_5_2