From 2dc1ac8fd866f387ca7d520a5774877942aa901b Mon Sep 17 00:00:00 2001
From: Thomas Graves <tgraves@nvidia.com>
Date: Fri, 29 Jan 2021 23:15:16 +0000
Subject: [PATCH 1/5] Add explicit Arrow dep for databricks

---
 pom.xml                  | 6 ++++++
 shims/spark301db/pom.xml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7865400523f..394a8451ac8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,6 +230,12 @@
               <type>test-jar</type>
               <scope>test</scope>
             </dependency>
+	    <dependency>
+              <groupId>org.apache.arrow</groupId>
+              <artifactId>arrow-vector</artifactId>
+              <version>0.15.1</version>
+	      <scope>provided</scope>
+            </dependency>
             <dependency>
               <groupId>org.apache.orc</groupId>
               <artifactId>orc-core</artifactId>
diff --git a/shims/spark301db/pom.xml b/shims/spark301db/pom.xml
index 178fe1c1459..25835250701 100644
--- a/shims/spark301db/pom.xml
+++ b/shims/spark301db/pom.xml
@@ -82,6 +82,12 @@
             <artifactId>rapids-4-spark-shims-spark301_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
         </dependency>
+	<dependency>
+            <groupId>org.apache.arrow</groupId>
+            <artifactId>arrow-vector</artifactId>
+            <version>0.15.1</version>
+	    <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-sql_${scala.binary.version}</artifactId>

From d7c43f955a8bb0629027da36487ddea323666c15 Mon Sep 17 00:00:00 2001
From: Thomas Graves <tgraves@nvidia.com>
Date: Fri, 29 Jan 2021 23:24:15 +0000
Subject: [PATCH 2/5] remove uneeded

---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 394a8451ac8..7865400523f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,12 +230,6 @@
               <type>test-jar</type>
               <scope>test</scope>
             </dependency>
-	    <dependency>
-              <groupId>org.apache.arrow</groupId>
-              <artifactId>arrow-vector</artifactId>
-              <version>0.15.1</version>
-	      <scope>provided</scope>
-            </dependency>
             <dependency>
               <groupId>org.apache.orc</groupId>
               <artifactId>orc-core</artifactId>

From f4c897e54a9bfe39ab39d73c1b7fefa410da8032 Mon Sep 17 00:00:00 2001
From: Thomas Graves <tgraves@nvidia.com>
Date: Fri, 29 Jan 2021 23:29:38 +0000
Subject: [PATCH 3/5] fix tabs

---
 shims/spark301db/pom.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/shims/spark301db/pom.xml b/shims/spark301db/pom.xml
index 25835250701..f5ffc7ddfa9 100644
--- a/shims/spark301db/pom.xml
+++ b/shims/spark301db/pom.xml
@@ -23,7 +23,7 @@
         <groupId>com.nvidia</groupId>
         <artifactId>rapids-4-spark-shims_2.12</artifactId>
         <version>0.4.0-SNAPSHOT</version>
-	<relativePath>../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.nvidia</groupId>
     <artifactId>rapids-4-spark-shims-spark301-databricks_2.12</artifactId>
@@ -74,6 +74,7 @@
     <properties>
         <parquet.version>1.10.1</parquet.version>
         <spark301db.version>3.0.1-databricks</spark301db.version>
+        <arrow.version>0.15.1</arrow.version>
     </properties>
 
     <dependencies>
@@ -82,29 +83,29 @@
             <artifactId>rapids-4-spark-shims-spark301_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
         </dependency>
-	<dependency>
+        <dependency>
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-vector</artifactId>
-            <version>0.15.1</version>
-	    <scope>provided</scope>
+            <version>${arrow.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-sql_${scala.binary.version}</artifactId>
-	    <version>${spark301db.version}</version>
-	    <scope>provided</scope>
+            <version>${spark301db.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
-	    <version>${spark301db.version}</version>
-	    <scope>provided</scope>
+            <version>${spark301db.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-core_${scala.binary.version}</artifactId>
-	    <version>${spark301db.version}</version>
-	    <scope>provided</scope>
+            <version>${spark301db.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>

From 57b2033b28ce1e486a47464779deda743690ec94 Mon Sep 17 00:00:00 2001
From: Thomas Graves <tgraves@nvidia.com>
Date: Fri, 29 Jan 2021 23:30:51 +0000
Subject: [PATCH 4/5] sign off

Signed-off-by: Thomas Graves <tgraves@nvidia.com>

From 0990f655958caf3121af45381fb3edc287651792 Mon Sep 17 00:00:00 2001
From: Thomas Graves <tgraves@nvidia.com>
Date: Fri, 29 Jan 2021 23:36:46 +0000
Subject: [PATCH 5/5] fix copyright

Signed-off-by: Thomas Graves <tgraves@nvidia.com>
---
 shims/spark301db/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shims/spark301db/pom.xml b/shims/spark301db/pom.xml
index f5ffc7ddfa9..65555b61655 100644
--- a/shims/spark301db/pom.xml
+++ b/shims/spark301db/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2020, NVIDIA CORPORATION.
+  Copyright (c) 2020-2021, NVIDIA CORPORATION.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.