save progress

apache · Jun 11, 2024 · ea252bb · ea252bb
1 parent e7c5f25
commit ea252bb
Show file tree

Hide file tree

Showing 3 changed files with 506 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -91,6 +91,7 @@ under the License.
     <additional.3_4.test.source>spark-3.4-plus</additional.3_4.test.source>
     <shims.majorVerSrc>spark-3.x</shims.majorVerSrc>
     <shims.minorVerSrc>spark-3.4</shims.minorVerSrc>
+    <shims.extraVerSrc>spark-pre-3.5</shims.extraVerSrc>
   </properties>
 
   <dependencyManagement>
@@ -528,6 +529,7 @@ under the License.
         <additional.3_3.test.source>not-needed-yet</additional.3_3.test.source>
         <additional.3_4.test.source>not-needed-yet</additional.3_4.test.source>
         <shims.minorVerSrc>spark-3.2</shims.minorVerSrc>
+        <shims.extraVerSrc>spark-pre-3.5</shims.extraVerSrc>
       </properties>
     </profile>
 
@@ -540,6 +542,7 @@ under the License.
         <parquet.version>1.12.0</parquet.version>
         <additional.3_4.test.source>not-needed-yet</additional.3_4.test.source>
         <shims.minorVerSrc>spark-3.3</shims.minorVerSrc>
+        <shims.extraVerSrc>spark-pre-3.5</shims.extraVerSrc>
       </properties>
     </profile>
 
@@ -549,6 +552,24 @@ under the License.
         <scala.version>2.12.17</scala.version>
         <spark.version.short>3.4</spark.version.short>
         <parquet.version>1.13.1</parquet.version>
+        <shims.minorVerSrc>spark-3.4</shims.minorVerSrc>
+        <shims.extraVerSrc>spark-pre-3.5</shims.extraVerSrc>
+      </properties>
+    </profile>
+
+    <profile>
+      <!-- FIXME: this is WIP. Tests may fail -->
+      <id>spark-3.5</id>
+      <properties>
+        <scala.version>2.12.17</scala.version>
+        <spark.version>3.5.1</spark.version>
+        <spark.version.short>3.5</spark.version.short>
+        <parquet.version>1.13.1</parquet.version>
+<!--        <additional.3_3.test.source>spark-3.3-plus</additional.3_3.test.source>-->
+<!--        <additional.3_5.test.source>spark-3.5</additional.3_5.test.source>-->
+        <shims.minorVerSrc>spark-3.5</shims.minorVerSrc>
+        <shims.extraVerSrc>not-needed</shims.extraVerSrc>
+
       </properties>
     </profile>
 
@@ -571,19 +592,6 @@ under the License.
       </properties>
     </profile>
 
-    <profile>
-      <id>spark-3.5</id>
-      <properties>
-        <scala.version>2.12.17</scala.version>
-        <spark.version>3.5.1</spark.version>
-        <spark.version.short>3.5</spark.version.short>
-        <parquet.version>1.13.1</parquet.version>
-        <additional.3_3.test.source>spark-3.3-plus</additional.3_3.test.source>
-        <additional.3_5.test.source>spark-3.5</additional.3_5.test.source>
-        <shims.minorVerSrc>spark-3.5</shims.minorVerSrc>
-      </properties>
-    </profile>
-
     <profile>
       <id>scala-2.13</id>
       <properties>

diff --git a/spark/pom.xml b/spark/pom.xml
@@ -254,6 +254,7 @@ under the License.
                 <source>src/test/${additional.3_4.test.source}</source>
                 <source>src/test/${shims.majorVerSrc}</source>
                 <source>src/test/${shims.minorVerSrc}</source>
+                <source>src/test/${shims.extraVerSrc}</source>
               </sources>
             </configuration>
           </execution>
@@ -267,6 +268,7 @@ under the License.
               <sources>
                 <source>src/main/${shims.majorVerSrc}</source>
                 <source>src/main/${shims.minorVerSrc}</source>
+                <source>src/main/${shims.extraVerSrc}</source>
               </sources>
             </configuration>
           </execution>