[fluo] branch master updated: Fixes #909 Move netty jar to lib/twill (#910)

[mw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mwalch 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 dbdd1a5  Fixes #909 Move netty jar to lib/twill (#910)
dbdd1a5 is described below

commit dbdd1a577201343d2f6d68b95148c8bcbd53252f
Author: Mike Walch <mw...@apache.org>
AuthorDate: Wed Aug 16 09:48:03 2017 -0400

    Fixes #909 Move netty jar to lib/twill (#910)
    
    * Also put log4j & logback jars together
---
 modules/distribution/src/main/lib/fetch.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/distribution/src/main/lib/fetch.sh b/modules/distribution/src/main/lib/fetch.sh
index fcffbcb..d945d83 100755
--- a/modules/distribution/src/main/lib/fetch.sh
+++ b/modules/distribution/src/main/lib/fetch.sh
@@ -55,8 +55,6 @@ ahz)
 extra)
   echo "Fetching extra Fluo dependencies"
   download aopalliance:aopalliance:jar:1.0
-  download ch.qos.logback:logback-classic:jar:1.1.3 ./logback
-  download ch.qos.logback:logback-core:jar:1.1.3 ./logback
   download com.beust:jcommander:jar:1.32
   download com.google.code.gson:gson:jar:2.2.4
   download com.google.guava:guava:jar:13.0.1
@@ -67,18 +65,20 @@ extra)
   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 log4j:log4j:jar:1.2.17 ./log4j
   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.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:jar:1.1.0
   download org.slf4j:jcl-over-slf4j:jar:1.7.2
-  download org.slf4j:log4j-over-slf4j:jar:1.7.12 ./logback
   download org.slf4j:slf4j-api:jar:1.7.12
+
+  download log4j:log4j:jar:1.2.17 ./log4j
   download org.slf4j:slf4j-log4j12:jar:1.7.12 ./log4j
-  # See https://github.com/apache/incubator/issues/820
-  download io.netty:netty:jar:3.9.9.Final
+
+  download ch.qos.logback:logback-classic:jar:1.1.3 ./logback
+  download ch.qos.logback:logback-core:jar:1.1.3 ./logback
+  download org.slf4j:log4j-over-slf4j:jar:1.7.12 ./logback
 
   # Jars for deprecated launching in YARN (in Twill)
   download com.101tec:zkclient:jar:0.3 ./twill
@@ -99,6 +99,8 @@ extra)
   download org.scala-lang:scala-library:jar:2.10.1 ./twill
   download org.scala-lang:scala-reflect:jar:2.10.1 ./twill
   download org.xerial.snappy:snappy-java:jar:1.0.5 ./twill
+  # See https://github.com/apache/fluo/issues/820
+  download io.netty:netty:jar:3.9.9.Final ./twill
 
   echo -e "Done!\n"
   echo "NOTE - The dependencies downloaded have been tested with some versions of Hadoop, Zookeeper, and Accumulo."

-- 
To stop receiving notification emails like this one, please contact
['"commits@fluo.apache.org" <co...@fluo.apache.org>'].