diff --git a/lib/ulib/java b/lib/ulib/java index 89df1b6..8213d01 100644 --- a/lib/ulib/java +++ b/lib/ulib/java @@ -500,37 +500,37 @@ function select_java() { case "$1" in 1.3|1.3+) - for v in 1_3 1_4 5 6 7 8 11; do + for v in 1_3 1_4 5 6 7 8; do __java_select "$v" "$2" && return 0 done ;; 1.4|1.4+) - for v in 1_4 5 6 7 8 11; do + for v in 1_4 5 6 7 8; do __java_select "$v" "$2" && return 0 done ;; 1.5|1.5+|5|5+) - for v in 5 6 7 8 11; do + for v in 5 6 7 8; do __java_select "$v" "$2" && return 0 done ;; 1.6|1.6+|6|6+) - for v in 6 7 8 11; do + for v in 6 7 8; do __java_select "$v" "$2" && return 0 done ;; 1.7|1.7+|7|7+) - for v in 7 8 11; do + for v in 7 8; do __java_select "$v" "$2" && return 0 done ;; 1.8|1.8+|8|8+) - for v in 8 11; do + for v in 8; do __java_select "$v" "$2" && return 0 done ;; 11|11+) - for v in 11; do + for v in 11 17; do __java_select "$v" "$2" && return 0 done ;; @@ -556,7 +556,7 @@ function select_java_exact() { __java_select 1_3 && return 0 ;; 1.3+) - for v in 1_3 1_4 5 6 7 8 11; do + for v in 1_3 1_4 5 6 7 8; do __java_select "$v" "$2" && return 0 done ;; @@ -564,7 +564,7 @@ function select_java_exact() { __java_select 1_4 && return 0 ;; 1.4+) - for v in 1_4 5 6 7 8 11; do + for v in 1_4 5 6 7 8; do __java_select "$v" "$2" && return 0 done ;; @@ -572,7 +572,7 @@ function select_java_exact() { __java_select 5 "$2" && return 0 ;; 1.5+|5+) - for v in 5 6 7 8 11; do + for v in 5 6 7 8; do __java_select "$v" "$2" && return 0 done ;; @@ -580,7 +580,7 @@ function select_java_exact() { __java_select 6 "$2" && return 0 ;; 1.6+|6+) - for v in 6 7 8 11; do + for v in 6 7 8; do __java_select "$v" "$2" && return 0 done ;; @@ -588,7 +588,7 @@ function select_java_exact() { __java_select 7 "$2" && return 0 ;; 1.7+|7+) - for v in 7 8 11; do + for v in 7 8; do __java_select "$v" "$2" && return 0 done ;; @@ -596,7 +596,7 @@ function select_java_exact() { __java_select 8 "$2" && return 0 ;; 1.8+|8+) - for v in 8 11; do + for v in 8; do __java_select "$v" "$2" && return 0 done ;; @@ -604,7 +604,7 @@ function select_java_exact() { __java_select 11 "$2" && return 0 ;; 11+) - for v in 11; do + for v in 11 17; do __java_select "$v" "$2" && return 0 done ;;