[fluo-uno] branch master updated: Remove unneeded step for Hadoop 3.3 and later (#250)

[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-uno.git


The following commit(s) were added to refs/heads/master by this push:
     new 886c202  Remove unneeded step for Hadoop 3.3 and later (#250)
886c202 is described below

commit 886c202cd8beeee4064e66bab6e19cedaf5bfacd
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Aug 3 13:06:01 2020 -0400

    Remove unneeded step for Hadoop 3.3 and later (#250)
    
    Prevent unnecessary javax.activation-api step for Hadoop 3.3 and later,
    where it is already included in the Hadoop binary.
---
 bin/impl/install/hadoop.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/impl/install/hadoop.sh b/bin/impl/install/hadoop.sh
index 6dd04c0..a0a4f9d 100755
--- a/bin/impl/install/hadoop.sh
+++ b/bin/impl/install/hadoop.sh
@@ -41,7 +41,10 @@ if [[ $HADOOP_VERSION =~ ^2\..*$ ]]; then
   cp "$UNO_HOME"/conf/hadoop/2/* "$hadoop_conf/"
 else
   cp "$UNO_HOME"/conf/hadoop/3/* "$hadoop_conf/"
-  # need the following for Java 11, because Hadoop doesn't include it
+fi
+
+if [[ $HADOOP_VERSION =~ ^3\.[012]\..*$ ]]; then
+  # need the following for Java 11, because Hadoop doesn't include it until 3.3
   # Using maven-dependency-plugin version 3.1.1 explicitly, because some older
   # versions require to be executed within a POM project
   mvn org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \