GEOMESA-3425 CLI - Fix older Hadoop versions jar downloads (#3247)

geomesa-accumulo/geomesa-accumulo-tools/conf-filtered/dependencies.sh

@@ -101,6 +101,11 @@ function dependencies() {
       "commons-configuration:commons-configuration:1.6:jar"
     )
   fi
+  if ! version_ge "${hadoop_version}" 3.4.0; then
+    gavs+=(
+      "commons-collections:commons-collections:3.2.2:jar"
+    )
+  fi
 
   # compare the version of zookeeper to determine if we need zookeeper-jute (version >= 3.5.5)
   JUTE_FROM_VERSION="3.5.5"

geomesa-fs/geomesa-fs-tools/conf-filtered/dependencies.sh

@@ -74,6 +74,11 @@ function dependencies() {
       "com.google.guava:guava:11.0.2:jar"
     )
   fi
+  if ! version_ge "${hadoop_version}" 3.4.0; then
+    gavs+=(
+      "commons-collections:commons-collections:3.2.2:jar"
+    )
+  fi
 
   # aws sdk
   if version_ge "${hadoop_version}" 3.4.0; then

geomesa-gt/geomesa-gt-tools/conf-filtered/dependencies.sh

@@ -43,13 +43,20 @@ function dependencies() {
   )
 
   # add hadoop 3+ jars if needed
-  local hadoop_maj_ver
-  hadoop_maj_ver="$([[ "$hadoop_version" =~ ([0-9][0-9]*)\. ]] && echo "${BASH_REMATCH[1]}")"
-  if [[ "$hadoop_maj_ver" -ge 3 ]]; then
+  if version_ge "${hadoop_version}" 3.0.0; then
     gavs+=(
       "org.apache.hadoop:hadoop-client-api:${hadoop_version}:jar"
       "org.apache.hadoop:hadoop-client-runtime:${hadoop_version}:jar"
     )
+  else
+    gavs+=(
+      "commons-configuration:commons-configuration:1.6:jar"
+    )
+  fi
+  if ! version_ge "${hadoop_version}" 3.4.0; then
+    gavs+=(
+      "commons-collections:commons-collections:3.2.2:jar"
+    )
   fi
 
   echo "${gavs[@]}" | tr ' ' '\n' | sort | tr '\n' ' '

geomesa-hbase/geomesa-hbase-tools/conf-filtered/dependencies.sh

@@ -100,13 +100,20 @@ function dependencies() {
   fi
 
   # add hadoop 3+ jars if needed
-  local hadoop_maj_ver
-  hadoop_maj_ver="$([[ "$hadoop_version" =~ ([0-9][0-9]*)\. ]] && echo "${BASH_REMATCH[1]}")"
-  if [[ "$hadoop_maj_ver" -ge 3 ]]; then
+  if version_ge "${hadoop_version}" 3.0.0; then
     gavs+=(
       "org.apache.hadoop:hadoop-client-api:${hadoop_version}:jar"
       "org.apache.hadoop:hadoop-client-runtime:${hadoop_version}:jar"
     )
+  else
+    gavs+=(
+      "commons-configuration:commons-configuration:1.6:jar"
+    )
+  fi
+  if ! version_ge "${hadoop_version}" 3.4.0; then
+    gavs+=(
+      "commons-collections:commons-collections:3.2.2:jar"
+    )
   fi
 
   # compare the version of zookeeper to determine if we need zookeeper-jute (version >= 3.5.5)

geomesa-lambda/geomesa-lambda-tools/conf-filtered/dependencies.sh

@@ -85,9 +85,7 @@ function dependencies() {
   fi
 
   # add hadoop 3+ jars if needed
-  local hadoop_maj_ver
-  hadoop_maj_ver="$([[ "$hadoop_version" =~ ([0-9][0-9]*)\. ]] && echo "${BASH_REMATCH[1]}")"
-  if [[ "$hadoop_maj_ver" -ge 3 ]]; then
+  if version_ge "${hadoop_version}" 3.0.0; then
     gavs+=(
       "org.apache.hadoop:hadoop-client-api:${hadoop_version}:jar"
       "org.apache.hadoop:hadoop-client-runtime:${hadoop_version}:jar"
@@ -97,6 +95,11 @@ function dependencies() {
       "commons-configuration:commons-configuration:1.6:jar"
     )
   fi
+  if ! version_ge "${hadoop_version}" 3.4.0; then
+    gavs+=(
+      "commons-collections:commons-collections:3.2.2:jar"
+    )
+  fi
 
   # compare the version of zookeeper to determine if we need zookeeper-jute (version >= 3.5.5)
   JUTE_FROM_VERSION="3.5.5"

geomesa-tools/conf-filtered/parquet-dependencies.sh

@@ -44,6 +44,11 @@ function dependencies() {
       "commons-configuration:commons-configuration:1.6:jar"
     )
   fi
+  if ! version_ge "${hadoop_version}" 3.4.0; then
+    gavs+=(
+      "commons-collections:commons-collections:3.2.2:jar"
+    )
+  fi
 
   echo "${gavs[@]}" | tr ' ' '\n' | sort | tr '\n' ' '
 }