From c2b27f120ff26cd1329ae7db5bed70e7fbb36f7f Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dhyun@apple.com>
Date: Sun, 24 Nov 2019 21:49:21 -0800
Subject: [PATCH 1/4] [SPARK-30015][BUILD] Move hive-storage-api dependency
 from `hive-2.3` to `sql/core`

---
 core/pom.xml     |  4 ++++
 pom.xml          | 22 ++++++++++++++--------
 sql/core/pom.xml |  5 +++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 3eedc69c9593..34335b14c5af 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -164,6 +164,10 @@
       <version>${javaxservlet.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
diff --git a/pom.xml b/pom.xml
index 1c12b9c5c7e4..4910b0c5fa0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,6 +229,7 @@
     <hadoop.deps.scope>compile</hadoop.deps.scope>
     <hive.deps.scope>compile</hive.deps.scope>
     <hive.parquet.scope>provided</hive.parquet.scope>
+    <hive.storage.scope>compile</hive.storage.scope>
     <orc.deps.scope>compile</orc.deps.scope>
     <parquet.deps.scope>compile</parquet.deps.scope>
     <parquet.test.deps.scope>test</parquet.test.deps.scope>
@@ -2184,6 +2185,18 @@
         <artifactId>univocity-parsers</artifactId>
         <version>2.8.3</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hive</groupId>
+        <artifactId>hive-storage-api</artifactId>
+        <version>2.6.0</version>
+        <scope>${hive.storage.scope}</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -2934,6 +2947,7 @@
         <!-- Version used for internal directory structure -->
         <hive.version.short>1.2</hive.version.short>
         <hive.parquet.scope>${hive.deps.scope}</hive.parquet.scope>
+        <hive.storage.scope>provided</hive.storage.scope>
         <orc.classifier>nohive</orc.classifier>
         <datanucleus-core.version>3.2.10</datanucleus-core.version>
       </properties>
@@ -2942,14 +2956,6 @@
     <profile>
       <id>hive-2.3</id>
       <!-- Default hive profile. Uses global properties. -->
-      <dependencies>
-        <!-- Both Hive and ORC need hive-storage-api, but it is excluded by orc-mapreduce -->
-        <dependency>
-          <groupId>org.apache.hive</groupId>
-          <artifactId>hive-storage-api</artifactId>
-          <version>2.6.0</version>
-        </dependency>
-      </dependencies>
     </profile>
 
     <profile>
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 5cd7c656ea72..7bbe410c5a31 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -95,6 +95,11 @@
       <artifactId>orc-mapreduce</artifactId>
       <classifier>${orc.classifier}</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-storage-api</artifactId>
+      <version>2.6.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.parquet</groupId>
       <artifactId>parquet-column</artifactId>

From e091ecc244e3beb9955340a8742c949ee706f6f1 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dhyun@apple.com>
Date: Mon, 25 Nov 2019 00:45:03 -0800
Subject: [PATCH 2/4] Address comments

---
 sql/core/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 7bbe410c5a31..87874e2a0eb0 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -98,7 +98,6 @@
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-storage-api</artifactId>
-      <version>2.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.parquet</groupId>

From afb1af157a0c2b811270ed9e8ceb1f06bb952170 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dhyun@apple.com>
Date: Mon, 25 Nov 2019 09:33:14 -0800
Subject: [PATCH 3/4] Address comment

---
 core/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index 34335b14c5af..5e9611cacb1e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -163,7 +163,6 @@
       <artifactId>javax.servlet-api</artifactId>
       <version>${javaxservlet.version}</version>
     </dependency>
-
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>

From 3ecdede2c8bc0f775666948ff852d133ece0f728 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dhyun@apple.com>
Date: Mon, 25 Nov 2019 09:58:54 -0800
Subject: [PATCH 4/4] Change to test dependency

---
 core/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/pom.xml b/core/pom.xml
index 5e9611cacb1e..04a3fe521ef8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -166,6 +166,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>