Cross building Maven artifacts
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/070f1794 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/070f1794 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/070f1794 Branch: refs/heads/livedoc Commit: 070f1794d790bc312b390df1ff2379d44d1ac0a1 Parents: d5ff55f Author: Donald Szeto <[email protected]> Authored: Tue Apr 4 09:54:39 2017 -0700 Committer: Donald Szeto <[email protected]> Committed: Tue Apr 4 09:54:39 2017 -0700 ---------------------------------------------------------------------- build.sbt | 2 +- storage/elasticsearch/build.sbt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/070f1794/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index 208bde7..26ba0da 100644 --- 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) http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/070f1794/storage/elasticsearch/build.sbt ---------------------------------------------------------------------- diff --git a/storage/elasticsearch/build.sbt b/storage/elasticsearch/build.sbt index 50292c5..7500d1e 100644 --- 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",
