Releasing Neo4j 5.21.0

[jennyowen]

Thank you!

[github-actions]

Diff for 2218926:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0e15e0b..2bdf463 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -11,32 +11,22 @@ Architectures: amd64, arm64v8
 GitCommit: d8543a8aec237f8d127f233c74f09cf3c76f9051
 Directory: 4.4.34/bullseye/enterprise
 
-Tags: 5.20.0-community-bullseye, 5.20-community-bullseye, 5-community-bullseye, 5.20.0-community, 5.20-community, 5-community, 5.20.0-bullseye, 5.20-bullseye, 5-bullseye, 5.20.0, 5.20, 5, community-bullseye, community, bullseye, latest
+Tags: 5.21.0-community-bullseye, 5.21-community-bullseye, 5-community-bullseye, 5.21.0-community, 5.21-community, 5-community, 5.21.0-bullseye, 5.21-bullseye, 5-bullseye, 5.21.0, 5.21, 5, community-bullseye, community, bullseye, latest
 Architectures: amd64, arm64v8
-GitCommit: e3875367d27866ea446b1e0a1f069c5275095bcc
-Directory: 5.20.0/bullseye/community
+GitCommit: b1989e4b7222c257c56a1fc432b8bad090c159b8
+Directory: 5.21.0/bullseye/community
 
-Tags: 5.20.0-community-ubi8, 5.20-community-ubi8, 5-community-ubi8, 5.20.0-ubi8, 5.20-ubi8, 5-ubi8, community-ubi8, ubi8
+Tags: 5.21.0-community-ubi9, 5.21-community-ubi9, 5-community-ubi9, 5.21.0-ubi9, 5.21-ubi9, 5-ubi9, community-ubi9, ubi9
 Architectures: amd64, arm64v8
-GitCommit: e3875367d27866ea446b1e0a1f069c5275095bcc
-Directory: 5.20.0/ubi8/community
+GitCommit: b1989e4b7222c257c56a1fc432b8bad090c159b8
+Directory: 5.21.0/ubi9/community
 
-Tags: 5.20.0-community-ubi9, 5.20-community-ubi9, 5-community-ubi9, 5.20.0-ubi9, 5.20-ubi9, 5-ubi9, community-ubi9, ubi9
+Tags: 5.21.0-enterprise-bullseye, 5.21-enterprise-bullseye, 5-enterprise-bullseye, 5.21.0-enterprise, 5.21-enterprise, 5-enterprise, enterprise-bullseye, enterprise
 Architectures: amd64, arm64v8
-GitCommit: e3875367d27866ea446b1e0a1f069c5275095bcc
-Directory: 5.20.0/ubi9/community
+GitCommit: b1989e4b7222c257c56a1fc432b8bad090c159b8
+Directory: 5.21.0/bullseye/enterprise
 
-Tags: 5.20.0-enterprise-bullseye, 5.20-enterprise-bullseye, 5-enterprise-bullseye, 5.20.0-enterprise, 5.20-enterprise, 5-enterprise, enterprise-bullseye, enterprise
+Tags: 5.21.0-enterprise-ubi9, 5.21-enterprise-ubi9, 5-enterprise-ubi9, enterprise-ubi9
 Architectures: amd64, arm64v8
-GitCommit: e3875367d27866ea446b1e0a1f069c5275095bcc
-Directory: 5.20.0/bullseye/enterprise
-
-Tags: 5.20.0-enterprise-ubi8, 5.20-enterprise-ubi8, 5-enterprise-ubi8, enterprise-ubi8
-Architectures: amd64, arm64v8
-GitCommit: e3875367d27866ea446b1e0a1f069c5275095bcc
-Directory: 5.20.0/ubi8/enterprise
-
-Tags: 5.20.0-enterprise-ubi9, 5.20-enterprise-ubi9, 5-enterprise-ubi9, enterprise-ubi9
-Architectures: amd64, arm64v8
-GitCommit: e3875367d27866ea446b1e0a1f069c5275095bcc
-Directory: 5.20.0/ubi9/enterprise
+GitCommit: b1989e4b7222c257c56a1fc432b8bad090c159b8
+Directory: 5.21.0/ubi9/enterprise
diff --git a/_bashbrew-list b/_bashbrew-list
index c31b867..64fa8ad 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,47 +8,35 @@ neo4j:5
 neo4j:5-bullseye
 neo4j:5-community
 neo4j:5-community-bullseye
