This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch support/1.13 in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push: new 4f1c654 Revert "First pass at switching to liberica jdk. (#5312)" 4f1c654 is described below commit 4f1c65402b0eff2191c818ceeb9c40ab4dc46f57 Author: Owen Nichols <onich...@pivotal.io> AuthorDate: Mon Jun 29 17:45:30 2020 -0700 Revert "First pass at switching to liberica jdk. (#5312)" This reverts commit 9c46985e67eafd65070ea09d4d250969839e7433. --- ci/images/google-geode-builder/scripts/cache_dependencies.sh | 2 +- ci/images/google-geode-builder/scripts/setup.sh | 6 ++---- ci/images/google-windows-geode-builder/packer.json | 8 ++++---- ci/images/test-container/Dockerfile | 6 ++---- ci/scripts/execute_build.sh | 2 +- ci/scripts/execute_build_examples.sh | 2 +- ci/scripts/execute_publish.sh | 2 +- ci/scripts/execute_tests.sh | 4 ++-- ci/scripts/rsync_code_down.sh | 2 +- docker/Dockerfile | 2 +- 10 files changed, 16 insertions(+), 20 deletions(-) diff --git a/ci/images/google-geode-builder/scripts/cache_dependencies.sh b/ci/images/google-geode-builder/scripts/cache_dependencies.sh index 97c06c5..bca4da1 100644 --- a/ci/images/google-geode-builder/scripts/cache_dependencies.sh +++ b/ci/images/google-geode-builder/scripts/cache_dependencies.sh @@ -19,7 +19,7 @@ set -e WORK_DIR=$(mktemp -d) -export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64 +export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64 echo "JAVA_HOME is [${JAVA_HOME}]" if [ -z ${JAVA_HOME} ]; then diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh index 903ac7c..16a38f4 100755 --- a/ci/images/google-geode-builder/scripts/setup.sh +++ b/ci/images/google-geode-builder/scripts/setup.sh @@ -29,10 +29,8 @@ apt-get install -y --no-install-recommends \ echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list -echo "deb [arch=amd64] https://apt.bell-sw.com/ stable main" | sudo tee /etc/apt/sources.list.d/bellsoft.list curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - -curl -fsSL https://download.bell-sw.com/pki/GPG-KEY-bellsoft | apt-key add - apt-get update set +e && apt-get purge -y google-cloud-sdk lxc-docker && set -e apt-get install -y --no-install-recommends \ @@ -57,8 +55,8 @@ apt-get install -y --no-install-recommends \ cp -R /etc/alternatives /etc/keep-alternatives apt-get install -y --no-install-recommends \ - bellsoft-java11 \ - bellsoft-java8 + openjdk-8-jdk \ + openjdk-11-jdk rm -rf /etc/alternatives mv /etc/keep-alternatives /etc/alternatives diff --git a/ci/images/google-windows-geode-builder/packer.json b/ci/images/google-windows-geode-builder/packer.json index 145ea50..7b63db5 100644 --- a/ci/images/google-windows-geode-builder/packer.json +++ b/ci/images/google-windows-geode-builder/packer.json @@ -77,10 +77,10 @@ "inline": [ "$ErrorActionPreference = \"Stop\"", "Set-ExecutionPolicy Bypass -Scope Process -Force", - "choco install -y git cygwin cyg-get liberica11jdk", - "Move-Item \"C:\\Program Files\\BellSoft\\LibericaJDK-11*\" c:\\java11", - "choco install -y liberica8jdk", - "Move-Item \"C:\\Program Files\\BellSoft\\LibericaJDK-8*\" c:\\java8", + "choco install -y git cygwin cyg-get adoptopenjdk11", + "Move-Item \"C:\\Program Files\\AdoptOpenJDK\\jdk-11*\" c:\\java11", + "choco install -y jdk8 -params 'installdir=c:\\\\java8tmp;source=false'", + "Move-Item \"C:\\java8tmp\" c:\\java8", "choco install -y openssh --version 7.7.2.1 /SSHServerFeature", "refreshenv", "$OldPath = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\Environment' -Name PATH).Path", diff --git a/ci/images/test-container/Dockerfile b/ci/images/test-container/Dockerfile index 1c14b2a..16758c3 100644 --- a/ci/images/test-container/Dockerfile +++ b/ci/images/test-container/Dockerfile @@ -30,9 +30,7 @@ RUN apt-get update \ unzip \ xz-utils \ && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \ - && echo "deb [arch=amd64] https://apt.bell-sw.com/ stable main" > /etc/apt/sources.list.d/bellsoft.list \ && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \ - && curl -fsSL https://download.bell-sw.com/pki/GPG-KEY-bellsoft | apt-key add - \ && apt-get update \ && apt-get install -y --no-install-recommends \ aptitude \ @@ -48,8 +46,8 @@ 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 \ - bellsoft-java11 \ - bellsoft-java8 \ + openjdk-8-jdk \ + openjdk-11-jdk \ && rm -rf /etc/alternatives \ && mv /etc/keep-alternatives /etc/alternatives \ && apt-get clean \ diff --git a/ci/scripts/execute_build.sh b/ci/scripts/execute_build.sh index 1459c5d..6eaa907 100755 --- a/ci/scripts/execute_build.sh +++ b/ci/scripts/execute_build.sh @@ -82,7 +82,7 @@ else DUNIT_PARALLEL_FORKS="" fi -SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64" +SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64" if [ -v CALL_STACK_TIMEOUT ]; then ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "${SET_JAVA_HOME} && tmux new-session -d -s callstacks; tmux send-keys ~/capture-call-stacks.sh\ ${PARALLEL_DUNIT}\ ${CALL_STACK_TIMEOUT} C-m" diff --git a/ci/scripts/execute_build_examples.sh b/ci/scripts/execute_build_examples.sh index e490c5e..87a56a3 100755 --- a/ci/scripts/execute_build_examples.sh +++ b/ci/scripts/execute_build_examples.sh @@ -46,7 +46,7 @@ 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/bellsoft-java${JAVA_BUILD_VERSION}-amd64" +SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64" GRADLE_COMMAND="./gradlew \ ${DEFAULT_GRADLE_TASK_OPTIONS} \ diff --git a/ci/scripts/execute_publish.sh b/ci/scripts/execute_publish.sh index 84ab06a..32b4333 100755 --- a/ci/scripts/execute_publish.sh +++ b/ci/scripts/execute_publish.sh @@ -58,7 +58,7 @@ 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/bellsoft-java${JAVA_BUILD_VERSION}-amd64" +SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64" GRADLE_COMMAND="./gradlew \ ${DEFAULT_GRADLE_TASK_OPTIONS} \ diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh index 0aff4ea..f038b98 100755 --- a/ci/scripts/execute_tests.sh +++ b/ci/scripts/execute_tests.sh @@ -71,8 +71,8 @@ case $ARTIFACT_SLUG in SEP=";" ;; *) - JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64 - JAVA_TEST_PATH=/usr/lib/jvm/bellsoft-java${JAVA_TEST_VERSION}-amd64 + JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64 + JAVA_TEST_PATH=/usr/lib/jvm/java-${JAVA_TEST_VERSION}-openjdk-amd64 SEP="&&" ;; esac diff --git a/ci/scripts/rsync_code_down.sh b/ci/scripts/rsync_code_down.sh index 133e38e..b003a3b 100755 --- a/ci/scripts/rsync_code_down.sh +++ b/ci/scripts/rsync_code_down.sh @@ -44,7 +44,7 @@ case $ARTIFACT_SLUG in EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH}; cd geode; ./gradlew --no-daemon combineReports'" ;; *) - JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64 + JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64 EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH} && cd geode && ./gradlew --no-daemon combineReports'" ;; esac diff --git a/docker/Dockerfile b/docker/Dockerfile index 09ba60f..05f92cc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM bellsoft/liberica-openjdk-alpine:8 +FROM openjdk:8-jre-alpine # runtime dependencies RUN apk add --no-cache \