aboutsummaryrefslogtreecommitdiff
path: root/java/javavmwrapper/src
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2021-11-24 06:48:02 +0000
committerGreg Lewis <glewis@FreeBSD.org>2021-11-24 06:48:02 +0000
commit72f430924b584d85a23ddcccba76620845ef9835 (patch)
tree9c5554a2e8c50d240341ddd4291a492e007ad17c /java/javavmwrapper/src
parentc6c4d2ead2fd5b460e0ab975c13e3479065b21f6 (diff)
Diffstat (limited to 'java/javavmwrapper/src')
-rw-r--r--java/javavmwrapper/src/javavm.14
-rw-r--r--java/javavmwrapper/src/javavmwrapper.sh23
-rw-r--r--java/javavmwrapper/src/manvm.16
3 files changed, 21 insertions, 12 deletions
diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1
index c613d0be99bf..41a975b8d94f 100644
--- a/java/javavmwrapper/src/javavm.1
+++ b/java/javavmwrapper/src/javavm.1
@@ -135,8 +135,10 @@ Currently allowed versions are
.Ql 15 ,
.Ql 15+ ,
.Ql 16 ,
+.Ql 16+ ,
+.Ql 17 ,
and
-.Ql 16+ .
+.Ql 17+ .
.It Ev JAVAVM_OPTS
The contents of this environment variable will be passed to the invoked
Java VM as options.
diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh
index 428fed83b582..685fd04e07f7 100644
--- a/java/javavmwrapper/src/javavmwrapper.sh
+++ b/java/javavmwrapper/src/javavmwrapper.sh
@@ -504,34 +504,37 @@ setJavaHome() {
for version in ${JAVA_VERSION}; do
case "${version}" in
*7+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12 13 14 15 16"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12 13 14 15 16 17"
;;
*8+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13 14 15 16"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13 14 15 16 17"
;;
*9+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13 14 15 16"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13 14 15 16 17"
;;
10+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13 14 15 16"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13 14 15 16 17"
;;
11+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13 14 15 16"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13 14 15 16 17"
;;
12+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13 14 15 16"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13 14 15 16 17"
;;
13+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 13 14 15 16"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 13 14 15 16 17"
;;
14+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 14 15 16"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 14 15 16 17"
;;
15+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 15 16"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 15 16 17"
;;
16+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 16"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 16 17"
+ ;;
+ 17+)
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 17"
;;
1.7)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 7"
diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1
index 37c9a84b0d93..93fe6f01faf4 100644
--- a/java/javavmwrapper/src/manvm.1
+++ b/java/javavmwrapper/src/manvm.1
@@ -121,8 +121,12 @@ Currently allowed versions are
.Ql 14 ,
.Ql 14+ ,
.Ql 15 ,
+.Ql 15+ ,
+.Ql 16 ,
+.Ql 16+ ,
+.Ql 17 ,
and
-.Ql 15+ .
+.Ql 17+ .
.It Ev JAVAVM_OPTS
The contents of this environment variable will be passed to the invoked
.Nm man