diff options
| author | Calvin Jia <jia.calvin@gmail.com> | 2015-11-02 17:02:31 -0800 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-11-02 17:02:31 -0800 |
| commit | 476f4348e2ea57ea05f4b470abfe76d97eeb20ce (patch) | |
| tree | 71bb2540463684bf6a9625a64aa3991c5e3ca28e | |
| parent | c020f7d9d43548d27ae4a9564ba38981fd530cb1 (diff) | |
| download | spark-476f4348e2ea57ea05f4b470abfe76d97eeb20ce.tar.gz spark-476f4348e2ea57ea05f4b470abfe76d97eeb20ce.tar.bz2 spark-476f4348e2ea57ea05f4b470abfe76d97eeb20ce.zip | |
[SPARK-11236] [TEST-MAVEN] [TEST-HADOOP1.0] [CORE] Update Tachyon dependency 0.7.1 -> 0.8.1
This is a reopening of #9204 which failed hadoop1 sbt tests.
With the original PR, a classpath issue would occur due to the MIMA plugin pulling in hadoop-2.2 dependencies regardless of the hadoop version when building the `oldDeps` project. These affect the hadoop1 sbt build because they are placed in `lib_managed` and Tachyon 0.8.0's default hadoop version is 2.2.
Author: Calvin Jia <jia.calvin@gmail.com>
Closes #9395 from calvinjia/spark-11236.
| -rw-r--r-- | core/pom.xml | 6 | ||||
| -rwxr-xr-x | make-distribution.sh | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/core/pom.xml b/core/pom.xml index 1b6b13517b..570a25cf32 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -262,7 +262,7 @@ <dependency> <groupId>org.tachyonproject</groupId> <artifactId>tachyon-client</artifactId> - <version>0.7.1</version> + <version>0.8.1</version> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> @@ -284,10 +284,6 @@ <groupId>org.tachyonproject</groupId> <artifactId>tachyon-underfs-glusterfs</artifactId> </exclusion> - <exclusion> - <groupId>org.tachyonproject</groupId> - <artifactId>tachyon-underfs-s3</artifactId> - </exclusion> </exclusions> </dependency> <dependency> diff --git a/make-distribution.sh b/make-distribution.sh index 24418ace26..e1c2afdbc6 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -33,9 +33,9 @@ SPARK_HOME="$(cd "`dirname "$0"`"; pwd)" DISTDIR="$SPARK_HOME/dist" SPARK_TACHYON=false -TACHYON_VERSION="0.7.1" +TACHYON_VERSION="0.8.1" TACHYON_TGZ="tachyon-${TACHYON_VERSION}-bin.tar.gz" -TACHYON_URL="https://github.com/amplab/tachyon/releases/download/v${TACHYON_VERSION}/${TACHYON_TGZ}" +TACHYON_URL="http://tachyon-project.org/downloads/files/${TACHYON_VERSION}/${TACHYON_TGZ}" MAKE_TGZ=false NAME=none @@ -240,10 +240,10 @@ if [ "$SPARK_TACHYON" == "true" ]; then fi tar xzf "${TACHYON_TGZ}" - cp "tachyon-${TACHYON_VERSION}/core/target/tachyon-${TACHYON_VERSION}-jar-with-dependencies.jar" "$DISTDIR/lib" + cp "tachyon-${TACHYON_VERSION}/assembly/target/tachyon-assemblies-${TACHYON_VERSION}-jar-with-dependencies.jar" "$DISTDIR/lib" mkdir -p "$DISTDIR/tachyon/src/main/java/tachyon/web" cp -r "tachyon-${TACHYON_VERSION}"/{bin,conf,libexec} "$DISTDIR/tachyon" - cp -r "tachyon-${TACHYON_VERSION}"/core/src/main/java/tachyon/web "$DISTDIR/tachyon/src/main/java/tachyon/web" + cp -r "tachyon-${TACHYON_VERSION}"/servers/src/main/java/tachyon/web "$DISTDIR/tachyon/src/main/java/tachyon/web" if [[ `uname -a` == Darwin* ]]; then # need to run sed differently on osx |