Cross building Maven artifacts

JulienGremillot · Apr 4, 2017 · 070f179 · 070f179
1 parent d5ff55f
commit 070f179
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -64,7 +64,7 @@ javacOptions in (ThisBuild, compile) ++= Seq("-source", "1.7", "-target", "1.7",
   "-Xlint:deprecation", "-Xlint:unchecked")
 
 // Ignore differentiation of Spark patch levels
-sparkVersion in ThisBuild := sys.props.getOrElse("spark.version", "1.6.3")
+sparkVersion in ThisBuild := sys.props.getOrElse("spark.version", (if (scalaBinaryVersion.value == "2.10") "1.6.3" else "2.1.0"))
 
 sparkBinaryVersion in ThisBuild := binaryVersion(sparkVersion.value)
 

diff --git a/storage/elasticsearch/build.sbt b/storage/elasticsearch/build.sbt
@@ -21,6 +21,8 @@ name := "apache-predictionio-data-elasticsearch"
 
 elasticsearchSparkArtifact := (if (majorVersion(sparkVersion.value) == 2) "elasticsearch-spark-20" else "elasticsearch-spark-13")
 
+elasticsearchVersion := (if (majorVersion(elasticsearchVersion.value) < 5) "5.2.2" else elasticsearchVersion.value)
+
 libraryDependencies ++= Seq(
   "org.apache.predictionio" %% "apache-predictionio-core" % version.value % "provided",
   "org.apache.spark"        %% "spark-core"               % sparkVersion.value % "provided",