From f4700ea5123f3901959c2e9cd72bee7ae95820ab Mon Sep 17 00:00:00 2001 From: William Benton Date: Mar 26 2014 20:37:11 +0000 Subject: fixed patches --- diff --git a/spark-v0.9.1-rc2-0001-Replace-lift-json-with-json4s-jackson.patch b/spark-v0.9.1-rc2-0001-Replace-lift-json-with-json4s-jackson.patch index 3476182..37278a4 100644 --- a/spark-v0.9.1-rc2-0001-Replace-lift-json-with-json4s-jackson.patch +++ b/spark-v0.9.1-rc2-0001-Replace-lift-json-with-json4s-jackson.patch @@ -1,4 +1,4 @@ -From 599ca380655871839e1a970e506464ff922f289f Mon Sep 17 00:00:00 2001 +From 5d70618a8c585a1d7cb0bbb18d5c90681e8872e9 Mon Sep 17 00:00:00 2001 From: William Benton Date: Sun, 23 Feb 2014 17:22:07 -0600 Subject: [PATCH 1/9] Replace lift-json with json4s-jackson. @@ -29,10 +29,10 @@ Conflicts: 9 files changed, 37 insertions(+), 19 deletions(-) diff --git a/core/pom.xml b/core/pom.xml -index da5c951..395d91a 100644 +index 8111400..e7aa19a 100644 --- a/core/pom.xml +++ b/core/pom.xml -@@ -108,8 +108,9 @@ +@@ -104,8 +104,9 @@ scala-library @@ -236,10 +236,10 @@ index d05bbd6..8f1df8a 100644 } } diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala -index c603c4b..aa301d3 100644 +index 52e894e..6346b29 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala -@@ -275,7 +275,7 @@ object SparkBuild extends Build { +@@ -274,7 +274,7 @@ object SparkBuild extends Build { "org.spark-project.akka" %% "akka-remote" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty), "org.spark-project.akka" %% "akka-slf4j" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty), "org.spark-project.akka" %% "akka-testkit" % "2.2.3-shaded-protobuf" % "test", diff --git a/spark-v0.9.1-rc2-0002-use-sbt-0.13.1.patch b/spark-v0.9.1-rc2-0002-use-sbt-0.13.1.patch index e516ee6..d68e035 100644 --- a/spark-v0.9.1-rc2-0002-use-sbt-0.13.1.patch +++ b/spark-v0.9.1-rc2-0002-use-sbt-0.13.1.patch @@ -1,4 +1,4 @@ -From 144fac44df22ff4a2daa6ba2e2627e28e4fcf50f Mon Sep 17 00:00:00 2001 +From 92143b68e18754528f927f40e9a0eab9442fe3e8 Mon Sep 17 00:00:00 2001 From: William Benton Date: Thu, 27 Feb 2014 14:25:34 -0600 Subject: [PATCH 2/9] use sbt 0.13.1 diff --git a/spark-v0.9.1-rc2-0003-Removed-sbt-plugins.patch b/spark-v0.9.1-rc2-0003-Removed-sbt-plugins.patch index c43497e..c092784 100644 --- a/spark-v0.9.1-rc2-0003-Removed-sbt-plugins.patch +++ b/spark-v0.9.1-rc2-0003-Removed-sbt-plugins.patch @@ -1,4 +1,4 @@ -From 4122e3bbc1a6c8561e3b4dee26b2b62d7842a8e8 Mon Sep 17 00:00:00 2001 +From 496a085091397f0d40d4ee63b058909334457f53 Mon Sep 17 00:00:00 2001 From: William Benton Date: Thu, 27 Feb 2014 15:46:41 -0600 Subject: [PATCH 3/9] Removed sbt plugins. @@ -17,7 +17,7 @@ Conflicts: delete mode 100644 project/project/SparkPluginBuild.scala diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala -index aa301d3..01c0ea1 100644 +index 6346b29..1eaa755 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -18,8 +18,6 @@ @@ -75,7 +75,7 @@ index aa301d3..01c0ea1 100644 val slf4jVersion = "1.7.2" val excludeCglib = ExclusionRule(organization = "org.sonatype.sisu.inject") -@@ -323,11 +309,11 @@ object SparkBuild extends Build { +@@ -322,11 +308,11 @@ object SparkBuild extends Build { excludeAll(excludeSnappy) excludeAll(excludeCglib) ) @@ -89,7 +89,7 @@ index aa301d3..01c0ea1 100644 def graphxSettings = sharedSettings ++ Seq( name := "spark-graphx", -@@ -396,26 +382,6 @@ object SparkBuild extends Build { +@@ -395,26 +381,6 @@ object SparkBuild extends Build { ) ) diff --git a/spark-v0.9.1-rc2-0004-removed-examples.patch b/spark-v0.9.1-rc2-0004-removed-examples.patch index f8dab58..21e86fa 100644 --- a/spark-v0.9.1-rc2-0004-removed-examples.patch +++ b/spark-v0.9.1-rc2-0004-removed-examples.patch @@ -1,4 +1,4 @@ -From dc5105dea40919ff4b8a3dcf85d9200aaf63238e Mon Sep 17 00:00:00 2001 +From cc24412b35a4f3118bcb4ad3e57a5ce33549c809 Mon Sep 17 00:00:00 2001 From: William Benton Date: Thu, 27 Feb 2014 16:01:11 -0600 Subject: [PATCH 4/9] removed examples @@ -12,7 +12,7 @@ Conflicts: 1 file changed, 3 insertions(+), 80 deletions(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala -index 01c0ea1..e34c79e 100644 +index 1eaa755..3925475 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -93,31 +93,13 @@ object SparkBuild extends Build { @@ -50,7 +50,7 @@ index 01c0ea1..e34c79e 100644 def sharedSettings = Defaults.defaultSettings ++ Seq( organization := "org.apache.spark", -@@ -292,25 +274,6 @@ object SparkBuild extends Build { +@@ -291,25 +273,6 @@ object SparkBuild extends Build { libraryDependencies <+= scalaVersion(v => "org.scala-lang" % "scala-reflect" % v ) ) @@ -76,7 +76,7 @@ index 01c0ea1..e34c79e 100644 def toolsSettings = sharedSettings ++ Seq( name := "spark-tools" ) -@@ -381,44 +344,4 @@ object SparkBuild extends Build { +@@ -380,44 +343,4 @@ object SparkBuild extends Build { "org.apache.hadoop" % "hadoop-yarn-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib) ) ) diff --git a/spark-v0.9.1-rc2-0005-Removed-code-depending-on-Kryo.patch b/spark-v0.9.1-rc2-0005-Removed-code-depending-on-Kryo.patch index cb43b1c..1cd34d0 100644 --- a/spark-v0.9.1-rc2-0005-Removed-code-depending-on-Kryo.patch +++ b/spark-v0.9.1-rc2-0005-Removed-code-depending-on-Kryo.patch @@ -1,4 +1,4 @@ -From be1d98b9a06ebd7f1f576507bce511f79be0b80a Mon Sep 17 00:00:00 2001 +From 6172c60fe82dae51155ca97db39cd75bc42fcba3 Mon Sep 17 00:00:00 2001 From: William Benton Date: Thu, 27 Feb 2014 16:43:44 -0600 Subject: [PATCH 5/9] Removed code depending on Kryo diff --git a/spark-v0.9.1-rc2-0006-remove-unavailable-and-unnecessary-deps.patch b/spark-v0.9.1-rc2-0006-remove-unavailable-and-unnecessary-deps.patch index 8e0ef58..ca5c9b6 100644 --- a/spark-v0.9.1-rc2-0006-remove-unavailable-and-unnecessary-deps.patch +++ b/spark-v0.9.1-rc2-0006-remove-unavailable-and-unnecessary-deps.patch @@ -1,4 +1,4 @@ -From 9bf9cdec5687473eb229b4efc4a21d4d2d3e2373 Mon Sep 17 00:00:00 2001 +From 204fa5821bf7f20b49297d5a9019ec6a5bd3da87 Mon Sep 17 00:00:00 2001 From: William Benton Date: Fri, 28 Feb 2014 09:00:04 -0600 Subject: [PATCH 6/9] remove unavailable and unnecessary deps @@ -10,7 +10,7 @@ Conflicts: 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala -index e34c79e..0d31714 100644 +index 3925475..c028cd7 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -191,13 +191,7 @@ object SparkBuild extends Build { @@ -28,8 +28,8 @@ index e34c79e..0d31714 100644 ), testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"), -@@ -242,14 +236,12 @@ object SparkBuild extends Build { - "org.ow2.asm" % "asm" % "4.0", +@@ -241,14 +235,12 @@ object SparkBuild extends Build { + "org.xerial.snappy" % "snappy-java" % "1.0.5", "org.spark-project.akka" %% "akka-remote" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty), "org.spark-project.akka" %% "akka-slf4j" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty), - "org.spark-project.akka" %% "akka-testkit" % "2.2.3-shaded-protobuf" % "test", @@ -44,7 +44,7 @@ index e34c79e..0d31714 100644 "org.apache.avro" % "avro" % "1.7.4", "org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty), "org.apache.zookeeper" % "zookeeper" % "3.4.5" excludeAll(excludeNetty), -@@ -257,8 +249,6 @@ object SparkBuild extends Build { +@@ -256,8 +248,6 @@ object SparkBuild extends Build { "com.codahale.metrics" % "metrics-jvm" % "3.0.0", "com.codahale.metrics" % "metrics-json" % "3.0.0", "com.codahale.metrics" % "metrics-graphite" % "3.0.0", diff --git a/spark-v0.9.1-rc2-0007-use-Jetty-8.patch b/spark-v0.9.1-rc2-0007-use-Jetty-8.patch index 31a1ed9..abf8d58 100644 --- a/spark-v0.9.1-rc2-0007-use-Jetty-8.patch +++ b/spark-v0.9.1-rc2-0007-use-Jetty-8.patch @@ -1,4 +1,4 @@ -From 6ba3ac2ad0928d136667b6614391ebe28213afe1 Mon Sep 17 00:00:00 2001 +From 80144d10b48dd1c936e5ef37ad2a9766fbbb0936 Mon Sep 17 00:00:00 2001 From: William Benton Date: Fri, 28 Feb 2014 15:16:45 -0600 Subject: [PATCH 7/9] use Jetty 8 @@ -8,7 +8,7 @@ Subject: [PATCH 7/9] use Jetty 8 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala -index 0d31714..099b720 100644 +index c028cd7..9fdf9f8 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -189,9 +189,7 @@ object SparkBuild extends Build { diff --git a/spark-v0.9.1-rc2-0008-use-Akka-2.3.0-RC2.patch b/spark-v0.9.1-rc2-0008-use-Akka-2.3.0-RC2.patch index c24b67d..973d27a 100644 --- a/spark-v0.9.1-rc2-0008-use-Akka-2.3.0-RC2.patch +++ b/spark-v0.9.1-rc2-0008-use-Akka-2.3.0-RC2.patch @@ -1,15 +1,15 @@ -From 244fff5121944995286d5998aa0790192893b283 Mon Sep 17 00:00:00 2001 +From 2cbc1a0bf275759bd17033e8844fc18ddcbbed2d Mon Sep 17 00:00:00 2001 From: William Benton Date: Fri, 28 Feb 2014 15:31:52 -0600 Subject: [PATCH 8/9] use Akka 2.3.0-RC2 --- - core/src/main/scala/org/apache/spark/deploy/Client.scala | 2 +- - core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala | 2 +- - .../src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala | 2 +- - .../main/scala/org/apache/spark/util/IndestructibleActorSystem.scala | 2 +- - project/SparkBuild.scala | 4 ++-- - 5 files changed, 6 insertions(+), 6 deletions(-) + core/src/main/scala/org/apache/spark/deploy/Client.scala | 2 +- + core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala | 2 +- + .../main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala | 2 +- + .../main/scala/org/apache/spark/util/IndestructibleActorSystem.scala | 2 +- + project/SparkBuild.scala | 5 +++-- + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/Client.scala b/core/src/main/scala/org/apache/spark/deploy/Client.scala index 9987e23..7fda886 100644 @@ -64,15 +64,16 @@ index bf71882..08d703e 100644 protected override def uncaughtExceptionHandler: Thread.UncaughtExceptionHandler = { val fallbackHandler = super.uncaughtExceptionHandler diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala -index 099b720..9f9962d 100644 +index 9fdf9f8..9f9962d 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala -@@ -232,8 +232,8 @@ object SparkBuild extends Build { +@@ -231,8 +231,9 @@ object SparkBuild extends Build { + "commons-daemon" % "commons-daemon" % "1.0.10", // workaround for bug HADOOP-9407 "com.ning" % "compress-lzf" % "1.0.0", "org.xerial.snappy" % "snappy-java" % "1.0.5", - "org.ow2.asm" % "asm" % "4.0", - "org.spark-project.akka" %% "akka-remote" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty), - "org.spark-project.akka" %% "akka-slf4j" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty), ++ "org.ow2.asm" % "asm" % "4.0", + "com.typesafe.akka" %% "akka-remote" % "2.3.0-RC2" excludeAll(excludeNetty), + "com.typesafe.akka" %% "akka-slf4j" % "2.3.0-RC2" excludeAll(excludeNetty), "org.json4s" %% "json4s-jackson" % "3.2.6", diff --git a/spark-v0.9.1-rc2-0009-fedora-only-resolver-changes.patch b/spark-v0.9.1-rc2-0009-fedora-only-resolver-changes.patch index 397eb5f..f2784d4 100644 --- a/spark-v0.9.1-rc2-0009-fedora-only-resolver-changes.patch +++ b/spark-v0.9.1-rc2-0009-fedora-only-resolver-changes.patch @@ -1,4 +1,4 @@ -From 804e228e4d6ba50d5f32180aa5d68027ad7c4f34 Mon Sep 17 00:00:00 2001 +From 378005da937aff3b1b548508d0fcbb2041bc939d Mon Sep 17 00:00:00 2001 From: William Benton Date: Fri, 28 Feb 2014 16:39:51 -0600 Subject: [PATCH 9/9] fedora-only resolver changes