diff --git a/.travis.yml b/.travis.yml index f6037b5415..237c411122 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,14 +46,31 @@ cache: env: matrix: - BUILD_TYPE=Unit + PIO_SCALA_VERSION=2.11.12 + METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL + - BUILD_TYPE=Unit + PIO_SCALA_VERSION=2.12.8 METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL + - BUILD_TYPE=Integration + PIO_SCALA_VERSION=2.11.12 + METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3 + PIO_ELASTICSEARCH_VERSION=5.6.9 + - BUILD_TYPE=Integration + PIO_SCALA_VERSION=2.11.12 METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3 PIO_ELASTICSEARCH_VERSION=6.8.1 - BUILD_TYPE=Integration + PIO_SCALA_VERSION=2.11.12 METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS PIO_HBASE_VERSION=1.2.6 + - BUILD_TYPE=Integration + METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL + PIO_SCALA_VERSION=2.12.8 + PIO_SPARK_VERSION=2.4.3 + PIO_HADOOP_VERSION=2.6.5 + - BUILD_TYPE=Integration METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL PIO_SCALA_VERSION=2.11.12 @@ -75,6 +92,12 @@ env: PIO_SPARK_VERSION=2.3.3 PIO_HADOOP_VERSION=2.6.5 + - BUILD_TYPE=Integration + METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL + PIO_SCALA_VERSION=2.12.8 + PIO_SPARK_VERSION=2.4.3 + PIO_HADOOP_VERSION=2.7.7 + - BUILD_TYPE=Integration METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL PIO_SCALA_VERSION=2.11.12 diff --git a/LICENSE.txt b/LICENSE.txt index e06a1bcca3..b45b6d6521 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1433,11 +1433,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI Binary distribution bundles com.esotericsoftware # kryo # 3.0.3 (https://github.com/EsotericSoftware/kryo) + com.esotericsoftware # kryo-shaded # 4.0.2 (https://github.com/EsotericSoftware/kryo) com.esotericsoftware # minlog # 1.3.0 (https://github.com/EsotericSoftware/minlog) com.esotericsoftware # reflectasm # 1.10.1 (https://github.com/EsotericSoftware/reflectasm) - com.esotericsoftware.kryo # kryo # 2.21 (https://github.com/EsotericSoftware/kryo) - com.esotericsoftware.minlog # minlog # 1.2 (https://github.com/EsotericSoftware/minlog) - com.esotericsoftware.reflectasm # reflectasm # 1.07 (https://github.com/EsotericSoftware/reflectasm) which is available under the BSD license (http://www.opensource.org/licenses/bsd-license.php) @@ -1529,8 +1527,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Binary distribution bundles - com.thoughtworks.paranamer # paranamer # 2.3 (https://github.com/paul-hammant/paranamer) - com.thoughtworks.paranamer # paranamer # 2.6 (https://github.com/paul-hammant/paranamer) + com.thoughtworks.paranamer # paranamer # 2.3 (https://github.com/paul-hammant/paranamer) + com.thoughtworks.paranamer # paranamer # 2.8 (https://github.com/paul-hammant/paranamer) which is available under the BSD license (http://www.opensource.org/licenses/bsd-license.php) @@ -1632,7 +1630,7 @@ THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Binary distribution bundles - org.clapper # grizzled-slf4j_2.11 # 1.0.2 (http://software.clapper.org/grizzled-slf4j/) + org.clapper # grizzled-slf4j_2.11 # 1.3.4 (http://software.clapper.org/grizzled-slf4j/) which is available under the BSD license (http://www.opensource.org/licenses/bsd-license.php) @@ -1701,13 +1699,11 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Binary distribution bundles org.scala-lang # scala-library # 2.11.12 (http://scala-lang.org/) - org.scala-lang # scala-compiler # 2.11.12 (http://scala-lang.org/) org.scala-lang # scala-reflect # 2.11.12 (http://scala-lang.org/) - org.scala-lang # scalap # 2.11.12 (http://scala-lang.org/) org.scala-lang.modules # scala-java8-compat_2.11 # 0.7.0 (http://scala-lang.org/) org.scala-lang.modules # scala-parser-combinators_2.11 # 1.0.6 (http://scala-lang.org/) org.scala-lang.modules # scala-parser-combinators_2.11 # 1.1.0 (http://scala-lang.org/) - org.scala-lang.modules # scala-xml_2.11 # 1.0.5 (http://scala-lang.org/) + org.scala-lang.modules # scala-xml_2.11 # 1.0.6 (http://scala-lang.org/) which is available under the BSD license (http://www.scala-lang.org/downloads/license.html) diff --git a/build.sbt b/build.sbt index f5515dbbf1..0d55d07782 100644 --- a/build.sbt +++ b/build.sbt @@ -45,7 +45,7 @@ scalaVersion in ThisBuild := sys.props.getOrElse("scala.version", "2.11.12") scalaBinaryVersion in ThisBuild := binaryVersion(scalaVersion.value) -crossScalaVersions in ThisBuild := Seq(scalaVersion.value) +crossScalaVersions in ThisBuild := Seq("2.11.12", "2.12.8") scalacOptions in ThisBuild ++= Seq("-deprecation", "-unchecked", "-feature") @@ -56,7 +56,7 @@ javacOptions in (ThisBuild, compile) ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:deprecation", "-Xlint:unchecked") // Ignore differentiation of Spark patch levels -sparkVersion in ThisBuild := sys.props.getOrElse("spark.version", "2.1.3") +sparkVersion in ThisBuild := sys.props.getOrElse("spark.version", "2.4.3") sparkBinaryVersion in ThisBuild := binaryVersion(sparkVersion.value) diff --git a/core/build.sbt b/core/build.sbt index 14b3449744..3d5915e648 100644 --- a/core/build.sbt +++ b/core/build.sbt @@ -22,15 +22,15 @@ name := "apache-predictionio-core" libraryDependencies ++= Seq( "com.github.scopt" %% "scopt" % "3.5.0", "com.google.code.gson" % "gson" % "2.5", - "com.twitter" %% "chill-bijection" % "0.7.2", + "com.twitter" %% "chill-bijection" % "0.9.3", "de.javakaffee" % "kryo-serializers" % "0.37", "net.jodah" % "typetools" % "0.3.1", "org.apache.spark" %% "spark-core" % sparkVersion.value % "provided", "org.json4s" %% "json4s-ext" % json4sVersion.value, - "org.scalaj" %% "scalaj-http" % "1.1.6", + "org.scalaj" %% "scalaj-http" % "2.4.2", "org.slf4j" % "slf4j-log4j12" % "1.7.18", - "org.scalatest" %% "scalatest" % "2.1.7" % "test", - "org.specs2" %% "specs2" % "2.3.13" % "test", + "org.scalatest" %% "scalatest" % "3.0.5" % "test", + "org.specs2" %% "specs2-core" % "4.5.1" % "test", "org.scalamock" %% "scalamock-scalatest-support" % "3.5.0" % "test", "com.h2database" % "h2" % "1.4.196" % "test" ) diff --git a/data/build.sbt b/data/build.sbt index 65925360a3..708a766e42 100644 --- a/data/build.sbt +++ b/data/build.sbt @@ -21,15 +21,15 @@ name := "apache-predictionio-data" libraryDependencies ++= Seq( "org.scala-lang" % "scala-reflect" % scalaVersion.value, - "com.github.nscala-time" %% "nscala-time" % "2.6.0", + "com.github.nscala-time" %% "nscala-time" % "2.22.0", "com.google.guava" % "guava" % "14.0.1", "com.typesafe.akka" %% "akka-http-testkit" % "10.1.5" % "test", "org.apache.spark" %% "spark-sql" % sparkVersion.value % "provided", - "org.clapper" %% "grizzled-slf4j" % "1.0.2", - "org.scalatest" %% "scalatest" % "2.1.7" % "test", - "org.specs2" %% "specs2" % "3.3.1" % "test" + "org.clapper" %% "grizzled-slf4j" % "1.3.4", + "org.scalatest" %% "scalatest" % "3.0.5" % "test", + "org.specs2" %% "specs2-core" % "4.5.1" % "test" exclude("org.scalaz.stream", s"scalaz-stream_${scalaBinaryVersion.value}"), - "org.scalamock" %% "scalamock-specs2-support" % "3.5.0" % "test", + "org.scalamock" %% "scalamock-specs2-support" % "3.6.0" % "test", "com.h2database" % "h2" % "1.4.196" % "test") parallelExecution in Test := false diff --git a/e2/build.sbt b/e2/build.sbt index 29c1d48667..54f446ad27 100644 --- a/e2/build.sbt +++ b/e2/build.sbt @@ -23,6 +23,6 @@ parallelExecution in Test := false libraryDependencies ++= Seq( "org.apache.spark" %% "spark-mllib" % sparkVersion.value % "provided", - "org.scalatest" %% "scalatest" % "2.2.5" % "test") + "org.scalatest" %% "scalatest" % "3.0.5" % "test") pomExtra := childrenPomExtra.value diff --git a/storage/elasticsearch/build.sbt b/storage/elasticsearch/build.sbt index b7362f68df..0ff0b800dc 100644 --- a/storage/elasticsearch/build.sbt +++ b/storage/elasticsearch/build.sbt @@ -25,7 +25,7 @@ libraryDependencies ++= Seq( "org.elasticsearch.client" % "elasticsearch-rest-client" % elasticsearchVersion.value, "org.elasticsearch" %% "elasticsearch-spark-20" % elasticsearchVersion.value exclude("org.apache.spark", "*"), - "org.specs2" %% "specs2" % "2.3.13" % "test") + "org.specs2" %% "specs2-core" % "2.4.17" % "test") parallelExecution in Test := false diff --git a/storage/hbase/build.sbt b/storage/hbase/build.sbt index 5e412b06cf..672b6da8f2 100644 --- a/storage/hbase/build.sbt +++ b/storage/hbase/build.sbt @@ -33,7 +33,7 @@ libraryDependencies ++= Seq( exclude("org.mortbay.jetty", "servlet-api-2.5") exclude("org.mortbay.jetty", "jsp-api-2.1") exclude("org.mortbay.jetty", "jsp-2.1"), - "org.specs2" %% "specs2" % "2.3.13" % "test") + "org.specs2" %% "specs2-core" % "2.4.17" % "test") parallelExecution in Test := false diff --git a/storage/hdfs/build.sbt b/storage/hdfs/build.sbt index 50ec37928d..8e45bb5577 100644 --- a/storage/hdfs/build.sbt +++ b/storage/hdfs/build.sbt @@ -24,7 +24,7 @@ libraryDependencies ++= Seq( exclude("commons-beanutils", "*"), "org.apache.hadoop" % "hadoop-hdfs" % hadoopVersion.value, "org.apache.predictionio" %% "apache-predictionio-data" % version.value % "provided", - "org.scalatest" %% "scalatest" % "2.1.7" % "test") + "org.scalatest" %% "scalatest" % "3.0.5" % "test") parallelExecution in Test := false diff --git a/storage/jdbc/build.sbt b/storage/jdbc/build.sbt index 90265405fb..3b9ca1f6e3 100644 --- a/storage/jdbc/build.sbt +++ b/storage/jdbc/build.sbt @@ -24,7 +24,7 @@ libraryDependencies ++= Seq( "org.apache.spark" %% "spark-sql" % sparkVersion.value % "provided", "org.scalikejdbc" %% "scalikejdbc" % "3.1.0", "org.postgresql" % "postgresql" % "9.4-1204-jdbc41" % "test", - "org.specs2" %% "specs2" % "2.3.13" % "test") + "org.specs2" %% "specs2-core" % "2.4.17" % "test") parallelExecution in Test := false diff --git a/storage/localfs/build.sbt b/storage/localfs/build.sbt index 2306d24f7c..68048ce7c0 100644 --- a/storage/localfs/build.sbt +++ b/storage/localfs/build.sbt @@ -21,7 +21,7 @@ name := "apache-predictionio-data-localfs" libraryDependencies ++= Seq( "org.apache.predictionio" %% "apache-predictionio-core" % version.value % "provided", - "org.scalatest" %% "scalatest" % "2.1.7" % "test") + "org.scalatest" %% "scalatest" % "3.0.5" % "test") parallelExecution in Test := false diff --git a/storage/s3/build.sbt b/storage/s3/build.sbt index 40222090ab..c4bc98fbab 100644 --- a/storage/s3/build.sbt +++ b/storage/s3/build.sbt @@ -23,7 +23,7 @@ libraryDependencies ++= Seq( "org.apache.predictionio" %% "apache-predictionio-core" % version.value % "provided", "com.google.guava" % "guava" % "14.0.1" % "provided", "com.amazonaws" % "aws-java-sdk-s3" % "1.11.132", - "org.scalatest" %% "scalatest" % "2.1.7" % "test") + "org.scalatest" %% "scalatest" % "3.0.5" % "test") parallelExecution in Test := false diff --git a/tools/build.sbt b/tools/build.sbt index acdb1fe4a4..d1a50e4c4b 100644 --- a/tools/build.sbt +++ b/tools/build.sbt @@ -25,7 +25,7 @@ libraryDependencies ++= Seq( "org.apache.spark" %% "spark-sql" % sparkVersion.value % "provided", "com.typesafe.akka" %% "akka-slf4j" % akkaVersion.value, "com.typesafe.akka" %% "akka-http-testkit" % "10.1.5" % "test", - "org.specs2" %% "specs2-core" % "4.2.0" % "test") + "org.specs2" %% "specs2-core" % "4.5.1" % "test") assemblyMergeStrategy in assembly := { case PathList("META-INF", "LICENSE.txt") => MergeStrategy.concat