You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by da...@apache.org on 2022/09/28 14:02:52 UTC

[kafka] branch 3.3 updated (07a448295f7 -> 4b35f247d15)

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

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


    from 07a448295f7 MINOR: Small update docs/design.html grammar and typo (#12691)
     add 9d1f9f77642 Bump version to 3.3.0
     new da96ac933cf Merge tag '3.3.0-rc2' into 3.3
     new 4b35f247d15 Bump 3.3 branch to 3.3.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 +-
 .../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] 02/02: Bump 3.3 branch to 3.3.1-SNAPSHOT

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

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

commit 4b35f247d15d97cb9f60818441b1da4371ead04a
Author: David Arthur <mu...@gmail.com>
AuthorDate: Wed Sep 28 09:56:44 2022 -0400

    Bump 3.3 branch to 3.3.1-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 6b773468f96..dd5e02d93a5 100644
--- a/docs/js/templateData.js
+++ b/docs/js/templateData.js
@@ -19,6 +19,6 @@ limitations under the License.
 var context={
     "version": "33",
     "dotVersion": "3.3",
-    "fullDotVersion": "3.3.0",
+    "fullDotVersion": "3.3.1",
     "scalaVersion": "2.13"
 };
diff --git a/gradle.properties b/gradle.properties
index c25b54b817e..a56c5959b04 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=3.3.0
+version=3.3.1-SNAPSHOT
 scalaVersion=2.13.8
 task=build
 org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py
index 75a2fc4ba97..9593046b9cd 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.3.0")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "3.3.1")
 
 ORIGINAL_HEAD = ""
 
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index ad707a1f171..c488b85dc46 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.3.0</version>
+        <version>3.3.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 2e8250f9e73..46297302c64 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.3.0</kafka.version>
+        <kafka.version>3.3.1-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 194ef84ca47..e65f678edf1 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.3.0</version>
+    <version>3.3.1-SNAPSHOT</version>
 
     <name>Kafka Streams :: Quickstart</name>
 
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index 9ae8244e082..a769f78f0e9 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.3.0'
+__version__ = '3.3.1.dev0'
diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 29f1b4e8418..ada1e76e6c5 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -119,7 +119,7 @@ def get_version(node=None):
         return DEV_BRANCH
 
 DEV_BRANCH = KafkaVersion("dev")
-DEV_VERSION = KafkaVersion("3.3.0-SNAPSHOT")
+DEV_VERSION = KafkaVersion("3.3.1-SNAPSHOT")
 
 LATEST_METADATA_VERSION = "3.3"
 
@@ -233,4 +233,5 @@ LATEST_3_2 = V_3_2_0
 
 # 3.3.x versions
 V_3_3_0 = KafkaVersion("3.3.0")
-LATEST_3_3 = V_3_3_0
+V_3_3_1 = KafkaVersion("3.3.1")
+LATEST_3_3 = V_3_3_1


[kafka] 01/02: Merge tag '3.3.0-rc2' into 3.3

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

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

commit da96ac933cf06f5603dbeaf2104fa077ff3c2e80
Merge: 07a448295f7 9d1f9f77642
Author: David Arthur <mu...@gmail.com>
AuthorDate: Wed Sep 28 09:51:55 2022 -0400

    Merge tag '3.3.0-rc2' into 3.3
    
    3.3.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(-)