You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by mi...@apache.org on 2022/09/09 16:13:03 UTC

[kafka] branch 3.1 updated (67bd5b4fd6 -> 9ffcd1e693)

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

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


    from 67bd5b4fd6 Upgrade Netty and Jackson versions for CVE fixes [KAFKA-14044] (#12376)
     add f8c67dc3ae Bump version to 3.1.2
     new f0e4574cea Merge tag '3.1.2-rc0' into 3.1
     new 9ffcd1e693 MINOR: Update 3.1 branch version to 3.1.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:
 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 +-
 7 files changed, 7 insertions(+), 7 deletions(-)


[kafka] 02/02: MINOR: Update 3.1 branch version to 3.1.3-SNAPSHOT

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

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

commit 9ffcd1e69314d3eb937b9da2a9fd471c8797b804
Author: Mickael Maison <mi...@gmail.com>
AuthorDate: Fri Sep 9 18:12:46 2022 +0200

    MINOR: Update 3.1 branch version to 3.1.3-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 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/js/templateData.js b/docs/js/templateData.js
index 53a400da50..ae051822f1 100644
--- a/docs/js/templateData.js
+++ b/docs/js/templateData.js
@@ -19,6 +19,6 @@ limitations under the License.
 var context={
     "version": "31",
     "dotVersion": "3.1",
-    "fullDotVersion": "3.1.2-SNAPSHOT",
+    "fullDotVersion": "3.1.3-SNAPSHOT",
     "scalaVersion": "2.13"
 };
diff --git a/gradle.properties b/gradle.properties
index 2092df3bd3..f59f9b10c6 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.1.2
+version=3.1.3-SNAPSHOT
 scalaVersion=2.13.6
 task=build
 org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
diff --git a/kafka-merge-pr.py b/kafka-merge-pr.py
index 8451e34582..c60d97916b 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.1.2-SNAPSHOT")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "3.1.3-SNAPSHOT")
 
 def get_json(url):
     try:
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index c2b678d5bb..c9de304902 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.1.2</version>
+        <version>3.1.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 bf267d383d..cbb2e325a4 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.1.2</kafka.version>
+        <kafka.version>3.1.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 939ace31d5..f8c7e2ecbc 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.1.2</version>
+    <version>3.1.3-SNAPSHOT</version>
 
     <name>Kafka Streams :: Quickstart</name>
 
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index 34447789d6..874acdd8ad 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.1.2'
+__version__ = '3.1.3.dev0'


[kafka] 01/02: Merge tag '3.1.2-rc0' into 3.1

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

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

commit f0e4574ceab0c0317d7a833822a504ae62212eab
Merge: 67bd5b4fd6 f8c67dc3ae
Author: Mickael Maison <mi...@gmail.com>
AuthorDate: Fri Sep 9 18:09:52 2022 +0200

    Merge tag '3.1.2-rc0' into 3.1
    
    3.1.2-rc0

 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(-)