From nobody Tue May 03 01:22:38 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 B30B21AACF6D; Tue, 3 May 2022 01:22:38 +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 4Kshz24kVNz4SVt; Tue, 3 May 2022 01:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651540958; 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=U3n9ME2z1Nx+pg5qLU/Xrnm3Bv2m/cEXHA3fxPe+BI8=; b=FKo/bkfmNhIFMWFz9TB1EDZhDzECj5WGY0H9H42OkwMj1NiPKpK574hTYqJHHx2b+f9mpA Mqt4BOSgrwuOZFEXWiW/x0swOXQh1yShkH2Mkv6iZK6cUCSNmVHi+WyFdEsNPoXL61j4EB C6Qn/KISL8QqjqBIHEgIXnRh7nk6vhnDYtKzfFcWm7VT1OOeHhNLD+6JwAzF4/8qpw0olc IQPzwB28ABT3AkYrHQDMFMlCtMYWNYOBwmdUtVpU6bbaaT3tgl/9qR4I53fvJqU5aTvLEC 5e+uKj1AmK+vJIzCWMFGYtQeGytoDC6HZm7ay8fsApFyRjhRpVksR5X4rHW30g== 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 8344314CDB; Tue, 3 May 2022 01:22:38 +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 2431McEZ051018; Tue, 3 May 2022 01:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2431MckG051017; Tue, 3 May 2022 01:22:38 GMT (envelope-from git) Date: Tue, 3 May 2022 01:22:38 GMT Message-Id: <202205030122.2431MckG051017@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: 1309940fd048 - main - Mk/bsd.java.mk: Revert previous commit allowing 1.11 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: 1309940fd048982c2b472bfc287bcbc1ed83c574 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651540958; 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=U3n9ME2z1Nx+pg5qLU/Xrnm3Bv2m/cEXHA3fxPe+BI8=; b=ZsXJMPZRDDK3c2X0QEjM2RH1Rs3GvI4aNsKGbZHURKCIG3i6Xbi5X52BIPFfFZ0A0a6mvV TdMSp1M5tqyJCer7u4p/rMjkAByQeKOrsXkNm1h1EdDF6sdL0qH9MiPObqG4G+phMJ31NI 23qHWUjz4NW5sAHc1sv0QtBbhoE4FKGnKsPK/UFaMLriY1TcpuMS1L+dTyGyDONlrexLXf aPUrSmZtp8kJMxTRaOKd9RXAuiTKChDmFgQ/4MZp3NJgxAC17p83Einanm7ai/jusvRsvx BQm8EW1aT+gMSWS4yOKtjgTGPPETgt9LlI1Tdwgo8Rno2/t4+U76XdN+ipdo1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651540958; a=rsa-sha256; cv=none; b=nwEFNQKF9vRs/lTYPsdWTvhwFg8d+2HFFLOERO4egJunfhPBseKMkkGCr8Xk9pF8whBHF5 OfZ0bRV6ulaVxlG8iSRqOwue8+jUmPtGIIzTKu7eGjUrWHcBSkeCNuD5hLUfRwFl7VcQQB /cUTeIGs2K6cJJSSEvwcEJMjltwYLM/UTR3wZ7ExAYpv4kpnk1qh7dLAs7YmLtwU9kQMDy qHz4zWfY332UjJVcpan3dxWjOuq6HjZ4+riKk0llQqPPmdM2UnQ4E4VyrgnypbHPiHM585 zpRBXX8Cbt4nMbV4NC1qpw46YFdgrlhrktJMRgKP/3rAhcLIRZNqZJnVO68Qbg== 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=1309940fd048982c2b472bfc287bcbc1ed83c574 commit 1309940fd048982c2b472bfc287bcbc1ed83c574 Author: Greg Lewis AuthorDate: 2022-05-03 01:21:05 +0000 Commit: Greg Lewis CommitDate: 2022-05-03 01:21:05 +0000 Mk/bsd.java.mk: Revert previous commit allowing 1.11 as a version * 1.11 has never been a valid Java version. I've fixed the offeding port that used it rather than adding it here. --- Mk/bsd.java.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 454c759258d4..a88204514650 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -285,7 +285,7 @@ JAVA_RUN= jre . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^1.11+/11 12+/:S/^1.11/11/:S/^11+/11 12+/:S/^12+/12 13+/:S/^13+/13 14+/:S/^14+/14 15+/:S/^15+/15 16+/:S/^16+/16 17+/:S/^17+/17 18+/:S/^18+/18/} +_JAVA_VERSION= ${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^11+/11 12+/:S/^12+/12 13+/:S/^13+/13 14+/:S/^14+/14 15+/:S/^15+/15 16+/:S/^16+/16 17+/:S/^17+/17 18+/:S/^18+/18/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif