Skip to content

Commit f02142b

Browse files
jiminhsiehholdenk
authored andcommitted
Add sbt version (high-performance-spark#98)
* Add `build.properties` file for IntelliJ * `MaxPermSize` was deprecated * Use the same Spark version as build file * Prevent the failure of installing Oracle JDK
1 parent 6680eed commit f02142b

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
dist: trusty
2+
13
language: scala
24
sudo: false
35
cache:
@@ -52,9 +54,9 @@ before_install:
5254
script:
5355
- "export SPARK_CONF_DIR=./log4j/"
5456
- sbt clean coverage compile package assembly test || (rm -rf ~/.ivy2 ~/.m2 && sbt clean coverage compile package test)
55-
- "[ -f spark] || mkdir spark && cd spark && axel http://d3kbcqa49mib13.cloudfront.net/spark-2.1.0-bin-hadoop2.7.tgz && cd .."
56-
- "tar -xf ./spark/spark-2.1.0-bin-hadoop2.7.tgz"
57-
- "export SPARK_HOME=`pwd`/spark-2.1.0-bin-hadoop2.7"
57+
- "[ -f spark] || mkdir spark && cd spark && axel http://d3kbcqa49mib13.cloudfront.net/spark-2.2.0-bin-hadoop2.7.tgz && cd .."
58+
- "tar -xf ./spark/spark-2.2.0-bin-hadoop2.7.tgz"
59+
- "export SPARK_HOME=`pwd`/spark-2.2.0-bin-hadoop2.7"
5860
- "export PYTHONPATH=$SPARK_HOME/python:`ls -1 $SPARK_HOME/python/lib/py4j-*-src.zip`:$PYTHONPATH"
5961
- "PYSPARK_SUBMIT_ARGS='--jars ./target/examples-assembly-0.0.1.jar pyspark-shell' nosetests --with-doctest --doctest-options=+ELLIPSIS --logging-level=INFO --detailed-errors --verbosity=2 --with-coverage --cover-html-dir=./htmlcov"
6062
- # $SPARK_HOME/bin/spark-submit ./src/main/r/wc.R $SPARK_HOME/README.md

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ parallelExecution in Test := false
3232

3333
fork := true
3434

35-
javaOptions ++= Seq("-Xms512M", "-Xmx2048M", "-XX:MaxPermSize=2048M", "-XX:+CMSClassUnloadingEnabled", "-Djna.nosys=true")
35+
javaOptions ++= Seq("-Xms512M", "-Xmx2048M", "-XX:+CMSClassUnloadingEnabled", "-Djna.nosys=true")
3636

3737
// additional libraries
3838
libraryDependencies ++= Seq(

build_windows.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ parallelExecution in Test := false
3232

3333
fork := true
3434

35-
javaOptions ++= Seq("-Xms512M", "-Xmx2048M", "-XX:MaxPermSize=2048M", "-XX:+CMSClassUnloadingEnabled", "-Djna.nosys=true")
35+
javaOptions ++= Seq("-Xms512M", "-Xmx2048M", "-XX:+CMSClassUnloadingEnabled", "-Djna.nosys=true")
3636

3737
// additional libraries
3838
libraryDependencies ++= Seq(

project/build.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sbt.version=0.13.18

0 commit comments

Comments
 (0)