You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2020/06/14 02:09:22 UTC
[spark] branch branch-3.0 updated: [SPARK-31644][BUILD][FOLLOWUP]
Make Spark's guava version configurable from the command line for sbt
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 43fee8b [SPARK-31644][BUILD][FOLLOWUP] Make Spark's guava version configurable from the command line for sbt
43fee8b is described below
commit 43fee8b913dfb8c0742c488c1259bb3c30f19eaf
Author: Kousuke Saruta <sa...@oss.nttdata.com>
AuthorDate: Sat Jun 13 19:04:33 2020 -0700
[SPARK-31644][BUILD][FOLLOWUP] Make Spark's guava version configurable from the command line for sbt
This PR proposes to support guava version configurable from command line for sbt.
sbt is usually faster than Maven so it's useful for developers.
No.
I confirmed the guava version is changed with the following commands.
```
$ build/sbt "inspect tree clean" | grep guava
[info] +-spark/*:dependencyOverrides = Set(com.google.guava:guava:14.0.1, xerces:xercesImpl:2.12.0, jline:jline:2.14.6, org.apache.avro:avro:1.8.2)
```
```
$ build/sbt -Dguava.version=25.0-jre "inspect tree clean" | grep guava
[info] +-spark/*:dependencyOverrides = Set(com.google.guava:guava:25.0-jre, xerces:xercesImpl:2.12.0, jline:jline:2.14.6, org.apache.avro:avro:1.8.2)
```
Closes #28822 from sarutak/guava-version-for-sbt.
Authored-by: Kousuke Saruta <sa...@oss.nttdata.com>
Signed-off-by: Dongjoon Hyun <do...@apache.org>
(cherry picked from commit 610acb2fe4e2d8f76c4a863e3872d94299b88c4c)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
project/SparkBuild.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index c9521ea..50d1527 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -620,8 +620,9 @@ object KubernetesIntegrationTests {
* Overrides to work around sbt's dependency resolution being different from Maven's.
*/
object DependencyOverrides {
+ lazy val guavaVersion = sys.props.get("guava.version").getOrElse("14.0.1")
lazy val settings = Seq(
- dependencyOverrides += "com.google.guava" % "guava" % "14.0.1",
+ dependencyOverrides += "com.google.guava" % "guava" % guavaVersion,
dependencyOverrides += "commons-io" % "commons-io" % "2.4",
dependencyOverrides += "xerces" % "xercesImpl" % "2.12.0",
dependencyOverrides += "jline" % "jline" % "2.14.6",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org