Date: Wed, 24 Nov 2021 06:51:13 GMT From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 72f430924b58 - main - java/javavmwrapper: Add support for 17 as a version Message-ID: <202111240651.1AO6pDDk046374@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=72f430924b584d85a23ddcccba76620845ef9835 commit 72f430924b584d85a23ddcccba76620845ef9835 Author: Greg Lewis <glewis@FreeBSD.org> AuthorDate: 2021-11-24 06:48:02 +0000 Commit: Greg Lewis <glewis@FreeBSD.org> CommitDate: 2021-11-24 06:48:02 +0000 java/javavmwrapper: Add support for 17 as a version --- java/javavmwrapper/Makefile | 2 +- java/javavmwrapper/src/javavm.1 | 4 +++- java/javavmwrapper/src/javavmwrapper.sh | 23 +++++++++++++---------- java/javavmwrapper/src/manvm.1 | 6 +++++- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index abe40ee6b43a..7e2a58459e0d 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -1,7 +1,7 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> PORTNAME= javavmwrapper -PORTVERSION= 2.7.7 +PORTVERSION= 2.7.8 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111240651.1AO6pDDk046374>