This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo.git
The following commit(s) were added to refs/heads/master by this push:
new 70b6fb2 Update tarball for Hadoop 3 and sync tar deps with pom (#1062)
70b6fb2 is described below
commit 70b6fb2520bc89d3b7348d2594eba04d90dd063d
Author: Keith Turner <[email protected]>
AuthorDate: Wed Nov 21 08:55:04 2018 -0500
Update tarball for Hadoop 3 and sync tar deps with pom (#1062)
---
modules/distribution/src/main/config/fluo-env.sh | 11 +++--------
modules/distribution/src/main/lib/fetch.sh | 22 +++++++++++-----------
2 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/modules/distribution/src/main/config/fluo-env.sh
b/modules/distribution/src/main/config/fluo-env.sh
index 2d72d44..ea329cf 100755
--- a/modules/distribution/src/main/config/fluo-env.sh
+++ b/modules/distribution/src/main/config/fluo-env.sh
@@ -24,7 +24,7 @@
####################################
## Hadoop installation
-export HADOOP_PREFIX="${HADOOP_PREFIX:-/path/to/hadoop}"
+export HADOOP_HOME="${HADOOP_HOME:-/path/to/hadoop}"
## Fluo connection properties
export FLUO_CONN_PROPS="${FLUO_CONN_PROPS:-${conf}/fluo-conn.properties}"
## Fluo temp directory where the fluo script will copy jars from HDFS to the
local machine
@@ -85,17 +85,12 @@ setupClasspathFromSystem()
fi
#any jars matching this pattern is excluded from classpath
- EXCLUDE_RE="(.*log4j.*)|(.*asm.*)|(.*guava.*)|(.*gson.*)"
+
EXCLUDE_RE="(.*log4j.*)|(.*asm.*)|(.*guava.*)|(.*gson.*)|(.*hadoop-client-minicluster.*)"
addToClasspath "$ACCUMULO_HOME/lib" $EXCLUDE_RE
addToClasspath "$ZOOKEEPER_HOME" $EXCLUDE_RE
addToClasspath "$ZOOKEEPER_HOME/lib" $EXCLUDE_RE
- addToClasspath "$HADOOP_PREFIX/share/hadoop/common" $EXCLUDE_RE;
- addToClasspath "$HADOOP_PREFIX/share/hadoop/common/lib" $EXCLUDE_RE;
- addToClasspath "$HADOOP_PREFIX/share/hadoop/hdfs" $EXCLUDE_RE;
- addToClasspath "$HADOOP_PREFIX/share/hadoop/hdfs/lib" $EXCLUDE_RE;
- addToClasspath "$HADOOP_PREFIX/share/hadoop/yarn" $EXCLUDE_RE;
- addToClasspath "$HADOOP_PREFIX/share/hadoop/yarn/lib" $EXCLUDE_RE;
+ addToClasspath "$HADOOP_HOME/share/hadoop/client" $EXCLUDE_RE;
export CLASSPATH
}
diff --git a/modules/distribution/src/main/lib/fetch.sh
b/modules/distribution/src/main/lib/fetch.sh
index 2dd523c..17d5ca4 100755
--- a/modules/distribution/src/main/lib/fetch.sh
+++ b/modules/distribution/src/main/lib/fetch.sh
@@ -55,20 +55,20 @@ ahz)
extra)
echo "Fetching extra Fluo dependencies"
download aopalliance:aopalliance:jar:1.0
- download com.beust:jcommander:jar:1.32
- download com.google.code.gson:gson:jar:2.8.0
- download com.google.guava:guava:jar:13.0.1
+ download com.beust:jcommander:jar:1.72
+ download com.google.code.gson:gson:jar:2.8.5
+ download com.google.guava:guava:jar:27.0-jre
download com.google.inject:guice:jar:4.0
- download commons-collections:commons-collections:jar:3.2.1
+ download org.apache.commons:commons-collections4:jar:4.2
download commons-configuration:commons-configuration:jar:1.10
- download commons-io:commons-io:jar:2.4
+ download commons-io:commons-io:jar:2.6
download io.dropwizard.metrics:metrics-core:jar:3.1.1
download io.dropwizard.metrics:metrics-graphite:jar:3.1.1
download javax.inject:javax.inject:jar:1
- download org.apache.curator:curator-client:jar:2.7.1
- download org.apache.curator:curator-framework:jar:2.7.1
- download org.apache.curator:curator-recipes:jar:2.7.1
- download org.hdrhistogram:HdrHistogram:jar:2.1.8
+ download org.apache.curator:curator-client:jar:4.0.1
+ download org.apache.curator:curator-framework:jar:4.0.1
+ download org.apache.curator:curator-recipes:jar:4.0.1
+ download org.hdrhistogram:HdrHistogram:jar:2.1.10
download
org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:jar:1.1.0
download org.slf4j:jcl-over-slf4j:jar:1.7.2
download org.slf4j:slf4j-api:jar:1.7.12
@@ -76,8 +76,8 @@ extra)
download log4j:log4j:jar:1.2.17 ./log4j
download org.slf4j:slf4j-log4j12:jar:1.7.12 ./log4j
- download ch.qos.logback:logback-classic:jar:1.1.3 ./logback
- download ch.qos.logback:logback-core:jar:1.1.3 ./logback
+ download ch.qos.logback:logback-classic:jar:1.2.3 ./logback
+ download ch.qos.logback:logback-core:jar:1.2.3 ./logback
download org.slf4j:log4j-over-slf4j:jar:1.7.12 ./logback
# Jars for deprecated launching in YARN (in Twill)
