Repository: predictionio Updated Branches: refs/heads/develop 8265d7d75 -> d4ae9e871
[PIO-170] Upgrade sbt to 1.2.3 Closes #470 Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/d4ae9e87 Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/d4ae9e87 Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/d4ae9e87 Branch: refs/heads/develop Commit: d4ae9e8718d526b664dd8e4776950b51106e1af2 Parents: 8265d7d Author: Naoki Takezoe <[email protected]> Authored: Fri Sep 28 23:35:20 2018 +0900 Committer: Naoki Takezoe <[email protected]> Committed: Fri Sep 28 23:35:20 2018 +0900 ---------------------------------------------------------------------- LICENSE.txt | 1 + build.sbt | 36 ++++++++++++++++-------------------- project/assembly.sbt | 2 +- project/build.properties | 2 +- project/plugins.sbt | 14 +++++++------- project/unidoc.sbt | 2 +- 6 files changed, 27 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/predictionio/blob/d4ae9e87/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 72f53a3..a05f3d8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1712,6 +1712,7 @@ Binary distribution bundles org.scala-lang.modules # scala-parser-combinators_2.11 # 1.0.6 (http://scala-lang.org/) org.scala-lang.modules # scala-xml_2.11 # 1.0.3 (http://scala-lang.org/) org.scala-lang.modules # scala-xml_2.11 # 1.0.4 (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) http://git-wip-us.apache.org/repos/asf/predictionio/blob/d4ae9e87/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index 6a61521..8b69b03 100644 --- a/build.sbt +++ b/build.sbt @@ -74,18 +74,6 @@ hadoopVersion in ThisBuild := sys.props.getOrElse( "hadoop.version", scalaSparkDepsVersion(scalaBinaryVersion.value)(sparkBinaryVersion.value)("hadoop")) -val pioBuildInfoSettings = buildInfoSettings ++ Seq( - sourceGenerators in Compile += buildInfo, - buildInfoKeys := Seq[BuildInfoKey]( - name, - version, - scalaVersion, - scalaBinaryVersion, - sbtVersion, - sparkVersion, - hadoopVersion), - buildInfoPackage := "org.apache.predictionio.core") - val conf = file("conf") val commonSettings = Seq( @@ -146,7 +134,18 @@ val core = (project in file("core")). settings(commonSettings: _*). settings(commonTestSettings: _*). enablePlugins(GenJavadocPlugin). - settings(pioBuildInfoSettings: _*). + enablePlugins(BuildInfoPlugin). + settings( + buildInfoKeys := Seq[BuildInfoKey]( + name, + version, + scalaVersion, + scalaBinaryVersion, + sbtVersion, + sparkVersion, + hadoopVersion), + buildInfoPackage := "org.apache.predictionio.core" + ). enablePlugins(SbtTwirl). disablePlugins(sbtassembly.AssemblyPlugin) @@ -155,9 +154,9 @@ val tools = (project in file("tools")). dependsOn(data). settings(commonSettings: _*). settings(commonTestSettings: _*). + settings(skip in publish := true). enablePlugins(GenJavadocPlugin). - enablePlugins(SbtTwirl). - settings(publishArtifact := false) + enablePlugins(SbtTwirl) val e2 = (project in file("e2")). settings(commonSettings: _*). @@ -175,9 +174,9 @@ val storageSubprojects = Seq( dataS3) val storage = (project in file("storage")) + .settings(skip in publish := true) .aggregate(storageSubprojects map Project.projectToRef: _*) .disablePlugins(sbtassembly.AssemblyPlugin) - .settings(publishArtifact := false) val assembly = (project in file("assembly")). settings(commonSettings: _*) @@ -186,6 +185,7 @@ val root = (project in file(".")). settings(commonSettings: _*). enablePlugins(ScalaUnidocPlugin). settings( + skip in publish := true, unidocProjectFilter in (ScalaUnidoc, unidoc) := inAnyProject -- inProjects(dataElasticsearch, dataElasticsearch1), unidocProjectFilter in (JavaUnidoc, unidoc) := inAnyProject -- inProjects(dataElasticsearch, dataElasticsearch1), scalacOptions in (ScalaUnidoc, unidoc) ++= Seq( @@ -310,10 +310,6 @@ parallelExecution in Global := false testOptions in Test += Tests.Argument("-oDF") printBuildInfo := { - if (scalaBinaryVersion.value == "2.10") - streams.value.log.warn("Support for Scala 2.10 is deprecated. Please upgrade to a newer version of Scala.") - if (sparkBinaryVersion.value == "1.6") - streams.value.log.warn("Support for Spark 1.6 is deprecated. Please upgrade to a newer version of Spark.") println(s"PIO_SCALA_VERSION=${scalaVersion.value}") println(s"PIO_SPARK_VERSION=${sparkVersion.value}") println(s"PIO_ELASTICSEARCH_VERSION=${elasticsearchVersion.value}") http://git-wip-us.apache.org/repos/asf/predictionio/blob/d4ae9e87/project/assembly.sbt ---------------------------------------------------------------------- diff --git a/project/assembly.sbt b/project/assembly.sbt index 39c1bb8..d95475f 100644 --- a/project/assembly.sbt +++ b/project/assembly.sbt @@ -1 +1 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7") http://git-wip-us.apache.org/repos/asf/predictionio/blob/d4ae9e87/project/build.properties ---------------------------------------------------------------------- diff --git a/project/build.properties b/project/build.properties index 64317fd..0cd8b07 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=1.2.3 http://git-wip-us.apache.org/repos/asf/predictionio/blob/d4ae9e87/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/project/plugins.sbt b/project/plugins.sbt index 15b986d..4239efe 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,17 +1,17 @@ -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.3.2") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1") -addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.1.1") +addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.15") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") +addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/"; -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0-M8") +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.6") addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0") \ No newline at end of file http://git-wip-us.apache.org/repos/asf/predictionio/blob/d4ae9e87/project/unidoc.sbt ---------------------------------------------------------------------- diff --git a/project/unidoc.sbt b/project/unidoc.sbt index f9c20f8..ade7d89 100644 --- a/project/unidoc.sbt +++ b/project/unidoc.sbt @@ -1 +1 @@ -addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.0") +addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")
