From nobody Thu Jan 02 15:50:48 2025 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 4YPB4n1NCqz5jMsV; Thu, 02 Jan 2025 15:50:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPB4m4pGGz4WFg; Thu, 2 Jan 2025 15:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735833048; 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=ALkZDAOG5ZMUfEL5FfdLaSpPnlDNVUvt1FKhpVn7zlc=; b=a4880QkzwBNv5z+KUFN8oV7h80XIYKbC2MYKbVD48sUZMQH34CfCKRT4yPoe2Gt4u9eQfV 6Csu6ZO/rP+Xu14/OcP2aPHKJfimRknx61i4hZXwBuZhoRNbIo3aUNRYI7o0GQ04HowPjT CTb96LUJH1ptv8AnJrnA2pxNo6GcV5J256LEthkZ1kNhAD9yOrYGXdf0d3uk/11cgJeriG gUC2gWkRZXGEYrZkgXrdkBrw0OWxmIm0koJQwlLGzV5BEYNV+VgTDyuxbo+fIWa2MccJ5n fvacvxjzE+1NFFDJoH+eXLYqWt3CNVN5l7l4nGUy3nDPuMRq3PZEjs4ADf+pbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735833048; 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=ALkZDAOG5ZMUfEL5FfdLaSpPnlDNVUvt1FKhpVn7zlc=; b=gmk1NhGIfAnHgy4R+LD/M3ycYCYo1nRUDspjri4g+ygOJTBKxw3koIEJZlx67j3CbVxT5u 6tiw5DsM64/Gfq0d0m3IxykABhw9NkIlkmxfhFuocUeAXuWCC0SlKJW7jbsmEuQnKnp3tA 4KsbDK9nRRv3k2DrmXScJNz6AaVm8DmtjZT/u56DYOT7MP6MLCPHx2EjGqkiUqpbjPlMne yw/eiAut1xTDxz0ekyq0iZrp7WBQduUKRrUZ7j4YEPz+o6cEsFRZvuclWcnNwKttQ6qhKa nooS6aVqGXRx4rYCBM9AHcJDx1PYzpGy1aApQ7yN2UorAb922hrbSafuMHkHKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735833048; a=rsa-sha256; cv=none; b=UxBVQJL4gVcFv+ijTNdKP5bwVBkWA3F+EcBc+YOKhsb8Aj08FlRqG8Pv/hiL0Ot856K44V R5Z5Z16DUkr/dUDJ+5ZbCvzg2ZCajvDE07vRMu8V3fRdWvy93opCUvWADA6dkjS7DZjSga HcBLqbo6rk8vtoRnfpaYOSo1OnyIrDtfqfP4CaoCBwftcWhZeBtQb46i0XaPEW29tVesTq DeYkDLkq5KQgKaqSnfZMOmjATHQhlDOjtBo3Qoui1wfk4rvRFVldC59ZLbwGnMrgnmNYVV vk8nUroFe7ddU5F8NodVDTIJQtY/LYLtgJ/k4l/evgFKTqxSnjrFt+kDsS9aKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPB4m4Jy4zkMg; Thu, 02 Jan 2025 15:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 502FomFc074883; Thu, 2 Jan 2025 15:50:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502FomP4074880; Thu, 2 Jan 2025 15:50:48 GMT (envelope-from git) Date: Thu, 2 Jan 2025 15:50:48 GMT Message-Id: <202501021550.502FomP4074880@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 964e4cfd8a22 - main - devel/apache-log4j2: upgrade to 2.24.3 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 964e4cfd8a2253c06c4417c6ffba14461215fca0 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=964e4cfd8a2253c06c4417c6ffba14461215fca0 commit 964e4cfd8a2253c06c4417c6ffba14461215fca0 Author: Thierry Thomas AuthorDate: 2025-01-02 15:29:26 +0000 Commit: Thierry Thomas CommitDate: 2025-01-02 15:40:12 +0000 devel/apache-log4j2: upgrade to 2.24.3 Releases notes at https://logging.apache.org/log4j/2.x/release-notes.html --- devel/apache-log4j2/Makefile | 6 +++++- devel/apache-log4j2/distinfo | 6 +++--- devel/apache-log4j2/pkg-plist | 5 +---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/devel/apache-log4j2/Makefile b/devel/apache-log4j2/Makefile index 5c33daaaf0d0..4b97aa56e0d8 100644 --- a/devel/apache-log4j2/Makefile +++ b/devel/apache-log4j2/Makefile @@ -1,5 +1,5 @@ PORTNAME= log4j2 -PORTVERSION= 2.23.1 +PORTVERSION= 2.24.3 CATEGORIES= devel java MASTER_SITES= APACHE/logging/log4j/${PORTVERSION} PKGNAMEPREFIX= apache- @@ -24,6 +24,10 @@ PORTDOCS= NOTICE.txt RELEASE-NOTES.adoc OPTIONS_DEFINE= DOCS +pre-install: + # log4j-slf4j-impl cannot be present with log4j-to-slf4j + ${RM} ${WRKSRC}/log4j-to-slf4j-${PORTVERSION}.jar + do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} cd ${WRKSRC} && \ diff --git a/devel/apache-log4j2/distinfo b/devel/apache-log4j2/distinfo index ef247eecbe6c..3c71f9cc00ae 100644 --- a/devel/apache-log4j2/distinfo +++ b/devel/apache-log4j2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711217904 -SHA256 (apache-log4j-2.23.1-bin.zip) = c53645414ce68f21dd347439df5852ad16b38cd7227a9d417ebaf411a1c09501 -SIZE (apache-log4j-2.23.1-bin.zip) = 3816331 +TIMESTAMP = 1735811648 +SHA256 (apache-log4j-2.24.3-bin.zip) = 359ef2d7278b67a72053239c1c8cdba44a5681097835d010982470e121c2338a +SIZE (apache-log4j-2.24.3-bin.zip) = 3617769 diff --git a/devel/apache-log4j2/pkg-plist b/devel/apache-log4j2/pkg-plist index 323644601cd3..5f16112248de 100644 --- a/devel/apache-log4j2/pkg-plist +++ b/devel/apache-log4j2/pkg-plist @@ -7,7 +7,6 @@ %%JAVAJARDIR%%/log4j-core-test.jar %%JAVAJARDIR%%/log4j-couchdb.jar %%JAVAJARDIR%%/log4j-docker.jar -%%JAVAJARDIR%%/log4j-flume-ng.jar %%JAVAJARDIR%%/log4j-iostreams.jar %%JAVAJARDIR%%/log4j-jakarta-smtp.jar %%JAVAJARDIR%%/log4j-jakarta-web.jar @@ -16,9 +15,8 @@ %%JAVAJARDIR%%/log4j-jpa.jar %%JAVAJARDIR%%/log4j-jpl.jar %%JAVAJARDIR%%/log4j-jul.jar -%%JAVAJARDIR%%/log4j-kubernetes.jar %%JAVAJARDIR%%/log4j-layout-template-json.jar -%%JAVAJARDIR%%/log4j-mongodb3.jar +%%JAVAJARDIR%%/log4j-mongodb.jar %%JAVAJARDIR%%/log4j-mongodb4.jar %%JAVAJARDIR%%/log4j-slf4j-impl.jar %%JAVAJARDIR%%/log4j-slf4j2-impl.jar @@ -26,5 +24,4 @@ %%JAVAJARDIR%%/log4j-spring-cloud-config-client.jar %%JAVAJARDIR%%/log4j-taglib.jar %%JAVAJARDIR%%/log4j-to-jul.jar -%%JAVAJARDIR%%/log4j-to-slf4j.jar %%JAVAJARDIR%%/log4j-web.jar