From 1ccc48100ac3343b72d6d759e84e5ff36f33cfa0 Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@nvidia.com>
Date: Mon, 1 Mar 2021 09:38:41 -0600
Subject: [PATCH 1/3] Spark 3.1.1 shim no longer a snapshot shim

Signed-off-by: Jason Lowe <jlowe@nvidia.com>
---
 pom.xml                  |  2 +-
 shims/aggregator/pom.xml | 12 ++++++------
 shims/pom.xml            |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 37f851bd6d8..149660a9dc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
         <spark301.version>3.0.1</spark301.version>
         <spark301db.version>3.0.1-databricks</spark301db.version>
         <spark302.version>3.0.2</spark302.version>
-        <spark311.version>3.1.1-SNAPSHOT</spark311.version>
+        <spark311.version>3.1.1</spark311.version>
         <mockito.version>3.6.0</mockito.version>
         <scala.plugin.version>4.3.0</scala.plugin.version>
         <maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
diff --git a/shims/aggregator/pom.xml b/shims/aggregator/pom.xml
index 14e69185026..7204c55d7dd 100644
--- a/shims/aggregator/pom.xml
+++ b/shims/aggregator/pom.xml
@@ -62,12 +62,6 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
-                <dependency>
-                    <groupId>com.nvidia</groupId>
-                    <artifactId>rapids-4-spark-shims-spark311_${scala.binary.version}</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
             </dependencies>
         </profile>
     </profiles>
@@ -103,5 +97,11 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.nvidia</groupId>
+            <artifactId>rapids-4-spark-shims-spark311_${scala.binary.version}</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/shims/pom.xml b/shims/pom.xml
index 2d1df82e717..9b2025225cf 100644
--- a/shims/pom.xml
+++ b/shims/pom.xml
@@ -45,7 +45,6 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>spark311</module>
             </modules>
         </profile>
     </profiles>
@@ -56,6 +55,7 @@
         <module>spark301emr</module>
         <module>spark301</module>
         <module>spark302</module>
+        <module>spark311</module>
         <module>aggregator</module>
     </modules>
     <dependencies>

From 4d918dc90945dcf8cb149a84c17a89bf960ee325 Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@nvidia.com>
Date: Mon, 1 Mar 2021 10:42:16 -0600
Subject: [PATCH 2/3] Remove 3.1.0, 3.1.0-SNAPSHOT, and 3.1.1-SNAPSHOT support

---
 .../spark/rapids/shims/spark311/SparkShimServiceProvider.scala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shims/spark311/src/main/scala/com/nvidia/spark/rapids/shims/spark311/SparkShimServiceProvider.scala b/shims/spark311/src/main/scala/com/nvidia/spark/rapids/shims/spark311/SparkShimServiceProvider.scala
index 8ce22923520..64fe9edd3a8 100644
--- a/shims/spark311/src/main/scala/com/nvidia/spark/rapids/shims/spark311/SparkShimServiceProvider.scala
+++ b/shims/spark311/src/main/scala/com/nvidia/spark/rapids/shims/spark311/SparkShimServiceProvider.scala
@@ -20,9 +20,8 @@ import com.nvidia.spark.rapids.{SparkShims, SparkShimVersion}
 
 object SparkShimServiceProvider {
   // keep 3.1.0 snapshot version for now until 3.1.1 is released
-  val VERSION310 = SparkShimVersion(3, 1, 0)
   val VERSION = SparkShimVersion(3, 1, 1)
-  val VERSIONNAMES = Seq(s"$VERSION310-SNAPSHOT", s"$VERSION", s"$VERSION-SNAPSHOT")
+  val VERSIONNAMES = Seq(s"$VERSION")
 }
 
 class SparkShimServiceProvider extends com.nvidia.spark.rapids.SparkShimServiceProvider {

From 11fca3be7aa2efeb91009d9d2a1e8d004a23163f Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@nvidia.com>
Date: Tue, 2 Mar 2021 08:41:27 -0600
Subject: [PATCH 3/3] Remove obsolete comment

---
 .../spark/rapids/shims/spark311/SparkShimServiceProvider.scala   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shims/spark311/src/main/scala/com/nvidia/spark/rapids/shims/spark311/SparkShimServiceProvider.scala b/shims/spark311/src/main/scala/com/nvidia/spark/rapids/shims/spark311/SparkShimServiceProvider.scala
index 64fe9edd3a8..3e7e694564a 100644
--- a/shims/spark311/src/main/scala/com/nvidia/spark/rapids/shims/spark311/SparkShimServiceProvider.scala
+++ b/shims/spark311/src/main/scala/com/nvidia/spark/rapids/shims/spark311/SparkShimServiceProvider.scala
@@ -19,7 +19,6 @@ package com.nvidia.spark.rapids.shims.spark311
 import com.nvidia.spark.rapids.{SparkShims, SparkShimVersion}
 
 object SparkShimServiceProvider {
-  // keep 3.1.0 snapshot version for now until 3.1.1 is released
   val VERSION = SparkShimVersion(3, 1, 1)
   val VERSIONNAMES = Seq(s"$VERSION")
 }