Spark 3.1: Remove module

.github/workflows/spark-ci.yml

@@ -60,7 +60,7 @@ jobs:
     strategy:
       matrix:
         jvm: [8, 11]
-        spark: ['3.1', '3.2', '3.3', '3.4', '3.5']
+        spark: ['3.2', '3.3', '3.4', '3.5']
     env:
       SPARK_LOCAL_IP: localhost
     steps:

.gitignore

@@ -28,7 +28,6 @@ lib/
 site/site
 
 # benchmark output
-spark/v3.1/spark/benchmark/*
 spark/v3.2/spark/benchmark/*
 spark/v3.3/spark/benchmark/*
 spark/v3.3/spark-extensions/benchmark/*

dev/stage-binaries.sh

@@ -20,7 +20,7 @@
 
 SCALA_VERSION=2.12
 FLINK_VERSIONS=1.15,1.16,1.17
-SPARK_VERSIONS=3.1,3.2,3.3,3.4
+SPARK_VERSIONS=3.2,3.3,3.4
 HIVE_VERSIONS=2,3
 
 ./gradlew -Prelease -DscalaVersion=$SCALA_VERSION -DflinkVersions=$FLINK_VERSIONS -DsparkVersions=$SPARK_VERSIONS -DhiveVersions=$HIVE_VERSIONS publishApachePublicationToMavenRepository

gradle.properties

@@ -21,7 +21,7 @@ systemProp.knownFlinkVersions=1.15,1.16,1.17
 systemProp.defaultHiveVersions=2
 systemProp.knownHiveVersions=2,3
 systemProp.defaultSparkVersions=3.5
-systemProp.knownSparkVersions=3.1,3.2,3.3,3.4,3.5
+systemProp.knownSparkVersions=3.2,3.3,3.4,3.5
 systemProp.defaultScalaVersion=2.12
 systemProp.knownScalaVersions=2.12,2.13
 org.gradle.parallel=true

gradle/libs.versions.toml

@@ -59,7 +59,6 @@ s3mock-junit5 = "2.11.0"
 scala-collection-compat = "2.11.0"
 slf4j = "1.7.36"
 snowflake-jdbc = "3.13.30"
-spark-hive31 = "3.1.3"
 spark-hive32 = "3.2.2"
 spark-hive33 = "3.3.2"
 spark-hive34 = "3.4.1"

jmh.gradle

@@ -25,10 +25,6 @@ def sparkVersions = (System.getProperty("sparkVersions") != null ? System.getPro
 def scalaVersion = System.getProperty("scalaVersion") != null ? System.getProperty("scalaVersion") : System.getProperty("defaultScalaVersion")
 def jmhProjects = [project(":iceberg-core")]
 
-if (sparkVersions.contains("3.1")) {
-  jmhProjects.add(project(":iceberg-spark:iceberg-spark-3.1_2.12"))
-}
-
 if (sparkVersions.contains("3.2")) {
   jmhProjects.add(project(":iceberg-spark:iceberg-spark-3.2_${scalaVersion}"))
 }

settings.gradle

@@ -133,18 +133,6 @@ if (flinkVersions.contains("1.17")) {
   project(":iceberg-flink:flink-runtime-1.17").name = "iceberg-flink-runtime-1.17"
 }
 
-if (sparkVersions.contains("3.1")) {
-  include ':iceberg-spark:spark-3.1_2.12'
-  include ':iceberg-spark:spark-extensions-3.1_2.12'
-  include ':iceberg-spark:spark-runtime-3.1_2.12'
-  project(':iceberg-spark:spark-3.1_2.12').projectDir = file('spark/v3.1/spark')
-  project(':iceberg-spark:spark-3.1_2.12').name = 'iceberg-spark-3.1_2.12'
-  project(':iceberg-spark:spark-extensions-3.1_2.12').projectDir = file('spark/v3.1/spark-extensions')
-  project(':iceberg-spark:spark-extensions-3.1_2.12').name = 'iceberg-spark-extensions-3.1_2.12'
-  project(':iceberg-spark:spark-runtime-3.1_2.12').projectDir = file('spark/v3.1/spark-runtime')
-  project(':iceberg-spark:spark-runtime-3.1_2.12').name = 'iceberg-spark-runtime-3.1_2.12'
-}
-
 if (sparkVersions.contains("3.2")) {
   include ":iceberg-spark:spark-3.2_${scalaVersion}"
   include ":iceberg-spark:spark-extensions-3.2_${scalaVersion}"

spark/build.gradle

@@ -20,10 +20,6 @@
 // add enabled Spark version modules to the build
 def sparkVersions = (System.getProperty("sparkVersions") != null ? System.getProperty("sparkVersions") : System.getProperty("defaultSparkVersions")).split(",")
 
-if (sparkVersions.contains("3.1")) {
-  apply from: file("$projectDir/v3.1/build.gradle")
-}
-
 if (sparkVersions.contains("3.2")) {
   apply from: file("$projectDir/v3.2/build.gradle")
 }