From 6cb71f4733a920d916b91c66bb2a508a21883b16 Mon Sep 17 00:00:00 2001 From: Josh Rosen Date: Thu, 9 Jun 2016 12:32:29 -0700 Subject: [SPARK-15839] Fix Maven doc-jar generation when JAVA_7_HOME is set ## What changes were proposed in this pull request? It looks like the nightly Maven snapshots broke after we set `JAVA_7_HOME` in the build: https://amplab.cs.berkeley.edu/jenkins/view/Spark%20Packaging/job/spark-master-maven-snapshots/1573/. It seems that passing `-javabootclasspath` to ScalaDoc using scala-maven-plugin ends up preventing the Scala library classes from being added to scalac's internal class path, causing compilation errors while building doc-jars. There might be a principled fix to this inside of the scala-maven-plugin itself, but for now this patch configures the build to omit the `-javabootclasspath` option during Maven doc-jar generation. ## How was this patch tested? Tested manually with `build/mvn clean install -DskipTests=true` when `JAVA_7_HOME` was set. Also manually inspected the effective POM diff to verify that the final POM changes were scoped correctly: https://gist.github.com/JoshRosen/f889d1c236fad14fa25ac4be01654653 /cc vanzin and yhuai for review. Author: Josh Rosen Closes #13573 from JoshRosen/SPARK-15839. --- pom.xml | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index fd4068376c..89ed87ff9e 100644 --- a/pom.xml +++ b/pom.xml @@ -2605,12 +2605,29 @@ net.alchim31.maven scala-maven-plugin - - - -javabootclasspath - ${env.JAVA_7_HOME}/jre/lib/rt.jar - - + + + + scala-compile-first + + + -javabootclasspath + ${env.JAVA_7_HOME}/jre/lib/rt.jar + + + + + scala-test-compile-first + + + -javabootclasspath + ${env.JAVA_7_HOME}/jre/lib/rt.jar + + + + -- cgit v1.2.3