Fixing Guava 1635 issue with spark cassandra connector + other minor … (spark-jobserver#903)

* Fixing Guava 1635 issue with spark cassandra connector + other minor fixes

* Excluded .DS_Store

* Fixed changes as requested

Author: sreeraaman

.DS_Store

@@ -9,6 +9,7 @@ test-reports/
 .idea*
 .vagrant
 *.pyc
+.DS_Store
 
 # ignore deployment configs
 config/*.conf

.gitignore

@@ -137,7 +137,10 @@ lazy val dockerSettings = Seq(
     val sparkBuild = s"spark-${Versions.spark}"
     val sparkBuildCmd = scalaBinaryVersion.value match {
       case "2.11" =>
-        "./make-distribution.sh -Dscala-2.11 -Phadoop-2.7 -Phive"
+        Versions.spark match {
+          case s if s.startsWith("1") => {"./make-distribution.sh -Dscala-2.11 -Phadoop-2.7 -Phive"}
+          case _ => {"./dev/make-distribution.sh -Dscala-2.11 -Phadoop-2.7 -Phive"}
+        }
       case other => throw new RuntimeException(s"Scala version $other is not supported!")
     }
 

build.sbt

@@ -66,4 +66,4 @@ deploy {
 }
 
 # Note that you can use this file to define settings not only for job server,
-# but for your Spark jobs as well.  Spark job configuration merges with this configuration file as defaults.
+# but for your Spark jobs as well.  Spark job configuration merges with this configuration file as defaults.

job-server/config/docker.conf

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # Environment and deploy file
 # For use with bin/server_deploy, bin/server_package etc.
 DEPLOY_HOSTS="hostname1.net

job-server/config/local.sh.template

@@ -5,12 +5,12 @@ import sbtassembly.AssemblyPlugin.autoImport._
 object Assembly {
   lazy val settings = Seq(
     assemblyJarName in assembly := "spark-job-server.jar",
-    // uncomment below to exclude tests
+      // uncomment below to exclude tests
     // test in assembly := {},
     assemblyExcludedJars in assembly <<= (fullClasspath in assembly) map { _ filter { cp =>
       List("servlet-api", "guice-all", "junit", "uuid",
         "jetty", "jsp-api-2.0", "antlr", "avro", "slf4j-log4j", "log4j-1.2",
-        "scala-actors", "spark", "commons-cli", "stax-api", "mockito").exists(cp.data.getName.startsWith(_))
+        "scala-actors", "commons-cli", "stax-api", "mockito").exists(cp.data.getName.startsWith(_))
     } },
     // We don't need the Scala library, Spark already includes it
     assembleArtifact in assemblyPackageScala := false,

project/Assembly.scala

@@ -58,9 +58,10 @@ object Dependencies {
     "org.flywaydb" % "flyway-core" % flyway
   )
 
+
+
   lazy val cassandraDeps = Seq(
-    "com.datastax.cassandra" % "cassandra-driver-core" % cassandra,
-    "com.datastax.cassandra" % "cassandra-driver-mapping" % cassandra
+    "com.datastax.spark" %% "spark-cassandra-connector" % cassandraConnector
   )
 
   lazy val logbackDeps = Seq(

project/Dependencies.scala

@@ -28,4 +28,5 @@ object Versions {
   lazy val spray = "1.3.3"
   lazy val sprayJson = "1.3.2"
   lazy val typeSafeConfig = if (isJavaAtLeast("1.8")) "1.3.0" else "1.2.1"
+  lazy val cassandraConnector = "2.0.5"
 }

project/Versions.scala

@@ -18,4 +18,4 @@ addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3")
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
 
-addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.0")
+addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.1")