From a308c165fd00600d31ba79b61f8fe61786e08c6f Mon Sep 17 00:00:00 2001 From: Mikhail Bautin Date: Mon, 26 Jan 2015 14:26:53 -0800 Subject: [PATCH 1/2] Update CDH version to 5.3.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6cfb0afd41384..49ee9cf8f0caa 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT pom Spark Project Parent POM http://spark.apache.org/ @@ -116,9 +116,9 @@ 2.0.1 0.18.1 shaded-protobuf - 4.1.2 + 5.3.0 cdh${cdh.version} - 2.0.0-mr1-${hadoop.dist.suffix} + 2.5.0-cdh5.3.0 org.spark-project.akka 2.2.3-shaded-protobuf 1.7.5 From f330454c88c8d72713320583c7e368cc2a4b77da Mon Sep 17 00:00:00 2001 From: Mikhail Bautin Date: Mon, 9 Feb 2015 11:37:43 -0800 Subject: [PATCH 2/2] Update version to 1.1.1-cdh5.3.0-csd-1-SNAPSHOT --- assembly/pom.xml | 2 +- bagel/pom.xml | 2 +- core/pom.xml | 2 +- examples/pom.xml | 2 +- external/flume-sink/pom.xml | 2 +- external/flume/pom.xml | 2 +- external/kafka/pom.xml | 2 +- external/mqtt/pom.xml | 2 +- external/twitter/pom.xml | 2 +- external/zeromq/pom.xml | 2 +- graphx/pom.xml | 2 +- mllib/pom.xml | 2 +- repl/pom.xml | 2 +- sql/catalyst/pom.xml | 2 +- sql/core/pom.xml | 2 +- sql/hive/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 6ad7b3d1f81db..580745d320043 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../pom.xml diff --git a/bagel/pom.xml b/bagel/pom.xml index 4801b7314aef8..1e7f2bee4b673 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 97df437ea3fde..e86a60eadbf82 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 140d318fdf622..90fcbb733d282 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../pom.xml diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index 306c00c5fb89b..93dc23cfb002b 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../../pom.xml diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 2bd5f83f4d2ce..958884dd9c981 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../../pom.xml diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index c0aca7707fb50..2015fd2b14bcd 100644 --- a/external/kafka/pom.xml +++ b/external/kafka/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../../pom.xml diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index 894c6b6b76dac..9dd8f4ade2bff 100644 --- a/external/mqtt/pom.xml +++ b/external/mqtt/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../../pom.xml diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index a6252a16fc3bb..502d01b6392bf 100644 --- a/external/twitter/pom.xml +++ b/external/twitter/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../../pom.xml diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index 866d357deb323..7a6ac36655f47 100644 --- a/external/zeromq/pom.xml +++ b/external/zeromq/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index 7d9d5a6bae35a..4a6c2a64c59e5 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 4ff6d8d43e2b8..8d5c757420dd7 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../pom.xml diff --git a/repl/pom.xml b/repl/pom.xml index 49b8700b25a37..f321f9d68467a 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../pom.xml diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index fbe8c2f4c0ed6..98b815841645d 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index e4bfb26d271a7..8a9e64bf77d5f 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index c580b60744ab4..207fd5e17b36a 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index f0efc8b2c61fe..631f4bb67fc98 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index e5ed22d7ae322..3db057fdb2452 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent - 1.1.1-csd-4-SNAPSHOT + 1.1.1-cdh5.3.0-csd-1-SNAPSHOT ../pom.xml