[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/14: guix: maven: Support fixing extensions.
From: |
guix-commits |
Subject: |
04/14: guix: maven: Support fixing extensions. |
Date: |
Tue, 22 Jun 2021 07:11:35 -0400 (EDT) |
roptat pushed a commit to branch master
in repository guix.
commit 9711970c99cfbf1b5546c395d5407d67b954c343
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Tue Jun 1 00:44:17 2021 +0200
guix: maven: Support fixing extensions.
* 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 8f16cf4..3a4ad7a 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
('() '())
- branch master updated (a40207b -> 1b1eeb3), guix-commits, 2021/06/22
- 01/14: guix: java-utils: Factorize pom.xml generation., guix-commits, 2021/06/22
- 03/14: guix: maven: Simplify finding local packages and modules., guix-commits, 2021/06/22
- 04/14: guix: maven: Support fixing extensions.,
guix-commits <=
- 05/14: guix: maven: Support fixing modules., guix-commits, 2021/06/22
- 02/14: guix: maven: Simplify finding version and group information., guix-commits, 2021/06/22
- 07/14: guix: maven: Use a temporary file to fix pom files., guix-commits, 2021/06/22
- 08/14: guix: java-utils: Look for actual jar files., guix-commits, 2021/06/22
- 11/14: gnu: maven-core: Hardcode versions we have in Guix., guix-commits, 2021/06/22
- 13/14: gnu: java-jmh: Update to 1.32., guix-commits, 2021/06/22
- 06/14: guix: maven: Look in local packages when searching for package version., guix-commits, 2021/06/22
- 09/14: gnu: Add java-jopt-simple-4., guix-commits, 2021/06/22
- 12/14: gnu: maven-enforcer-parent-pom: Fix pom., guix-commits, 2021/06/22
- 10/14: gnu: java-commons-math3: Install to maven repository., guix-commits, 2021/06/22