From nobody Sat Apr 16 14:52:33 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 028D95D55C6; Sat, 16 Apr 2022 14:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KgblP6DCSz3NpY; Sat, 16 Apr 2022 14:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650120753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Zw2KV8IOv9Uh/finJTJ6p8zDlV/fSXEVnHwMdTuNZs=; b=WqWRvRIifex8N0XtziY1eL5rz1ucNoW7hYQ0yCHebl9S1Mv34ccDAaT8DYzhmfLrVN7fFS hvHMkcQJ3cLnlBTiCfyzNNISkvNjr+/6UGv54LlaHy99qFCkqyPju8oLzmrrz5yKuzGLv0 csrUyJvYlSuVXtnthAKm5B/6sGg0UDdWEaya14hsdh7cCNfqlilyEqTfCc6PmH8Gf4g73j v+0cQZABVo/3VzzZw3OynBXhb9d+zVdh6CkKcq/LtCPn18G33ehpar07B+YPdryATz34xG bd4FOX8OyfkDMTql+AOrvbIHKWFmmWEHt4Md1DxxGvak08WSq0MsJ168+qTl6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5BA23F8A; Sat, 16 Apr 2022 14:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23GEqXgM058551; Sat, 16 Apr 2022 14:52:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23GEqXBb058550; Sat, 16 Apr 2022 14:52:33 GMT (envelope-from git) Date: Sat, 16 Apr 2022 14:52:33 GMT Message-Id: <202204161452.23GEqXBb058550@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: 42d0730fd9a8 - main - java/javavmwrapper: Add support for 18 as a version List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42d0730fd9a85b44fe1d8b82461ab46207b89334 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650120753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Zw2KV8IOv9Uh/finJTJ6p8zDlV/fSXEVnHwMdTuNZs=; b=PiEIu+ufetbr8zLPvEEK4TH5k4nQ3JWEObLxFWuSCyxRywya+8AT6za/LkgmQ2Y5MBEIJ7 dLcszTWshXrwNDRvmHPBgMeGAN220GZ4Nz4jGbS98D6pebyFiuzgtolJakadBAKgROE+w+ Q2VH0UHA86befyE1CGl5UcVky+S5dNwC3nxDf29hrZhP+xTuIuraTaGVkbjWczNwkgZP/g r+MyWaV14U1YL1M+e2tK/jBWyvplTsr9QUv5o2OfAdaApoIevg0GwYGB+zvgur4A0AD5EH IzQItZ7NLfIJJMosEaJDuvtoIwBFHm+QwmoL4sfvJ+364Nhm7NkzJAJro9QpVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650120753; a=rsa-sha256; cv=none; b=UbwlwboC9QJ5ThP3ICpxeZmNqU7Fqyky/HWA7qfKmBclJ6O1msnx8l/GSZvqW1mdsNIh/X o9TuJEQ1jeQdUsnnnGmafQlEKgGweewVwL6z6grUsp+3588Fo+VMOBVIEQsq9qaauFlQKu CwmaMhfj5v3XmLZgomDgovBB9GZBudR6XoE+lrv2m4DL9p63YVGndt0HCr4XFR5Qi3Q7gd SGsQ3RXdAsauIhchjdIfDKYgFfsdTz11r9Fwuvac0tFRjxN+yPHTvf1r3Ey/Yy6QvYHTNj 5Daal/kbVLK5+ELKRI8im5crhL8/8Q2CNJQEM89pTUm9xFPSCqvNaZIA/s50Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=42d0730fd9a85b44fe1d8b82461ab46207b89334 commit 42d0730fd9a85b44fe1d8b82461ab46207b89334 Author: Greg Lewis AuthorDate: 2022-04-16 14:47:18 +0000 Commit: Greg Lewis 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 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