From fae66fe51dcfacf42881ce24300382ed786353c2 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Thu, 6 Jan 2022 12:00:34 -0600
Subject: [PATCH 1/4] Try gpuci_mamba_retry on Java CI.

---
 ci/gpu/java.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/gpu/java.sh b/ci/gpu/java.sh
index 6f7038d21d7..a928968d189 100755
--- a/ci/gpu/java.sh
+++ b/ci/gpu/java.sh
@@ -77,7 +77,7 @@ conda config --show-sources
 conda list --show-channel-urls
 
 gpuci_logger "Install dependencies"
-gpuci_conda_retry install -y \
+gpuci_mamba_retry install -y \
                   "cudatoolkit=$CUDA_REL" \
                   "rapids-build-env=$MINOR_VERSION.*" \
                   "rapids-notebook-env=$MINOR_VERSION.*" \
@@ -88,8 +88,8 @@ gpuci_conda_retry install -y \
                   "maven"
 
 # https://docs.rapids.ai/maintainers/depmgmt/
-# gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env
-# gpuci_conda_retry install -y "your-pkg=1.0.0"
+# gpuci_mamba_retry remove --force rapids-build-env rapids-notebook-env
+# gpuci_mamba_retry install -y "your-pkg=1.0.0"
 
 
 gpuci_logger "Check compiler versions"
@@ -130,7 +130,7 @@ KAFKA_CONDA_FILE=`basename "$KAFKA_CONDA_FILE" .tar.bz2` #get filename without e
 KAFKA_CONDA_FILE=${KAFKA_CONDA_FILE//-/=} #convert to conda install
 
 gpuci_logger "Installing $CUDF_CONDA_FILE & $KAFKA_CONDA_FILE"
-conda install -c ${CONDA_ARTIFACT_PATH} "$CUDF_CONDA_FILE" "$KAFKA_CONDA_FILE"
+gpuci_mamba_retry install -c ${CONDA_ARTIFACT_PATH} "$CUDF_CONDA_FILE" "$KAFKA_CONDA_FILE"
 
 install_dask
 

From 1e0e7bc5f574be36d0461d56862ce2df511a3144 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Thu, 6 Jan 2022 15:22:37 -0800
Subject: [PATCH 2/4] Use "gpuci_conda_retry remove" to avoid
 https://github.com/mamba-org/mamba/issues/412

Co-authored-by: AJ Schmidt <ajschmidt8@users.noreply.github.com>
---
 ci/gpu/java.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/gpu/java.sh b/ci/gpu/java.sh
index a928968d189..0a9240c6dc9 100755
--- a/ci/gpu/java.sh
+++ b/ci/gpu/java.sh
@@ -88,7 +88,7 @@ gpuci_mamba_retry install -y \
                   "maven"
 
 # https://docs.rapids.ai/maintainers/depmgmt/
-# gpuci_mamba_retry remove --force rapids-build-env rapids-notebook-env
+# gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env
 # gpuci_mamba_retry install -y "your-pkg=1.0.0"
 
 

From e26477dadf3191d46c69b6f5e133cb7569b4ed72 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Fri, 7 Jan 2022 07:53:21 -0800
Subject: [PATCH 3/4] Add --trace-expand for debugging CMake.

---
 java/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/pom.xml b/java/pom.xml
index ec6968ca761..94fb1ad46dc 100755
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -381,6 +381,7 @@
                                 <exec dir="${native.build.path}"
                                       failonerror="true"
                                       executable="cmake">
+                                    <arg value="--trace-expand"/>
                                     <arg value="${basedir}/src/main/native"/>
                                     <arg value="-DCUDA_STATIC_RUNTIME=${CUDA_STATIC_RUNTIME}" />
                                     <arg value="-DPER_THREAD_DEFAULT_STREAM=${PER_THREAD_DEFAULT_STREAM}" />

From 630b5846df6a257b91f65a4565b6aeba6d54ab5e Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Fri, 7 Jan 2022 13:19:01 -0800
Subject: [PATCH 4/4] Reactivate conda environment to ensure openjdk activation
 script sets JAVA_HOME.

---
 ci/gpu/java.sh | 4 ++++
 java/pom.xml   | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ci/gpu/java.sh b/ci/gpu/java.sh
index 0a9240c6dc9..b048470d155 100755
--- a/ci/gpu/java.sh
+++ b/ci/gpu/java.sh
@@ -86,6 +86,10 @@ gpuci_mamba_retry install -y \
                   "ucx-py=${UCX_PY_VERSION}" \
                   "openjdk=8.*" \
                   "maven"
+# "mamba install openjdk" adds an activation script to set JAVA_HOME but this is
+# not triggered on installation. Re-activating the conda environment will set
+# this environment variable so that CMake can find JNI.
+conda activate rapids
 
 # https://docs.rapids.ai/maintainers/depmgmt/
 # gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env
diff --git a/java/pom.xml b/java/pom.xml
index 94fb1ad46dc..ec6968ca761 100755
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -381,7 +381,6 @@
                                 <exec dir="${native.build.path}"
                                       failonerror="true"
                                       executable="cmake">
-                                    <arg value="--trace-expand"/>
                                     <arg value="${basedir}/src/main/native"/>
                                     <arg value="-DCUDA_STATIC_RUNTIME=${CUDA_STATIC_RUNTIME}" />
                                     <arg value="-DPER_THREAD_DEFAULT_STREAM=${PER_THREAD_DEFAULT_STREAM}" />