From nobody Mon Oct 24 14:46:52 2022 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 4MwyZh69hXz4fsJF; Mon, 24 Oct 2022 14:46:52 +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 4MwyZh5gRMz3MWN; Mon, 24 Oct 2022 14:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666622812; 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=PUUM2Pj7LlRHbDEYCJdmQ01mHi8dxzyiQuWXz6vY08Y=; b=kY5PxIRQbOVGSdh7Rluw3QY9XtlAMxXYDYax7arksy8F7PTdxhajoAyc3n+jLPkesO7xwD lkTXG6XrcovlaZ35n0J2VbvZOENJqyBG56r9pJkyg57ZXQsK+tAa0IF+ScQ5dEgTIK7Xqa /oh96p560MxFO9V4ct5jT8alxXWI0HyOjbBuZEifTakP151QLwCzcPXQAqlqQvTHBZtWsh UmXrgpem9i06HwLG+AlltCcJZFpruW6OphWj8hvrlN9vR9uZDfez7kbO9gJYsQ7EGMh9wr Z4HQGA5W87HKHwNQzDOR+IFpP9YRzLE1uzbJ/NdmIkPDPcUSpfneayF/t9xgdA== 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 4MwyZh4Y87zGsx; Mon, 24 Oct 2022 14:46:52 +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 29OEkqOd025996; Mon, 24 Oct 2022 14:46:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29OEkqbf025995; Mon, 24 Oct 2022 14:46:52 GMT (envelope-from git) Date: Mon, 24 Oct 2022 14:46:52 GMT Message-Id: <202210241446.29OEkqbf025995@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 14cdcc93ba15 - main - www/jetty9: Note CONFLICTS with www/jetty10 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: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14cdcc93ba152520eb0bf0eba3c1f83fc38d8f3f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666622812; 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=PUUM2Pj7LlRHbDEYCJdmQ01mHi8dxzyiQuWXz6vY08Y=; b=JXcjfGrTadC165tw1+YQebjCwTKaU1j4N79tu6L0/MWsIn3rayLPLGFUiPI8x//zWrwWFn ms5WFAniTSLv52wBTo/+o6+GDhKjtl9PEYhgvwi3L+Fn1CbmCftwApdtSa3H30Cu0p+Ri6 r8rB8KAuQDU/FB5DEY/OC5tPvm+HVNllRijaNkfEzR+9dUoXqvJLvEJ9h1QtQhzideHjQ3 OCxxHNINggETvipPZ/3BNoO6uW2OjuBjSXJGrWWczb8mdEbFISkyJBLqJ8KtoOal0UurMQ tyVzW2ztl7Xy6HJnShU35sMyOnb7wrogXMn8D/9aW97GeBp9ecVCZvv4Y0JUOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666622812; a=rsa-sha256; cv=none; b=SdbBgMqRG+IIUtBtzavOC3ttslE8LZf2HYrWR4J8u0coMkALWlFNEC2X3SiPnLSReskKGw r2iLLSopsTpH61jhNrdk5yPOzHGlmYuVBqOMGrZ1i6Y1sfOY6IqIeHqMJEwczHeU8IKfBB 6r7idGuCDrUIsXqVnpoq4IZ25QPHcMTuK/0HSEx4CeJX2vBCE8QksJJVLtKiuP1tuCwEdT gfOabgaK29a9XnB6EQFsRlSTSXQNYnE1WI1DOggXX5hy7/9WcNk0tQRixA5uQwM4JfYozt ZdxeYVaBOf/dLofhvfqMhJY8d9SGeOz6X/zi28LHcrP+s/OfDvF0cBn2mWNKcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=14cdcc93ba152520eb0bf0eba3c1f83fc38d8f3f commit 14cdcc93ba152520eb0bf0eba3c1f83fc38d8f3f Author: Ryan Steinmetz AuthorDate: 2022-10-24 14:46:40 +0000 Commit: Ryan Steinmetz CommitDate: 2022-10-24 14:46:40 +0000 www/jetty9: Note CONFLICTS with www/jetty10 --- www/jetty9/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/jetty9/Makefile b/www/jetty9/Makefile index b5400c2ebc76..da5f0d05051a 100644 --- a/www/jetty9/Makefile +++ b/www/jetty9/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= bash:shells/bash USES= cpe shebangfix FLAVORS= openjdk8 openjdk9 openjdk10 openjdk11 -CONFLICTS= jetty-8.* +CONFLICTS= jetty-8.* jetty-10.* JDVDATE= v20220914 USE_JAVA= yes