diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-16 17:33:56 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-16 17:33:56 -0700 |
| commit | 6c27c38451a9f7b7f870949d2838bc8f78f09892 (patch) | |
| tree | 83b197e9b11d0292d7aa6ce8b7c1290bfc0ea0e2 | |
| parent | dc146406aefa4285d2a2a5d9d45f2ef883e9ef73 (diff) | |
| parent | 43644a293f5faec088530cf3a84d3680f2a103af (diff) | |
| download | spark-6c27c38451a9f7b7f870949d2838bc8f78f09892.tar.gz spark-6c27c38451a9f7b7f870949d2838bc8f78f09892.tar.bz2 spark-6c27c38451a9f7b7f870949d2838bc8f78f09892.zip | |
Merge pull request #615 from rxin/build-fix
Maven build fix & two other small changes
| -rw-r--r-- | core/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 5 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 1 | ||||
| -rwxr-xr-x | run | 10 |
4 files changed, 17 insertions, 3 deletions
diff --git a/core/pom.xml b/core/pom.xml index 57a95328c3..d8687bf991 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -88,6 +88,10 @@ <artifactId>mesos</artifactId> </dependency> <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -257,6 +257,11 @@ <version>${mesos.version}</version> </dependency> <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + <version>4.0.0.Beta2</version> + </dependency> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>10.4.2.0</version> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 234b021c93..0ea23b446f 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -142,7 +142,6 @@ object SparkBuild extends Build { ), libraryDependencies ++= Seq( - "io.netty" % "netty" % "3.5.3.Final", "com.google.guava" % "guava" % "11.0.1", "log4j" % "log4j" % "1.2.16", "org.slf4j" % "slf4j-api" % slf4jVersion, @@ -102,12 +102,18 @@ STREAMING_DIR="$FWDIR/streaming" PYSPARK_DIR="$FWDIR/python" # Exit if the user hasn't compiled Spark -if [ ! -e "$REPL_DIR/target" ]; then - echo "Failed to find Spark classes in $REPL_DIR/target" >&2 +if [ ! -e "$CORE_DIR/target" ]; then + echo "Failed to find Spark classes in $CORE_DIR/target" >&2 echo "You need to compile Spark before running this program" >&2 exit 1 fi +if [[ "$@" = *repl* && ! -e "$REPL_DIR/target" ]]; then + echo "Failed to find Spark classes in $REPL_DIR/target" >&2 + echo "You need to compile Spark repl module before running this program" >&2 + exit 1 +fi + # Build up classpath CLASSPATH="$SPARK_CLASSPATH" CLASSPATH="$CLASSPATH:$FWDIR/conf" |