diff options
author | Josh Rosen <joshrosen@databricks.com> | 2016-04-14 17:00:20 -0700 |
---|---|---|
committer | Josh Rosen <joshrosen@databricks.com> | 2016-04-14 17:00:20 -0700 |
commit | b31016eb5638533bf8476bf8ad47c58701dc0851 (patch) | |
tree | 4295e58b059df44718a9793ee79f05657f50cc4e | |
parent | ee4090b60e8b6a350913d1d5049f0770c251cd4a (diff) | |
download | spark-b31016eb5638533bf8476bf8ad47c58701dc0851.tar.gz spark-b31016eb5638533bf8476bf8ad47c58701dc0851.tar.bz2 spark-b31016eb5638533bf8476bf8ad47c58701dc0851.zip |
Use Scala snapshot to test SI-9390 fix.
-rw-r--r-- | pom.xml | 18 | ||||
-rw-r--r-- | project/SparkBuild.scala | 5 |
2 files changed, 21 insertions, 2 deletions
@@ -2536,16 +2536,30 @@ <property><name>scala-2.12</name></property> </activation> <properties> - <scala.version>2.12.0-M4</scala.version> + <!-- This version corresponds to a commit in https://github.com/scala/scala/pull/5099 --> + <scala.version>2.12.0-e6a566e-SNAPSHOT</scala.version> <scala.binary.version>2.12.0-M4</scala.binary.version> <!-- This corresponds to https://github.com/twitter/chill/pull/253 --> <chill.version>0.8.1-SNAPSHOT</chill.version> - <!-- This corresponds to https://github.com/FasterXML/jackson-module-scala/pull/247 --> + <!-- This incorporates https://github.com/FasterXML/jackson-module-scala/pull/247 --> <fasterxml.jackson.scala.version>2.7.3-SNAPSHOT</fasterxml.jackson.scala.version> <fasterxml.jackson.version>2.7.0</fasterxml.jackson.version> <!-- This corresponds to https://github.com/JoshRosen/json4s/tree/scala-2.12.0-m4 --> <json4s.version>3.4.0-SNAPSHOT</json4s.version> </properties> + <repositories> + <repository> + <id>scala-pr-snapshots</id> + <name>Scala PR Snapshots</name> + <url>https://scala-ci.typesafe.com/artifactory/scala-pr-validation-snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> </profile> <profile> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index cb85c63382..81dcacec94 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -172,6 +172,11 @@ object SparkBuild extends PomBuild { Resolver.mavenLocal, Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns) ), + resolvers ++= (if (System.getProperty("scala-2.12") != null) { + Seq("scala-pr-snapshots" at "https://scala-ci.typesafe.com/artifactory/scala-pr-validation-snapshots/") + } else { + Seq.empty + }), externalResolvers := resolvers.value, otherResolvers <<= SbtPomKeys.mvnLocalRepository(dotM2 => Seq(Resolver.file("dotM2", dotM2))), publishLocalConfiguration in MavenCompile <<= (packagedArtifacts, deliverLocal, ivyLoggingLevel) map { |