git: 42d0730fd9a8 - main - java/javavmwrapper: Add support for 18 as a version
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 16 Apr 2022 14:52:33 UTC
The branch main has been updated by glewis:
URL: https://cgit.FreeBSD.org/ports/commit/?id=42d0730fd9a85b44fe1d8b82461ab46207b89334
commit 42d0730fd9a85b44fe1d8b82461ab46207b89334
Author: Greg Lewis <glewis@FreeBSD.org>
AuthorDate: 2022-04-16 14:47:18 +0000
Commit: Greg Lewis <glewis@FreeBSD.org>
CommitDate: 2022-04-16 14:52:19 +0000
java/javavmwrapper: Add support for 18 as a version
---
java/javavmwrapper/Makefile | 2 +-
java/javavmwrapper/src/javavm.1 | 4 +++-
java/javavmwrapper/src/javavmwrapper.sh | 25 ++++++++++++++-----------
java/javavmwrapper/src/manvm.1 | 4 +++-
4 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index 7e2a58459e0d..3e6c7fb61fc0 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.8
+PORTVERSION= 2.7.9
CATEGORIES= java
MASTER_SITES= # none
DISTFILES= # none
diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1
index 41a975b8d94f..fe5552ccf379 100644
--- a/java/javavmwrapper/src/javavm.1
+++ b/java/javavmwrapper/src/javavm.1
@@ -137,8 +137,10 @@ Currently allowed versions are
.Ql 16 ,
.Ql 16+ ,
.Ql 17 ,
+.Ql 17+ ,
+.Ql 18 ,
and
-.Ql 17+ .
+.Ql 18+ .
.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 685fd04e07f7..573e6a5243af 100644
--- a/java/javavmwrapper/src/javavmwrapper.sh
+++ b/java/javavmwrapper/src/javavmwrapper.sh
@@ -504,37 +504,40 @@ 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 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12 13 14 15 16 17 18"
;;
*8+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13 14 15 16 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13 14 15 16 17 18"
;;
*9+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13 14 15 16 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13 14 15 16 17 18"
;;
10+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13 14 15 16 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13 14 15 16 17 18"
;;
11+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13 14 15 16 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13 14 15 16 17 18"
;;
12+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13 14 15 16 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13 14 15 16 17 18"
;;
13+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 13 14 15 16 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 13 14 15 16 17 18"
;;
14+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 14 15 16 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 14 15 16 17 18"
;;
15+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 15 16 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 15 16 17 18"
;;
16+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 16 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 16 17 18"
;;
17+)
- _JAVAVM_VERSION="${_JAVAVM_VERSION} 17"
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 17 18"
+ ;;
+ 18+)
+ _JAVAVM_VERSION="${_JAVAVM_VERSION} 18"
;;
1.7)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 7"
diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1
index 93fe6f01faf4..a76e9f46e23d 100644
--- a/java/javavmwrapper/src/manvm.1
+++ b/java/javavmwrapper/src/manvm.1
@@ -125,8 +125,10 @@ Currently allowed versions are
.Ql 16 ,
.Ql 16+ ,
.Ql 17 ,
+.Ql 17+ ,
+.Ql 18 ,
and
-.Ql 17+ .
+.Ql 18+ .
.It Ev JAVAVM_OPTS
The contents of this environment variable will be passed to the invoked
.Nm man