Repository: incubator-toree Updated Branches: refs/heads/0.1.x 5bef39490 -> 1d526954e
Fixed staging url and organization name, disabled coursier due to issues Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/1d526954 Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/1d526954 Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/1d526954 Branch: refs/heads/0.1.x Commit: 1d526954ecaba1d5dc0f40ec555dd598b2b11df7 Parents: 5bef394 Author: Chip Senkbeil <chip.senkb...@gmail.com> Authored: Wed Dec 21 16:11:55 2016 -0600 Committer: Chip Senkbeil <chip.senkb...@gmail.com> Committed: Wed Dec 21 16:11:55 2016 -0600 ---------------------------------------------------------------------- kernel/src/main/scala/org/apache/toree/Main.scala | 1 - project/common.scala | 12 ++++++------ project/plugins.sbt | 2 +- .../toree/kernel/protocol/v5/SparkKernelInfo.scala | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/1d526954/kernel/src/main/scala/org/apache/toree/Main.scala ---------------------------------------------------------------------- diff --git a/kernel/src/main/scala/org/apache/toree/Main.scala b/kernel/src/main/scala/org/apache/toree/Main.scala index 5756336..8f4e9db 100644 --- a/kernel/src/main/scala/org/apache/toree/Main.scala +++ b/kernel/src/main/scala/org/apache/toree/Main.scala @@ -19,7 +19,6 @@ package org.apache.toree import org.apache.toree.boot.layer._ import org.apache.toree.boot.{CommandLineOptions, KernelBootstrap} -import org.apache.toree.kernel.BuildInfo object Main extends App { private val options = new CommandLineOptions(args) http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/1d526954/project/common.scala ---------------------------------------------------------------------- diff --git a/project/common.scala b/project/common.scala index b924859..aa7b3c2 100644 --- a/project/common.scala +++ b/project/common.scala @@ -20,7 +20,7 @@ import sbt.Keys._ import sbtbuildinfo._ import sbtbuildinfo.BuildInfoKeys._ import scoverage.ScoverageSbtPlugin -import coursier.Keys._ +//import coursier.Keys._ import com.typesafe.sbt.pgp.PgpKeys._ import scala.util.{Try, Properties} @@ -30,7 +30,7 @@ object Common { private val snapshot = Properties.envOrElse("IS_SNAPSHOT","true").toBoolean private val gpgLocation = Properties.envOrElse("GPG","/usr/local/bin/gpg") private val gpgPassword = Properties.envOrElse("GPG_PASSWORD","") - private val buildOrganization = "org.apache.toree.kernel" + private val buildOrganization = "org.apache.toree" private val buildVersion = if (snapshot) s"$versionNumber-SNAPSHOT" else versionNumber private val buildScalaVersion = "2.10.4" @@ -167,7 +167,7 @@ object Common { mappings in packageBin in Compile += file("LICENSE") -> "LICENSE", mappings in packageBin in Compile += file("NOTICE") -> "NOTICE", - coursierVerbosity := { + /*coursierVerbosity := { val level = Try(Integer.valueOf(Properties.envOrElse( "TOREE_RESOLUTION_VERBOSITY", "1") ).toInt).getOrElse(1) @@ -177,7 +177,7 @@ object Common { ) level - }, + },*/ scalacOptions in (Compile, doc) ++= Seq( // Ignore packages (for Scaladoc) not from our project @@ -232,9 +232,9 @@ object Common { if (isSnapshot.value) Some("Apache Staging Repo" at "https://repository.apache.org/content/repositories/snapshots/";) else - Some("Apache Staging Repo" at "https://repository.apache.org/content/repositories/staging/";) + Some("Apache Staging Repo" at "https://repository.apache.org/service/local/staging/deploy/maven2/";) }, - credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"), + publishMavenStyle := true, // Add rebuild ivy xml to the following tasks compile <<= (compile in Compile) dependsOn (rebuildIvyXml dependsOn deliverLocal) http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/1d526954/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/project/plugins.sbt b/project/plugins.sbt index 357f8a6..bc5e654 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -50,7 +50,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3") // Provides alternative resolving/downloading over sbt -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M12") +//addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M12") // Used for signing jars published via `sbt publish-signed` addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/1d526954/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala ---------------------------------------------------------------------- diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala index 622d5ed..c0b68b6 100644 --- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala +++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala @@ -17,7 +17,7 @@ package org.apache.toree.kernel.protocol.v5 -import org.apache.toree.kernel.BuildInfo +import org.apache.toree.BuildInfo object SparkKernelInfo { /**