-neo4j:5-community-ubi8
 neo4j:5-community-ubi9
 neo4j:5-enterprise
 neo4j:5-enterprise-bullseye
-neo4j:5-enterprise-ubi8
 neo4j:5-enterprise-ubi9
-neo4j:5-ubi8
 neo4j:5-ubi9
-neo4j:5.20
-neo4j:5.20-bullseye
-neo4j:5.20-community
-neo4j:5.20-community-bullseye
-neo4j:5.20-community-ubi8
-neo4j:5.20-community-ubi9
-neo4j:5.20-enterprise
-neo4j:5.20-enterprise-bullseye
-neo4j:5.20-enterprise-ubi8
-neo4j:5.20-enterprise-ubi9
-neo4j:5.20-ubi8
-neo4j:5.20-ubi9
-neo4j:5.20.0
-neo4j:5.20.0-bullseye
-neo4j:5.20.0-community
-neo4j:5.20.0-community-bullseye
-neo4j:5.20.0-community-ubi8
-neo4j:5.20.0-community-ubi9
-neo4j:5.20.0-enterprise
-neo4j:5.20.0-enterprise-bullseye
-neo4j:5.20.0-enterprise-ubi8
-neo4j:5.20.0-enterprise-ubi9
-neo4j:5.20.0-ubi8
-neo4j:5.20.0-ubi9
+neo4j:5.21
+neo4j:5.21-bullseye
+neo4j:5.21-community
+neo4j:5.21-community-bullseye
+neo4j:5.21-community-ubi9
+neo4j:5.21-enterprise
+neo4j:5.21-enterprise-bullseye
+neo4j:5.21-enterprise-ubi9
+neo4j:5.21-ubi9
+neo4j:5.21.0
+neo4j:5.21.0-bullseye
+neo4j:5.21.0-community
+neo4j:5.21.0-community-bullseye
+neo4j:5.21.0-community-ubi9
+neo4j:5.21.0-enterprise
+neo4j:5.21.0-enterprise-bullseye
+neo4j:5.21.0-enterprise-ubi9
+neo4j:5.21.0-ubi9
 neo4j:bullseye
 neo4j:community
 neo4j:community-bullseye
-neo4j:community-ubi8
 neo4j:community-ubi9
 neo4j:enterprise
 neo4j:enterprise-bullseye
-neo4j:enterprise-ubi8
 neo4j:enterprise-ubi9
 neo4j:latest
-neo4j:ubi8
 neo4j:ubi9
diff --git a/neo4j_enterprise-ubi8/Dockerfile b/neo4j_enterprise-ubi8/Dockerfile
deleted file mode 100644
index ab66153..0000000
diff --git a/neo4j_enterprise-ubi8/local-package/docker-entrypoint.sh b/neo4j_enterprise-ubi8/local-package/docker-entrypoint.sh
deleted file mode 100755
index ae3bd7d..0000000
diff --git a/neo4j_enterprise-ubi8/local-package/neo4j-admin-report.sh b/neo4j_enterprise-ubi8/local-package/neo4j-admin-report.sh
deleted file mode 100755
index 5d43399..0000000
diff --git a/neo4j_enterprise-ubi8/local-package/neo4j-plugins.json b/neo4j_enterprise-ubi8/local-package/neo4j-plugins.json
deleted file mode 100644
index 32c2701..0000000
diff --git a/neo4j_enterprise-ubi8/local-package/semver.jq b/neo4j_enterprise-ubi8/local-package/semver.jq
deleted file mode 100755
index 2d8c144..0000000
diff --git a/neo4j_enterprise-ubi8/local-package/utilities.sh b/neo4j_enterprise-ubi8/local-package/utilities.sh
deleted file mode 100644
index 4943afe..0000000
diff --git a/neo4j_enterprise-ubi9/Dockerfile b/neo4j_enterprise-ubi9/Dockerfile
index 281800f..688d08f 100644
--- a/neo4j_enterprise-ubi9/Dockerfile
+++ b/neo4j_enterprise-ubi9/Dockerfile
@@ -2,7 +2,7 @@ FROM redhat/ubi9-minimal:latest
 
 # gather pre-requisite packages
 RUN set -eux; \
