diff --git a/build/buildall b/build/buildall
index e8c0610deb7..cd86c1414cb 100755
--- a/build/buildall
+++ b/build/buildall
@@ -196,7 +196,7 @@ case $DIST_PROFILE in
     SPARK_SHIM_VERSIONS=($(versionsFromDistProfile "minimumFeatureVersionMix"))
     ;;
 
-  3*)
+  [34]*)
     <<< $DIST_PROFILE IFS="," read -ra SPARK_SHIM_VERSIONS
     INCLUDED_BUILDVERS_OPT="-Dincluded_buildvers=$DIST_PROFILE"
     unset DIST_PROFILE
diff --git a/pom.xml b/pom.xml
index c939f8d5891..5169978ac2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -611,6 +611,26 @@
                 <module>delta-lake/delta-stub</module>
             </modules>
         </profile>
+        <profile>
+            <id>release400</id>
+            <activation>
+                <property>
+                    <name>buildver</name>
+                    <value>400</value>
+                </property>
+            </activation>
+            <properties>
+                <buildver>400</buildver>
+                <spark.version>${spark400.version}</spark.version>
+                <spark.test.version>${spark400.version}</spark.test.version>
+                <parquet.hadoop.version>1.13.1</parquet.hadoop.version>
+                <iceberg.version>${spark330.iceberg.version}</iceberg.version>
+                <slf4j.version>2.0.7</slf4j.version>
+            </properties>
+            <modules>
+                <module>delta-lake/delta-stub</module>
+            </modules>
+        </profile>
         <profile>
             <id>source-javadoc</id>
             <build>
@@ -642,7 +662,7 @@
             <id>scala-2.13</id>
             <properties>
                 <scala.binary.version>2.13</scala.binary.version>
-                <scala.version>2.13.8</scala.version>
+                <scala.version>2.13.13</scala.version>
             </properties>
         </profile>
         <profile>
@@ -782,6 +802,7 @@
         <spark341db.version>3.4.1-databricks</spark341db.version>
         <spark350.version>3.5.0</spark350.version>
         <spark351.version>3.5.1</spark351.version>
+        <spark400.version>4.0.0-SNAPSHOT</spark400.version>
         <mockito.version>3.12.4</mockito.version>
         <scala.plugin.version>4.3.0</scala.plugin.version>
         <maven.install.plugin.version>3.1.1</maven.install.plugin.version>
@@ -835,6 +856,9 @@
             351
         </noSnapshot.buildvers>
         <snapshot.buildvers>
+        <!-- #if scala-2.13 --><!--
+            400
+        --><!-- #endif scala-2.13 -->
         </snapshot.buildvers>
         <databricks.buildvers>
             330db,
@@ -890,6 +914,7 @@
             351
         </noSnapshotScala213.buildvers>
         <snapshotScala213.buildvers>
+            400
         </snapshotScala213.buildvers>
         <allScala213.buildvers>
             ${noSnapshotScala213.buildvers}
@@ -1502,7 +1527,7 @@ This will force full Scala code rebuild in downstream modules.
                         <requireProperty>
                             <regexMessage>Unexpected buildver value ${buildver} for a Scala 2.13 build, only Apache Spark versions 3.3.0 (330) and higher are supported, no vendor builds such as 330db</regexMessage>
                             <property>buildver</property>
-                            <regex>[3-9][3-9][0-9]</regex>
+                            <regex>(?:[3-9][3-9]|[4-9][0-9])[0-9]</regex>
                         </requireProperty>
                         --><!-- #endif scala-2.13 -->
                       </rules>
diff --git a/scala2.13/pom.xml b/scala2.13/pom.xml
index cf3bfb48373..a790e460719 100644
--- a/scala2.13/pom.xml
+++ b/scala2.13/pom.xml
@@ -611,6 +611,26 @@
                 <module>delta-lake/delta-stub</module>
             </modules>
         </profile>
