toree-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lbust...@apache.org
Subject incubator-toree git commit: Updated to use coursier for dependency resolution/downloading
Date Wed, 02 Mar 2016 16:17:59 GMT
Repository: incubator-toree
Updated Branches:
  refs/heads/master 4c0dccfb7 -> 61c4b81e6


Updated to use coursier for dependency resolution/downloading

Added resolver needed for Typesafe Play-Json

Updated Coursier version to 1.0.0-M9

Added suppression of verbose Coursier output so we can see full logs in Travis CI

Added resolution verbosity option


Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/61c4b81e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/61c4b81e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/61c4b81e

Branch: refs/heads/master
Commit: 61c4b81e6e7775133302fc98222d24ea92b10ff0
Parents: 4c0dccf
Author: Chip Senkbeil <chipsenkbeil@gatech.edu>
Authored: Tue Feb 23 20:33:04 2016 -0600
Committer: Chip Senkbeil <chip.senkbeil@gmail.com>
Committed: Mon Feb 29 12:05:34 2016 -0600

----------------------------------------------------------------------
 .travis.yml          |  9 +++++++--
 kernel-api/build.sbt |  4 ++--
 project/Common.scala | 19 ++++++++++++++++++-
 project/plugins.sbt  |  2 ++
 4 files changed, 29 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/61c4b81e/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index afc2969..4c6e481 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,10 @@
 language: scala
 scala:
     - "2.10.4"
-
+env:
+    global:
+        - COURSIER_NO_TERM=1
+        - TOREE_RESOLUTION_VERBOSITY=0
 jdk:
     - oraclejdk7
     - openjdk7
@@ -15,7 +18,9 @@ cache:
     directories:
         - $HOME/.ivy2/cache
         - $HOME/.sbt/boot/
+        - $HOME/.coursier/cache/v1
 
 branches:
     only:
-        - master
\ No newline at end of file
+        - master
+

http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/61c4b81e/kernel-api/build.sbt
----------------------------------------------------------------------
diff --git a/kernel-api/build.sbt b/kernel-api/build.sbt
index 29d2d73..331f9bf 100644
--- a/kernel-api/build.sbt
+++ b/kernel-api/build.sbt
@@ -50,8 +50,8 @@ libraryDependencies += "net.sf.jopt-simple" % "jopt-simple" % "4.6" // MIT
 libraryDependencies ++= Seq(
   // Used to find and download jars from Maven-based repositories
   "org.apache.ivy" % "ivy" % "2.4.0-rc1", // Apache v2
-  "com.github.alexarchambault" %% "coursier" % "1.0.0-M6", // Apache v2
-  "com.github.alexarchambault" %% "coursier-cache" % "1.0.0-M6" // Apache v2
+  "com.github.alexarchambault" %% "coursier" % "1.0.0-M9", // Apache v2
+  "com.github.alexarchambault" %% "coursier-cache" % "1.0.0-M9" // Apache v2
 )
 
 // Brought in in order to simplify the reading of each project's ivy.xml file

http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/61c4b81e/project/Common.scala
----------------------------------------------------------------------
diff --git a/project/Common.scala b/project/Common.scala
index 5ea12aa..dd1c8aa 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -18,8 +18,9 @@
 import org.apache.commons.io.FileUtils
 import sbt._
 import Keys._
+import coursier.Keys._
 
-import scala.util.Properties
+import scala.util.{Try, Properties}
 
 object Common {
   //  Parameters for publishing to artifact repositories
@@ -52,6 +53,10 @@ object Common {
     "org.mockito" % "mockito-all" % "1.9.5" % "test"   // MIT
   )
 
+  private val buildResolvers = Seq(
+    "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
+  )
+
   // The prefix used for our custom artifact names
   private val artifactPrefix = "ibm-spark"
   lazy val sparkVersion = {
@@ -83,6 +88,18 @@ object Common {
     scalaVersion := buildScalaVersion,
     libraryDependencies ++= buildLibraryDependencies,
     isSnapshot := snapshot,
+    resolvers ++= buildResolvers,
+    coursierVerbosity := {
+      val level = Try(Integer.valueOf(Properties.envOrElse(
+        "TOREE_RESOLUTION_VERBOSITY", "1")
+      ).toInt).getOrElse(1)
+
+      scala.Console.out.println(
+        s"[INFO] Toree Resolution Verbosity Level = $level"
+      )
+
+      level
+    },
 
     scalacOptions in (Compile, doc) ++= Seq(
       // Ignore packages (for Scaladoc) not from our project

http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/61c4b81e/project/plugins.sbt
----------------------------------------------------------------------
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 9c9f6ef..f0ef85b 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -49,3 +49,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")
 // Provides auto-generating and publishing a gh-pages site
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3")
 
+// Provides alternative resolving/downloading over sbt
+addSbtPlugin("com.github.alexarchambault" % "coursier-sbt-plugin" % "1.0.0-M9")


Mime
View raw message