-    arch="$(uname -m)"; \
+    arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \
     case "${arch}" in \
         'x86_64') \
             tini_url="https://github.com/krallin/tini/releases/download/v0.19.0/tini"; \
@@ -50,11 +50,11 @@ RUN set -eux; \
     microdnf remove -y git* perl* make gcc glibc-headers glibc-devel libxcrypt-devel; \
     microdnf clean all
 
-ENV NEO4J_SHA256=ba4c6236f822138f9e9034bbf50bfca98d3bf794add0731aa49841127c7aea1e \
-    NEO4J_TARBALL=neo4j-enterprise-5.20.0-unix.tar.gz \
+ENV NEO4J_SHA256=d1761704ed2e7f01756219ea6f04fce729230ac12d8e30946b7692f49ddcdba8 \
+    NEO4J_TARBALL=neo4j-enterprise-5.21.0-unix.tar.gz \
     NEO4J_EDITION=enterprise \
     NEO4J_HOME="/var/lib/neo4j"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-5.20.0-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-5.21.0-unix.tar.gz
 
 COPY ./local-package/* /startup/
 
diff --git a/neo4j_enterprise-ubi9/local-package/docker-entrypoint.sh b/neo4j_enterprise-ubi9/local-package/docker-entrypoint.sh
index 7bd277b..d6a65f7 100755
--- a/neo4j_enterprise-ubi9/local-package/docker-entrypoint.sh
+++ b/neo4j_enterprise-ubi9/local-package/docker-entrypoint.sh
@@ -153,14 +153,21 @@ function load_plugin_from_url
 
     # Now we call out to github to get the versions.json for this plugin and we parse that to find the url for the correct plugin jar for our neo4j version
     echo "Fetching versions.json for Plugin '${_plugin_name}' from ${_versions_json_url}"
-    local _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"
+    local _versions_json
+    if ! _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"; then
+        debug_msg "ERROR: could not fetch '${_versions_json}'"
+        echo >&2 "ERROR: could not query ${_versions_json_url} for plugin compatibility information.
+    This could indicate a problem with your network or this container's network settings.
+    Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
+        return
+    fi
     local _plugin_jar_url="$(echo "${_versions_json}" | jq -L/startup --raw-output "import \"semver\" as lib; [ .[] | select(.neo4j|lib::semver(\"${_neo4j_version}\")) ] | min_by(.neo4j) | .jar")"
     if [[ -z "${_plugin_jar_url}" ]] || [[ "${_plugin_jar_url}" == "null" ]]; then
         debug_msg "ERROR: '${_versions_json_url}' does not contain an entry for ${_neo4j_version}"
-        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version} ${NEO4J_EDITION}."
-        echo >&2 "This can happen with the newest Neo4j versions when a compatible plugin has not yet been released."
-        echo >&2 "You can either use an older version of Neo4j, or continue without ${_plugin_name}."
-        echo >&2 "Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
+        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version} ${NEO4J_EDITION}.
+    This can happen with the newest Neo4j versions when a compatible plugin has not yet been released.
+    You can either use an older version of Neo4j, or continue without ${_plugin_name}.
+    Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
     else
         echo "Installing Plugin '${_plugin_name}' from ${_plugin_jar_url} to ${_destination} "
         wget -q --timeout 300 --tries 30 --output-document="${_destination}" "${_plugin_jar_url}"
@@ -338,7 +345,7 @@ If Neo4j fails to start, you can:
                 extra_args+=("--verbose")
             fi
             debug_msg "Setting initial password"
-            debug_msg "${neo4j_admin_cmd} dbms set-initial-password ${password} ${extra_args[*]}"
+            debug_msg "${neo4j_admin_cmd} dbms set-initial-password ***** ${extra_args[*]}"
             ${neo4j_admin_cmd} dbms set-initial-password "${password}" "${extra_args[@]}"
 
         elif [ -n "${_neo4j_auth:-}" ]; then
diff --git a/neo4j_enterprise/Dockerfile b/neo4j_enterprise/Dockerfile
index 8c424e8..e90d940 100644
--- a/neo4j_enterprise/Dockerfile
+++ b/neo4j_enterprise/Dockerfile
@@ -2,11 +2,11 @@ FROM debian:bullseye-slim
 ENV JAVA_HOME=/opt/java/openjdk
 COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}" \
-    NEO4J_SHA256=ba4c6236f822138f9e9034bbf50bfca98d3bf794add0731aa49841127c7aea1e \
-    NEO4J_TARBALL=neo4j-enterprise-5.20.0-unix.tar.gz \
+    NEO4J_SHA256=d1761704ed2e7f01756219ea6f04fce729230ac12d8e30946b7692f49ddcdba8 \
+    NEO4J_TARBALL=neo4j-enterprise-5.21.0-unix.tar.gz \
     NEO4J_EDITION=enterprise \
     NEO4J_HOME="/var/lib/neo4j"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-5.20.0-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-5.21.0-unix.tar.gz
 
 RUN addgroup --gid 7474 --system neo4j && adduser --uid 7474 --system --no-create-home --home "${NEO4J_HOME}" --ingroup neo4j neo4j
 
diff --git a/neo4j_enterprise/local-package/docker-entrypoint.sh b/neo4j_enterprise/local-package/docker-entrypoint.sh
index 7bd277b..d6a65f7 100755
--- a/neo4j_enterprise/local-package/docker-entrypoint.sh
+++ b/neo4j_enterprise/local-package/docker-entrypoint.sh
@@ -153,14 +153,21 @@ function load_plugin_from_url
 
     # Now we call out to github to get the versions.json for this plugin and we parse that to find the url for the correct plugin jar for our neo4j version
     echo "Fetching versions.json for Plugin '${_plugin_name}' from ${_versions_json_url}"
-    local _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"
+    local _versions_json
+    if ! _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"; then
+        debug_msg "ERROR: could not fetch '${_versions_json}'"
+        echo >&2 "ERROR: could not query ${_versions_json_url} for plugin compatibility information.
+    This could indicate a problem with your network or this container's network settings.
+    Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
+        return
+    fi
     local _plugin_jar_url="$(echo "${_versions_json}" | jq -L/startup --raw-output "import \"semver\" as lib; [ .[] | select(.neo4j|lib::semver(\"${_neo4j_version}\")) ] | min_by(.neo4j) | .jar")"
     if [[ -z "${_plugin_jar_url}" ]] || [[ "${_plugin_jar_url}" == "null" ]]; then
         debug_msg "ERROR: '${_versions_json_url}' does not contain an entry for ${_neo4j_version}"
-        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version} ${NEO4J_EDITION}."
-        echo >&2 "This can happen with the newest Neo4j versions when a compatible plugin has not yet been released."
-        echo >&2 "You can either use an older version of Neo4j, or continue without ${_plugin_name}."
-        echo >&2 "Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
+        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version} ${NEO4J_EDITION}.
+    This can happen with the newest Neo4j versions when a compatible plugin has not yet been released.
+    You can either use an older version of Neo4j, or continue without ${_plugin_name}.
+    Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
     else
         echo "Installing Plugin '${_plugin_name}' from ${_plugin_jar_url} to ${_destination} "
         wget -q --timeout 300 --tries 30 --output-document="${_destination}" "${_plugin_jar_url}"
@@ -338,7 +345,7 @@ If Neo4j fails to start, you can:
                 extra_args+=("--verbose")
             fi
             debug_msg "Setting initial password"
-            debug_msg "${neo4j_admin_cmd} dbms set-initial-password ${password} ${extra_args[*]}"
+            debug_msg "${neo4j_admin_cmd} dbms set-initial-password ***** ${extra_args[*]}"
             ${neo4j_admin_cmd} dbms set-initial-password "${password}" "${extra_args[@]}"
 
         elif [ -n "${_neo4j_auth:-}" ]; then
diff --git a/neo4j_latest/Dockerfile b/neo4j_latest/Dockerfile
index b856486..085d0ee 100644
--- a/neo4j_latest/Dockerfile
+++ b/neo4j_latest/Dockerfile
@@ -2,11 +2,11 @@ FROM debian:bullseye-slim
 ENV JAVA_HOME=/opt/java/openjdk
 COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}" \
-    NEO4J_SHA256=203215748402702871e511c6dfff3c62f72587c4e80df703bf854085c436d066 \
-    NEO4J_TARBALL=neo4j-community-5.20.0-unix.tar.gz \
+    NEO4J_SHA256=3451a852a986f1502b42ac74a7ca83520bdbb519d86e4d4c60f490e425057b18 \
+    NEO4J_TARBALL=neo4j-community-5.21.0-unix.tar.gz \
     NEO4J_EDITION=community \
     NEO4J_HOME="/var/lib/neo4j"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-5.20.0-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-5.21.0-unix.tar.gz
 
 RUN addgroup --gid 7474 --system neo4j && adduser --uid 7474 --system --no-create-home --home "${NEO4J_HOME}" --ingroup neo4j neo4j
 
diff --git a/neo4j_latest/local-package/docker-entrypoint.sh b/neo4j_latest/local-package/docker-entrypoint.sh
index 7bd277b..d6a65f7 100755
--- a/neo4j_latest/local-package/docker-entrypoint.sh
+++ b/neo4j_latest/local-package/docker-entrypoint.sh
@@ -153,14 +153,21 @@ function load_plugin_from_url
 
     # Now we call out to github to get the versions.json for this plugin and we parse that to find the url for the correct plugin jar for our neo4j version
     echo "Fetching versions.json for Plugin '${_plugin_name}' from ${_versions_json_url}"
-    local _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"
+    local _versions_json
+    if ! _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"; then
+        debug_msg "ERROR: could not fetch '${_versions_json}'"
+        echo >&2 "ERROR: could not query ${_versions_json_url} for plugin compatibility information.
+    This could indicate a problem with your network or this container's network settings.
+    Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
+        return
+    fi
     local _plugin_jar_url="$(echo "${_versions_json}" | jq -L/startup --raw-output "import \"semver\" as lib; [ .[] | select(.neo4j|lib::semver(\"${_neo4j_version}\")) ] | min_by(.neo4j) | .jar")"
     if [[ -z "${_plugin_jar_url}" ]] || [[ "${_plugin_jar_url}" == "null" ]]; then
         debug_msg "ERROR: '${_versions_json_url}' does not contain an entry for ${_neo4j_version}"
-        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version} ${NEO4J_EDITION}."
-        echo >&2 "This can happen with the newest Neo4j versions when a compatible plugin has not yet been released."
-        echo >&2 "You can either use an older version of Neo4j, or continue without ${_plugin_name}."
-        echo >&2 "Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
+        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version} ${NEO4J_EDITION}.
+    This can happen with the newest Neo4j versions when a compatible plugin has not yet been released.
+    You can either use an older version of Neo4j, or continue without ${_plugin_name}.
+    Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
     else
         echo "Installing Plugin '${_plugin_name}' from ${_plugin_jar_url} to ${_destination} "
         wget -q --timeout 300 --tries 30 --output-document="${_destination}" "${_plugin_jar_url}"
@@ -338,7 +345,7 @@ If Neo4j fails to start, you can:
                 extra_args+=("--verbose")
             fi
             debug_msg "Setting initial password"
-            debug_msg "${neo4j_admin_cmd} dbms set-initial-password ${password} ${extra_args[*]}"
+            debug_msg "${neo4j_admin_cmd} dbms set-initial-password ***** ${extra_args[*]}"
             ${neo4j_admin_cmd} dbms set-initial-password "${password}" "${extra_args[@]}"
 
         elif [ -n "${_neo4j_auth:-}" ]; then
diff --git a/neo4j_ubi8/Dockerfile b/neo4j_ubi8/Dockerfile
deleted file mode 100644
index ab29da7..0000000
diff --git a/neo4j_ubi8/local-package/docker-entrypoint.sh b/neo4j_ubi8/local-package/docker-entrypoint.sh
deleted file mode 100755
index ae3bd7d..0000000
diff --git a/neo4j_ubi8/local-package/neo4j-admin-report.sh b/neo4j_ubi8/local-package/neo4j-admin-report.sh
deleted file mode 100755
index 5d43399..0000000
diff --git a/neo4j_ubi8/local-package/neo4j-plugins.json b/neo4j_ubi8/local-package/neo4j-plugins.json
deleted file mode 100644
index 32c2701..0000000
diff --git a/neo4j_ubi8/local-package/semver.jq b/neo4j_ubi8/local-package/semver.jq
deleted file mode 100755
index 2d8c144..0000000
diff --git a/neo4j_ubi8/local-package/utilities.sh b/neo4j_ubi8/local-package/utilities.sh
deleted file mode 100644
index 4943afe..0000000
diff --git a/neo4j_ubi9/Dockerfile b/neo4j_ubi9/Dockerfile
index d8f80f2..afea5d5 100644
--- a/neo4j_ubi9/Dockerfile
+++ b/neo4j_ubi9/Dockerfile
@@ -2,7 +2,7 @@ FROM redhat/ubi9-minimal:latest
 
 # gather pre-requisite packages
 RUN set -eux; \
-    arch="$(uname -m)"; \
+    arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \
     case "${arch}" in \
         'x86_64') \
             tini_url="https://github.com/krallin/tini/releases/download/v0.19.0/tini"; \
@@ -50,11 +50,11 @@ RUN set -eux; \
     microdnf remove -y git* perl* make gcc glibc-headers glibc-devel libxcrypt-devel; \
     microdnf clean all
 
-ENV NEO4J_SHA256=203215748402702871e511c6dfff3c62f72587c4e80df703bf854085c436d066 \
-    NEO4J_TARBALL=neo4j-community-5.20.0-unix.tar.gz \
+ENV NEO4J_SHA256=3451a852a986f1502b42ac74a7ca83520bdbb519d86e4d4c60f490e425057b18 \
+    NEO4J_TARBALL=neo4j-community-5.21.0-unix.tar.gz \
     NEO4J_EDITION=community \
     NEO4J_HOME="/var/lib/neo4j"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-5.20.0-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-5.21.0-unix.tar.gz
 
 COPY ./local-package/* /startup/
 
diff --git a/neo4j_ubi9/local-package/docker-entrypoint.sh b/neo4j_ubi9/local-package/docker-entrypoint.sh
index 7bd277b..d6a65f7 100755
--- a/neo4j_ubi9/local-package/docker-entrypoint.sh
+++ b/neo4j_ubi9/local-package/docker-entrypoint.sh
@@ -153,14 +153,21 @@ function load_plugin_from_url
 
     # Now we call out to github to get the versions.json for this plugin and we parse that to find the url for the correct plugin jar for our neo4j version
     echo "Fetching versions.json for Plugin '${_plugin_name}' from ${_versions_json_url}"
-    local _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"
+    local _versions_json
+    if ! _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"; then
+        debug_msg "ERROR: could not fetch '${_versions_json}'"
+        echo >&2 "ERROR: could not query ${_versions_json_url} for plugin compatibility information.
+    This could indicate a problem with your network or this container's network settings.
+    Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
+        return
+    fi
     local _plugin_jar_url="$(echo "${_versions_json}" | jq -L/startup --raw-output "import \"semver\" as lib; [ .[] | select(.neo4j|lib::semver(\"${_neo4j_version}\")) ] | min_by(.neo4j) | .jar")"
     if [[ -z "${_plugin_jar_url}" ]] || [[ "${_plugin_jar_url}" == "null" ]]; then
         debug_msg "ERROR: '${_versions_json_url}' does not contain an entry for ${_neo4j_version}"
-        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version} ${NEO4J_EDITION}."
-        echo >&2 "This can happen with the newest Neo4j versions when a compatible plugin has not yet been released."
-        echo >&2 "You can either use an older version of Neo4j, or continue without ${_plugin_name}."
-        echo >&2 "Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
+        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version} ${NEO4J_EDITION}.
+    This can happen with the newest Neo4j versions when a compatible plugin has not yet been released.
+    You can either use an older version of Neo4j, or continue without ${_plugin_name}.
+    Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
     else
         echo "Installing Plugin '${_plugin_name}' from ${_plugin_jar_url} to ${_destination} "
         wget -q --timeout 300 --tries 30 --output-document="${_destination}" "${_plugin_jar_url}"
@@ -338,7 +345,7 @@ If Neo4j fails to start, you can:
                 extra_args+=("--verbose")
             fi
             debug_msg "Setting initial password"
-            debug_msg "${neo4j_admin_cmd} dbms set-initial-password ${password} ${extra_args[*]}"
+            debug_msg "${neo4j_admin_cmd} dbms set-initial-password ***** ${extra_args[*]}"
             ${neo4j_admin_cmd} dbms set-initial-password "${password}" "${extra_args[@]}"
 
         elif [ -n "${_neo4j_auth:-}" ]; then

Relevant Maintainers:

• neo4j: @jennyowen @glindroth @ericsporre