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

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

commit 9325a10350472bbb997f74651c46bd4e0096e397
Merge: cc54000 83f1575
Author: Bill Bejeck <b...@confluent.io>
AuthorDate: Thu Oct 8 15:02:57 2020 -0400

    Merge branch 'master' into Merge_AK_to_CCS_10_08_2020

 Confluent-README.md                                |   6 +
 Jenkinsfile                                        | 259 +++++++++------------
 gradle.properties => Makefile                      |  21 +-
 gradle.properties => bin/connect-distributed       |  13 +-
 bin/connect-distributed.sh                         |  31 ++-
 gradle.properties => bin/connect-standalone        |  13 +-
 bin/connect-standalone.sh                          |  31 ++-
 gradle.properties => bin/git-hooks/pre-push        |  35 +--
 gradle.properties => bin/kafka-acls                |  13 +-
 gradle.properties => bin/kafka-broker-api-versions |  13 +-
 gradle.properties => bin/kafka-configs             |  13 +-
 gradle.properties => bin/kafka-console-consumer    |  13 +-
 gradle.properties => bin/kafka-console-producer    |  13 +-
 gradle.properties => bin/kafka-consumer-groups     |  13 +-
 gradle.properties => bin/kafka-consumer-perf-test  |  13 +-
 gradle.properties => bin/kafka-delegation-tokens   |  13 +-
 gradle.properties => bin/kafka-delete-records      |  13 +-
 gradle.properties => bin/kafka-dump-log            |  13 +-
 gradle.properties => bin/kafka-log-dirs            |  13 +-
 gradle.properties => bin/kafka-mirror-maker        |  13 +-
 .../kafka-preferred-replica-election               |  13 +-
 gradle.properties => bin/kafka-producer-perf-test  |  13 +-
 gradle.properties => bin/kafka-reassign-partitions |  13 +-
 .../kafka-replica-verification                     |  13 +-
 gradle.properties => bin/kafka-run-class           |  13 +-
 bin/kafka-run-class.sh                             |  17 +-
 gradle.properties => bin/kafka-server-start        |  13 +-
 bin/kafka-server-start.sh                          |  11 +-
 gradle.properties => bin/kafka-server-stop         |  13 +-
 bin/kafka-server-stop.sh                           |  10 +-
 .../kafka-streams-application-reset                |  13 +-
 gradle.properties => bin/kafka-topics              |  13 +-
 gradle.properties => bin/kafka-verifiable-consumer |  13 +-
 gradle.properties => bin/kafka-verifiable-producer |  13 +-
 bin/windows/kafka-run-class.bat                    |   6 +-
 bin/windows/kafka-server-start.bat                 |   6 +-
 bin/windows/zookeeper-server-start.bat             |   6 +-
 .../zookeeper-security-migration                   |  13 +-
 gradle.properties => bin/zookeeper-server-start    |  13 +-
 bin/zookeeper-server-start.sh                      |  11 +-
 gradle.properties => bin/zookeeper-server-stop     |  13 +-
 gradle.properties => bin/zookeeper-shell           |  13 +-
 build.gradle                                       |  29 ++-
 checkstyle/checkstyle.xml                          |   6 -
 ci.py                                              | 105 +++++++++
 config/connect-distributed.properties              |   2 +-
 config/connect-standalone.properties               |   2 +-
 config/server.properties                           |  12 +
 .../confluent/support/metrics/SupportedKafka.scala |  28 +++
 gradle.properties                                  |   3 +-
 gradle/dependencies.gradle                         |   6 +-
 streams/quickstart/java/pom.xml                    |   2 +-
 .../src/main/resources/archetype-resources/pom.xml |   2 +-
 streams/quickstart/pom.xml                         |   2 +-
 tests/README.md                                    |   2 +-
 tests/kafkatest/__init__.py                        |   6 +-
 .../sanity_checks/test_verifiable_producer.py      |   2 +-
 tests/kafkatest/services/kafka/kafka.py            |   7 +-
 .../tests/streams/streams_upgrade_test.py          |   4 +-
 tests/kafkatest/utils/util.py                      |   9 +
 tests/kafkatest/version.py                         |   2 +-
 61 files changed, 537 insertions(+), 521 deletions(-)

diff --cc gradle.properties
index 5ce35db,e6c5dd3..161a200
--- a/gradle.properties
+++ b/gradle.properties
@@@ -20,7 -20,7 +20,8 @@@ group=org.apache.kafk
  #  - tests/kafkatest/__init__.py
  #  - tests/kafkatest/version.py (variable DEV_VERSION)
  #  - kafka-merge-pr.py
- version=2.8.0-SNAPSHOT
 -version=6.1.0-0-ccs
++
++version=6.2.0-0-ccs
  scalaVersion=2.13.3
  task=build
  org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
diff --cc streams/quickstart/java/pom.xml
index c0008a3,172ed6e..fd26508
--- a/streams/quickstart/java/pom.xml
+++ b/streams/quickstart/java/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
      <parent>
          <groupId>org.apache.kafka</groupId>
          <artifactId>streams-quickstart</artifactId>
-         <version>2.8.0-SNAPSHOT</version>
 -        <version>6.1.0-0-ccs</version>
++        <version>6.2.0-0-ccs</version>
          <relativePath>..</relativePath>
      </parent>
  
diff --cc streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
index 52d2f5a,64f815a..40f7235
--- 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 +29,7 @@@
  
      <properties>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-         <kafka.version>2.8.0-SNAPSHOT</kafka.version>
 -        <kafka.version>6.1.0-0-ccs</kafka.version>
++        <kafka.version>6.2.0-0-ccs</kafka.version>
          <slf4j.version>1.7.7</slf4j.version>
          <log4j.version>1.2.17</log4j.version>
      </properties>
diff --cc streams/quickstart/pom.xml
index 3c71792,844b917..f64a1d1
--- a/streams/quickstart/pom.xml
+++ b/streams/quickstart/pom.xml
@@@ -22,7 -22,7 +22,7 @@@
      <groupId>org.apache.kafka</groupId>
      <artifactId>streams-quickstart</artifactId>
      <packaging>pom</packaging>
-     <version>2.8.0-SNAPSHOT</version>
 -    <version>6.1.0-0-ccs</version>
++    <version>6.2.0-0-ccs</version>
  
      <name>Kafka Streams :: Quickstart</name>
  
diff --cc tests/kafkatest/__init__.py
index c5e1ad5,cdf7600..5dd3528
--- a/tests/kafkatest/__init__.py
+++ b/tests/kafkatest/__init__.py
@@@ -21,5 -21,5 +21,7 @@@
  #
  # 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__ = '2.8.0.dev0'
++
+ # For example, when Kafka is at version 1.0.0-0, this should be something 
like "1.0.0-0.dev0"
 -__version__ = '6.1.0-0.dev0'
++__version__ = '6.2.0-0.dev0'
++
diff --cc tests/kafkatest/version.py
index 3762414,1feb99f..bb05e4b
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@@ -99,7 -99,7 +99,7 @@@ def get_version(node=None)
          return DEV_BRANCH
  
  DEV_BRANCH = KafkaVersion("dev")
- DEV_VERSION = KafkaVersion("2.8.0-SNAPSHOT")
 -DEV_VERSION = KafkaVersion("6.1.0-0")
++DEV_VERSION = KafkaVersion("6.2.0-0")
  
  # 0.8.2.x versions
  V_0_8_2_1 = KafkaVersion("0.8.2.1")

Reply via email to