Repository: spark Updated Branches: refs/heads/master 3e0b07800 -> 1db9cbc33
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 <[email protected]> Closes #1170 from srowen/SPARK-1996 and squashes the following commits: 5ca2930 [Sean Owen] Remove outdated Akka repository references Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1db9cbc3 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1db9cbc3 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1db9cbc3 Branch: refs/heads/master Commit: 1db9cbc33603cfe012790b7dd4975df20ab15bda Parents: 3e0b078 Author: Sean Owen <[email protected]> Authored: Sat Jun 21 23:29:57 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Sat Jun 21 23:29:57 2014 -0700 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1db9cbc3/dev/audit-release/blank_maven_build/pom.xml ---------------------------------------------------------------------- diff --git a/dev/audit-release/blank_maven_build/pom.xml b/dev/audit-release/blank_maven_build/pom.xml index 047659e..02dd904 100644 --- a/dev/audit-release/blank_maven_build/pom.xml +++ b/dev/audit-release/blank_maven_build/pom.xml @@ -29,10 +29,6 @@ <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> </repository> http://git-wip-us.apache.org/repos/asf/spark/blob/1db9cbc3/dev/audit-release/blank_sbt_build/build.sbt ---------------------------------------------------------------------- diff --git a/dev/audit-release/blank_sbt_build/build.sbt b/dev/audit-release/blank_sbt_build/build.sbt index 1cf5274..696c7f6 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/";) http://git-wip-us.apache.org/repos/asf/spark/blob/1db9cbc3/dev/audit-release/maven_app_core/pom.xml ---------------------------------------------------------------------- diff --git a/dev/audit-release/maven_app_core/pom.xml b/dev/audit-release/maven_app_core/pom.xml index 76a381f..b516396 100644 --- a/dev/audit-release/maven_app_core/pom.xml +++ b/dev/audit-release/maven_app_core/pom.xml @@ -29,10 +29,6 @@ <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> </repository> http://git-wip-us.apache.org/repos/asf/spark/blob/1db9cbc3/dev/audit-release/sbt_app_core/build.sbt ---------------------------------------------------------------------- diff --git a/dev/audit-release/sbt_app_core/build.sbt b/dev/audit-release/sbt_app_core/build.sbt index 97a8cc3..291b1d6 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/";) http://git-wip-us.apache.org/repos/asf/spark/blob/1db9cbc3/dev/audit-release/sbt_app_ganglia/build.sbt ---------------------------------------------------------------------- diff --git a/dev/audit-release/sbt_app_ganglia/build.sbt b/dev/audit-release/sbt_app_ganglia/build.sbt index 55db675..6d9474a 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/";) http://git-wip-us.apache.org/repos/asf/spark/blob/1db9cbc3/dev/audit-release/sbt_app_graphx/build.sbt ---------------------------------------------------------------------- diff --git a/dev/audit-release/sbt_app_graphx/build.sbt b/dev/audit-release/sbt_app_graphx/build.sbt index 66f2db3..dd11245 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/";) http://git-wip-us.apache.org/repos/asf/spark/blob/1db9cbc3/dev/audit-release/sbt_app_hive/build.sbt ---------------------------------------------------------------------- diff --git a/dev/audit-release/sbt_app_hive/build.sbt b/dev/audit-release/sbt_app_hive/build.sbt index 7ac1be7..a0d4f25 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/";) http://git-wip-us.apache.org/repos/asf/spark/blob/1db9cbc3/dev/audit-release/sbt_app_sql/build.sbt ---------------------------------------------------------------------- diff --git a/dev/audit-release/sbt_app_sql/build.sbt b/dev/audit-release/sbt_app_sql/build.sbt index 6e0ad3b..9116180 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/";) http://git-wip-us.apache.org/repos/asf/spark/blob/1db9cbc3/dev/audit-release/sbt_app_streaming/build.sbt ---------------------------------------------------------------------- diff --git a/dev/audit-release/sbt_app_streaming/build.sbt b/dev/audit-release/sbt_app_streaming/build.sbt index 492e5e7..cb369d5 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/";) http://git-wip-us.apache.org/repos/asf/spark/blob/1db9cbc3/docs/quick-start.md ---------------------------------------------------------------------- diff --git a/docs/quick-start.md b/docs/quick-start.md index 6402399..23313d8 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>
