[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.
This commit is contained in:
parent
c020f7d9d4
commit
476f4348e2
|
@ -262,7 +262,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.tachyonproject</groupId>
|
<groupId>org.tachyonproject</groupId>
|
||||||
<artifactId>tachyon-client</artifactId>
|
<artifactId>tachyon-client</artifactId>
|
||||||
<version>0.7.1</version>
|
<version>0.8.1</version>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
|
@ -284,10 +284,6 @@
|
||||||
<groupId>org.tachyonproject</groupId>
|
<groupId>org.tachyonproject</groupId>
|
||||||
<artifactId>tachyon-underfs-glusterfs</artifactId>
|
<artifactId>tachyon-underfs-glusterfs</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
|
||||||
<groupId>org.tachyonproject</groupId>
|
|
||||||
<artifactId>tachyon-underfs-s3</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -33,9 +33,9 @@ SPARK_HOME="$(cd "`dirname "$0"`"; pwd)"
|
||||||
DISTDIR="$SPARK_HOME/dist"
|
DISTDIR="$SPARK_HOME/dist"
|
||||||
|
|
||||||
SPARK_TACHYON=false
|
SPARK_TACHYON=false
|
||||||
TACHYON_VERSION="0.7.1"
|
TACHYON_VERSION="0.8.1"
|
||||||
TACHYON_TGZ="tachyon-${TACHYON_VERSION}-bin.tar.gz"
|
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
|
MAKE_TGZ=false
|
||||||
NAME=none
|
NAME=none
|
||||||
|
@ -240,10 +240,10 @@ if [ "$SPARK_TACHYON" == "true" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tar xzf "${TACHYON_TGZ}"
|
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"
|
mkdir -p "$DISTDIR/tachyon/src/main/java/tachyon/web"
|
||||||
cp -r "tachyon-${TACHYON_VERSION}"/{bin,conf,libexec} "$DISTDIR/tachyon"
|
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
|
if [[ `uname -a` == Darwin* ]]; then
|
||||||
# need to run sed differently on osx
|
# need to run sed differently on osx
|
||||||
|
|
Loading…
Reference in a new issue