You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2018/02/15 16:06:42 UTC
hive git commit: HIVE-18717 : Avoid transitive dependency on jetty
6.x (Ashutosh Chauhan via Zoltan Haindrich)
Repository: hive
Updated Branches:
refs/heads/master 7ddac02b8 -> 6a268713f
HIVE-18717 : Avoid transitive dependency on jetty 6.x (Ashutosh Chauhan via Zoltan Haindrich)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6a268713
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6a268713
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6a268713
Branch: refs/heads/master
Commit: 6a268713fe9b26b03647907db316734e492010e9
Parents: 7ddac02
Author: Ashutosh Chauhan <ha...@apache.org>
Authored: Wed Feb 14 17:51:03 2018 -0800
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Thu Feb 15 08:06:12 2018 -0800
----------------------------------------------------------------------
hcatalog/core/pom.xml | 12 +++++++++++-
hcatalog/hcatalog-pig-adapter/pom.xml | 12 +++++++++++-
llap-server/pom.xml | 8 ++++++++
llap-tez/pom.xml | 8 ++++++++
pom.xml | 30 +++++++++++++++++++++++++++---
ql/pom.xml | 8 ++++++++
storage-api/pom.xml | 2 +-
7 files changed, 74 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/6a268713/hcatalog/core/pom.xml
----------------------------------------------------------------------
diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml
index 560e438..b0269cd 100644
--- a/hcatalog/core/pom.xml
+++ b/hcatalog/core/pom.xml
@@ -235,7 +235,17 @@
<version>${pig.version}</version>
<classifier>h2</classifier>
<scope>test</scope>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/hive/blob/6a268713/hcatalog/hcatalog-pig-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml
index c50a4d5..4a2075f 100644
--- a/hcatalog/hcatalog-pig-adapter/pom.xml
+++ b/hcatalog/hcatalog-pig-adapter/pom.xml
@@ -66,7 +66,17 @@
<artifactId>pig</artifactId>
<version>${pig.version}</version>
<classifier>h2</classifier>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
http://git-wip-us.apache.org/repos/asf/hive/blob/6a268713/llap-server/pom.xml
----------------------------------------------------------------------
diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index eabe1a8..65cb78f 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -206,7 +206,15 @@
<artifactId>slider-core</artifactId>
<version>${slider.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
<exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
http://git-wip-us.apache.org/repos/asf/hive/blob/6a268713/llap-tez/pom.xml
----------------------------------------------------------------------
diff --git a/llap-tez/pom.xml b/llap-tez/pom.xml
index 69fbea3..50865ad 100644
--- a/llap-tez/pom.xml
+++ b/llap-tez/pom.xml
@@ -154,7 +154,15 @@
<version>${tez.version}</version>
<optional>true</optional>
<exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
<exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
http://git-wip-us.apache.org/repos/asf/hive/blob/6a268713/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e220891..a242fbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -488,7 +488,17 @@
<artifactId>avro-mapred</artifactId>
<classifier>hadoop2</classifier>
<version>${avro.version}</version>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -538,7 +548,17 @@
<groupId>org.apache.pig</groupId>
<artifactId>pig</artifactId>
<version>${pig.version}</version>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libfb303</artifactId>
@@ -719,7 +739,11 @@
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<exclusions>
- <exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-sslengine</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
http://git-wip-us.apache.org/repos/asf/hive/blob/6a268713/ql/pom.xml
----------------------------------------------------------------------
diff --git a/ql/pom.xml b/ql/pom.xml
index 2d1034c..5f917c1 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -655,7 +655,15 @@
<optional>true</optional>
<scope>test</scope>
<exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
<exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
http://git-wip-us.apache.org/repos/asf/hive/blob/6a268713/storage-api/pom.xml
----------------------------------------------------------------------
diff --git a/storage-api/pom.xml b/storage-api/pom.xml
index 770dff5..3f148cf 100644
--- a/storage-api/pom.xml
+++ b/storage-api/pom.xml
@@ -33,7 +33,7 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-logging.version>1.1.3</commons-logging.version>
<guava.version>14.0.1</guava.version>
- <hadoop.version>2.8.1</hadoop.version>
+ <hadoop.version>3.0.0-beta1</hadoop.version>
<junit.version>4.11</junit.version>
<slf4j.version>1.7.10</slf4j.version>
<maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>