[fluo] branch master updated: Converge deps in fetch script with parent pom (#1082)

[ct...@apache.org]

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

ctubbsii 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 549d645  Converge deps in fetch script with parent pom (#1082)
549d645 is described below

commit 549d645addb330f4ae2e074447428cb86b5a9a3f
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Tue Nov 26 17:03:46 2019 -0500

    Converge deps in fetch script with parent pom (#1082)
    
    Update fetch.sh and lib/ahz/pom.xml in the distribution tarball to fetch
    the dependency versions from the dependency tree in the build.
---
 modules/distribution/src/main/lib/ahz/pom.xml | 8 ++++----
 modules/distribution/src/main/lib/fetch.sh    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/distribution/src/main/lib/ahz/pom.xml b/modules/distribution/src/main/lib/ahz/pom.xml
index f2d609b..8af0aa3 100644
--- a/modules/distribution/src/main/lib/ahz/pom.xml
+++ b/modules/distribution/src/main/lib/ahz/pom.xml
@@ -20,9 +20,9 @@
   <version>a</version>
 
   <properties>
-    <accumulo.version>1.7.2</accumulo.version>
-    <hadoop.version>2.7.2</hadoop.version>
-    <zookeeper.version>3.4.8</zookeeper.version>
+    <accumulo.version>2.0.0</accumulo.version>
+    <hadoop.version>3.1.1</hadoop.version>
+    <zookeeper.version>3.4.14</zookeeper.version>
   </properties>
 
   <dependencies>
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-client</artifactId>
+      <artifactId>hadoop-client-runtime</artifactId>
       <version>${hadoop.version}</version>
     </dependency>
     <dependency>
diff --git a/modules/distribution/src/main/lib/fetch.sh b/modules/distribution/src/main/lib/fetch.sh
index ac69f53..5f9c854 100755
--- a/modules/distribution/src/main/lib/fetch.sh
+++ b/modules/distribution/src/main/lib/fetch.sh
@@ -58,7 +58,7 @@ extra)
   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 com.google.inject:guice:jar:4.2.2
   download org.apache.commons:commons-collections4:jar:4.2
   download org.apache.commons:commons-configuration2:jar:2.5
   download commons-io:commons-io:jar:2.6
@@ -89,5 +89,5 @@ extra)
   echo -e "   extra     Download extra Fluo dependencies\n"
   echo "For 'ahz', the versions of Hadoop, Accumulo, & Zookeeper are specifed in ahz/pom.xml."
   echo -e "However, you can override them using the command below:\n"
-  echo "./fetch.sh ahz -Daccumulo.version=1.7.2 -Dhadoop.version=2.7.2 -Dzookeeper.version=3.4.8"
+  echo "./fetch.sh ahz -Daccumulo.version=2.0.0 -Dhadoop.version=3.1.1 -Dzookeeper.version=3.4.14"
 esac