aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Rosen <joshrosen@databricks.com>2016-01-08 20:58:53 -0800
committerReynold Xin <rxin@databricks.com>2016-01-08 20:58:53 -0800
commit090d691323063c436601943506baac3ec5255dd9 (patch)
tree982ab60cae46c8379f120a6e041a007d29ed3858
parent1fdf9bbd67b884f23150b651f0fefdab6ccf008a (diff)
downloadspark-090d691323063c436601943506baac3ec5255dd9.tar.gz
spark-090d691323063c436601943506baac3ec5255dd9.tar.bz2
spark-090d691323063c436601943506baac3ec5255dd9.zip
[SPARK-4628][BUILD] Remove all non-Maven-Central repositories from build
This patch removes all non-Maven-central repositories from Spark's build, thereby avoiding any risk of future build-breaks due to us accidentally depending on an artifact which is not present in an immutable public Maven repository. I tested this by running ``` build/mvn \ -Phive \ -Phive-thriftserver \ -Pkinesis-asl \ -Pspark-ganglia-lgpl \ -Pyarn \ dependency:go-offline ``` inside of a fresh Ubuntu Docker container with no Ivy or Maven caches (I did a similar test for SBT). Author: Josh Rosen <joshrosen@databricks.com> Closes #10659 from JoshRosen/SPARK-4628.
-rw-r--r--external/mqtt/pom.xml2
-rw-r--r--pom.xml87
-rw-r--r--project/SparkBuild.scala7
-rw-r--r--project/plugins.sbt6
4 files changed, 7 insertions, 95 deletions
diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml
index b3ba72a008..d3a2bf5825 100644
--- a/external/mqtt/pom.xml
+++ b/external/mqtt/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
diff --git a/pom.xml b/pom.xml
index 9c975a45f8..0eac212754 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,93 +226,6 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <repository>
- <id>apache-repo</id>
- <name>Apache Repository</name>
- <url>https://repository.apache.org/content/repositories/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jboss-repo</id>
- <name>JBoss Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>mqtt-repo</id>
- <name>MQTT Repository</name>
- <url>https://repo.eclipse.org/content/repositories/paho-releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>cloudera-repo</id>
- <name>Cloudera Repository</name>
- <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>spark-hive-staging</id>
- <name>Staging Repo for Hive 1.2.1 (Spark Version)</name>
- <url>https://oss.sonatype.org/content/repositories/orgspark-project-1113</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>mapr-repo</id>
- <name>MapR Repository</name>
- <url>http://repository.mapr.com/maven/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <!-- returning unauthorized on some operations -->
- <repository>
- <id>spring-releases</id>
- <name>Spring Release Repository</name>
- <url>https://repo.spring.io/libs-release</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <!-- For transitive dependencies brougt by parquet-thrift -->
- <repository>
- <id>twttr-repo</id>
- <name>Twttr Repository</name>
- <url>http://maven.twttr.com</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 5d4f19ab14..4c34c888cf 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -141,7 +141,12 @@ object SparkBuild extends PomBuild {
publishMavenStyle := true,
unidocGenjavadocVersion := "0.9-spark0",
- resolvers += Resolver.mavenLocal,
+ // Override SBT's default resolvers:
+ resolvers := Seq(
+ DefaultMavenRepository,
+ Resolver.mavenLocal
+ ),
+ externalResolvers := resolvers.value,
otherResolvers <<= SbtPomKeys.mvnLocalRepository(dotM2 => Seq(Resolver.file("dotM2", dotM2))),
publishLocalConfiguration in MavenCompile <<= (packagedArtifacts, deliverLocal, ivyLoggingLevel) map {
(arts, _, level) => new PublishConfiguration(None, "dotM2", arts, Seq(), level)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 15ba3a36d5..822a7c4a82 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,9 +1,3 @@
-resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
-
-resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
-
-resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/"
-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")