From 5d5f38ff3f9dacdf6a2dc4913040a6cc47132a2d Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Mon, 24 Jun 2019 22:38:21 -0400 Subject: [PATCH 01/10] [PIO-210] Add support for Scala 2.12; Update dependencies --- build.sbt | 4 ++-- core/build.sbt | 8 ++++---- data/build.sbt | 10 +++++----- e2/build.sbt | 2 +- project/build.properties | 2 +- storage/elasticsearch/build.sbt | 4 ++-- storage/hbase/build.sbt | 2 +- storage/hdfs/build.sbt | 2 +- storage/jdbc/build.sbt | 2 +- storage/localfs/build.sbt | 2 +- storage/s3/build.sbt | 2 +- tools/build.sbt | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build.sbt b/build.sbt index 082521b929..c97009c359 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ scalaVersion in ThisBuild := sys.props.getOrElse("scala.version", "2.11.12") scalaBinaryVersion in ThisBuild := binaryVersion(scalaVersion.value) -crossScalaVersions in ThisBuild := Seq("2.11.12") +crossScalaVersions in ThisBuild := Seq("2.11.12", "2.12.8") scalacOptions in ThisBuild ++= Seq("-deprecation", "-unchecked", "-feature") @@ -37,7 +37,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/project/build.properties b/project/build.properties index 5f528e4747..c0bab04941 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.3 \ No newline at end of file +sbt.version=1.2.8 diff --git a/storage/elasticsearch/build.sbt b/storage/elasticsearch/build.sbt index 3dbd3dec96..2c99c37d7e 100644 --- a/storage/elasticsearch/build.sbt +++ b/storage/elasticsearch/build.sbt @@ -25,10 +25,10 @@ libraryDependencies ++= Seq( "org.apache.predictionio" %% "apache-predictionio-core" % version.value % "provided", "org.apache.spark" %% "spark-core" % sparkVersion.value % "provided", "org.elasticsearch.client" % "elasticsearch-rest-client" % elasticsearchVersion.value, - "org.elasticsearch" %% "elasticsearch-spark-20" % elasticsearchVersion.value + "org.elasticsearch" % "elasticsearch-spark-20_2.11" % elasticsearchVersion.value exclude("org.apache.spark", "*"), "org.elasticsearch" % "elasticsearch-hadoop-mr" % elasticsearchVersion.value, - "org.specs2" %% "specs2" % "2.3.13" % "test") + "org.specs2" %% "specs2-core" % "4.5.1" % "test") parallelExecution in Test := false diff --git a/storage/hbase/build.sbt b/storage/hbase/build.sbt index 5e412b06cf..f7dcaa4a19 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" % "4.5.1" % "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..c282de7475 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" % "4.5.1" % "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 From 0496da7e56cd7011f1b12a7d6a0206859386464b Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Mon, 24 Jun 2019 23:13:07 -0400 Subject: [PATCH 02/10] cleanup LICENSE.txt --- LICENSE.txt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 6e02f9bccb..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,10 @@ 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) From 618a36ab19e3bb117196f0cf7ada35ac1b3902dd Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Tue, 25 Jun 2019 00:12:10 -0400 Subject: [PATCH 03/10] Drop specs2 version to fix build --- storage/elasticsearch/build.sbt | 2 +- storage/hbase/build.sbt | 2 +- storage/jdbc/build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/elasticsearch/build.sbt b/storage/elasticsearch/build.sbt index 2c99c37d7e..68e3bf5fe2 100644 --- a/storage/elasticsearch/build.sbt +++ b/storage/elasticsearch/build.sbt @@ -28,7 +28,7 @@ libraryDependencies ++= Seq( "org.elasticsearch" % "elasticsearch-spark-20_2.11" % elasticsearchVersion.value exclude("org.apache.spark", "*"), "org.elasticsearch" % "elasticsearch-hadoop-mr" % elasticsearchVersion.value, - "org.specs2" %% "specs2-core" % "4.5.1" % "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 f7dcaa4a19..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-core" % "4.5.1" % "test") + "org.specs2" %% "specs2-core" % "2.4.17" % "test") parallelExecution in Test := false diff --git a/storage/jdbc/build.sbt b/storage/jdbc/build.sbt index c282de7475..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-core" % "4.5.1" % "test") + "org.specs2" %% "specs2-core" % "2.4.17" % "test") parallelExecution in Test := false From 9368fe5d81572ac4f379d7cb7c75f3c51142a491 Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Tue, 25 Jun 2019 11:15:20 -0400 Subject: [PATCH 04/10] Add Scala 2.12 tests to travis --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.travis.yml b/.travis.yml index c8071655fc..58dae76f49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,12 @@ 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 METADATA_REP=ELASTICSEARCH EVENTDATA_REP=ELASTICSEARCH MODELDATA_REP=S3 PIO_ELASTICSEARCH_VERSION=5.6.9 @@ -57,6 +62,12 @@ env: 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 @@ -78,6 +89,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 From 54cae9cbf2af1a1e27e9ec74dae4e61c7d17aa9c Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Tue, 25 Jun 2019 15:18:27 -0400 Subject: [PATCH 05/10] Attempt to fix travis build --- .travis.yml | 1 - project/assembly.sbt | 2 +- tests/pio_tests/engines/recommendation-engine/build.sbt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58dae76f49..edfaee0745 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,6 @@ 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 diff --git a/project/assembly.sbt b/project/assembly.sbt index d95475f16f..9c014713d3 100644 --- a/project/assembly.sbt +++ b/project/assembly.sbt @@ -1 +1 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9") diff --git a/tests/pio_tests/engines/recommendation-engine/build.sbt b/tests/pio_tests/engines/recommendation-engine/build.sbt index 14454179d5..19b91734ca 100644 --- a/tests/pio_tests/engines/recommendation-engine/build.sbt +++ b/tests/pio_tests/engines/recommendation-engine/build.sbt @@ -26,6 +26,6 @@ name := "template-scala-parallel-recommendation" organization := "org.apache.predictionio" libraryDependencies ++= Seq( - "org.apache.predictionio" %% "apache-predictionio-core" % "0.14.0" % "provided", + "org.apache.predictionio" % "apache-predictionio-core_2.11" % "0.15.0-SNAPSHOT" % "provided", "org.apache.spark" %% "spark-core" % sys.env.getOrElse("PIO_SPARK_VERSION", "2.1.1") % "provided", "org.apache.spark" %% "spark-mllib" % sys.env.getOrElse("PIO_SPARK_VERSION", "2.1.1") % "provided") From b6262a1855df23a9de1378e7caa75256ffdcba7e Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Tue, 25 Jun 2019 15:33:54 -0400 Subject: [PATCH 06/10] Attempt to fix travis build --- tests/pio_tests/engines/recommendation-engine/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pio_tests/engines/recommendation-engine/build.sbt b/tests/pio_tests/engines/recommendation-engine/build.sbt index 19b91734ca..a5c9739aa3 100644 --- a/tests/pio_tests/engines/recommendation-engine/build.sbt +++ b/tests/pio_tests/engines/recommendation-engine/build.sbt @@ -26,6 +26,6 @@ name := "template-scala-parallel-recommendation" organization := "org.apache.predictionio" libraryDependencies ++= Seq( - "org.apache.predictionio" % "apache-predictionio-core_2.11" % "0.15.0-SNAPSHOT" % "provided", + "org.apache.predictionio" % "apache-predictionio-core" % "0.15.0-SNAPSHOT" % "provided", "org.apache.spark" %% "spark-core" % sys.env.getOrElse("PIO_SPARK_VERSION", "2.1.1") % "provided", "org.apache.spark" %% "spark-mllib" % sys.env.getOrElse("PIO_SPARK_VERSION", "2.1.1") % "provided") From ec817b0e8b0f2a6d6c606977b008491412ab2363 Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Tue, 25 Jun 2019 22:47:02 -0400 Subject: [PATCH 07/10] Don't use 2.11 version of elasticsearch-spark in 2.12 --- storage/elasticsearch/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/elasticsearch/build.sbt b/storage/elasticsearch/build.sbt index 68e3bf5fe2..9105a355dd 100644 --- a/storage/elasticsearch/build.sbt +++ b/storage/elasticsearch/build.sbt @@ -25,7 +25,7 @@ libraryDependencies ++= Seq( "org.apache.predictionio" %% "apache-predictionio-core" % version.value % "provided", "org.apache.spark" %% "spark-core" % sparkVersion.value % "provided", "org.elasticsearch.client" % "elasticsearch-rest-client" % elasticsearchVersion.value, - "org.elasticsearch" % "elasticsearch-spark-20_2.11" % elasticsearchVersion.value + "org.elasticsearch" %% "elasticsearch-spark-20" % elasticsearchVersion.value exclude("org.apache.spark", "*"), "org.elasticsearch" % "elasticsearch-hadoop-mr" % elasticsearchVersion.value, "org.specs2" %% "specs2-core" % "2.4.17" % "test") From 4289256458965e43f3ff6fc46df9cfc4f817d4d9 Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Wed, 26 Jun 2019 09:20:04 -0400 Subject: [PATCH 08/10] Revert assembly plugin --- project/assembly.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/assembly.sbt b/project/assembly.sbt index 9c014713d3..d95475f16f 100644 --- a/project/assembly.sbt +++ b/project/assembly.sbt @@ -1 +1 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7") From d8c0796481da0bf7c67a183164f03324f1b549c1 Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Thu, 27 Jun 2019 12:52:53 -0400 Subject: [PATCH 09/10] Be explicit about Scala version --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index edfaee0745..f125193866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,18 +46,22 @@ 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.4.2 - BUILD_TYPE=Integration + PIO_SCALA_VERSION=2.11.12 METADATA_REP=ELASTICSEARCH EVENTDATA_REP=HBASE MODELDATA_REP=LOCALFS PIO_HBASE_VERSION=1.2.6 From 2ea73d48b2208f9514e54a1291e91f3f8d321d13 Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Fri, 28 Jun 2019 12:39:20 -0400 Subject: [PATCH 10/10] Fix pio-core dep in test engine --- tests/pio_tests/engines/recommendation-engine/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pio_tests/engines/recommendation-engine/build.sbt b/tests/pio_tests/engines/recommendation-engine/build.sbt index a5c9739aa3..91f01db032 100644 --- a/tests/pio_tests/engines/recommendation-engine/build.sbt +++ b/tests/pio_tests/engines/recommendation-engine/build.sbt @@ -26,6 +26,6 @@ name := "template-scala-parallel-recommendation" organization := "org.apache.predictionio" libraryDependencies ++= Seq( - "org.apache.predictionio" % "apache-predictionio-core" % "0.15.0-SNAPSHOT" % "provided", + "org.apache.predictionio" %% "apache-predictionio-core" % "0.15.0-SNAPSHOT" % "provided", "org.apache.spark" %% "spark-core" % sys.env.getOrElse("PIO_SPARK_VERSION", "2.1.1") % "provided", "org.apache.spark" %% "spark-mllib" % sys.env.getOrElse("PIO_SPARK_VERSION", "2.1.1") % "provided")