You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by va...@apache.org on 2018/12/19 00:29:00 UTC
incubator-livy git commit: [LIVY-543] Clean thriftserver dependencies
from Hive's jetty
Repository: incubator-livy
Updated Branches:
refs/heads/master 1d05d18cf -> c8cfe2994
[LIVY-543] Clean thriftserver dependencies from Hive's jetty
## What changes were proposed in this pull request?
Hive 3.0 uses Jetty 9.3.8. So there are some jars coming from hive dependency which are conflicting with our Jetty dependencies which were upgraded in LIVY-526. Hence we should ignore the dependencies Hive has on Jetty and use our own version. After the refactor which has been done in the thriftserver, this should be easy. This can cause issue when running the server (not always, though, which makes it hard to debug and reproduce).
The PR removes also an extra-dependency which was left in the thriftserver-server module which is not needed anymore after the refactor which created the thriftserver-session module.
## How was this patch tested?
manual tests, checking the generated JARs
Please review https://livy.incubator.apache.org/community/ before opening a pull request.
Author: Marco Gaido <mg...@hortonworks.com>
Closes #134 from mgaido91/LIVY-543.
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/c8cfe299
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/c8cfe299
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/c8cfe299
Branch: refs/heads/master
Commit: c8cfe2994ea8925d63ff22e2d076c3fae1cf3dc1
Parents: 1d05d18
Author: Marco Gaido <mg...@hortonworks.com>
Authored: Tue Dec 18 16:28:54 2018 -0800
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Tue Dec 18 16:28:54 2018 -0800
----------------------------------------------------------------------
thriftserver/server/pom.xml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/c8cfe299/thriftserver/server/pom.xml
----------------------------------------------------------------------
diff --git a/thriftserver/server/pom.xml b/thriftserver/server/pom.xml
index c08c3fd..e59d908 100644
--- a/thriftserver/server/pom.xml
+++ b/thriftserver/server/pom.xml
@@ -50,6 +50,10 @@
<groupId>org.apache.hive</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -104,11 +108,10 @@
<version>2.25.1</version>
</dependency>
- <!-- needed for compiling successfully when using JobContext -->
<dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-hive_${scala.binary.version}</artifactId>
- <scope>provided</scope>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-runner</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<!-- needed for testing -->