From 266978b1b6793a6e44433be32a467fee6cbab80a Mon Sep 17 00:00:00 2001 From: Confluent Jenkins Bot Date: Fri, 10 Dec 2021 22:01:36 +0000 Subject: [PATCH] Set Confluent to 6.1.4, Kafka to 6.1.4. --- docs/conf.py | 4 ++-- docs/settings.sh | 2 +- env_files/config.env | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 50f019fa6..0202ee913 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -164,7 +164,7 @@ def makeLink(role, rawtext, text, lineno, inliner, options={}, content=[]): # The short X.Y version. version = '6.1' # The full version, including alpha/beta/rc tags. -release = '6.1.4-0' +release = '6.1.4' # Kafka version kafka_branch = '2.6' # Kafka Javadoc version @@ -172,7 +172,7 @@ def makeLink(role, rawtext, text, lineno, inliner, options={}, content=[]): # Kafka release we're tracking from upstream, so we can refer to it without the -cp version kafka_upstream_release = '2.6.0' # Kafka release (included in CP examples) -kafka_release = '6.1.4-0-ccs' +kafka_release = '6.1.4-ccs' # Scala version used for CP packages scala_version = '2.13' # release post branch, used in ksqlDB, streams, examples diff --git a/docs/settings.sh b/docs/settings.sh index c3cb3a6b6..e6ded958d 100755 --- a/docs/settings.sh +++ b/docs/settings.sh @@ -38,7 +38,7 @@ fi # can automatically pass them as environment variables to the Makefile. # # IMPORTANT: For *branches*, this must be a remote ref, i.e. "orgin/foobar", not just "foobar"! -export BRANCH="origin/6.1.x" +export BRANCH="origin/6.1.4-post" export MAVEN_OPTS="-XX:MaxPermSize=128M -Dhttps.protocols=TLSv1.2" diff --git a/env_files/config.env b/env_files/config.env index 9d2d55baf..b765cf8bf 100644 --- a/env_files/config.env +++ b/env_files/config.env @@ -5,11 +5,11 @@ # over time to construct other # values required by this repository ##################################################### -CONFLUENT=6.1.4-0 -CONFLUENT_DOCKER_TAG=6.1.x-latest +CONFLUENT=6.1.4 +CONFLUENT_DOCKER_TAG=6.1.4 CONFLUENT_SHORT=6.1 CONFLUENT_PREVIOUS="6.1.3" -CONFLUENT_RELEASE_TAG_OR_BRANCH=6.1.x +CONFLUENT_RELEASE_TAG_OR_BRANCH=6.1.4-post CONFLUENT_MAJOR=6 CONFLUENT_MINOR=1 CONFLUENT_PATCH=4