Skip to content

Commit e56ca9d

Browse files
committed
Print an error if build for 2.10 and 2.11 is spotted.
1 parent 937c0b8 commit e56ca9d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

bin/compute-classpath.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,14 @@ fi
3737
if [ -z "$SPARK_SCALA_VERSION" ]; then
3838

3939
ASSEMBLY_DIR2="$FWDIR/assembly/target/scala-2.11"
40-
# if scala-2.11 directory for assembly exists, we use that. Otherwise we default to
41-
# scala 2.10.
40+
ASSEMBLY_DIR1="$FWDIR/assembly/target/scala-2.10"
41+
42+
if [[ -d "$ASSEMBLY_DIR2" && -d "$ASSEMBLY_DIR1" ]]; then
43+
echo -e "Presence of build for both scala versions(SCALA 2.10 and SCALA 2.11) detected." 1>&2
44+
echo -e 'Either clean one of them or, export SPARK_SCALA_VERSION=2.11 in spark-env.sh.' 1>&2
45+
exit 1
46+
fi
47+
4248
if [ -d "$ASSEMBLY_DIR2" ]; then
4349
SPARK_SCALA_VERSION="2.11"
4450
else

examples/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
<groupId>org.eclipse.jetty</groupId>
129129
<artifactId>jetty-server</artifactId>
130130
</dependency>
131-
<dependency>
132131
<dependency>
133132
<groupId>org.apache.commons</groupId>
134133
<artifactId>commons-math3</artifactId>

0 commit comments

Comments
 (0)