Skip to content

Commit

Permalink
Removed changes for IBM Java9, will add it back when there is a lates…
Browse files Browse the repository at this point in the history
…t IBM Java9 build available
  • Loading branch information
chandrams committed Sep 27, 2017
1 parent 7b2af64 commit ccd8738
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 24 deletions.
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -38,7 +38,6 @@ Supported aliases are:
* `openjdk7`
* `openjdk6` or `jdk6`
* `ibmjava8` or `ibmjdk8`
* `ibmjava9` or `ibmjdk9`

Sun JDK 6 will be EOL in November 2012 and is not supported. Ubuntu 12.04 and next Fedora release
both will use OpenJDK 7 by default. Time to upgrade, JDK 7 is backwards compatible and packed with
Expand Down
23 changes: 0 additions & 23 deletions jdk_switcher.sh
Expand Up @@ -58,13 +58,6 @@ if [[ -d "/usr/lib/jvm/java-8-ibm-${ARCH_SUFFIX}" ]]; then
IBMJAVA8_JAVA_HOME="/usr/lib/jvm/java-8-ibm-${ARCH_SUFFIX}"
fi

IBMJAVA9_UJA_ALIAS="java-9-ibm"
IBMJAVA9_JAVA_HOME="/usr/lib/jvm/java-9-ibm"
if [[ -d "/usr/lib/jvm/java-9-ibm-${ARCH_SUFFIX}" ]]; then
IBMJAVA9_UJA_ALIAS="java-9-ibm-${ARCH_SUFFIX}"
IBMJAVA9_JAVA_HOME="/usr/lib/jvm/java-9-ibm-${ARCH_SUFFIX}"
fi

for config_file in /etc/default/jdk-switcher "${HOME}/.jdk_switcherrc" "${JDK_SWITCHER_CONFIG}"; do
if [[ -f "${config_file}" ]]; then
# shellcheck source=/dev/null
Expand Down Expand Up @@ -114,12 +107,6 @@ switch_to_ibmjava8() {
export JAVA_HOME="$IBMJAVA8_JAVA_HOME"
}

switch_to_ibmjava9() {
echo "Switching to IBM JAVA9 ($IBMJAVA9_UJA_ALIAS), JAVA_HOME will be set to $IBMJAVA9_JAVA_HOME"
sudo "${UJA}" --set "$IBMJAVA9_UJA_ALIAS"
export JAVA_HOME="$IBMJAVA9_JAVA_HOME"
}

print_home_of_openjdk6() {
echo "$OPENJDK6_JAVA_HOME"
}
Expand Down Expand Up @@ -148,10 +135,6 @@ print_home_of_ibmjava8() {
echo "$IBMJAVA8_JAVA_HOME"
}

print_home_of_ibmjava9() {
echo "$IBMJAVA9_JAVA_HOME"
}

warn_sunjdk6_eol() {
echo "Sun/Oracle JDK 6 is EOL since November 2012, and is no longer supported. Please consider upgrading..." >&2
}
Expand Down Expand Up @@ -195,9 +178,6 @@ switch_jdk() {
ibmjava8 | ibmjava1.8 | ibmjava1.8.0 | ibmjdk8 | ibmjdk1.8 | ibmjdk1.8.0 | ibm8 | ibm1.8.0 | ibm8.0)
switch_to_ibmjava8
;;
ibmjava9 | ibmjava1.9 | ibmjava1.9.0 | ibmjdk9 | ibmjdk1.9 | ibmjdk1.9.0 | ibm9 | ibm1.9.0 | ibm9.0)
switch_to_ibmjava9
;;
default)
"switch_to_${JDK_SWITCHER_DEFAULT}"
;;
Expand Down Expand Up @@ -240,9 +220,6 @@ print_java_home() {
ibmjava8 | ibmjava1.8 | ibmjava1.8.0 | ibmjdk8 | ibmjdk1.8 | ibmjdk1.8.0 | ibm8 | ibm1.8.0 | ibm8.0)
print_home_of_ibmjava8
;;
ibmjava9 | ibmjava1.9 | ibmjava1.9.0 | ibmjdk9 | ibmjdk1.9 | ibmjdk1.9.0 | ibm9 | ibm1.9.0 | ibm9.0)
print_home_of_ibmjava9
;;
default)
"print_home_of_${JDK_SWITCHER_DEFAULT}"
;;
Expand Down

0 comments on commit ccd8738

Please sign in to comment.