[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#48766] [PATCH 04/14] guix: maven: Support fixing extensions.
From: |
Julien Lepiller |
Subject: |
[bug#48766] [PATCH 04/14] guix: maven: Support fixing extensions. |
Date: |
Tue, 1 Jun 2021 00:44:17 +0200 |
* guix/build/maven/pom.scm (fix-pom-dependencies): Add support for fixing
extension versions.
---
guix/build/maven/pom.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/guix/build/maven/pom.scm b/guix/build/maven/pom.scm
index 8f16cf4d26..3a4ad7a216 100644
--- a/guix/build/maven/pom.scm
+++ b/guix/build/maven/pom.scm
@@ -374,8 +374,27 @@ Returns nothing, but overrides the @var{pom-file} as a
side-effect."
`((http://maven.apache.org/POM/4.0.0:plugins
,(fix-plugins plugins))
,@(fix-build rest)))
+ (('http://maven.apache.org/POM/4.0.0:extensions extensions ...)
+ `((http://maven.apache.org/POM/4.0.0:extensions
+ ,(fix-extensions extensions))
+ ,@(fix-build rest)))
(tag (cons tag (fix-build rest)))))))
+ (define* (fix-extensions extensions #:optional optional?)
+ (match extensions
+ ('() '())
+ ((tag rest ...)
+ (match tag
+ (('http://maven.apache.org/POM/4.0.0:extension extension ...)
+ (let ((group (or (pom-groupid extension) "org.apache.maven.plugins"))
+ (artifact (pom-artifactid extension)))
+ (if (member artifact (or (assoc-ref excludes group) '()))
+ (fix-extensions rest optional?)
+ `((http://maven.apache.org/POM/4.0.0:extension
+ ,(fix-plugin extension optional?)); extensions are similar
to plugins
+ ,@(fix-extensions rest optional?)))))
+ (tag (cons tag (fix-extensions rest optional?)))))))
+
(define fix-management
(match-lambda
('() '())
--
2.31.1
- [bug#48766] [PATCH] gnu: java-jmh: Switch to maven-build-system., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 01/14] guix: java-utils: Factorize pom.xml generation., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 04/14] guix: maven: Support fixing extensions.,
Julien Lepiller <=
- [bug#48766] [PATCH 02/14] guix: maven: Simplify finding version and group information., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 03/14] guix: maven: Simplify finding local packages and modules., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 07/14] guix: maven: Use a temporary file to fix pom files., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 06/14] guix: maven: Look in local packages when searching for package version., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 05/14] guix: maven: Support fixing modules., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 08/14] guix: java-utils: Look for actual jar files., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 10/14] gnu: java-commons-math3: Install to maven repository., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 11/14] gnu: maven-core: Hardcode versions we have in Guix., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 14/14] gnu: java-jmh: Switch to maven-build-system., Julien Lepiller, 2021/05/31
- [bug#48766] [PATCH 13/14] gnu: java-jmh: Update to 1.32., Julien Lepiller, 2021/05/31