Skip to content

Commit

Permalink
Update Spark dependency version to 3.0.1 (#2274)
Browse files Browse the repository at this point in the history
* Update Spark dependency version to 3.0.1.

* Update jenkins build for Spark 3.0.1.
  • Loading branch information
heuermh committed Sep 9, 2020
1 parent f8323b9 commit bac1cb1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<avro.version>1.8.2</avro.version>
<scala.version>2.12.8</scala.version>
<scala.version.prefix>2.12</scala.version.prefix>
<spark.version>3.0.0</spark.version>
<spark.version>3.0.1</spark.version>
<parquet.version>1.10.1</parquet.version>
<!-- Edit the following line to configure the Hadoop (HDFS) version. -->
<hadoop.version>2.7.5</hadoop.version>
Expand Down
6 changes: 3 additions & 3 deletions scripts/jenkins-test
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ then
fi

# move to Spark 3.x if requested
if [ ${SPARK_VERSION} == 3.0.0 ];
if [ ${SPARK_VERSION} == 3.0.1 ];
then
set +e
./scripts/move_to_spark_3.sh
Expand Down Expand Up @@ -255,9 +255,9 @@ do

done

if [ ${SPARK_VERSION} == 3.0.0 ]
if [ ${SPARK_VERSION} == 3.0.1 ]
then
echo "Unable to build R support for Spark 3.0.0, SparkR is not available"
echo "Unable to build R support for Spark 3.0.1, SparkR is not available"
else
# make a directory to install SparkR into, and set the R user libs path
export R_LIBS_USER=${SPARK_HOME}/local_R_libs
Expand Down
2 changes: 1 addition & 1 deletion scripts/move_to_spark_2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ find . -name "pom.xml" -exec sed \
-e "/adam-/ $substitution_cmd" \
-e "/utils-/ s/-spark3_2\.1/-spark2_2\.1/" \
-e "/utils-/ $substitution_cmd" \
-e "/spark.version/ s/3.0.0/2.4.6/g" \
-e "/spark.version/ s/3.0.1/2.4.6/g" \
-i.spark2.bak '{}' \;
2 changes: 1 addition & 1 deletion scripts/move_to_spark_3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ find . -name "pom.xml" -exec sed \
-e "/adam-/ $substitution_cmd" \
-e "/utils-/ s/-spark2_2\.1/-spark3_2\.1/" \
-e "/utils-/ $substitution_cmd" \
-e "/spark.version/ s/2.4.6/3.0.0/g" \
-e "/spark.version/ s/2.4.6/3.0.1/g" \
-i.spark3.bak '{}' \;

0 comments on commit bac1cb1

Please sign in to comment.