Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix build by updating kafka client to 2.2.2 for CVE-2019-12399 (#9259) 

* fix build by updating kafka client to 2.2.2 for CVE-2019-12399

* one kafka version to rule them all

* notice
This commit is contained in:
Clint Wylie 2020-01-27 11:07:02 -08:00 committed by Jihoon Son
parent 20eb201d00
commit c6c8b80644
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java
View File

@ -205,7 +205,7 @@ public class TestKafkaExtractionCluster
private void checkServer() private void checkServer()
{ {
if (!kafkaServer.apis().controller().isActive()) { if (!kafkaServer.dataPlaneRequestProcessor().controller().isActive()) {
throw new ISE("server is not active!"); throw new ISE("server is not active!");
} }
} }

4
extensions-core/kafka-indexing-service/pom.xml
View File

@ -33,10 +33,6 @@
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<properties>
<apache.kafka.version>2.2.1</apache.kafka.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.druid</groupId> <groupId>org.apache.druid</groupId>

8
licenses.yaml
View File

@ -3093,7 +3093,7 @@ libraries:
--- ---
name: Apache Kafka name: Apache Kafka
version: 2.2.1 version: 2.2.2
license_category: binary license_category: binary
module: extensions/druid-kafka-indexing-service module: extensions/druid-kafka-indexing-service
license_name: Apache License version 2.0 license_name: Apache License version 2.0
@ -3102,7 +3102,7 @@ libraries:
notices: notices:
- kafka-clients: | - kafka-clients: |
Apache Kafka Apache Kafka
Copyright 2018 The Apache Software Foundation. Copyright 2019 The Apache Software Foundation.
This distribution has a binary dependency on jersey, which is available under the CDDL 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/. License. The source code of jersey can be found at https://github.com/jersey/jersey/.
@ -3967,14 +3967,14 @@ name: Apache Kafka
license_category: binary license_category: binary
module: extensions/kafka-extraction-namespace module: extensions/kafka-extraction-namespace
license_name: Apache License version 2.0 license_name: Apache License version 2.0
version: 2.1.1 version: 2.2.2
libraries: libraries:
- org.apache.kafka: kafka_2.12 - org.apache.kafka: kafka_2.12
- org.apache.kafka: kafka-clients - org.apache.kafka: kafka-clients
notices: notices:
- kafka-clients: - kafka-clients:
Apache Kafka Apache Kafka
Copyright 2018 The Apache Software Foundation. Copyright 2019 The Apache Software Foundation.
This distribution has a binary dependency on jersey, which is available under the CDDL 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/. License. The source code of jersey can be found at https://github.com/jersey/jersey/.

2
pom.xml
View File

@ -78,7 +78,7 @@
<aether.version>0.9.0.M2</aether.version> <aether.version>0.9.0.M2</aether.version>
<apache.curator.version>4.1.0</apache.curator.version> <apache.curator.version>4.1.0</apache.curator.version>
<apache.curator.test.version>2.12.0</apache.curator.test.version> <apache.curator.test.version>2.12.0</apache.curator.test.version>
<apache.kafka.version>2.1.1</apache.kafka.version> <apache.kafka.version>2.2.2</apache.kafka.version>
<avatica.version>1.15.0</avatica.version> <avatica.version>1.15.0</avatica.version>
<avro.version>1.9.1</avro.version> <avro.version>1.9.1</avro.version>
<calcite.version>1.21.0</calcite.version> <calcite.version>1.21.0</calcite.version>