+        <profile>
+            <id>release400</id>
+            <activation>
+                <property>
+                    <name>buildver</name>
+                    <value>400</value>
+                </property>
+            </activation>
+            <properties>
+                <buildver>400</buildver>
+                <spark.version>${spark400.version}</spark.version>
+                <spark.test.version>${spark400.version}</spark.test.version>
+                <parquet.hadoop.version>1.13.1</parquet.hadoop.version>
+                <iceberg.version>${spark330.iceberg.version}</iceberg.version>
+                <slf4j.version>2.0.7</slf4j.version>
+            </properties>
+            <modules>
+                <module>delta-lake/delta-stub</module>
+            </modules>
+        </profile>
         <profile>
             <id>source-javadoc</id>
             <build>
@@ -642,7 +662,7 @@
             <id>scala-2.13</id>
             <properties>
                 <scala.binary.version>2.13</scala.binary.version>
-                <scala.version>2.13.8</scala.version>
+                <scala.version>2.13.13</scala.version>
             </properties>
         </profile>
         <profile>
@@ -724,7 +744,7 @@
         <scala.binary.version>2.13</scala.binary.version>
         <alluxio.client.version>2.8.0</alluxio.client.version>
         <scala.recompileMode>incremental</scala.recompileMode>
-        <scala.version>2.13.8</scala.version>
+        <scala.version>2.13.13</scala.version>
         <!--
         -processing
         to suppress unactionable "No processor claimed any of these annotations"
@@ -782,6 +802,7 @@
         <spark341db.version>3.4.1-databricks</spark341db.version>
         <spark350.version>3.5.0</spark350.version>
         <spark351.version>3.5.1</spark351.version>
+        <spark400.version>4.0.0-SNAPSHOT</spark400.version>
         <mockito.version>3.12.4</mockito.version>
         <scala.plugin.version>4.3.0</scala.plugin.version>
         <maven.install.plugin.version>3.1.1</maven.install.plugin.version>
@@ -835,6 +856,9 @@
             351
         </noSnapshot.buildvers>
         <snapshot.buildvers>
+        <!-- #if scala-2.13 -->
+            400
+        <!-- #endif scala-2.13 -->
         </snapshot.buildvers>
         <databricks.buildvers>
             330db,
@@ -890,6 +914,7 @@
             351
         </noSnapshotScala213.buildvers>
         <snapshotScala213.buildvers>
+            400
         </snapshotScala213.buildvers>
         <allScala213.buildvers>
             ${noSnapshotScala213.buildvers}
@@ -1502,7 +1527,7 @@ This will force full Scala code rebuild in downstream modules.
                         <requireProperty>
                             <regexMessage>Unexpected buildver value ${buildver} for a Scala 2.13 build, only Apache Spark versions 3.3.0 (330) and higher are supported, no vendor builds such as 330db</regexMessage>
                             <property>buildver</property>
-                            <regex>[3-9][3-9][0-9]</regex>
+                            <regex>(?:[3-9][3-9]|[4-9][0-9])[0-9]</regex>
                         </requireProperty>
                         <!-- #endif scala-2.13 -->
                       </rules>
diff --git a/scala2.13/sql-plugin/pom.xml b/scala2.13/sql-plugin/pom.xml
index 5bee34752c7..8d92bd43c0f 100644
--- a/scala2.13/sql-plugin/pom.xml
+++ b/scala2.13/sql-plugin/pom.xml
@@ -103,6 +103,26 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <!-- #if scala-2.13 -->
+    <profiles>
+        <profile>
+            <id>release400</id>
+            <activation>
+                <property>
+                    <name>buildver</name>
+                    <value>400</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.spark</groupId>
+                    <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
+                    <version>${spark.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+    <!-- #endif scala-2.13 -->
     <build>
         <resources>
           <resource>
diff --git a/sql-plugin/pom.xml b/sql-plugin/pom.xml
index cbe7d873dff..6ee699f181f 100644
--- a/sql-plugin/pom.xml
+++ b/sql-plugin/pom.xml
@@ -103,6 +103,26 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <!-- #if scala-2.13 -->
+    <profiles>
+        <profile>
+            <id>release400</id>
+            <activation>
+                <property>
+                    <name>buildver</name>
+                    <value>400</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.spark</groupId>
+                    <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
+                    <version>${spark.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+    <!-- #endif scala-2.13 -->
     <build>
         <resources>
           <resource>