From nobody Wed Nov 24 06:51:13 2021 X-Original-To: dev-commits-ports-main@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 51DE118893BA; Wed, 24 Nov 2021 06:51:14 +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 4HzWr14xCjz4qfh; Wed, 24 Nov 2021 06:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 55BF925551; Wed, 24 Nov 2021 06:51:13 +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 1AO6pDTc046375; Wed, 24 Nov 2021 06:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AO6pDDk046374; Wed, 24 Nov 2021 06:51:13 GMT (envelope-from git) Date: Wed, 24 Nov 2021 06:51:13 GMT Message-Id: <202111240651.1AO6pDDk046374@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: 72f430924b58 - main - java/javavmwrapper: Add support for 17 as a version List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 72f430924b584d85a23ddcccba76620845ef9835 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637736673; 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=pmYSmjbcXFGAlnrFIaf9L4/NczNZwNvC+MjKR4L9ofM=; b=rWNL6fiN4VvpKnToD+z3TitYJlvS6iMfT9Me14F1q56BtqAAsvGmG2hb8unljCYzYw7UNb BeJn9wYFXa1vMfQUOEjEZZ5Bc6MW3C8k23ktbj5eiOlSZc0ptPa//BJrzNgbEbj6M+ltI2 XSKhJmhwybOL70sX4nqe4cfmEZIPBHPT4mOz34+AT6weRR66SlICrIYQ2eoJqeAvIry/8G FZfOwc22fxCx3ihVlc4eycps9DBD/oBE4R9xHqeP5rligDjJNapOhhEPPskpoWu2PcTu1n fisaZ8zvEACjKyqoJ9t1q2kQpaFKYJ2tSuegAPuCMZ7ZpwJplmZ9qWdmWorj+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637736673; a=rsa-sha256; cv=none; b=wShVHWV3YWOtgXAmUcn9/Sr0ihoUB63UXM2mUL4E51JIWGQ+ActPqpy0uGt8pjRNjm4c06 8XDijAHiHOfS1eVUUE82jrgmnFhKfo5B4LFawlezQBYdYkQm3yPrbhQWHv8amTk0wVKUvi 9U18E0XyFAU0+4ZFhPicgKiPV/2tT457XWHOvRzX3j/eUZqe94TtHFmy6S/CyNH3X0itbw lEh2aqfzqO7KfhzcQLMrheLRxsvdoRFpsaXiIobhE2HFa4UpBayvbxQOuPX4s6oPOYcOIi sWmEGU2yNsyUpxU8mm7d6BvE3hcZaHBzB2y2CuJgdv4Ag+UtOHczxboYoF+xAg== 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=72f430924b584d85a23ddcccba76620845ef9835 commit 72f430924b584d85a23ddcccba76620845ef9835 Author: Greg Lewis AuthorDate: 2021-11-24 06:48:02 +0000 Commit: Greg Lewis 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 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