From af7498870a4eed0f6e4b9fe37cc69edc022d0d8c Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Sun, 8 Dec 2013 21:46:45 -0800 Subject: [PATCH 01/19] [maven-release-plugin] prepare for next development iteration --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 278931283a2f9..361a1d8c1621c 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 8ec6acbdc92c1..2be372da59d5f 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index dbef7ba191c84..90ac301261581 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index bc9b7924033a7..d12e3abf2e89b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 4e36d4c989d16..bd6a1c35f1a8c 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 4abddcc1f36d3..53f576c54e81d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - v0.8.1-incubating + HEAD diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index dc4a21ab6aca4..6f14fe87ae650 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 20c6b87238953..7a59d89819dd1 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 834f155590a3a..910401691f0a8 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index c3bb2940ec399..66e492e76f873 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index bcb8baff409a2..002c731851e52 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml From 1e8b0449563b36860d9e1edf352a61e103879afe Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Mon, 9 Dec 2013 16:59:20 -0800 Subject: [PATCH 02/19] Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit af7498870a4eed0f6e4b9fe37cc69edc022d0d8c. --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 361a1d8c1621c..278931283a2f9 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 2be372da59d5f..8ec6acbdc92c1 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 90ac301261581..dbef7ba191c84 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index d12e3abf2e89b..bc9b7924033a7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index bd6a1c35f1a8c..4e36d4c989d16 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/pom.xml b/pom.xml index 53f576c54e81d..4abddcc1f36d3 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - HEAD + v0.8.1-incubating diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index 6f14fe87ae650..dc4a21ab6aca4 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 7a59d89819dd1..20c6b87238953 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 910401691f0a8..834f155590a3a 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 66e492e76f873..c3bb2940ec399 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index 002c731851e52..bcb8baff409a2 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml From b6754abace2a91e7d1bfad966161d178b8a1f714 Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Mon, 9 Dec 2013 16:59:22 -0800 Subject: [PATCH 03/19] Revert "[maven-release-plugin] prepare release v0.8.1-incubating" This reverts commit c88a9916a183e7a57b53537531620bbde6d8869a. --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 278931283a2f9..7e9b201d3546d 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 8ec6acbdc92c1..44acbd9caf20a 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index dbef7ba191c84..1264bc4933cfe 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index bc9b7924033a7..2ef2785e17fd3 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 4e36d4c989d16..2a19d8b3b450c 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 4abddcc1f36d3..83f9b23e12de2 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - v0.8.1-incubating + HEAD diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index dc4a21ab6aca4..d0e4428908056 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 20c6b87238953..86d2a0c050436 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 834f155590a3a..320d5326f3819 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index c3bb2940ec399..21a6ba981262f 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index bcb8baff409a2..d9168e33f6084 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml From 45672958fd02abb3c33e176a9faa157ec6d9c43e Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Mon, 9 Dec 2013 16:51:36 -0800 Subject: [PATCH 04/19] Merge pull request #246 from pwendell/master Add missing license headers I found this when doing further audits on the 0.8.1 release candidate. (cherry picked from commit 6169fe14a140146602fb07cfcd13eee6efad98f9) Signed-off-by: Patrick Wendell --- .../spark/storage/StoragePerfTester.scala | 17 +++++++++++++++++ .../deploy/worker/ExecutorRunnerTest.scala | 17 +++++++++++++++++ .../spark/storage/DiskBlockManagerSuite.scala | 17 +++++++++++++++++ .../util/collection/OpenHashMapSuite.scala | 17 +++++++++++++++++ .../util/collection/OpenHashSetSuite.scala | 17 +++++++++++++++++ .../PrimitiveKeyOpenHashSetSuite.scala | 17 +++++++++++++++++ python/test_support/userlibrary.py | 17 +++++++++++++++++ 7 files changed, 119 insertions(+) diff --git a/core/src/main/scala/org/apache/spark/storage/StoragePerfTester.scala b/core/src/main/scala/org/apache/spark/storage/StoragePerfTester.scala index 68893a2bf49b1..369a2e536b068 100644 --- a/core/src/main/scala/org/apache/spark/storage/StoragePerfTester.scala +++ b/core/src/main/scala/org/apache/spark/storage/StoragePerfTester.scala @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.spark.storage import java.util.concurrent.atomic.AtomicLong diff --git a/core/src/test/scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala b/core/src/test/scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala index 8f0954122b322..4cb4ddc9cd66a 100644 --- a/core/src/test/scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala +++ b/core/src/test/scala/org/apache/spark/deploy/worker/ExecutorRunnerTest.scala @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.spark.deploy.worker import java.io.File diff --git a/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala b/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala index ef4c4c0f143f9..070982e798f34 100644 --- a/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala +++ b/core/src/test/scala/org/apache/spark/storage/DiskBlockManagerSuite.scala @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.spark.storage import java.io.{FileWriter, File} diff --git a/core/src/test/scala/org/apache/spark/util/collection/OpenHashMapSuite.scala b/core/src/test/scala/org/apache/spark/util/collection/OpenHashMapSuite.scala index ca3f684668d60..80ee59f26f49e 100644 --- a/core/src/test/scala/org/apache/spark/util/collection/OpenHashMapSuite.scala +++ b/core/src/test/scala/org/apache/spark/util/collection/OpenHashMapSuite.scala @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.spark.util.collection import scala.collection.mutable.HashSet diff --git a/core/src/test/scala/org/apache/spark/util/collection/OpenHashSetSuite.scala b/core/src/test/scala/org/apache/spark/util/collection/OpenHashSetSuite.scala index 4e11e8a628b44..5ad7ea74f186f 100644 --- a/core/src/test/scala/org/apache/spark/util/collection/OpenHashSetSuite.scala +++ b/core/src/test/scala/org/apache/spark/util/collection/OpenHashSetSuite.scala @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.spark.util.collection import org.scalatest.FunSuite diff --git a/core/src/test/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashSetSuite.scala b/core/src/test/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashSetSuite.scala index dfd6aed2c4bcc..0342195161dc0 100644 --- a/core/src/test/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashSetSuite.scala +++ b/core/src/test/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashSetSuite.scala @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.spark.util.collection import scala.collection.mutable.HashSet diff --git a/python/test_support/userlibrary.py b/python/test_support/userlibrary.py index 5bb6f5009ffbb..8e4a6292bc17c 100755 --- a/python/test_support/userlibrary.py +++ b/python/test_support/userlibrary.py @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + """ Used to test shipping of code depenencies with SparkContext.addPyFile(). """ From 7e5564cc788c33a3048914d61e90eff88b1a3903 Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Mon, 9 Dec 2013 18:06:54 -0800 Subject: [PATCH 05/19] [maven-release-plugin] prepare release v0.8.1-incubating --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 7e9b201d3546d..278931283a2f9 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 44acbd9caf20a..8ec6acbdc92c1 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 1264bc4933cfe..dbef7ba191c84 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 2ef2785e17fd3..bc9b7924033a7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 2a19d8b3b450c..4e36d4c989d16 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/pom.xml b/pom.xml index 83f9b23e12de2..4abddcc1f36d3 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - HEAD + v0.8.1-incubating diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index d0e4428908056..dc4a21ab6aca4 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 86d2a0c050436..20c6b87238953 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 320d5326f3819..834f155590a3a 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 21a6ba981262f..c3bb2940ec399 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index d9168e33f6084..bcb8baff409a2 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml From 216b473df0d6912f4905204402cfe04568e0560c Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Mon, 9 Dec 2013 18:07:00 -0800 Subject: [PATCH 06/19] [maven-release-plugin] prepare for next development iteration --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 278931283a2f9..361a1d8c1621c 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 8ec6acbdc92c1..2be372da59d5f 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index dbef7ba191c84..90ac301261581 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index bc9b7924033a7..d12e3abf2e89b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 4e36d4c989d16..bd6a1c35f1a8c 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 4abddcc1f36d3..53f576c54e81d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - v0.8.1-incubating + HEAD diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index dc4a21ab6aca4..6f14fe87ae650 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 20c6b87238953..7a59d89819dd1 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 834f155590a3a..910401691f0a8 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index c3bb2940ec399..66e492e76f873 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index bcb8baff409a2..002c731851e52 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml From e468f81164887a612377caedb398d102b3acdf50 Mon Sep 17 00:00:00 2001 From: Raymond Liu Date: Tue, 10 Dec 2013 13:30:57 +0800 Subject: [PATCH 07/19] Fix POM file for mvn assembly on hadoop 2.2 Yarn --- assembly/pom.xml | 28 ++++++++++ examples/pom.xml | 17 ++++++ new-yarn/pom.xml | 18 +++++- pom.xml | 140 +++++++++++++++++++++++++++++++++++++++++++++++ repl-bin/pom.xml | 12 ++++ repl/pom.xml | 12 ++++ yarn/pom.xml | 17 ++++++ 7 files changed, 243 insertions(+), 1 deletion(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 361a1d8c1621c..e7d923c5e7d0b 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -39,6 +39,23 @@ + + ${akka.group} + akka-actor + + + ${akka.group} + akka-remote + + + ${akka.group} + akka-slf4j + + + ${akka.group} + akka-zeromq + + org.apache.spark spark-core_2.9.3 @@ -133,6 +150,17 @@ + + new-yarn + + + org.apache.spark + spark-yarn_2.9.3 + ${project.version} + + + + bigtop-dist + + + com.typesafe.akka + akka-actor + + + com.typesafe.akka + akka-remote + + + com.typesafe.akka + akka-slf4j + + + com.typesafe.akka + akka-zeromq + + + + + org.apache.spark + spark-bagel_2.9.3 + ${project.version} + + + com.typesafe.akka + akka-actor + + + com.typesafe.akka + akka-remote + + + com.typesafe.akka + akka-slf4j + + + com.typesafe.akka + akka-zeromq + + + + + org.apache.spark + spark-mllib_2.9.3 + ${project.version} + + + com.typesafe.akka + akka-actor + + + com.typesafe.akka + akka-remote + + + com.typesafe.akka + akka-slf4j + + + com.typesafe.akka + akka-zeromq + + + + + org.apache.spark + spark-repl_2.9.3 + ${project.version} + + + com.typesafe.akka + akka-actor + + + com.typesafe.akka + akka-remote + + + com.typesafe.akka + akka-slf4j + + + com.typesafe.akka + akka-zeromq + + + + + org.apache.spark + spark-streaming_2.9.3 + ${project.version} + + + com.typesafe.akka + akka-actor + + + com.typesafe.akka + akka-remote + + + com.typesafe.akka + akka-slf4j + + + com.typesafe.akka + akka-zeromq + + + + + org.apache.spark + spark-yarn_2.9.3 + ${project.version} + + + com.typesafe.akka + akka-actor + + + com.typesafe.akka + akka-remote + + + com.typesafe.akka + akka-slf4j + + + com.typesafe.akka + akka-zeromq + + + + org.eclipse.jetty jetty-server diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index 6f14fe87ae650..d6aa47a8f869d 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -38,6 +38,18 @@ + + ${akka.group} + akka-actor + + + ${akka.group} + akka-remote + + + ${akka.group} + akka-slf4j + org.apache.spark spark-core_2.9.3 diff --git a/repl/pom.xml b/repl/pom.xml index 7a59d89819dd1..b7dbff7ff3027 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -37,6 +37,18 @@ + + ${akka.group} + akka-actor + + + ${akka.group} + akka-remote + + + ${akka.group} + akka-slf4j + org.apache.spark spark-core_2.9.3 diff --git a/yarn/pom.xml b/yarn/pom.xml index 002c731851e52..04934aa8b8297 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -31,6 +31,23 @@ http://spark.incubator.apache.org/ + + ${akka.group} + akka-actor + + + ${akka.group} + akka-remote + + + ${akka.group} + akka-slf4j + + + ${akka.group} + akka-zeromq + + org.apache.spark spark-core_2.9.3 From 52c0890ebe5aa5cdb88bd1359717c31bccddd7c0 Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Mon, 9 Dec 2013 23:08:33 -0800 Subject: [PATCH 08/19] Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 216b473df0d6912f4905204402cfe04568e0560c. --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 361a1d8c1621c..278931283a2f9 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 2be372da59d5f..8ec6acbdc92c1 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 90ac301261581..dbef7ba191c84 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index d12e3abf2e89b..bc9b7924033a7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index bd6a1c35f1a8c..4e36d4c989d16 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/pom.xml b/pom.xml index 53f576c54e81d..4abddcc1f36d3 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - HEAD + v0.8.1-incubating diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index 6f14fe87ae650..dc4a21ab6aca4 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 7a59d89819dd1..20c6b87238953 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 910401691f0a8..834f155590a3a 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 66e492e76f873..c3bb2940ec399 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index 002c731851e52..bcb8baff409a2 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml From d61494588a72fb37b8766385c559ddf2acb7b00b Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Mon, 9 Dec 2013 23:08:44 -0800 Subject: [PATCH 09/19] Revert "[maven-release-plugin] prepare release v0.8.1-incubating" This reverts commit 7e5564cc788c33a3048914d61e90eff88b1a3903. --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 278931283a2f9..7e9b201d3546d 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 8ec6acbdc92c1..44acbd9caf20a 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index dbef7ba191c84..1264bc4933cfe 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index bc9b7924033a7..2ef2785e17fd3 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 4e36d4c989d16..2a19d8b3b450c 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 4abddcc1f36d3..83f9b23e12de2 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - v0.8.1-incubating + HEAD diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index dc4a21ab6aca4..d0e4428908056 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 20c6b87238953..86d2a0c050436 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 834f155590a3a..320d5326f3819 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index c3bb2940ec399..21a6ba981262f 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index bcb8baff409a2..d9168e33f6084 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml From 81293289ee7dfa4db0c5b4ec89faf4fa72d3ba10 Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Mon, 9 Dec 2013 23:13:15 -0800 Subject: [PATCH 10/19] Updating CHANGES and one fix from last merge --- CHANGES.txt | 4 ++++ new-yarn/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index ce0aeab524505..efafab2745748 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,10 @@ Spark Change Log Release 0.8.1-incubating + d03589d Mon Dec 9 23:10:00 2013 -0800 + Merge pull request #248 from colorant/branch-0.8 + [Fix POM file for mvn assembly on hadoop 2.2 Yarn] + 3e1f78c Sun Dec 8 21:34:12 2013 -0800 Merge pull request #195 from dhardy92/fix_DebScriptPackage [[Deb] fix package of Spark classes adding org.apache prefix in scripts embeded in .deb] diff --git a/new-yarn/pom.xml b/new-yarn/pom.xml index 3310f04022e15..556fd378a4250 100644 --- a/new-yarn/pom.xml +++ b/new-yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating-SNAPSHOT ../pom.xml From 22fcb787a7e78ac6943c2fbcc43235c83bd1bfac Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Tue, 10 Dec 2013 00:02:27 -0800 Subject: [PATCH 11/19] Add missing dependencies --- bagel/pom.xml | 12 ++++++++++++ mllib/pom.xml | 13 +++++++++++++ streaming/pom.xml | 12 ++++++++++++ yarn/pom.xml | 1 - 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/bagel/pom.xml b/bagel/pom.xml index 44acbd9caf20a..99e797ecdea87 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -32,6 +32,18 @@ http://spark.incubator.apache.org/ + + ${akka.group} + akka-actor + + + ${akka.group} + akka-remote + + + ${akka.group} + akka-slf4j + org.apache.spark spark-core_2.9.3 diff --git a/mllib/pom.xml b/mllib/pom.xml index 2a19d8b3b450c..5b09d07f51ab9 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -32,6 +32,19 @@ http://spark.incubator.apache.org/ + + ${akka.group} + akka-actor + + + ${akka.group} + akka-remote + + + ${akka.group} + akka-slf4j + + org.apache.spark spark-core_2.9.3 diff --git a/streaming/pom.xml b/streaming/pom.xml index 320d5326f3819..498e035ea8ab2 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -40,6 +40,18 @@ + + ${akka.group} + akka-actor + + + ${akka.group} + akka-remote + + + ${akka.group} + akka-slf4j + org.apache.spark spark-core_2.9.3 diff --git a/yarn/pom.xml b/yarn/pom.xml index c190cdc5d1f7a..556fd378a4250 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -47,7 +47,6 @@ ${akka.group} akka-zeromq - org.apache.spark spark-core_2.9.3 From c45a267a0d181d6641827ac4980dbeeace21ec4e Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Tue, 10 Dec 2013 00:08:02 -0800 Subject: [PATCH 12/19] Small fix from prior commit --- mllib/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/mllib/pom.xml b/mllib/pom.xml index 5b09d07f51ab9..0a582277c44bf 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -44,7 +44,6 @@ ${akka.group} akka-slf4j - org.apache.spark spark-core_2.9.3 From b0e50f8548efc8857826bf138d2cf04029f70337 Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Tue, 10 Dec 2013 13:01:26 -0800 Subject: [PATCH 13/19] Merge pull request #250 from pwendell/master README incorrectly suggests build sources spark-env.sh This is misleading because the build doesn't source that file. IMO it's better to force people to specify build environment variables on the command line always, like we do in every example, so I'm just removing this doc. (cherry picked from commit d2efe13574090e93c600adeacc7f6356bc196e6c) Signed-off-by: Patrick Wendell --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 5e3a65f3401c7..fc572d57e94c4 100644 --- a/README.md +++ b/README.md @@ -67,9 +67,6 @@ with YARN, also set `SPARK_YARN=true`: # Apache Hadoop 2.2.0 with YARN $ SPARK_HADOOP_VERSION=2.2.0 SPARK_YARN=true sbt/sbt assembly -For convenience, these variables may also be set through the `conf/spark-env.sh` file -described below. - When developing a Spark application, specify the Hadoop version by adding the "hadoop-client" artifact to your project's dependencies. For example, if you're using Hadoop 1.2.1 and build your application using SBT, add this entry to From 909a9e4d11eccea03980a8ed7ba7f9f27c68e33a Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Tue, 10 Dec 2013 13:22:11 -0800 Subject: [PATCH 14/19] [maven-release-plugin] prepare release v0.8.1-incubating --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 75adf3cf060fc..1a760036c4d84 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 99e797ecdea87..98fca78b9a7e2 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 1264bc4933cfe..dbef7ba191c84 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 1a162477e2b39..a6dc3200bffa2 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 0a582277c44bf..40e697eb5de2a 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/pom.xml b/pom.xml index 3b54fb4bd1e3d..77686ca691aeb 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - HEAD + v0.8.1-incubating diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index 47920ac0102bc..2e3e3cc8887ca 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 12cef253b1c3c..9b6c7a83fb843 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 498e035ea8ab2..0f55f4b23ca97 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 21a6ba981262f..c3bb2940ec399 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index 556fd378a4250..d15404cf2e670 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml From 7ca53692c821ead3a50520fe51e229d9fc1f856d Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Tue, 10 Dec 2013 13:22:17 -0800 Subject: [PATCH 15/19] [maven-release-plugin] prepare for next development iteration --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 1a760036c4d84..e7d923c5e7d0b 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 98fca78b9a7e2..d72d9d9b0be06 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index dbef7ba191c84..90ac301261581 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index a6dc3200bffa2..5683d40df79fc 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 40e697eb5de2a..4b3e3dc3e34f9 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 77686ca691aeb..dbff1be8dc58b 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - v0.8.1-incubating + HEAD diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index 2e3e3cc8887ca..d6aa47a8f869d 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 9b6c7a83fb843..b7dbff7ff3027 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 0f55f4b23ca97..6b3bd30bb80d4 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index c3bb2940ec399..66e492e76f873 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index d15404cf2e670..3310f04022e15 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.2-incubating-SNAPSHOT ../pom.xml From d101dfe6cb4c20d4f559da769a234e4196aac98c Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Tue, 10 Dec 2013 14:22:31 -0800 Subject: [PATCH 16/19] Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 7ca53692c821ead3a50520fe51e229d9fc1f856d. --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index e7d923c5e7d0b..1a760036c4d84 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index d72d9d9b0be06..98fca78b9a7e2 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 90ac301261581..dbef7ba191c84 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 5683d40df79fc..a6dc3200bffa2 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 4b3e3dc3e34f9..40e697eb5de2a 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/pom.xml b/pom.xml index dbff1be8dc58b..77686ca691aeb 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - HEAD + v0.8.1-incubating diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index d6aa47a8f869d..2e3e3cc8887ca 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index b7dbff7ff3027..9b6c7a83fb843 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 6b3bd30bb80d4..0f55f4b23ca97 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 66e492e76f873..c3bb2940ec399 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index 3310f04022e15..d15404cf2e670 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.2-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml From 9415d2daaa6473ad2dd332d23ae2565c56b3b784 Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Tue, 10 Dec 2013 14:22:34 -0800 Subject: [PATCH 17/19] Revert "[maven-release-plugin] prepare release v0.8.1-incubating" This reverts commit 909a9e4d11eccea03980a8ed7ba7f9f27c68e33a. --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 1a760036c4d84..75adf3cf060fc 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 98fca78b9a7e2..99e797ecdea87 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index dbef7ba191c84..1264bc4933cfe 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index a6dc3200bffa2..1a162477e2b39 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 40e697eb5de2a..0a582277c44bf 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 77686ca691aeb..3b54fb4bd1e3d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - v0.8.1-incubating + HEAD diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index 2e3e3cc8887ca..47920ac0102bc 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 9b6c7a83fb843..12cef253b1c3c 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 0f55f4b23ca97..498e035ea8ab2 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index c3bb2940ec399..21a6ba981262f 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index d15404cf2e670..556fd378a4250 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating + 0.8.1-incubating-SNAPSHOT ../pom.xml From 628ca8559c797007a62842290544ab89082564cd Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Tue, 10 Dec 2013 14:24:26 -0800 Subject: [PATCH 18/19] Small bug fix in YARN build patch --- new-yarn/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new-yarn/pom.xml b/new-yarn/pom.xml index 556fd378a4250..d15404cf2e670 100644 --- a/new-yarn/pom.xml +++ b/new-yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml From b87d31dd8eb4b4e47c0138e9242d0dd6922c8c4e Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Tue, 10 Dec 2013 14:35:56 -0800 Subject: [PATCH 19/19] [maven-release-plugin] prepare release v0.8.1-incubating --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 4 ++-- repl-bin/pom.xml | 2 +- repl/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 75adf3cf060fc..1a760036c4d84 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 99e797ecdea87..98fca78b9a7e2 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 1264bc4933cfe..dbef7ba191c84 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 1a162477e2b39..a6dc3200bffa2 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 0a582277c44bf..40e697eb5de2a 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/pom.xml b/pom.xml index 3b54fb4bd1e3d..77686ca691aeb 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating pom Spark Project Parent POM http://spark.incubator.apache.org/ @@ -40,7 +40,7 @@ scm:git:git@github.com:apache/incubator-spark.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git - HEAD + v0.8.1-incubating diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index 47920ac0102bc..2e3e3cc8887ca 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 12cef253b1c3c..9b6c7a83fb843 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 498e035ea8ab2..0f55f4b23ca97 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 21a6ba981262f..c3bb2940ec399 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index 556fd378a4250..d15404cf2e670 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 0.8.1-incubating-SNAPSHOT + 0.8.1-incubating ../pom.xml