From fcb11c7076abf1c60eba2a988172b6c260a000ec Mon Sep 17 00:00:00 2001
From: Niranjan Artal <nartal@nvidia.com>
Date: Tue, 11 Aug 2020 19:06:11 -0700
Subject: [PATCH 1/2] Move spark shim properties to top level pom

Signed-off-by: Niranjan Artal <nartal@nvidia.com>
---
 pom.xml                | 3 +++
 shims/spark300/pom.xml | 4 ----
 shims/spark301/pom.xml | 4 ----
 shims/spark310/pom.xml | 4 ----
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 59f0b60bec7..3ae0efaf2ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,6 +167,9 @@
 	<pytest.TEST_TAGS>not qarun</pytest.TEST_TAGS>
 	<rat.consoleOutput>false</rat.consoleOutput>
 	<slf4j.version>1.7.30</slf4j.version>
+    <spark300.version>3.0.0</spark300.version>
+    <spark301.version>3.0.1-SNAPSHOT</spark301.version>
+    <spark310.version>3.1.0-SNAPSHOT</spark310.version>
     </properties>
 
     <dependencyManagement>
diff --git a/shims/spark300/pom.xml b/shims/spark300/pom.xml
index 7f60a2124da..be62d24b6a4 100644
--- a/shims/spark300/pom.xml
+++ b/shims/spark300/pom.xml
@@ -31,10 +31,6 @@
     <description>The RAPIDS SQL plugin for Apache Spark 3.0.0 Shim</description>
     <version>0.2.0-SNAPSHOT</version>
 
-    <properties>
-        <spark300.version>3.0.0</spark300.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.spark</groupId>
diff --git a/shims/spark301/pom.xml b/shims/spark301/pom.xml
index 10a22e409a8..d467e3c3cea 100644
--- a/shims/spark301/pom.xml
+++ b/shims/spark301/pom.xml
@@ -31,10 +31,6 @@
     <description>The RAPIDS SQL plugin for Apache Spark 3.0.1 Shim</description>
     <version>0.2.0-SNAPSHOT</version>
 
-    <properties>
-        <spark301.version>3.0.1-SNAPSHOT</spark301.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.nvidia</groupId>
diff --git a/shims/spark310/pom.xml b/shims/spark310/pom.xml
index 52e77a711cc..9eeaacd23af 100644
--- a/shims/spark310/pom.xml
+++ b/shims/spark310/pom.xml
@@ -31,10 +31,6 @@
     <description>The RAPIDS SQL plugin for Apache Spark 3.1.0 Shim</description>
     <version>0.2.0-SNAPSHOT</version>
 
-    <properties>
-        <spark310.version>3.1.0-SNAPSHOT</spark310.version>
-    </properties>
-
     <dependencies>
 	<dependency>
             <groupId>com.nvidia</groupId>

From f115454203ebc3a5ba9448b0cf93abda52fb350f Mon Sep 17 00:00:00 2001
From: Niranjan Artal <nartal@nvidia.com>
Date: Tue, 11 Aug 2020 19:10:49 -0700
Subject: [PATCH 2/2] indetation fix

Signed-off-by: Niranjan Artal <nartal@nvidia.com>
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3ae0efaf2ca..bd2900c9e51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,9 +167,9 @@
 	<pytest.TEST_TAGS>not qarun</pytest.TEST_TAGS>
 	<rat.consoleOutput>false</rat.consoleOutput>
 	<slf4j.version>1.7.30</slf4j.version>
-    <spark300.version>3.0.0</spark300.version>
-    <spark301.version>3.0.1-SNAPSHOT</spark301.version>
-    <spark310.version>3.1.0-SNAPSHOT</spark310.version>
+	<spark300.version>3.0.0</spark300.version>
+	<spark301.version>3.0.1-SNAPSHOT</spark301.version>
+	<spark310.version>3.1.0-SNAPSHOT</spark310.version>
     </properties>
 
     <dependencyManagement>