From 1db9cbc33603cfe012790b7dd4975df20ab15bda Mon Sep 17 00:00:00 2001
From: Sean Owen <sowen@cloudera.com>
Date: Sat, 21 Jun 2014 23:29:57 -0700
Subject: [PATCH] SPARK-1996. Remove use of special Maven repo for Akka
Just following up Matei's suggestion to remove the Akka repo references. Builds and the audit-release script appear OK.
Author: Sean Owen <sowen@cloudera.com>
Closes #1170 from srowen/SPARK-1996 and squashes the following commits:
5ca2930 [Sean Owen] Remove outdated Akka repository references
---
dev/audit-release/blank_maven_build/pom.xml | 4 ----
dev/audit-release/blank_sbt_build/build.sbt | 1 -
dev/audit-release/maven_app_core/pom.xml | 4 ----
dev/audit-release/sbt_app_core/build.sbt | 1 -
dev/audit-release/sbt_app_ganglia/build.sbt | 1 -
dev/audit-release/sbt_app_graphx/build.sbt | 1 -
dev/audit-release/sbt_app_hive/build.sbt | 1 -
dev/audit-release/sbt_app_sql/build.sbt | 1 -
dev/audit-release/sbt_app_streaming/build.sbt | 1 -
docs/quick-start.md | 8 --------
10 files changed, 23 deletions(-)
diff --git a/dev/audit-release/blank_maven_build/pom.xml b/dev/audit-release/blank_maven_build/pom.xml
index 047659e4a8..02dd9046c9 100644
--- a/dev/audit-release/blank_maven_build/pom.xml
+++ b/dev/audit-release/blank_maven_build/pom.xml
@@ -28,10 +28,6 @@
<id>Spray.cc repository</id>
<url>http://repo.spray.cc</url>
</repository>
- <repository>
- <id>Akka repository</id>
- <url>http://repo.akka.io/releases</url>
- </repository>
<repository>
<id>Spark Staging Repo</id>
<url>${spark.release.repository}</url>
diff --git a/dev/audit-release/blank_sbt_build/build.sbt b/dev/audit-release/blank_sbt_build/build.sbt
index 1cf52743f2..696c7f6518 100644
--- a/dev/audit-release/blank_sbt_build/build.sbt
+++ b/dev/audit-release/blank_sbt_build/build.sbt
@@ -25,5 +25,4 @@ libraryDependencies += "org.apache.spark" % System.getenv.get("SPARK_MODULE") %
resolvers ++= Seq(
"Spark Release Repository" at System.getenv.get("SPARK_RELEASE_REPOSITORY"),
- "Akka Repository" at "http://repo.akka.io/releases/",
"Spray Repository" at "http://repo.spray.cc/")
diff --git a/dev/audit-release/maven_app_core/pom.xml b/dev/audit-release/maven_app_core/pom.xml
index 76a381f8e1..b516396825 100644
--- a/dev/audit-release/maven_app_core/pom.xml
+++ b/dev/audit-release/maven_app_core/pom.xml
@@ -28,10 +28,6 @@
<id>Spray.cc repository</id>
<url>http://repo.spray.cc</url>
</repository>
- <repository>
- <id>Akka repository</id>
- <url>http://repo.akka.io/releases</url>
- </repository>
<repository>
<id>Spark Staging Repo</id>
<url>${spark.release.repository}</url>
diff --git a/dev/audit-release/sbt_app_core/build.sbt b/dev/audit-release/sbt_app_core/build.sbt
index 97a8cc3a4e..291b1d6440 100644
--- a/dev/audit-release/sbt_app_core/build.sbt
+++ b/dev/audit-release/sbt_app_core/build.sbt
@@ -25,5 +25,4 @@ libraryDependencies += "org.apache.spark" %% "spark-core" % System.getenv.get("S
resolvers ++= Seq(
"Spark Release Repository" at System.getenv.get("SPARK_RELEASE_REPOSITORY"),
- "Akka Repository" at "http://repo.akka.io/releases/",
"Spray Repository" at "http://repo.spray.cc/")
diff --git a/dev/audit-release/sbt_app_ganglia/build.sbt b/dev/audit-release/sbt_app_ganglia/build.sbt
index 55db675c72..6d9474acf5 100644
--- a/dev/audit-release/sbt_app_ganglia/build.sbt
+++ b/dev/audit-release/sbt_app_ganglia/build.sbt
@@ -27,5 +27,4 @@ libraryDependencies += "org.apache.spark" %% "spark-ganglia-lgpl" % System.geten
resolvers ++= Seq(
"Spark Release Repository" at System.getenv.get("SPARK_RELEASE_REPOSITORY"),
- "Akka Repository" at "http://repo.akka.io/releases/",
"Spray Repository" at "http://repo.spray.cc/")
diff --git a/dev/audit-release/sbt_app_graphx/build.sbt b/dev/audit-release/sbt_app_graphx/build.sbt
index 66f2db357d..dd11245e67 100644
--- a/dev/audit-release/sbt_app_graphx/build.sbt
+++ b/dev/audit-release/sbt_app_graphx/build.sbt
@@ -25,5 +25,4 @@ libraryDependencies += "org.apache.spark" %% "spark-graphx" % System.getenv.get(
resolvers ++= Seq(
"Spark Release Repository" at System.getenv.get("SPARK_RELEASE_REPOSITORY"),
- "Akka Repository" at "http://repo.akka.io/releases/",
"Spray Repository" at "http://repo.spray.cc/")
diff --git a/dev/audit-release/sbt_app_hive/build.sbt b/dev/audit-release/sbt_app_hive/build.sbt
index 7ac1be729c..a0d4f25da5 100644
--- a/dev/audit-release/sbt_app_hive/build.sbt
+++ b/dev/audit-release/sbt_app_hive/build.sbt
@@ -25,5 +25,4 @@ libraryDependencies += "org.apache.spark" %% "spark-hive" % System.getenv.get("S
resolvers ++= Seq(
"Spark Release Repository" at System.getenv.get("SPARK_RELEASE_REPOSITORY"),
- "Akka Repository" at "http://repo.akka.io/releases/",
"Spray Repository" at "http://repo.spray.cc/")
diff --git a/dev/audit-release/sbt_app_sql/build.sbt b/dev/audit-release/sbt_app_sql/build.sbt
index 6e0ad3b4b2..9116180f71 100644
--- a/dev/audit-release/sbt_app_sql/build.sbt
+++ b/dev/audit-release/sbt_app_sql/build.sbt
@@ -25,5 +25,4 @@ libraryDependencies += "org.apache.spark" %% "spark-sql" % System.getenv.get("SP
resolvers ++= Seq(
"Spark Release Repository" at System.getenv.get("SPARK_RELEASE_REPOSITORY"),
- "Akka Repository" at "http://repo.akka.io/releases/",
"Spray Repository" at "http://repo.spray.cc/")
diff --git a/dev/audit-release/sbt_app_streaming/build.sbt b/dev/audit-release/sbt_app_streaming/build.sbt
index 492e5e7c8d..cb369d516d 100644
--- a/dev/audit-release/sbt_app_streaming/build.sbt
+++ b/dev/audit-release/sbt_app_streaming/build.sbt
@@ -25,5 +25,4 @@ libraryDependencies += "org.apache.spark" %% "spark-streaming" % System.getenv.g
resolvers ++= Seq(
"Spark Release Repository" at System.getenv.get("SPARK_RELEASE_REPOSITORY"),
- "Akka Repository" at "http://repo.akka.io/releases/",
"Spray Repository" at "http://repo.spray.cc/")
diff --git a/docs/quick-start.md b/docs/quick-start.md
index 6402399477..23313d8aa6 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -266,8 +266,6 @@ version := "1.0"
scalaVersion := "{{site.SCALA_VERSION}}"
libraryDependencies += "org.apache.spark" %% "spark-core" % "{{site.SPARK_VERSION}}"
-
-resolvers += "Akka Repository" at "http://repo.akka.io/releases/"
{% endhighlight %}
For sbt to work correctly, we'll need to layout `SimpleApp.scala` and `simple.sbt`
@@ -349,12 +347,6 @@ Note that Spark artifacts are tagged with a Scala version.
<name>Simple Project</name>
<packaging>jar</packaging>
<version>1.0</version>
- <repositories>
- <repository>
- <id>Akka repository</id>
- <url>http://repo.akka.io/releases</url>
- </repository>
- </repositories>
<dependencies>
<dependency> <!-- Spark dependency -->
<groupId>org.apache.spark</groupId>
--
GitLab