Skip to content

Commit

Permalink
Merge 44f3580 into b328460
Browse files Browse the repository at this point in the history
  • Loading branch information
heuermh authored Sep 3, 2019
2 parents b328460 + 44f3580 commit 69ab966
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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.11.12</scala.version>
<scala.version.prefix>2.11</scala.version.prefix>
<spark.version>2.4.3</spark.version>
<spark.version>2.4.4</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
8 changes: 4 additions & 4 deletions scripts/jenkins-test
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ SPARK=spark-${SPARK_VERSION}

# download prepackaged spark assembly

# Spark 2.4.3 needs special case for Scala 2.12
# Spark 2.4.3+ needs special case for Scala 2.12
if [ ${SCALAVER} == 2.12 ];
then
curl \
Expand All @@ -171,9 +171,9 @@ then
find hadoop-2.7.7 -name *.jar | grep avro | xargs rm

# download avro 1.8.x
curl \
-L "http://repo1.maven.org/maven2/org/apache/avro/avro/1.8.2/avro-1.8.2.jar" \
-o hadoop-2.7.7/share/hadoop/common/avro-1.8.2.jar
#curl \
# -L "http://repo1.maven.org/maven2/org/apache/avro/avro/1.8.2/avro-1.8.2.jar" \
# -o hadoop-2.7.7/share/hadoop/common/avro-1.8.2.jar

export SPARK_DIST_CLASSPATH=$(hadoop-2.7.7/bin/hadoop classpath)
else
Expand Down

0 comments on commit 69ab966

Please sign in to comment.