This is an automated email from the ASF dual-hosted git repository. arina pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 96fa53900ab470b89cf7d5b812d43f61db6eb056 Author: Bohdan Kazydub <[email protected]> AuthorDate: Tue Jun 26 12:30:53 2018 +0300 DRILL-6534: Upgrade ZooKeeper patch version to 3.4.12 and add Apache Curator to dependencyManagement closes #1337 --- contrib/storage-kafka/pom.xml | 8 ----- drill-yarn/pom.xml | 30 ++++++++---------- exec/java-exec/pom.xml | 39 ++++++++---------------- exec/jdbc-all/pom.xml | 1 + pom.xml | 71 +++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 94 insertions(+), 55 deletions(-) diff --git a/contrib/storage-kafka/pom.xml b/contrib/storage-kafka/pom.xml index 0adcfb9..5e2809f 100644 --- a/contrib/storage-kafka/pom.xml +++ b/contrib/storage-kafka/pom.xml @@ -88,14 +88,6 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> - <version>${curator.test.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.drill</groupId> diff --git a/drill-yarn/pom.xml b/drill-yarn/pom.xml index b6ada46..a2238c6 100644 --- a/drill-yarn/pom.xml +++ b/drill-yarn/pom.xml @@ -98,8 +98,19 @@ </dependency> <dependency> <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-x-discovery</artifactId> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> - <scope>test</scope> </dependency> <!-- For configuration --> @@ -125,21 +136,4 @@ <scope>test</scope> </dependency> </dependencies> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-test</artifactId> - <version>${curator.test.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </dependencyManagement> </project> diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index 94c3459..6d57ba3 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -312,38 +312,23 @@ </dependency> <dependency> <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-recipes</artifactId> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> <artifactId>curator-x-discovery</artifactId> - <version>2.7.1</version> - <exclusions> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> - <version>${curator.test.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.carrotsearch</groupId> diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml index d8423de..f3595be 100644 --- a/exec/jdbc-all/pom.xml +++ b/exec/jdbc-all/pom.xml @@ -636,6 +636,7 @@ <exclude>org.objenesis:objenesis</exclude> <exclude>org.eclipse.jetty:*</exclude> <exclude>org.apache.hadoop:*</exclude> + <exclude>org.jboss.netty:netty</exclude> <exclude>javax.xml.bind:jaxb-api</exclude> <exclude>javax.xml.stream:stax-api</exclude> <exclude>javax.activation:activation</exclude> diff --git a/pom.xml b/pom.xml index e3391b5..56582c3 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,7 @@ <sqlline.version>1.1.9-drill-r7</sqlline.version> <jackson.version>2.9.5</jackson.version> <jackson.databind.version>2.9.5</jackson.databind.version> + <zookeeper.version>3.4.12</zookeeper.version> <mapr.release.version>5.2.1-mapr</mapr.release.version> <ojai.version>1.1</ojai.version> <kerby.version>1.0.0-RC2</kerby.version> @@ -60,7 +61,7 @@ <junit.version>4.11</junit.version> <hamcrest.core.version>1.3</hamcrest.core.version> <maven.embedder.version>3.5.3</maven.embedder.version> - <curator.test.version>2.7.1</curator.test.version> + <curator.version>2.7.1</curator.version> <parquet.hadoop.version>1.8.1</parquet.hadoop.version> <wiremock.standalone.version>2.5.1</wiremock.standalone.version> <jmockit.version>1.39</jmockit.version> @@ -244,7 +245,7 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> - <version>${curator.test.version}</version> + <version>${curator.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -1555,6 +1556,71 @@ <artifactId>config</artifactId> <version>1.0.0</version> </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${zookeeper.version}</version> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + <version>${curator.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + <version>${curator.version}</version> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-recipes</artifactId> + <version>${curator.version}</version> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-x-discovery</artifactId> + <version>${curator.version}</version> + <exclusions> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-test</artifactId> + <version>${curator.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> @@ -2359,6 +2425,7 @@ <hive.version>2.1.1-mapr-1710</hive.version> <hbase.version>1.1.1-mapr-1602-m7-5.2.0</hbase.version> <hadoop.version>2.7.0-mapr-1707</hadoop.version> + <zookeeper.version>3.4.5-mapr-1710</zookeeper.version> </properties> <dependencyManagement> <dependencies>
