This is an automated email from the ASF dual-hosted git repository. xvrl pushed a commit to branch jdk15-zk3.5 in repository https://gitbox.apache.org/repos/asf/druid.git
commit 217e01b0f6669d8bf041bcf2a9701e52f02f3551 Author: Xavier Léauté <[email protected]> AuthorDate: Fri Mar 5 11:23:33 2021 -0800 remove ZK 3.4 compatibility --- extensions-core/kafka-extraction-namespace/pom.xml | 3 +-- extensions-core/kafka-indexing-service/pom.xml | 3 +-- indexing-service/pom.xml | 4 ++++ licenses.yaml | 3 ++- pom.xml | 12 ++++++------ server/pom.xml | 4 ++++ 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/extensions-core/kafka-extraction-namespace/pom.xml b/extensions-core/kafka-extraction-namespace/pom.xml index a5962e2..a5f0b43 100644 --- a/extensions-core/kafka-extraction-namespace/pom.xml +++ b/extensions-core/kafka-extraction-namespace/pom.xml @@ -132,8 +132,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <!-- Kafka brokers require ZooKeeper 3.5.x clients for testing --> - <version>3.5.8</version> + <version>${zookeeper.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/extensions-core/kafka-indexing-service/pom.xml b/extensions-core/kafka-indexing-service/pom.xml index 545b0d8..17848a3 100644 --- a/extensions-core/kafka-indexing-service/pom.xml +++ b/extensions-core/kafka-indexing-service/pom.xml @@ -144,8 +144,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <!-- Kafka brokers require ZooKeeper 3.5.x clients for testing --> - <version>3.5.8</version> + <version>${zookeeper.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml index be8360b..71cc336 100644 --- a/indexing-service/pom.xml +++ b/indexing-service/pom.xml @@ -138,6 +138,10 @@ <artifactId>zookeeper</artifactId> </dependency> <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper-jute</artifactId> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </dependency> diff --git a/licenses.yaml b/licenses.yaml index 7747b3a..231c7b5 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -1902,9 +1902,10 @@ name: Apache Zookeeper license_category: binary module: java-core license_name: Apache License version 2.0 -version: 3.4.14 +version: 3.5.9 libraries: - org.apache.zookeeper: zookeeper + - org.apache.zookeeper: zookeeper-jute notices: - zookeeper: | Apache ZooKeeper diff --git a/pom.xml b/pom.xml index 3486622..6fbb964 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ If we upgrade to 3.5.x clients, curator requires 3.5.x servers, which would break backwards compatibility see http://curator.apache.org/zk-compatibility.html --> <!-- When upgrading ZK, edit docs and integration tests as well (integration-tests/docker-base/setup.sh) --> - <zookeeper.version>3.4.14</zookeeper.version> + <zookeeper.version>3.5.9</zookeeper.version> <checkerframework.version>2.5.7</checkerframework.version> <com.google.apis.client.version>1.26.0</com.google.apis.client.version> <com.google.apis.compute.version>v1-rev20190607-${com.google.apis.client.version}</com.google.apis.compute.version> @@ -322,6 +322,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper-jute</artifactId> + <version>${zookeeper.version}</version> + </dependency> + <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-client</artifactId> <version>${apache.curator.version}</version> @@ -349,11 +354,6 @@ </exclusions> </dependency> <dependency> - <!-- - ~ TODO: This dependency transitively pulls in org.codehaus.jackson:jackson-mapper.asl.1.9.13 which has - ~ security vulnerability CVE-2017-7525. https://github.com/apache/druid/pull/8177 tracks - ~ upgrading to a newer curator version. - --> <groupId>org.apache.curator</groupId> <artifactId>curator-x-discovery</artifactId> <version>${apache.curator.version}</version> diff --git a/server/pom.xml b/server/pom.xml index 2c5ad5b..cf0030d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -75,6 +75,10 @@ <artifactId>zookeeper</artifactId> </dependency> <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper-jute</artifactId> + </dependency> + <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> <!-- We use log4j2 and log4j-1.2-api as a bridge --> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
