From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aFlRH09ZwmESJQAAgWs5BA (envelope-from ) for ; Tue, 21 Dec 2021 23:46:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wAYoG09ZwmE/MQAA1q6Kng (envelope-from ) for ; Tue, 21 Dec 2021 22:46:39 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2BE18119F5 for ; Tue, 21 Dec 2021 23:46:39 +0100 (CET) Received: from localhost ([::1]:39084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mznu2-0001SZ-Cq for larch@yhetil.org; Tue, 21 Dec 2021 17:46:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzntY-0008Uj-9X for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44526) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzntX-0001fT-VF for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzntX-00081s-U6 for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52723] [PATCH 15/26] gnu: maven-common-artifact-filters: Update to 3.2.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 22:46:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52723 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52723@debbugs.gnu.org Received: via spool by 52723-submit@debbugs.gnu.org id=B52723.164012675030665 (code B ref 52723); Tue, 21 Dec 2021 22:46:07 +0000 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:50 +0000 Received: from localhost ([127.0.0.1]:56040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntG-0007yR-3l for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:50 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsv-0007uN-K9 for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:30 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 085565e5 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=Pc8mNgZ1K51YyCwls0X42iOG/ plkbG6FMcib50f/ZGk=; b=Y6ZC3DGd2tELlRm8XL5lWA4tgTguRTmNe+yx/cWaW Rz7EaKVP/pOSkq0LabTrhmQ+boPIa/M2/yPyghWL9YdKy4KsgebbX6G0ET3eN8A6 2t7nS1sfKHUBaDl7OBCjVXAlcdhKFoGtdReEO33lMqZ6p+7czQhFBF5ZViIsS08Q iWwfTOu4iZ6xVO5YtH9uvCgjwIo14fYPfaxqPA5x0MI7ntdjcFITqzmWdyzOi3Xz B27osSheTwNY60cLIYaUzdbdaqpvZ4iXDlxGRSXfkp9DvPIFdGs7Gn8v8dgQsjGh kqHqXUw94V49Kz1Ilqf0lgZNUje86D4v825NP+m5dqHxw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1f10fa7f (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:24 +0000 (UTC) From: Julien Lepiller Date: Tue, 21 Dec 2021 23:44:59 +0100 Message-Id: <185067a5a2a5f2559fe48a00d294468199d0eb15.1640126679.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu> References: <20211221234231.44299f63@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640126799; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=psmVPzTSOuPA/WAmHy59EjxMoepWNhbAccL8+jH2IBc=; b=ukjOERoO8r1paqKZwtCflXK9VzYAkvxM5AeZc21gop5yRQ2sPu/7dL8tLrRVnYV2DIVavC TBwKeUJHXw3QBAouPsAFqU0gc+sjBjnV59eBwzwy/4xGGbG/Rx6/96zCjHNE0FxzhoOlD8 v8M+/P1wdZAFlM5LxTHDpoUeNK5dInZjGg3rt9BP/4X4rlN7kmuDJL4i5hfTWyg9U52tn9 NFUdx7DXs/qGzqo9rBLF+PLdyxd4IpXd9CtXwwZuQqv+xpCyhJx9CLWKBD+zSAU4186HrA hGu+V4bFNvjwto64WA1sZJaugPH64h0MD+9zdbTiNcrGt5Y0TbaePiO3jNiqFw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640126799; a=rsa-sha256; cv=none; b=JQdi7iFg7mZpn70wv4Y5dtbV+tPD/xawQehTmWqg5cftw5bnDdYeoFyoQVIS6gCt9hxdgF 5mrxFZ5mAPqa86BsO+Awcmqhmm8CuhREfzr9S/Be3F/Y+wyQsGWfe901SuY8fRA2G26o90 ek3rpweZcnQZRryuu2B/irWKWWOG9IFQA6zdWICIMYCa0K0VCvZ4Ab/RHnUJ/aeMLvvBLu vKpf3wpYrGa33dSUCaiJHpaYWUkacWW8gGoWLN+NaQEfJLfKOTMl3rxR/WKVZl2ptXGuNY 1H79BFjng7DWqbblLmVmOif6c7j2dxmxB6jZGA4OtsIIhweDbu9+M0YFqBFltA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Y6ZC3DGd; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Y6ZC3DGd; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 2BE18119F5 X-Spam-Score: -0.03 X-Migadu-Scanner: scn0.migadu.com X-TUID: IyixG78u0aDM * gnu/packages/maven.scm (maven-common-artifact-filters): Update to 3.2.0. (maven-common-artifact-filters-3.1.0): New variable. --- gnu/packages/maven.scm | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 4cad05f3e1..1be266f9a7 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2585,7 +2585,7 @@ (define-public maven-dependency-tree (define-public maven-common-artifact-filters (package (name "maven-common-artifact-filters") - (version "3.1.0") + (version "3.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/shared/" @@ -2593,7 +2593,7 @@ (define-public maven-common-artifact-filters "-source-release.zip")) (sha256 (base32 - "1cl1qk4r0gp62bjzfm7lml9raz1my2kd4yf0ci0lnfsn0h5qivnb")))) + "1mr92s4zz6gf028wiskjg8rd1znxzdnmskg42ac55ifg9v1p1884")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-common-artifact-filters.jar" @@ -2601,14 +2601,12 @@ (define-public maven-common-artifact-filters #:tests? #f; require maven-plugin-testing-harness, which requires maven 3.2. #:phases (modify-phases %standard-phases - (add-before 'build 'remove-sisu + (add-before 'build 'fix-aether (lambda _ - ;; Replace sisu with an existing dependency, to prevent a failure - ;; when rewritting dependency versions (substitute* "pom.xml" - (("sisu-inject-plexus") "maven-plugin-api") - (("org.sonatype.sisu") "org.apache.maven")) - #t)) + (("eclipse.aether") "sonatype.aether")) + (substitute* "src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java" + (("eclipse") "sonatype")))) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs @@ -2618,6 +2616,7 @@ (define-public maven-common-artifact-filters maven-3.0-plugin-api maven-shared-utils maven-parent-pom-33 + java-eclipse-sisu-plexus java-sonatype-aether-api java-sonatype-aether-util)) (inputs @@ -2630,6 +2629,29 @@ (define-public maven-common-artifact-filters Maven project dependencies.") (license license:asl2.0))) +(define-public maven-common-artifact-filters-3.1.0 + (package + (inherit maven-common-artifact-filters) + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/shared/" + "maven-common-artifact-filters-" version + "-source-release.zip")) + (sha256 + (base32 + "1cl1qk4r0gp62bjzfm7lml9raz1my2kd4yf0ci0lnfsn0h5qivnb")))) + (arguments + (substitute-keyword-arguments (package-arguments maven-common-artifact-filters) + ((#:phases phases) + `(modify-phases ,phases + (delete 'fix-aether) + (add-before 'build 'remove-sisu + (lambda _ + (substitute* "pom.xml" + (("sisu-inject-plexus") "maven-plugin-api") + (("org.sonatype.sisu") "org.apache.maven")))))))))) + (define-public maven-enforcer-api (package (name "maven-enforcer-api") @@ -2781,7 +2803,7 @@ (define-public maven-artifact-transfer (list java-commons-codec maven-3.0-artifact maven-3.0-core - maven-common-artifact-filters + maven-common-artifact-filters-3.1.0 java-plexus-component-annotations java-plexus-utils java-slf4j-api -- 2.34.0