You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by va...@apache.org on 2016/09/23 04:35:30 UTC
spark git commit: [SPARK-17639][BUILD] Add jce.jar to buildclasspath
when building.
Repository: spark
Updated Branches:
refs/heads/master 79159a1e8 -> a4aeb7677
[SPARK-17639][BUILD] Add jce.jar to buildclasspath when building.
This was missing, preventing code that uses javax.crypto to properly
compile in Spark.
Author: Marcelo Vanzin <va...@cloudera.com>
Closes #15204 from vanzin/SPARK-17639.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a4aeb767
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a4aeb767
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a4aeb767
Branch: refs/heads/master
Commit: a4aeb7677bc07d0b83f82de62dcffd7867d19d9b
Parents: 79159a1
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Thu Sep 22 21:35:25 2016 -0700
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Thu Sep 22 21:35:25 2016 -0700
----------------------------------------------------------------------
core/pom.xml | 4 +---
pom.xml | 7 ++++---
project/SparkBuild.scala | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/a4aeb767/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3c8138f..9a4f234 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>
http://git-wip-us.apache.org/repos/asf/spark/blob/a4aeb767/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8afc39b..8408f4b 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>
http://git-wip-us.apache.org/repos/asf/spark/blob/a4aeb767/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index a39c93e..8e47e7f 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
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org