This is an automated email from the ASF dual-hosted git repository. jshao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-livy.git
The following commit(s) were added to refs/heads/master by this push: new 0804c8e [LIVY-690][THRIFT] Exclude curator in thrift server pom to avoid conflict jars 0804c8e is described below commit 0804c8ea8ece67d01ababec616c9ad8e3b15dc9f Author: Yiheng Wang <yihe...@gmail.com> AuthorDate: Sun Sep 29 16:24:30 2019 +0800 [LIVY-690][THRIFT] Exclude curator in thrift server pom to avoid conflict jars ## What changes were proposed in this pull request? Currently, thrift server has a dependency of curator-client:2.12.0 through the hive service. After the build, a `curator-client-2.12.0.jar` file will be generated in the `jars` folder. It is conflicted with the `curator-client-2.7.1.jar` file, which is used by livy server. We observed that in some JDK, the `curator-client-2.12.0.jar` is loaded before the `curator-client-2.7.1.jar`, and will crash the recovery enabled livy server. In this patch, we exclude the `org.apache.curator` modules from the hive dependency. ## How was this patch tested? Manual test and existing UT/ITs Author: Yiheng Wang <yihe...@gmail.com> Closes #239 from yiheng/exclude_curator. --- thriftserver/server/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/thriftserver/server/pom.xml b/thriftserver/server/pom.xml index fe17f96..86f0b86 100644 --- a/thriftserver/server/pom.xml +++ b/thriftserver/server/pom.xml @@ -58,6 +58,10 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>*</artifactId> + </exclusion> </exclusions> </dependency>