Repository: spark
Updated Branches:
  refs/heads/branch-2.0 d5683a703 -> cc100ab54


[SPARK-16353][BUILD][DOC] Missing javadoc options for java unidoc

Link to Jira issue: https://issues.apache.org/jira/browse/SPARK-16353

## What changes were proposed in this pull request?

The javadoc options for the java unidoc generation are ignored when generating 
the java unidoc. For example, the generated `index.html` has the wrong HTML 
page title. This can be seen at 
http://spark.apache.org/docs/latest/api/java/index.html.

I changed the relevant setting scope from `doc` to `(JavaUnidoc, unidoc)`.

## How was this patch tested?

I ran `docs/jekyll build` and verified that the java unidoc `index.html` has 
the correct HTML page title.

Author: Michael Allman <[email protected]>

Closes #14031 from mallman/spark-16353.

(cherry picked from commit 7dbffcdd6dc76b8e8d6a9cd6eeb24323a6b740c3)
Signed-off-by: Sean Owen <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cc100ab5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cc100ab5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cc100ab5

Branch: refs/heads/branch-2.0
Commit: cc100ab54c7d6e7afeeab5439b21e70eb835a505
Parents: d5683a7
Author: Michael Allman <[email protected]>
Authored: Mon Jul 4 21:16:17 2016 +0100
Committer: Sean Owen <[email protected]>
Committed: Mon Jul 4 21:16:29 2016 +0100

----------------------------------------------------------------------
 project/SparkBuild.scala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/cc100ab5/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 8e3dcc2..6018b22 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -723,8 +723,7 @@ object Unidoc {
         .map(_.filterNot(_.getCanonicalPath.contains("org/apache/hadoop")))
     },
 
-    // Javadoc options: create a window title, and group key packages on index 
page
-    javacOptions in doc := Seq(
+    javacOptions in (JavaUnidoc, unidoc) := Seq(
       "-windowtitle", "Spark " + version.value.replaceAll("-SNAPSHOT", "") + " 
JavaDoc",
       "-public",
       "-noqualifier", "java.lang"


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to