You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2017/08/10 02:38:08 UTC
incubator-toree git commit: Updating SBT, SBT plugins,
and dependencies
Repository: incubator-toree
Updated Branches:
refs/heads/master 6be462faa -> dd771ca88
Updating SBT, SBT plugins, and dependencies
Closes #130
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/dd771ca8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/dd771ca8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/dd771ca8
Branch: refs/heads/master
Commit: dd771ca88f3ad3353ffccf487e701f19cc3d0b01
Parents: 6be462f
Author: Igor Melnichenko <my...@ya.ru>
Authored: Wed Aug 9 19:15:15 2017 +0300
Committer: Luciano Resende <lr...@apache.org>
Committed: Wed Aug 9 19:35:31 2017 -0700
----------------------------------------------------------------------
.../toree/dependencies/CoursierDependencyDownloader.scala | 5 +++--
project/Dependencies.scala | 7 ++++---
project/build.properties | 2 +-
project/plugins.sbt | 4 ++--
4 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/dd771ca8/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala b/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala
index 598edbe..c17da43 100644
--- a/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala
@@ -25,6 +25,7 @@ import coursier.core.Authentication
import coursier.Cache.Logger
import coursier.Dependency
import coursier.core.Repository
+import coursier.core.Resolution.ModuleVersion
import coursier.ivy.{IvyRepository, IvyXml}
import coursier.maven.MavenRepository
import org.springframework.core.io.support.PathMatchingResourcePatternResolver
@@ -116,9 +117,9 @@ class CoursierDependencyDownloader extends DependencyDownloader {
val resolution = start.process.run(fetch).unsafePerformSync
// Report any resolution errors
- val errors: Seq[(Dependency, Seq[String])] = resolution.errors
+ val errors: Seq[(ModuleVersion, Seq[String])] = resolution.metadataErrors
errors.foreach { case (d, e) =>
- printStream.println(s"-> Failed to resolve ${d.module.toString()}:${d.version}")
+ printStream.println(s"-> Failed to resolve ${d._1.toString()}:${d._2}")
e.foreach(s => printStream.println(s" -> $s"))
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/dd771ca8/project/Dependencies.scala
----------------------------------------------------------------------
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 670a758..462648a 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -32,10 +32,11 @@ object Dependencies {
val config = "com.typesafe" % "config" % "1.3.0" // Apache v2
- val coursier = "io.get-coursier" %% "coursier" % "1.0.0-M15-1" // Apache v2
- val coursierCache = "io.get-coursier" %% "coursier-cache" % "1.0.0-M15-1" // Apache v2
+ val coursierVersion = "1.0.0-RC10"
+ val coursier = "io.get-coursier" %% "coursier" % coursierVersion // Apache v2
+ val coursierCache = "io.get-coursier" %% "coursier-cache" % coursierVersion // Apache v2
- val ivy = "org.apache.ivy" % "ivy" % "2.4.0-rc1" // Apache v2
+ val ivy = "org.apache.ivy" % "ivy" % "2.4.0" // Apache v2
// use the same jackson version in test than the one provided at runtime by Spark 2.0.0
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.5" // Apache v2
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/dd771ca8/project/build.properties
----------------------------------------------------------------------
diff --git a/project/build.properties b/project/build.properties
index 8dd784c..9d799ec 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -15,4 +15,4 @@
# limitations under the License
#
-sbt.version=0.13.13
+sbt.version=0.13.16
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/dd771ca8/project/plugins.sbt
----------------------------------------------------------------------
diff --git a/project/plugins.sbt b/project/plugins.sbt
index d14f997..b15f852 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,13 +18,13 @@
logLevel := Level.Warn
// Provides the ability to generate unifed documentation for multiple projects
-addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.0")
+addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
// Provides abilit to create an uber-jar
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
// Provides a generated build info object to sync between build and application
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
// Used for signing jars published via `sbt publish-signed`
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")