diff --git a/core/pom.xml b/core/pom.xml index 3c8138f974a568b5805b59bb4896d6a8fe8cac28..9a4f234953a238b026d160ab47fb0c9c73250ef4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -417,7 +417,6 @@ </os> </activation> <properties> - <path.separator>\</path.separator> <script.extension>.bat</script.extension> </properties> </profile> @@ -429,7 +428,6 @@ </os> </activation> <properties> - <path.separator>/</path.separator> <script.extension>.sh</script.extension> </properties> </profile> @@ -450,7 +448,7 @@ </execution> </executions> <configuration> - <executable>..${path.separator}R${path.separator}install-dev${script.extension}</executable> + <executable>..${file.separator}R${file.separator}install-dev${script.extension}</executable> </configuration> </plugin> </plugins> diff --git a/pom.xml b/pom.xml index 8afc39bb46f80dd4fa7a4b83f0eaf5e6f2e4282d..8408f4b1fa5ed68f1d9c5110dd074992cf600d8a 100644 --- a/pom.xml +++ b/pom.xml @@ -2617,8 +2617,9 @@ <configuration> <compilerArgs combine.children="append"> <arg>-bootclasspath</arg> - <arg>${env.JAVA_7_HOME}/jre/lib/rt.jar</arg> + <arg>${env.JAVA_7_HOME}/jre/lib/rt.jar${path.separator}${env.JAVA_7_HOME}/jre/lib/jce.jar</arg> </compilerArgs> + <verbose>true</verbose> </configuration> </plugin> <plugin> @@ -2633,7 +2634,7 @@ <configuration> <args combine.children="append"> <arg>-javabootclasspath</arg> - <arg>${env.JAVA_7_HOME}/jre/lib/rt.jar</arg> + <arg>${env.JAVA_7_HOME}/jre/lib/rt.jar${path.separator}${env.JAVA_7_HOME}/jre/lib/jce.jar</arg> </args> </configuration> </execution> @@ -2642,7 +2643,7 @@ <configuration> <args combine.children="append"> <arg>-javabootclasspath</arg> - <arg>${env.JAVA_7_HOME}/jre/lib/rt.jar</arg> + <arg>${env.JAVA_7_HOME}/jre/lib/rt.jar${path.separator}${env.JAVA_7_HOME}/jre/lib/jce.jar</arg> </args> </configuration> </execution> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index a39c93e9574fa3b1ad1e464bfdaf044a5f7541b2..8e47e7f13d3675caa2b0ca5a57cd331c2d340503 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 }