diff --git a/core/pom.xml b/core/pom.xml index 3c8138f974a56..9a4f234953a23 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -417,7 +417,6 @@ - \ .bat @@ -429,7 +428,6 @@ - / .sh @@ -450,7 +448,7 @@ - ..${path.separator}R${path.separator}install-dev${script.extension} + ..${file.separator}R${file.separator}install-dev${script.extension} diff --git a/pom.xml b/pom.xml index 8afc39bb46f80..8408f4b1fa5ed 100644 --- a/pom.xml +++ b/pom.xml @@ -2617,8 +2617,9 @@ -bootclasspath - ${env.JAVA_7_HOME}/jre/lib/rt.jar + ${env.JAVA_7_HOME}/jre/lib/rt.jar${path.separator}${env.JAVA_7_HOME}/jre/lib/jce.jar + true @@ -2633,7 +2634,7 @@ -javabootclasspath - ${env.JAVA_7_HOME}/jre/lib/rt.jar + ${env.JAVA_7_HOME}/jre/lib/rt.jar${path.separator}${env.JAVA_7_HOME}/jre/lib/jce.jar @@ -2642,7 +2643,7 @@ -javabootclasspath - ${env.JAVA_7_HOME}/jre/lib/rt.jar + ${env.JAVA_7_HOME}/jre/lib/rt.jar${path.separator}${env.JAVA_7_HOME}/jre/lib/jce.jar diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index a39c93e9574fa..8e47e7f13d367 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -280,7 +280,7 @@ object SparkBuild extends PomBuild { "-target", javacJVMVersion.value ) ++ sys.env.get("JAVA_7_HOME").toSeq.flatMap { jdk7 => if (javacJVMVersion.value == "1.7") { - Seq("-bootclasspath", s"$jdk7/jre/lib/rt.jar") + Seq("-bootclasspath", s"$jdk7/jre/lib/rt.jar${File.pathSeparator}$jdk7/jre/lib/jce.jar") } else { Nil } @@ -291,7 +291,7 @@ object SparkBuild extends PomBuild { "-sourcepath", (baseDirectory in ThisBuild).value.getAbsolutePath // Required for relative source links in scaladoc ) ++ sys.env.get("JAVA_7_HOME").toSeq.flatMap { jdk7 => if (javacJVMVersion.value == "1.7") { - Seq("-javabootclasspath", s"$jdk7/jre/lib/rt.jar") + Seq("-javabootclasspath", s"$jdk7/jre/lib/rt.jar${File.pathSeparator}$jdk7/jre/lib/jce.jar") } else { Nil }