From b7a16d08a62da33f2f8328af426f2b36a09b0735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= <xvrl@apache.org>
Date: Tue, 22 Dec 2020 13:56:00 -0800
Subject: [PATCH] Update Apache Kafka to 2.7.0 (#10701)

- align scala versions to match Kafka
---
 NOTICE                                             | 4 ++--
 docs/tutorials/tutorial-kafka.md                   | 8 ++++----
 extensions-core/kafka-extraction-namespace/pom.xml | 4 ++--
 extensions-core/kafka-indexing-service/pom.xml     | 2 +-
 integration-tests/docker-base/setup.sh             | 2 +-
 licenses.yaml                                      | 6 +++---
 pom.xml                                            | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/NOTICE b/NOTICE
index 2cdc52dd15f..8f7d9c2ba9a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -54,9 +54,9 @@ Copyright 2008-2018 The Apache Software Foundation
 
 
 
-================= Apache Kafka 1.0 =================
+================= Apache Kafka 2.7.0 =================
 Apache Kafka
-Copyright 2017 The Apache Software Foundation.
+Copyright 2020 The Apache Software Foundation.
 
 
 
diff --git a/docs/tutorials/tutorial-kafka.md b/docs/tutorials/tutorial-kafka.md
index e6c539b1733..65a339fd784 100644
--- a/docs/tutorials/tutorial-kafka.md
+++ b/docs/tutorials/tutorial-kafka.md
@@ -35,13 +35,13 @@ running on your local machine. You don't need to have loaded any data yet.
 ## Download and start Kafka
 
 [Apache Kafka](http://kafka.apache.org/) is a high throughput message bus that works well with
-Druid.  For this tutorial, we will use Kafka 2.6.0. To download Kafka, issue the following
+Druid.  For this tutorial, we will use Kafka 2.7.0. To download Kafka, issue the following
 commands in your terminal:
 
 ```bash
-curl -O https://archive.apache.org/dist/kafka/2.6.0/kafka_2.13-2.6.0.tgz
-tar -xzf kafka_2.13-2.6.0.tgz
-cd kafka_2.13-2.6.0
+curl -O https://archive.apache.org/dist/kafka/2.7.0/kafka_2.13-2.7.0.tgz
+tar -xzf kafka_2.13-2.7.0.tgz
+cd kafka_2.13-2.7.0
 ```
 
 Start a Kafka broker by running the following command in a new terminal:
diff --git a/extensions-core/kafka-extraction-namespace/pom.xml b/extensions-core/kafka-extraction-namespace/pom.xml
index 32271d3451f..cfcde9a04da 100644
--- a/extensions-core/kafka-extraction-namespace/pom.xml
+++ b/extensions-core/kafka-extraction-namespace/pom.xml
@@ -138,7 +138,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
-      <artifactId>kafka_2.12</artifactId>
+      <artifactId>kafka_2.13</artifactId>
       <version>${apache.kafka.version}</version>
       <scope>test</scope>
     </dependency>
@@ -177,7 +177,7 @@
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
-      <version>2.12.10</version>
+      <version>2.13.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/extensions-core/kafka-indexing-service/pom.xml b/extensions-core/kafka-indexing-service/pom.xml
index 7cc1ebf65bf..d1598750237 100644
--- a/extensions-core/kafka-indexing-service/pom.xml
+++ b/extensions-core/kafka-indexing-service/pom.xml
@@ -195,7 +195,7 @@
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
-      <version>2.13.2</version>
+      <version>2.13.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/integration-tests/docker-base/setup.sh b/integration-tests/docker-base/setup.sh
index e15a065f1b8..3b9d27d6d4f 100644
--- a/integration-tests/docker-base/setup.sh
+++ b/integration-tests/docker-base/setup.sh
@@ -46,7 +46,7 @@ rm /tmp/$ZK_TAR.tar.gz
 
 # Kafka
 # Match the version to the Kafka client used by KafkaSupervisor
-KAFKA_VERSION=2.6.0
+KAFKA_VERSION=2.7.0
 wget -q -O /tmp/kafka_2.13-$KAFKA_VERSION.tgz "https://apache.org/dist/kafka/$KAFKA_VERSION/kafka_2.13-$KAFKA_VERSION.tgz"
 tar -xzf /tmp/kafka_2.13-$KAFKA_VERSION.tgz -C /usr/local
 ln -s /usr/local/kafka_2.13-$KAFKA_VERSION /usr/local/kafka
diff --git a/licenses.yaml b/licenses.yaml
index 255ee576221..d368c5f4787 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -3542,7 +3542,7 @@ libraries:
 ---
 
 name: Apache Kafka
-version: 2.6.0
+version: 2.7.0
 license_category: binary
 module: extensions/druid-kafka-indexing-service
 license_name: Apache License version 2.0
@@ -4454,14 +4454,14 @@ name: Apache Kafka
 license_category: binary
 module: extensions/kafka-extraction-namespace
 license_name: Apache License version 2.0
-version: 2.6.0
+version: 2.7.0
 libraries:
   - org.apache.kafka: kafka_2.13
   - org.apache.kafka: kafka-clients
 notices:
   - kafka-clients:
       Apache Kafka
-      Copyright 2019 The Apache Software Foundation.
+      Copyright 2020 The Apache Software Foundation.
 
       This distribution has a binary dependency on jersey, which is available under the CDDL
       License. The source code of jersey can be found at https://github.com/jersey/jersey/.
diff --git a/pom.xml b/pom.xml
index aed464d5786..023c90cdc15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
         <aether.version>0.9.0.M2</aether.version>
         <apache.curator.version>4.3.0</apache.curator.version>
         <apache.curator.test.version>2.12.0</apache.curator.test.version>
-        <apache.kafka.version>2.6.0</apache.kafka.version>
+        <apache.kafka.version>2.7.0</apache.kafka.version>
         <apache.ranger.version>2.0.0</apache.ranger.version>
         <apache.ranger.gson.version>2.2.4</apache.ranger.gson.version>
         <avatica.version>1.17.0</avatica.version>