You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2017/03/17 04:21:00 UTC
incubator-predictionio git commit: Fix build and tests
Repository: incubator-predictionio
Updated Branches:
refs/heads/feature/xbuild e30e6a4c6 -> d2ad76df5
Fix build and tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/d2ad76df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/d2ad76df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/d2ad76df
Branch: refs/heads/feature/xbuild
Commit: d2ad76df502d515940fb44fd2ccbd99d3d5fb651
Parents: e30e6a4
Author: Donald Szeto <do...@apache.org>
Authored: Thu Mar 16 21:20:51 2017 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Thu Mar 16 21:20:51 2017 -0700
----------------------------------------------------------------------
.travis.yml | 61 +++++++++++++++++++++++++++++++----------------
build.sbt | 27 +++++++++++----------
core/build.sbt | 1 -
data/build.sbt | 6 ++---
make-distribution.sh | 7 +++---
tests/unit.sh | 2 +-
6 files changed, 61 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d2ad76df/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 3921f1a..e45e8d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,31 +41,51 @@ cache: false
env:
matrix:
- - BUILD_TYPE=Unit BUILD_PROFILE=scala-2.10
+ - BUILD_TYPE=Unit
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
- - BUILD_TYPE=Integration BUILD_PROFILE=scala-2.10
+ PIO_SCALA_VERSION=2.10.6
+ - BUILD_TYPE=Integration
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
- - BUILD_TYPE=Integration BUILD_PROFILE=scala-2.10
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS ES_VERSION=5
- - BUILD_TYPE=Integration BUILD_PROFILE=scala-2.10
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS ES_VERSION=5
- - BUILD_TYPE=Integration BUILD_PROFILE=scala-2.10
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS ES_VERSION=1
- - BUILD_TYPE=Integration BUILD_PROFILE=scala-2.10
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS ES_VERSION=1
+ PIO_SCALA_VERSION=2.10.6
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
+ PIO_SCALA_VERSION=2.10.6
+ PIO_ELASTICSEARCH_VERSION=5.2.2
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
+ PIO_SCALA_VERSION=2.10.6
+ PIO_ELASTICSEARCH_VERSION=5.2.2
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
+ PIO_SCALA_VERSION=2.10.6
+ PIO_ELASTICSEARCH_VERSION=1.7.3
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
+ PIO_SCALA_VERSION=2.10.6
+ PIO_ELASTICSEARCH_VERSION=1.7.3
- - BUILD_TYPE=Unit BUILD_PROFILE=scala-2.11
+ - BUILD_TYPE=Unit
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
- - BUILD_TYPE=Integration BUILD_PROFILE=scala-2.11
+ PIO_SCALA_VERSION=2.11.8
+ - BUILD_TYPE=Integration
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
- - BUILD_TYPE=Integration BUILD_PROFILE=scala-2.11
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS ES_VERSION=5
- - BUILD_TYPE=Integration BUILD_PROFILE=scala-2.11
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS ES_VERSION=5
- - BUILD_TYPE=Integration BUILD_PROFILE=scala-2.11
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS ES_VERSION=1
- - BUILD_TYPE=Integration BUILD_PROFILE=scala-2.11
- METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS ES_VERSION=1
+ PIO_SCALA_VERSION=2.11.8
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
+ PIO_SCALA_VERSION=2.11.8
+ PIO_ELASTICSEARCH_VERSION=5.2.2
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
+ PIO_SCALA_VERSION=2.11.8
+ PIO_ELASTICSEARCH_VERSION=5.2.2
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS
+ PIO_SCALA_VERSION=2.11.8
+ PIO_ELASTICSEARCH_VERSION=1.7.3
+ - BUILD_TYPE=Integration
+ METADATA_REP=ELASTICSEARCH EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
+ PIO_SCALA_VERSION=2.11.8
+ PIO_ELASTICSEARCH_VERSION=1.7.3
before_install:
- unset SBT_OPTS JVM_OPTS
@@ -80,7 +100,6 @@ before_script:
- ./tests/before_script.travis.sh
script:
- - source conf/set_build_profile.sh ${BUILD_PROFILE}
- ./tests/script.travis.sh
after_script:
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d2ad76df/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 38b5f9e..fdf9a58 100644
--- a/build.sbt
+++ b/build.sbt
@@ -101,7 +101,13 @@ val conf = file("conf")
val commonSettings = Seq(
autoAPIMappings := true,
- unmanagedClasspath in Test += conf)
+ unmanagedClasspath in Test += conf,
+ unmanagedClasspath in Test += baseDirectory.value / s"../storage/jdbc/target/scala-${versionPrefix(scalaVersion.value)}/classes")
+
+val commonTestSettings = Seq(
+ libraryDependencies ++= Seq(
+ "org.postgresql" % "postgresql" % "9.4-1204-jdbc41" % "test",
+ "org.scalikejdbc" %% "scalikejdbc" % "2.3.5" % "test"))
val dataElasticsearch1 = (project in file("storage/elasticsearch1")).
settings(commonSettings: _*).
@@ -140,8 +146,8 @@ val common = (project in file("common")).
val data = (project in file("data")).
dependsOn(common).
- dependsOn(dataJdbc % "test->compile").
settings(commonSettings: _*).
+ settings(commonTestSettings: _*).
settings(genjavadocSettings: _*).
settings(unmanagedSourceDirectories in Compile +=
sourceDirectory.value / s"main/spark-${versionMajor(sparkVersion.value)}").
@@ -149,8 +155,8 @@ val data = (project in file("data")).
val core = (project in file("core")).
dependsOn(data).
- dependsOn(dataJdbc % "test->compile").
settings(commonSettings: _*).
+ settings(commonTestSettings: _*).
settings(genjavadocSettings: _*).
settings(pioBuildInfoSettings: _*).
enablePlugins(SbtTwirl).
@@ -159,8 +165,8 @@ val core = (project in file("core")).
val tools = (project in file("tools")).
dependsOn(core).
dependsOn(data).
- dependsOn(dataJdbc % "test->compile").
settings(commonSettings: _*).
+ settings(commonTestSettings: _*).
settings(genjavadocSettings: _*).
enablePlugins(SbtTwirl).
settings(publishArtifact := false)
@@ -172,17 +178,14 @@ val e2 = (project in file("e2")).
val dataEs = if (versionMajor(es) == 1) dataElasticsearch1 else dataElasticsearch
-val subprojects = Seq(
- common,
- core,
- data,
+val storageSubprojects = Seq(
dataEs,
dataHbase,
dataHdfs,
dataJdbc,
- dataLocalfs,
- tools,
- e2)
+ dataLocalfs)
+
+val storage = (project in file("storage")).aggregate(storageSubprojects map Project.projectToRef: _*)
val root = (project in file(".")).
settings(commonSettings: _*).
@@ -241,7 +244,7 @@ val root = (project in file(".")).
"docs/javadoc/javadoc-overview.html",
"-noqualifier",
"java.lang")).
- aggregate(subprojects map Project.projectToRef: _*).
+ aggregate(common, core, data, tools, e2).
disablePlugins(sbtassembly.AssemblyPlugin)
val pioUnidoc = taskKey[Unit]("Builds PredictionIO ScalaDoc")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d2ad76df/core/build.sbt
----------------------------------------------------------------------
diff --git a/core/build.sbt b/core/build.sbt
index c6bac3f..d040d4c 100644
--- a/core/build.sbt
+++ b/core/build.sbt
@@ -38,7 +38,6 @@ libraryDependencies ++= Seq(
"org.json4s" %% "json4s-ext" % json4sVersion.value,
"org.scalaj" %% "scalaj-http" % "1.1.6",
"org.slf4j" % "slf4j-log4j12" % "1.7.18",
- "org.postgresql" % "postgresql" % "9.4-1204-jdbc41" % "test",
"org.scalatest" %% "scalatest" % "2.1.7" % "test",
"org.specs2" %% "specs2" % "2.3.13" % "test")
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d2ad76df/data/build.sbt
----------------------------------------------------------------------
diff --git a/data/build.sbt b/data/build.sbt
index 778a8f1..7c34f23 100644
--- a/data/build.sbt
+++ b/data/build.sbt
@@ -25,8 +25,6 @@ libraryDependencies ++= Seq(
"commons-codec" % "commons-codec" % "1.9",
"io.spray" %% "spray-can" % "1.3.3",
"io.spray" %% "spray-routing" % "1.3.3",
- "io.spray" %% "spray-testkit" % "1.3.3" % "test",
- "mysql" % "mysql-connector-java" % "5.1.37" % "optional",
"org.apache.hadoop" % "hadoop-common" % hadoopVersion.value
exclude("javax.servlet", "servlet-api"),
"org.apache.zookeeper" % "zookeeper" % "3.4.7"
@@ -37,11 +35,11 @@ libraryDependencies ++= Seq(
"org.clapper" %% "grizzled-slf4j" % "1.0.2",
"org.json4s" %% "json4s-native" % json4sVersion.value,
"org.json4s" %% "json4s-ext" % json4sVersion.value,
- "org.scalatest" %% "scalatest" % "2.1.7" % "test",
"org.slf4j" % "slf4j-log4j12" % "1.7.18",
- "org.postgresql" % "postgresql" % "9.4.1209",
"org.scalikejdbc" %% "scalikejdbc" % "2.3.2",
"com.typesafe.akka" %% "akka-actor" % akkaVersion.value,
+ "io.spray" %% "spray-testkit" % "1.3.3" % "test",
+ "org.scalatest" %% "scalatest" % "2.1.7" % "test",
"org.specs2" %% "specs2" % "2.3.13" % "test")
parallelExecution in Test := false
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d2ad76df/make-distribution.sh
----------------------------------------------------------------------
diff --git a/make-distribution.sh b/make-distribution.sh
index 11dea3f..b3b650a 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -54,11 +54,10 @@ VERSION=$(grep ^version ${FWDIR}/build.sbt | grep ThisBuild | grep -o '".*"' | s
echo "Building binary distribution for PredictionIO $VERSION..."
-sbt/sbt printBuildInfo
-
cd ${FWDIR}
-sbt/sbt "$JAVA_PROPS" publishLocal
-sbt/sbt "$JAVA_PROPS" assembly
+sbt/sbt clean
+sbt/sbt "$JAVA_PROPS" printBuildInfo
+sbt/sbt "$JAVA_PROPS" publishLocal assembly storage/assembly
cd ${FWDIR}
rm -rf ${DISTDIR}
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d2ad76df/tests/unit.sh
----------------------------------------------------------------------
diff --git a/tests/unit.sh b/tests/unit.sh
index ea5659e..b204bf2 100755
--- a/tests/unit.sh
+++ b/tests/unit.sh
@@ -35,7 +35,7 @@ sbt/sbt scalastyle \
-Delasticsearch.version=$PIO_ELASTICSEARCH_VERSION
# Run all unit tests
-sbt/sbt test \
+sbt/sbt test storage/test \
-Dscala.version=$PIO_SCALA_VERSION \
-Dspark.version=$PIO_SPARK_VERSION \
-Dhadoop.version=$PIO_HADOOP_VERSION \