summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2020-01-16 14:43:34 -0600
committerjhh <jorge.hernandez-herrero@att.com>2020-01-16 14:43:34 -0600
commit34b4b5f4bc9b6a8ce4f8fc9dec217ad84f7892fb (patch)
treec75220c455197efb718771d5cefb64ae26bf7e08
parentabd70b47b97c4bcc6d22f84d4f47b16f313a7213 (diff)
Remove java 1.8 check
Issue-ID: POLICY-1586 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I19be48676da8bfd56122ea410539147f5a5f1746
-rw-r--r--packages/docker/src/main/docker/docker-install.sh46
1 files changed, 0 insertions, 46 deletions
diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh
index a44f91a6..824735ca 100644
--- a/packages/docker/src/main/docker/docker-install.sh
+++ b/packages/docker/src/main/docker/docker-install.sh
@@ -62,46 +62,6 @@ function POLICY_HOME() {
fi
}
-function check_java() {
- if [[ $DEBUG == y ]]; then
- echo "-- ${FUNCNAME[0]} $@ --"
- set -x
- fi
-
- local TARGET_JAVA_VERSION INSTALLED_JAVA_VERSION
-
- TARGET_JAVA_VERSION=$1
-
- if [[ -z ${JAVA_HOME} ]]; then
- echo "error: ${JAVA_HOME} is not set"
- return 1
- fi
-
- if ! check_x_file "${JAVA_HOME}/bin/java"; then
- echo "error: ${JAVA_HOME}/bin/java is not accessible"
- return 1
- fi
-
- INSTALLED_JAVA_VERSION=$("${JAVA_HOME}/bin/java" -version 2>&1 | awk -F '"' '/version/ {print $2}')
- if [[ -z $INSTALLED_JAVA_VERSION ]]; then
- echo "error: ${JAVA_HOME}/bin/java is invalid"
- return 1
- fi
-
- if [[ "${INSTALLED_JAVA_VERSION}" != ${TARGET_JAVA_VERSION}* ]]; then
- echo "error: java version (${INSTALLED_JAVA_VERSION}) does not"\
- "march desired version ${TARGET_JAVA_VERSION}"
- return 1
- fi
-
- echo "OK: java ${INSTALLED_JAVA_VERSION} installed"
-
- if ! type -p "${JAVA_HOME}/bin/keytool" > /dev/null 2>&1; then
- echo "error: {JAVA_HOME}/bin/keytool is not installed"
- return 1
- fi
-}
-
function process_configuration() {
if [[ $DEBUG == y ]]; then
echo "-- ${FUNCNAME[0]} $@ --"
@@ -290,12 +250,6 @@ function install_prereqs() {
exit 1
fi
- if ! check_java "1.8"; then
- echo "error: aborting ${COMPONENT_TYPE} installation: invalid java version"
- exit 1
- fi
-
-
if [[ -z ${POLICY_HOME} ]]; then
echo "error: aborting ${COMPONENT_TYPE} installation: ${POLICY_HOME} is not set"
exit 1