Update travis branch to track latest Spark 2.1 release version (graphframes#198)

* Update travis branch to track latest Spark 2.1 release version
* update Makefile and build.sbt default

Author: phi-dbq

.travis.yml

@@ -15,10 +15,10 @@ env:
   matrix:
     - PYSPARK_PYTHON=python2 SCALA_VERSION=2.10.6 SPARK_VERSION=1.6.3 SPARK_BUILD="spark-1.6.3-bin-hadoop2.6" SPARK_BUILD_URL="http://d3kbcqa49mib13.cloudfront.net/spark-1.6.3-bin-hadoop2.6.tgz"
     - PYSPARK_PYTHON=python2 SCALA_VERSION=2.11.8 SPARK_VERSION=2.0.2 SPARK_BUILD="spark-2.0.2-bin-hadoop2.7" SPARK_BUILD_URL="http://d3kbcqa49mib13.cloudfront.net/spark-2.0.2-bin-hadoop2.7.tgz"
-    - PYSPARK_PYTHON=python2 SCALA_VERSION=2.11.8 SPARK_VERSION=2.1.0 SPARK_BUILD="spark-2.1.0-bin-hadoop2.7" SPARK_BUILD_URL="http://d3kbcqa49mib13.cloudfront.net/spark-2.1.0-bin-hadoop2.7.tgz"
+    - PYSPARK_PYTHON=python2 SCALA_VERSION=2.11.8 SPARK_VERSION=2.1.1 SPARK_BUILD="spark-2.1.1-bin-hadoop2.7" SPARK_BUILD_URL="http://d3kbcqa49mib13.cloudfront.net/spark-2.1.1-bin-hadoop2.7.tgz"
     - PYSPARK_PYTHON=python3 SCALA_VERSION=2.10.6 SPARK_VERSION=1.6.3 SPARK_BUILD="spark-1.6.3-bin-hadoop2.6" SPARK_BUILD_URL="http://d3kbcqa49mib13.cloudfront.net/spark-1.6.3-bin-hadoop2.6.tgz"
     - PYSPARK_PYTHON=python3 SCALA_VERSION=2.11.8 SPARK_VERSION=2.0.2 SPARK_BUILD="spark-2.0.2-bin-hadoop2.7" SPARK_BUILD_URL="http://d3kbcqa49mib13.cloudfront.net/spark-2.0.2-bin-hadoop2.7.tgz"
-    - PYSPARK_PYTHON=python3 SCALA_VERSION=2.11.8 SPARK_VERSION=2.1.0 SPARK_BUILD="spark-2.1.0-bin-hadoop2.7" SPARK_BUILD_URL="http://d3kbcqa49mib13.cloudfront.net/spark-2.1.0-bin-hadoop2.7.tgz"
+    - PYSPARK_PYTHON=python3 SCALA_VERSION=2.11.8 SPARK_VERSION=2.1.1 SPARK_BUILD="spark-2.1.1-bin-hadoop2.7" SPARK_BUILD_URL="http://d3kbcqa49mib13.cloudfront.net/spark-2.1.1-bin-hadoop2.7.tgz"
 
 before_install:
  - ./bin/download_travis_dependencies.sh

Makefile

@@ -1,10 +1,10 @@
-all: 2.1.0s2.10 1.6.3 2.0.2 2.1.0
+all: 2.1.1s2.10 1.6.3 2.0.2 2.1.1
 
 clean:
 	rm -rf target/graphframes_*.zip
 
-1.6.3 2.0.2 2.1.0:
+1.6.3 2.0.2 2.1.1:
 	build/sbt -Dspark.version=$@ spDist
 
-2.1.0s2.10:
-	build/sbt -Dspark.version=2.1.0 -Dscala.version=2.10.6 spDist assembly test
+2.1.1s2.10:
+	build/sbt -Dspark.version=2.1.1 -Dscala.version=2.10.6 spDist assembly test

build.sbt

@@ -1,7 +1,7 @@
 // Your sbt build file. Guides on how to write one can be found at
 // http://www.scala-sbt.org/0.13/docs/index.html
 
-val sparkVer = sys.props.getOrElse("spark.version", "2.1.0")
+val sparkVer = sys.props.getOrElse("spark.version", "2.1.1")
 val sparkBranch = sparkVer.substring(0, 3)
 val defaultScalaVer = sparkBranch match {
   case "1.6" => "2.10.6"