GEODE-8321: part 3 - remove adoptopenjdk (apache#6457)

This is the final cleanup following successful conversion in Part 2 (apache#5474)

(all three phases were 1: add liberica  2: switch  3: remove adoptopenjdk)

Author: onichols-pivotal

ci/images/google-geode-builder/scripts/setup.sh

@@ -59,8 +59,6 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
 
 cp -R /etc/alternatives /etc/keep-alternatives
 apt-get install -y --no-install-recommends \
-    openjdk-8-jdk \
-    openjdk-11-jdk \
     bellsoft-java11 \
     bellsoft-java8
 rm -rf /etc/alternatives

ci/images/google-windows-geode-builder/packer.json

@@ -77,10 +77,6 @@
       "inline": [
         "$ErrorActionPreference = \"Stop\"",
         "Set-ExecutionPolicy Bypass -Scope Process -Force",
-        "choco install -y git cygwin cyg-get adoptopenjdk11",
-        "Move-Item \"C:\\Program Files\\AdoptOpenJDK\\jdk-11*\" c:\\java11-adoptopenjdk",
-        "choco install -y jdk8 -params 'installdir=c:\\\\java8tmp;source=false'",
-        "Move-Item \"C:\\java8tmp\" c:\\java8-adoptopenjdk",
         "choco install -y git cygwin cyg-get liberica11jdk",
         "Move-Item \"C:\\Program Files\\BellSoft\\LibericaJDK-11*\" c:\\java11",
         "choco install -y liberica8jdk",

ci/images/test-container/Dockerfile

@@ -53,8 +53,6 @@ RUN  apt-get update \
   && useradd --shell /bin/bash -u 93043 -o -c "" -m geode \
   && cp -R /etc/alternatives /etc/keep-alternatives \
   && apt-get install -y --no-install-recommends \
-    openjdk-8-jdk \
-    openjdk-11-jdk \
     java-common \
     bellsoft-java11 \
     bellsoft-java8 \

ci/scripts/execute_build.sh

@@ -85,7 +85,6 @@ else
 fi
 
 
-# SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64"
 SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64"
 
 if [ -v CALL_STACK_TIMEOUT ]; then

ci/scripts/execute_build_examples.sh

@@ -46,7 +46,6 @@ INSTANCE_IP_ADDRESS="$(cat instance-data/instance-ip-address)"
 
 GEODE_VERSION=$(jq -r .semver geode-passing-tokens/*.json)
 
-# SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64"
 SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64"
 
 GRADLE_COMMAND="./gradlew \

ci/scripts/execute_publish.sh

@@ -58,7 +58,6 @@ SSH_OPTIONS="-i ${SSHKEY_FILE} -o ConnectionAttempts=60 -o StrictHostKeyChecking
 
 INSTANCE_IP_ADDRESS="$(cat instance-data/instance-ip-address)"
 
-# SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64"
 SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64"
 
 GRADLE_COMMAND="./gradlew \

ci/scripts/execute_tests.sh

@@ -81,8 +81,6 @@ case $ARTIFACT_SLUG in
     SEP=";"
     ;;
   *)
-    # JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
-    # JAVA_TEST_PATH=/usr/lib/jvm/java-${JAVA_TEST_VERSION}-openjdk-amd64
     JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64
     JAVA_TEST_PATH=/usr/lib/jvm/bellsoft-java${JAVA_TEST_VERSION}-amd64
     SEP="&&"

ci/scripts/rsync_code_down.sh

@@ -47,7 +47,6 @@ case $ARTIFACT_SLUG in
     del=";"
     ;;
   *)
-    # JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
     JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64
     del="&&"
     ;;

docker/Dockerfile

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# FROM openjdk:8-jre-alpine
 FROM bellsoft/liberica-openjdk-alpine:8
 
 # runtime dependencies

geode-assembly/Dockerfile

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# FROM openjdk:11
 FROM bellsoft/liberica-openjdk-debian:11
 COPY geode /geode
 ENV GEODE_HOME="/geode"