diff options
| -rw-r--r-- | core/pom.xml | 6 | ||||
| -rwxr-xr-x | make-distribution.sh | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/core/pom.xml b/core/pom.xml index dff40e91ad..319a50049a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -266,7 +266,7 @@ <dependency> <groupId>org.tachyonproject</groupId> <artifactId>tachyon-client</artifactId> - <version>0.8.0</version> + <version>0.7.1</version> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> @@ -288,6 +288,10 @@ <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 f676678481..24418ace26 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.8.0" +TACHYON_VERSION="0.7.1" TACHYON_TGZ="tachyon-${TACHYON_VERSION}-bin.tar.gz" -TACHYON_URL="http://tachyon-project.org/downloads/files/${TACHYON_VERSION}/${TACHYON_TGZ}" +TACHYON_URL="https://github.com/amplab/tachyon/releases/download/v${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}/assembly/target/tachyon-assemblies-${TACHYON_VERSION}-jar-with-dependencies.jar" "$DISTDIR/lib" + cp "tachyon-${TACHYON_VERSION}/core/target/tachyon-${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}"/servers/src/main/java/tachyon/web "$DISTDIR/tachyon/src/main/java/tachyon/web" + cp -r "tachyon-${TACHYON_VERSION}"/core/src/main/java/tachyon/web "$DISTDIR/tachyon/src/main/java/tachyon/web" if [[ `uname -a` == Darwin* ]]; then # need to run sed differently on osx |