diff options
| author | Patrick Wendell <patrick@databricks.com> | 2015-01-29 17:14:27 -0800 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-01-29 17:14:27 -0800 |
| commit | d2071e8f45e74117f78a42770b0c610cb98e5075 (patch) | |
| tree | 37156e97f71127f1b293f9aa6d6806b6ce51db62 /bin | |
| parent | 5338772f3fe9cfe1f8caee64cce2275457d8f23f (diff) | |
| download | spark-d2071e8f45e74117f78a42770b0c610cb98e5075.tar.gz spark-d2071e8f45e74117f78a42770b0c610cb98e5075.tar.bz2 spark-d2071e8f45e74117f78a42770b0c610cb98e5075.zip | |
Revert "[WIP] [SPARK-3996]: Shade Jetty in Spark deliverables"
This reverts commit f240fe390b46b6e9859ce74108c5a5fba5c5f8b3.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/compute-classpath.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh index a8c344b1ca..9e8d0b7851 100755 --- a/bin/compute-classpath.sh +++ b/bin/compute-classpath.sh @@ -50,8 +50,8 @@ fi if [ -n "$SPARK_PREPEND_CLASSES" ]; then echo "NOTE: SPARK_PREPEND_CLASSES is set, placing locally compiled Spark"\ "classes ahead of assembly." >&2 - # Spark classes CLASSPATH="$CLASSPATH:$FWDIR/core/target/scala-$SPARK_SCALA_VERSION/classes" + CLASSPATH="$CLASSPATH:$FWDIR/core/target/jars/*" CLASSPATH="$CLASSPATH:$FWDIR/repl/target/scala-$SPARK_SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/mllib/target/scala-$SPARK_SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/bagel/target/scala-$SPARK_SCALA_VERSION/classes" @@ -63,8 +63,6 @@ if [ -n "$SPARK_PREPEND_CLASSES" ]; then CLASSPATH="$CLASSPATH:$FWDIR/sql/hive/target/scala-$SPARK_SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/sql/hive-thriftserver/target/scala-$SPARK_SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/yarn/stable/target/scala-$SPARK_SCALA_VERSION/classes" - # Jars for shaded deps in their original form (copied here during build) - CLASSPATH="$CLASSPATH:$FWDIR/core/target/jars/*" fi # Use spark-assembly jar from either RELEASE or assembly directory |