From: Julien Lepiller <julien@lepiller.eu>
To: 52723@debbugs.gnu.org
Subject: [bug#52723] [PATCH 05/26] gnu: maven-parent-pom: Fix dependency versions.
Date: Tue, 21 Dec 2021 23:44:49 +0100 [thread overview]
Message-ID: <ea49348ccedd09091011a62e278cac4482b44dff.1640126678.git.julien@lepiller.eu> (raw)
In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu>
* 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
--
2.34.0
next prev parent reply other threads:[~2021-12-21 22:46 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 22:42 [bug#52723] [PATCH] gnu: maven: Update to 3.8.4 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 01/26] gnu: Add apache-parent-pom-23 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 02/26] gnu: Add apache-commons-parent-pom-52 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 03/26] gnu: Add plexus-parent-pom-8 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 04/26] gnu: Add maven-parent-pom-34 Julien Lepiller
2021-12-21 22:44 ` Julien Lepiller [this message]
2021-12-21 22:44 ` [bug#52723] [PATCH 06/26] gnu: java-commons-codec: Use latest commons parent Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 07/26] gnu: java-plexus-utils: Default to the newer one Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 08/26] gnu: Add java-plexus-build-api Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 09/26] gnu: java-plexus-cipher: Update to 2.0 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 10/26] gnu: java-plexus-sec-dispatcher: " Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 11/26] gnu: Add java-jvnet-parent-pom-3 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 12/26] gnu: java-jsr250: Use proper source Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 13/26] gnu: java-eclipse-sisu-inject: Update to 0.3.5 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 14/26] gnu: java-eclipse-sisu-plexus: " Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 15/26] gnu: maven-common-artifact-filters: Update to 3.2.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 16/26] gnu: java-plexus-container-default-bootstrap: Update to 2.1.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 17/26] gnu: Add java-sonatype-aether-api-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 18/26] gnu: Add java-sonatype-aether-spi-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 19/26] gnu: Add java-sonatype-aether-test-util-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 20/26] gnu: Add java-sonatype-aether-util-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 21/26] gnu: maven-dependency-tree: Update to 3.1.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 22/26] guix: maven: Fix java parser Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 23/26] gnu: maven-enforcer-api: Update to 3.0.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 24/26] gnu: maven-wagon-provider-api: Update to 3.4.3 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 25/26] gnu: Update maven-artifact-transfer to 0.13.1 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 26/26] gnu: maven: Update to 3.8.4 Julien Lepiller
2022-02-02 22:41 ` [bug#52723] [PATCH] " Björn Höfling
2022-02-05 16:16 ` Björn Höfling
2022-02-05 21:53 ` bug#52723: " Julien Lepiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ea49348ccedd09091011a62e278cac4482b44dff.1640126678.git.julien@lepiller.eu \
--to=julien@lepiller.eu \
--cc=52723@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).