diff --git a/scripts/setup-adapters.sh b/scripts/setup-adapters.sh
index 4fed3cdced9a..4203ec58aae7 100755
--- a/scripts/setup-adapters.sh
+++ b/scripts/setup-adapters.sh
@@ -24,6 +24,7 @@ source $SCRIPTDIR/setup-helper-functions.sh
 DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)/deps-download}
 CMAKE_BUILD_TYPE="${BUILD_TYPE:-Release}"
 MACHINE=$(uname -m)
+LINUX_DISTRIBUTION=$(. /etc/os-release && echo ${ID})
 
 if [[ "$OSTYPE" == darwin* ]]; then
   export INSTALL_PREFIX=${INSTALL_PREFIX:-"$(pwd)/deps-install"}
@@ -124,7 +125,7 @@ function install_azure-storage-sdk-cpp {
     sed -i "s/\"version-string\"/\"overrides\": [{ \"name\": \"openssl\", \"version-string\": \"$openssl_version\" }],\"version-string\"/" $azure_core_dir/vcpkg.json
   fi
   (
-    cd $azure_core_dir 
+    cd $azure_core_dir
     cmake_install -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS=OFF
   )
   # install azure-storage-common
@@ -161,8 +162,11 @@ function install_hdfs_deps {
     cp -a ${DEPENDENCY_DIR}/hadoop /usr/local/
     wget -P /usr/local/hadoop/share/hadoop/common/lib/ https://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar
 
-    yum install -y java-1.8.0-openjdk-devel
-    
+    if [[ "$LINUX_DISTRIBUTION" == "ubuntu" || "$LINUX_DISTRIBUTION" == "debian" ]]; then
+      apt install -y openjdk-8-jdk
+    else # Assume Fedora/CentOS
+      yum install -y java-1.8.0-openjdk-devel
+    fi
   fi
   cmake_install_dir $libhdfs3_dir
 }
@@ -173,7 +177,6 @@ function install_hdfs_deps {
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
    # /etc/os-release is a standard way to query various distribution
    # information and is available everywhere
-   LINUX_DISTRIBUTION=$(. /etc/os-release && echo ${ID})
    if [[ "$LINUX_DISTRIBUTION" == "ubuntu" || "$LINUX_DISTRIBUTION" == "debian" ]]; then
       apt install -y --no-install-recommends libxml2-dev libgsasl7-dev uuid-dev
       # Dependencies of GCS, probably a workaround until the docker image is rebuilt