mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-02-01 23:36:35 +01:00
gnu: maven-parent-pom: Fix dependency versions.
* 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.
This commit is contained in:
parent
661cac8db6
commit
baa2a49b81
1 changed files with 32 additions and 12 deletions
|
@ -395,7 +395,7 @@ (define-public plexus-parent-pom-8
|
||||||
(make-plexus-parent-pom
|
(make-plexus-parent-pom
|
||||||
"8" "0ybwdzawa58qg9ag39rxyin24lk9sjcaih6n2yfldfzsbkq6gnww"))
|
"8" "0ybwdzawa58qg9ag39rxyin24lk9sjcaih6n2yfldfzsbkq6gnww"))
|
||||||
|
|
||||||
(define (make-maven-parent-pom version hash parent)
|
(define* (make-maven-parent-pom version hash parent #:key replacements)
|
||||||
(hidden-package
|
(hidden-package
|
||||||
(package
|
(package
|
||||||
(name "maven-parent-pom")
|
(name "maven-parent-pom")
|
||||||
|
@ -418,6 +418,12 @@ (define (make-maven-parent-pom version hash parent)
|
||||||
(install-pom-file "maven-plugins/pom.xml"))
|
(install-pom-file "maven-plugins/pom.xml"))
|
||||||
(add-after 'install 'install-shared
|
(add-after 'install 'install-shared
|
||||||
(install-pom-file "maven-shared-components/pom.xml"))
|
(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
|
(replace 'install
|
||||||
(install-pom-file "pom.xml")))))
|
(install-pom-file "pom.xml")))))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
|
@ -431,17 +437,32 @@ (define (make-maven-parent-pom version hash parent)
|
||||||
(define-public maven-parent-pom-34
|
(define-public maven-parent-pom-34
|
||||||
(make-maven-parent-pom
|
(make-maven-parent-pom
|
||||||
"34" "1vkmrfwva76k6maf1ljbja5ga4kzav4xc73ymbaf42xaiaknglbc"
|
"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
|
(define-public maven-parent-pom-33
|
||||||
(make-maven-parent-pom
|
(make-maven-parent-pom
|
||||||
"33" "1b0z2gsvpccgcssys9jbdfwlwq8b5imdwr508f87ssdbfs29lh65"
|
"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
|
(define-public maven-parent-pom-31
|
||||||
(make-maven-parent-pom
|
(make-maven-parent-pom
|
||||||
"31" "0skxv669v9ffwbmrmybnn9awkf1g3ylk88bz0hv6g11zpj1a8454"
|
"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
|
(define-public maven-parent-pom-30
|
||||||
(make-maven-parent-pom
|
(make-maven-parent-pom
|
||||||
|
@ -477,7 +498,12 @@ (define-public maven-parent-pom-15
|
||||||
(define-public maven-parent-pom-22
|
(define-public maven-parent-pom-22
|
||||||
(let ((base (make-maven-parent-pom
|
(let ((base (make-maven-parent-pom
|
||||||
"22" "1kgqbyx7ckashy47n9rgyg4asyrvp933hdiknvnad7msq5d4c2jg"
|
"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
|
(package
|
||||||
(inherit base)
|
(inherit base)
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -485,13 +511,7 @@ (define-public maven-parent-pom-22
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
`(modify-phases ,phases
|
`(modify-phases ,phases
|
||||||
(delete 'install-plugins)
|
(delete 'install-plugins)
|
||||||
(delete 'install-shared)
|
(delete 'install-shared))))))))
|
||||||
(add-before 'install 'fix-versions
|
|
||||||
(lambda _
|
|
||||||
(substitute* "pom.xml"
|
|
||||||
(("1.5.5")
|
|
||||||
,(package-version java-plexus-component-annotations)))
|
|
||||||
#t)))))))))
|
|
||||||
|
|
||||||
(define-public maven-plugins-pom-23
|
(define-public maven-plugins-pom-23
|
||||||
(hidden-package
|
(hidden-package
|
||||||
|
|
Loading…
Reference in a new issue