Enforce Apache 3.3.0+ for Scala 2.13 (#9568)

* Enforce Apache 3.3.0+ for Scala 2.13 Fixes #9563 Signed-off-by: Gera Shegalov <gera@apache.org> * Fix comment Signed-off-by: Gera Shegalov <gera@apache.org> --------- Signed-off-by: Gera Shegalov <gera@apache.org>
NVIDIA · Oct 30, 2023 · 2cc202a · 2cc202a
1 parent 2e282f9
commit 2cc202a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1234,7 +1234,13 @@
                           <message>Minimum Maven version 3.6.x required</message>
                           <version>[3.6,)</version>
                         </requireMavenVersion>
-                        <!-- TODO add buildver validation -->
+                        <!-- #if scala-2.13 --><!--
+                        <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>
+                        </requireProperty>
+                        --><!-- #endif -->
                       </rules>
                     </configuration>
                   </execution>
@@ -1346,13 +1352,13 @@
                             <skip>${maven.cleanall.skip}</skip>
                             <target>
                                 <!-- #if scala-2.12 -->
-                                <dirset dir="${project.basedir}" 
+                                <dirset dir="${project.basedir}"
                                     includes="**/target"
                                     excludes="scala2.13/**"
                                     id="target.dirs.for.clean"/>
                                 <!-- #endif scala-2.12 -->
                                 <!-- #if scala-2.13 --><!--
-                                <dirset dir="${project.basedir}" 
+                                <dirset dir="${project.basedir}"
                                     includes="**/target"
                                     id="target.dirs.for.clean"/>
                                 --><!-- #endif scala-2.13 -->

diff --git a/scala2.13/pom.xml b/scala2.13/pom.xml
@@ -1234,7 +1234,13 @@
                           <message>Minimum Maven version 3.6.x required</message>
                           <version>[3.6,)</version>
                         </requireMavenVersion>
-                        <!-- TODO add buildver validation -->
+                        <!-- #if scala-2.13 -->
+                        <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>
+                        </requireProperty>
+                        --><!-- #endif -->
                       </rules>
                     </configuration>
                   </execution>
@@ -1346,13 +1352,13 @@
                             <skip>${maven.cleanall.skip}</skip>
                             <target>
                                 <!-- #if scala-2.12 --><!--
-                                <dirset dir="${project.basedir}" 
+                                <dirset dir="${project.basedir}"
                                     includes="**/target"
                                     excludes="scala2.13/**"
                                     id="target.dirs.for.clean"/>
                                 --><!-- #endif scala-2.12 -->
                                 <!-- #if scala-2.13 -->
-                                <dirset dir="${project.basedir}" 
+                                <dirset dir="${project.basedir}"
                                     includes="**/target"
                                     id="target.dirs.for.clean"/>
                                 <!-- #endif scala-2.13 -->