You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/01/09 05:58:56 UTC
spark git commit: [SPARK-4628][BUILD] Remove all non-Maven-Central
repositories from build
Repository: spark
Updated Branches:
refs/heads/master 1fdf9bbd6 -> 090d69132
[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 <jo...@databricks.com>
Closes #10659 from JoshRosen/SPARK-4628.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/090d6913
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/090d6913
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/090d6913
Branch: refs/heads/master
Commit: 090d691323063c436601943506baac3ec5255dd9
Parents: 1fdf9bb
Author: Josh Rosen <jo...@databricks.com>
Authored: Fri Jan 8 20:58:53 2016 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Fri Jan 8 20:58:53 2016 -0800
----------------------------------------------------------------------
external/mqtt/pom.xml | 2 +-
pom.xml | 87 -------------------------------------------
project/SparkBuild.scala | 7 +++-
project/plugins.sbt | 6 ---
4 files changed, 7 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/090d6913/external/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml
index b3ba72a..d3a2bf5 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>
http://git-wip-us.apache.org/repos/asf/spark/blob/090d6913/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c975a4..0eac212 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>
http://git-wip-us.apache.org/repos/asf/spark/blob/090d6913/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 5d4f19a..4c34c88 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)
http://git-wip-us.apache.org/repos/asf/spark/blob/090d6913/project/plugins.sbt
----------------------------------------------------------------------
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 15ba3a3..822a7c4 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")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org