From d11ad14cad52240d7dcd4d49a0c96fb35522eda6 Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Thu, 22 Sep 2016 15:55:56 -0700 Subject: [PATCH 1/3] [SPARK-17639][build] Add jce.jar to buildclasspath when building. This was missing, preventing code that uses javax.crypto to properly compile in Spark. --- pom.xml | 6 +++--- project/SparkBuild.scala | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 8afc39bb46f80..0c6365d1c1585 100644 --- a/pom.xml +++ b/pom.xml @@ -2617,7 +2617,7 @@ -bootclasspath - ${env.JAVA_7_HOME}/jre/lib/rt.jar + ${env.JAVA_7_HOME}/jre/lib/rt.jar,${env.JAVA_7_HOME}/jre/lib/jce.jar @@ -2633,7 +2633,7 @@ -javabootclasspath - ${env.JAVA_7_HOME}/jre/lib/rt.jar + ${env.JAVA_7_HOME}/jre/lib/rt.jar,${env.JAVA_7_HOME}/jre/lib/jce.jar @@ -2642,7 +2642,7 @@ -javabootclasspath - ${env.JAVA_7_HOME}/jre/lib/rt.jar + ${env.JAVA_7_HOME}/jre/lib/rt.jar,${env.JAVA_7_HOME}/jre/lib/jce.jar diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index a39c93e9574fa..d1e6cb0a60b3e 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,$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,$jdk7/jre/lib/jce.jar") } else { Nil } From d0136f585b10a7b9583a1e79417120b2d3219db2 Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Thu, 22 Sep 2016 17:26:45 -0700 Subject: [PATCH 2/3] Use the correct separator. --- pom.xml | 6 +++--- project/SparkBuild.scala | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0c6365d1c1585..0a11a65d784c3 100644 --- a/pom.xml +++ b/pom.xml @@ -2617,7 +2617,7 @@ -bootclasspath - ${env.JAVA_7_HOME}/jre/lib/rt.jar,${env.JAVA_7_HOME}/jre/lib/jce.jar + ${env.JAVA_7_HOME}/jre/lib/rt.jar:${env.JAVA_7_HOME}/jre/lib/jce.jar @@ -2633,7 +2633,7 @@ -javabootclasspath - ${env.JAVA_7_HOME}/jre/lib/rt.jar,${env.JAVA_7_HOME}/jre/lib/jce.jar + ${env.JAVA_7_HOME}/jre/lib/rt.jar:${env.JAVA_7_HOME}/jre/lib/jce.jar @@ -2642,7 +2642,7 @@ -javabootclasspath - ${env.JAVA_7_HOME}/jre/lib/rt.jar,${env.JAVA_7_HOME}/jre/lib/jce.jar + ${env.JAVA_7_HOME}/jre/lib/rt.jar:${env.JAVA_7_HOME}/jre/lib/jce.jar diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d1e6cb0a60b3e..60f3f278e6b5c 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,$jdk7/jre/lib/jce.jar") + Seq("-bootclasspath", s"$jdk7/jre/lib/rt.jar:$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,$jdk7/jre/lib/jce.jar") + Seq("-javabootclasspath", s"$jdk7/jre/lib/rt.jar:$jdk7/jre/lib/jce.jar") } else { Nil } From 33fed28341d387def52a915c762c3db8f5c01abd Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Thu, 22 Sep 2016 19:15:03 -0700 Subject: [PATCH 3/3] Windows-friendly version. Also fix a bug in core/pom.xml that was overriding the system variable. --- core/pom.xml | 4 +--- pom.xml | 7 ++++--- project/SparkBuild.scala | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) 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 0a11a65d784c3..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/jce.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/jce.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/jce.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 60f3f278e6b5c..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:$jdk7/jre/lib/jce.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:$jdk7/jre/lib/jce.jar") + Seq("-javabootclasspath", s"$jdk7/jre/lib/rt.jar${File.pathSeparator}$jdk7/jre/lib/jce.jar") } else { Nil }