[ADAM-1221] Bump Spark/Hadoop versions.

Resolves #1221.
bigdatagenomics · Nov 10, 2016 · 1b72f0b · 1b72f0b
1 parent 8352592
commit 1b72f0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,10 +21,10 @@
     <avro.version>1.8.0</avro.version>
     <scala.version>2.10.6</scala.version>
     <scala.version.prefix>2.10</scala.version.prefix>
-    <spark.version>1.6.1</spark.version>
+    <spark.version>1.6.3</spark.version>
     <parquet.version>1.8.1</parquet.version>
     <!-- Edit the following line to configure the Hadoop (HDFS) version. -->
-    <hadoop.version>2.6.0</hadoop.version>
+    <hadoop.version>2.7.3</hadoop.version>
     <hadoop-bam.version>7.7.0</hadoop-bam.version>
     <slf4j.version>1.7.21</slf4j.version>
     <bdg-formats.version>0.9.0</bdg-formats.version>

diff --git a/scripts/move_to_spark_2.sh b/scripts/move_to_spark_2.sh
@@ -2,13 +2,13 @@
 
 set +x
 
-svp="\${scala\.version\.prefix}"
+svp="\${scala.version.prefix}"
 substitution_cmd="s/_$svp/-spark2_$svp/g"
 
 find . -name "pom.xml" -exec sed \
     -e "/utils-/ s/_2\.10/-spark2_2.10/g" \
     -e "/adam-/ s/_2\.10/-spark2_2.10/g" \
     -e "/utils-/ $substitution_cmd" \
     -e "/adam-/ $substitution_cmd" \
-    -e "/spark\.version/ s/1\.6\.1/2.0.0/g" \
+    -e "/spark.version/ s/1.6.3/2.0.0/g" \
     -i.spark2.bak '{}' \;