This is an automated email from the ASF dual-hosted git repository.

srowen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 187e9a85175 [SPARK-45364][INFRA][BUILD] Clean up the unnecessary Scala 
2.12 logical in SparkBuild
187e9a85175 is described below

commit 187e9a851758c0e9cec11edab2bc07d6f4404001
Author: panbingkun <pbk1...@gmail.com>
AuthorDate: Thu Sep 28 08:36:08 2023 -0500

    [SPARK-45364][INFRA][BUILD] Clean up the unnecessary Scala 2.12 logical in 
SparkBuild
    
    ### What changes were proposed in this pull request?
    The pr aims to clean up the unnecessary Scala 2.12 logical in SparkBuild.
    
    ### Why are the changes needed?
    Spark 4.0 no longer supports Scala 2.12.
    
    ### Does this PR introduce _any_ user-facing change?
    No.
    
    ### How was this patch tested?
    Pass GA.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    No.
    
    Closes #43158 from panbingkun/SPARK-45364.
    
    Authored-by: panbingkun <pbk1...@gmail.com>
    Signed-off-by: Sean Owen <sro...@gmail.com>
---
 project/SparkBuild.scala | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 85ffda304bc..13c92142d46 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -352,10 +352,7 @@ object SparkBuild extends PomBuild {
         "org.apache.spark.util.collection"
       ).mkString(":"),
       "-doc-title", "Spark " + version.value.replaceAll("-SNAPSHOT", "") + " 
ScalaDoc"
-    ) ++ {
-      // Do not attempt to scaladoc javadoc comments under 2.12 since it can't 
handle inner classes
-      if (scalaBinaryVersion.value == "2.12") Seq("-no-java-comments") else 
Seq.empty
-    },
+    ),
 
     // disable Mima check for all modules,
     // to be enabled in specific ones that have previous artifacts


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to