Update spark330shim to use released lib (#5848)

* Revert "Temporarily allow 3.3.1 for 3.3.0 shims. (#5693)"

This reverts commit 53cfa49.

* update shim330 dep to released spark 330 libs

Signed-off-by: Peixin Li <pxli@nyu.edu>

* drop 330 from snapshot section in buildall

build/buildall

@@ -159,7 +159,6 @@ case $DIST_PROFILE in
       320
       321
       322
-      330
     )
     ;;
 
@@ -171,6 +170,7 @@ case $DIST_PROFILE in
       313
       320
       321
+      330
     )
     ;;
 
@@ -179,6 +179,7 @@ case $DIST_PROFILE in
       321cdh
       312
       320
+      330
     )
     ;;
 

dist/pom.xml

@@ -46,12 +46,12 @@
             313,
             320,
             321,
-            321cdh
+            321cdh,
+            330
         </noSnapshot.buildvers>
         <snapshot.buildvers>
             314,
-            322,
-            330
+            322
         </snapshot.buildvers>
         <databricks.buildvers>
             312db,
@@ -91,14 +91,14 @@
                 - a downstream distro
                 - a snapshot
             for testing while minimizing the build time
-            TODO add 3.3.0-SNAPSHOT
             -->
             <id>minimumFeatureVersionMix</id>
             <properties>
                 <included_buildvers>
                     312,
                     320,
-                    321cdh
+                    321cdh,
+                    330
                 </included_buildvers>
             </properties>
         </profile>

docs/additional-functionality/rapids-shuffle.md

@@ -286,6 +286,7 @@ In this section, we are using a docker container built using the sample dockerfi
    | 3.2.0           | com.nvidia.spark.rapids.spark320.RapidsShuffleManager    |
    | 3.2.1           | com.nvidia.spark.rapids.spark321.RapidsShuffleManager    |
    | 3.2.1 CDH       | com.nvidia.spark.rapids.spark321cdh.RapidsShuffleManager |
+   | 3.3.0           | com.nvidia.spark.rapids.spark330.RapidsShuffleManager    |
    | Databricks 9.1  | com.nvidia.spark.rapids.spark312db.RapidsShuffleManager  |
    | Databricks 10.4 | com.nvidia.spark.rapids.spark321db.RapidsShuffleManager  |
 

pom.xml

@@ -863,7 +863,7 @@
         <spark321cdh.version>3.2.1.3.2.7171000.0-3</spark321cdh.version>
         <spark321db.version>3.2.1-databricks</spark321db.version>
         <spark322.version>3.2.2-SNAPSHOT</spark322.version>
-        <spark330.version>3.3.1-SNAPSHOT</spark330.version>
+        <spark330.version>3.3.0</spark330.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>

sql-plugin/src/main/330/scala/com/nvidia/spark/rapids/shims/spark330/SparkShimServiceProvider.scala

@@ -20,9 +20,7 @@ import com.nvidia.spark.rapids.SparkShimVersion
 
 object SparkShimServiceProvider {
   val VERSION = SparkShimVersion(3, 3, 0)
-  // temporarily allow 3.3.1 while 3.3.0 release candidates are being produced
-  private val VERSION331 = SparkShimVersion(3, 3, 1)
-  val VERSIONNAMES = Seq(VERSION, VERSION331).flatMap(v => Seq(s"$v", s"$v-SNAPSHOT"))
+  val VERSIONNAMES = Seq(s"$VERSION", s"$VERSION-SNAPSHOT")
 }
 
 class SparkShimServiceProvider extends com.nvidia.spark.rapids.SparkShimServiceProvider {

sql-plugin/src/test/330/scala/com/nvidia/spark/rapids/shims/spark330/Spark330ShimsSuite.scala

@@ -24,9 +24,7 @@ import org.apache.spark.sql.types.{DayTimeIntervalType, YearMonthIntervalType}
 
 class Spark330ShimsSuite extends FunSuite {
   test("spark shims version") {
-    // temporarily allow 3.3.1 while 3.3.0 release candidates are being produced
-    assert(SparkShimImpl.getSparkShimVersion === SparkShimVersion(3, 3, 0) ||
-      SparkShimImpl.getSparkShimVersion === SparkShimVersion(3, 3, 1))
+    assert(SparkShimImpl.getSparkShimVersion === SparkShimVersion(3, 3, 0))
   }
 
   test("shuffle manager class") {