From patchwork Tue Dec 21 22:44:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35544 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6F4CC27BBEA; Tue, 21 Dec 2021 22:46:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EB96C27BBE9 for ; Tue, 21 Dec 2021 22:46:24 +0000 (GMT) Received: from localhost ([::1]:37874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mznto-0000Vd-3o for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 17:46:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzntU-0008M0-50 for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44515) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzntT-0001dk-S7 for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzntT-00080S-RV for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52723] [PATCH 05/26] gnu: maven-parent-pom: Fix dependency versions. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 22:46:03 +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.164012673030523 (code B ref 52723); Tue, 21 Dec 2021 22:46:03 +0000 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:30 +0000 Received: from localhost ([127.0.0.1]:56007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsv-0007vs-BB for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:30 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznso-0007uN-6i for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:22 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2359e178 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:19 +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=1cZAmQwJqg2LVCuk41LO2/XtG nrQiQ2wOMod7Vh6S74=; b=d3AppTSYVqItQXlPtATs87pZP8mHIOV481Lp5tXZH A6DHEbELtZS/d16wfl5pBOQbRcyBKuquIV67w/I32jFu2pSL30XN1W/UsoIXTtPA 8mBMKJnl1yc3LOMLkI6gHF8DNhGuI/QMKNm7O3YmlFWuo1WlzHFBWeGvfyCR/ssU mU9MZfRRvAlLgb6ixGtbidvt8Z8PJr21jbu3xAbQkBgwf0xrU9uyKo1/2+8KVCNh 2MAAnjvuJCM6soTZLiEV1ORSfHhL34M1MvFky1Y1+ufSjo0UHc3H1zyk/v9g8NSU mntYQbWykDa/oLwKmmjzRNIwvwj+d+4FqBVxjHej2DY3w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 10f0a017 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:19 +0000 (UTC) From: Julien Lepiller Date: Tue, 21 Dec 2021 23:44:49 +0100 Message-Id: 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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven-parent-pom.scm (make-maven-parent-pom): Add a replacement option. (maven-parent-pom-34, maven-parent-pom-33, maven-parent-pom-31, maven-parent-pom-22, maven-parent-pom-15): Replace java-plexus-component-annotations version. --- gnu/packages/maven-parent-pom.scm | 44 ++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 19f1bc5007..6d11c84f44 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -395,7 +395,7 @@ (define-public plexus-parent-pom-8 (make-plexus-parent-pom "8" "0ybwdzawa58qg9ag39rxyin24lk9sjcaih6n2yfldfzsbkq6gnww")) -(define (make-maven-parent-pom version hash parent) +(define* (make-maven-parent-pom version hash parent #:key replacements) (hidden-package (package (name "maven-parent-pom") @@ -418,6 +418,12 @@ (define (make-maven-parent-pom version hash parent) (install-pom-file "maven-plugins/pom.xml")) (add-after 'install 'install-shared (install-pom-file "maven-shared-components/pom.xml")) + ,@(if replacements + `((add-before 'install 'fix-pom + (lambda _ + (use-modules (guix build maven pom)) + (fix-pom-dependencies "pom.xml" '() #:local-packages (quote ,(force replacements)))))) + '()) (replace 'install (install-pom-file "pom.xml"))))) (propagated-inputs @@ -431,17 +437,32 @@ (define (make-maven-parent-pom version hash parent) (define-public maven-parent-pom-34 (make-maven-parent-pom "34" "1vkmrfwva76k6maf1ljbja5ga4kzav4xc73ymbaf42xaiaknglbc" - apache-parent-pom-23)) + apache-parent-pom-23 + #:replacements + (delay + `(("org.codehaus.plexus" + ("plexus-component-annotations" . + ,(package-version java-plexus-component-annotations))))))) (define-public maven-parent-pom-33 (make-maven-parent-pom "33" "1b0z2gsvpccgcssys9jbdfwlwq8b5imdwr508f87ssdbfs29lh65" - apache-parent-pom-21)) + apache-parent-pom-21 + #:replacements + (delay + `(("org.codehaus.plexus" + ("plexus-component-annotations" . + ,(package-version java-plexus-component-annotations))))))) (define-public maven-parent-pom-31 (make-maven-parent-pom "31" "0skxv669v9ffwbmrmybnn9awkf1g3ylk88bz0hv6g11zpj1a8454" - apache-parent-pom-19)) + apache-parent-pom-19 + #:replacements + (delay + `(("org.codehaus.plexus" + ("plexus-component-annotations" . + ,(package-version java-plexus-component-annotations))))))) (define-public maven-parent-pom-30 (make-maven-parent-pom @@ -477,7 +498,12 @@ (define-public maven-parent-pom-15 (define-public maven-parent-pom-22 (let ((base (make-maven-parent-pom "22" "1kgqbyx7ckashy47n9rgyg4asyrvp933hdiknvnad7msq5d4c2jg" - apache-parent-pom-11))) + apache-parent-pom-11 + #:replacements + (delay + `(("org.codehaus.plexus" + ("plexus-component-annotations" . + ,(package-version java-plexus-container-default)))))))) (package (inherit base) (arguments @@ -485,13 +511,7 @@ (define-public maven-parent-pom-22 ((#:phases phases) `(modify-phases ,phases (delete 'install-plugins) - (delete 'install-shared) - (add-before 'install 'fix-versions - (lambda _ - (substitute* "pom.xml" - (("1.5.5") - ,(package-version java-plexus-component-annotations))) - #t))))))))) + (delete 'install-shared)))))))) (define-public maven-plugins-pom-23 (hidden-package