root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Bump trunk to 2.6.0-SNAPSHOT (#8026)

This commit is contained in:
David Arthur 2020-02-03 13:04:56 -05:00 committed by GitHub
parent 738e14edb8
commit 7e776b0462
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/js/templateData.js
View File

@ -17,8 +17,8 @@ limitations under the License.
// Define variables for doc templates // Define variables for doc templates
var context={ var context={
"version": "25", "version": "26",
"dotVersion": "2.5", "dotVersion": "2.6",
"fullDotVersion": "2.5.0", "fullDotVersion": "2.6.0",
"scalaVersion": "2.12" "scalaVersion": "2.12"
}; };

2
gradle.properties
View File

@ -20,7 +20,7 @@ group=org.apache.kafka
# - tests/kafkatest/__init__.py # - tests/kafkatest/__init__.py
# - tests/kafkatest/version.py (variable DEV_VERSION) # - tests/kafkatest/version.py (variable DEV_VERSION)
# - kafka-merge-pr.py # - kafka-merge-pr.py
version=2.5.0-SNAPSHOT version=2.6.0-SNAPSHOT
scalaVersion=2.12.10 scalaVersion=2.12.10
task=build task=build
org.gradle.jvmargs=-Xmx1024m -Xss2m org.gradle.jvmargs=-Xmx1024m -Xss2m

2
kafka-merge-pr.py
View File

@ -70,7 +70,7 @@ TEMP_BRANCH_PREFIX = "PR_TOOL"
DEV_BRANCH_NAME = "trunk" DEV_BRANCH_NAME = "trunk"
DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "2.5.0") DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "2.6.0")
def get_json(url): def get_json(url):
try: try:

2
streams/quickstart/java/pom.xml
View File

@ -26,7 +26,7 @@
<parent> <parent>
<groupId>org.apache.kafka</groupId> <groupId>org.apache.kafka</groupId>
<artifactId>streams-quickstart</artifactId> <artifactId>streams-quickstart</artifactId>
<version>2.5.0-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
View File

@ -29,7 +29,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kafka.version>2.5.0-SNAPSHOT</kafka.version> <kafka.version>2.6.0-SNAPSHOT</kafka.version>
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
</properties> </properties>

2
streams/quickstart/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>org.apache.kafka</groupId> <groupId>org.apache.kafka</groupId>
<artifactId>streams-quickstart</artifactId> <artifactId>streams-quickstart</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.5.0-SNAPSHOT</version> <version>2.6.0-SNAPSHOT</version>
<name>Kafka Streams :: Quickstart</name> <name>Kafka Streams :: Quickstart</name>

2
tests/kafkatest/__init__.py
View File

@ -22,4 +22,4 @@
# Instead, in development branches, the version should have a suffix of the form ".devN" # 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" # For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0.dev0"
__version__ = '2.5.0.dev0' __version__ = '2.6.0.dev0'

2
tests/kafkatest/version.py
View File

@ -63,7 +63,7 @@ def get_version(node=None):
return DEV_BRANCH return DEV_BRANCH
DEV_BRANCH = KafkaVersion("dev") DEV_BRANCH = KafkaVersion("dev")
DEV_VERSION = KafkaVersion("2.5.0-SNAPSHOT") DEV_VERSION = KafkaVersion("2.6.0-SNAPSHOT")
# 0.8.2.x versions # 0.8.2.x versions
V_0_8_2_1 = KafkaVersion("0.8.2.1") V_0_8_2_1 = KafkaVersion("0.8.2.1")