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 0f949f0 GEODE-8321: part 3 - remove adoptopenjdk (#6457)
0f949f0 is described below
commit 0f949f00e760d0156b29e265b941367ebbfa24c8
Author: Owen Nichols <[email protected]>
AuthorDate: Mon May 10 14:32:11 2021 -0700
GEODE-8321: part 3 - remove adoptopenjdk (#6457)
This is the final cleanup following successful conversion in Part 2 (#5474)
(all three phases were 1: add liberica 2: switch 3: remove adoptopenjdk)
(cherry picked from commit d9b323fa18dc969fb7e737652c00a200c297de17)
(cherry picked from commit 0d28c0c59701bd1cff08a7d0e14b3990fa5e1e3c)
---
ci/images/google-geode-builder/scripts/setup.sh | 2 --
ci/images/google-windows-geode-builder/packer.json | 4 ----
ci/images/test-container/Dockerfile | 2 --
ci/scripts/execute_build.sh | 1 -
ci/scripts/execute_build_examples.sh | 1 -
ci/scripts/execute_publish.sh | 1 -
ci/scripts/execute_tests.sh | 2 --
ci/scripts/rsync_code_down.sh | 1 -
docker/Dockerfile | 1 -
geode-assembly/Dockerfile | 1 -
10 files changed, 16 deletions(-)
diff --git a/ci/images/google-geode-builder/scripts/setup.sh
b/ci/images/google-geode-builder/scripts/setup.sh
index ebab0f1..d461227 100755
--- a/ci/images/google-geode-builder/scripts/setup.sh
+++ b/ci/images/google-geode-builder/scripts/setup.sh
@@ -58,8 +58,6 @@ 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
diff --git a/ci/images/google-windows-geode-builder/packer.json
b/ci/images/google-windows-geode-builder/packer.json
index 6523b71..908168d 100644
--- a/ci/images/google-windows-geode-builder/packer.json
+++ b/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",
diff --git a/ci/images/test-container/Dockerfile
b/ci/images/test-container/Dockerfile
index f7cf4f5..edc22d7 100644
--- a/ci/images/test-container/Dockerfile
+++ b/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 \
diff --git a/ci/scripts/execute_build.sh b/ci/scripts/execute_build.sh
index 99d6d27..1459c5d 100755
--- a/ci/scripts/execute_build.sh
+++ b/ci/scripts/execute_build.sh
@@ -82,7 +82,6 @@ else
DUNIT_PARALLEL_FORKS=""
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
diff --git a/ci/scripts/execute_build_examples.sh
b/ci/scripts/execute_build_examples.sh
index b09f8e0..e490c5e 100755
--- a/ci/scripts/execute_build_examples.sh
+++ b/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 \
diff --git a/ci/scripts/execute_publish.sh b/ci/scripts/execute_publish.sh
index 5e49cb0..84ab06a 100755
--- a/ci/scripts/execute_publish.sh
+++ b/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 \
diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh
index 29bf1f8..b95ee05 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -73,8 +73,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="&&"
diff --git a/ci/scripts/rsync_code_down.sh b/ci/scripts/rsync_code_down.sh
index bcb93be..9321d00 100755
--- a/ci/scripts/rsync_code_down.sh
+++ b/ci/scripts/rsync_code_down.sh
@@ -44,7 +44,6 @@ case $ARTIFACT_SLUG in
EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH}; cd geode; cp
-r ../.gradle .gradle_logs; ./gradlew --no-daemon combineReports'"
;;
*)
- # JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
JAVA_BUILD_PATH=/usr/lib/jvm/bellsoft-java${JAVA_BUILD_VERSION}-amd64
EXEC_COMMAND="bash -c 'export JAVA_HOME=${JAVA_BUILD_PATH} && cd geode &&
./gradlew --no-daemon combineReports && mv ../.gradle .gradle_logs'"
;;
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 139fd5c..f09428d 100644
--- a/docker/Dockerfile
+++ b/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
diff --git a/geode-assembly/Dockerfile b/geode-assembly/Dockerfile
index 29e96a7..c94eadb 100644
--- a/geode-assembly/Dockerfile
+++ b/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"
