[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/14: gnu: maven-core: Hardcode versions we have in Guix.
From: |
guix-commits |
Subject: |
11/14: gnu: maven-core: Hardcode versions we have in Guix. |
Date: |
Tue, 22 Jun 2021 07:11:38 -0400 (EDT) |
roptat pushed a commit to branch master
in repository guix.
commit b6b9668949ec73b45141d9002802f55c5604a3bd
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Tue Jun 1 00:44:24 2021 +0200
gnu: maven-core: Hardcode versions we have in Guix.
* gnu/packages/maven.scm (maven-core)[phases]: Replace default hardcoded
versions by versions of packages we have in Guix.
---
gnu/packages/maven.scm | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 8f63ee9..9d65e9b 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2018-2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
@@ -1541,7 +1541,9 @@ process."))))
(add-before 'build 'modify-metainf
(lambda _
(substitute* "build.xml"
- (("message=\"\"") "message=\"Implementation-Version:
3.5.4\n\""))
+ (("message=\"\"")
+ (string-append "message=\"Implementation-Version: "
+ (package-version maven) "\n\"")))
#t))
(add-before 'build 'add-maven-files
(lambda _
@@ -1590,7 +1592,28 @@ artifactId=maven-core" ,(package-version
maven-core-bootstrap))))
default-bindings-xml
artifact-handlers-xml)))))))
#t))
- (add-after 'generate-metadata 'rebuild
+ (add-after 'generate-metadata 'fix-plugin-versions
+ (lambda _
+ ;; This file controls the default plugins used by Maven.
Ensure
+ ;; we use the versions we have packaged by default
+ (substitute*
'("build/classes/META-INF/plexus/default-bindings.xml"
+ "build/classes/META-INF/plexus/components.xml")
+ (("maven-install-plugin:[0-9.]+")
+ (string-append "maven-install-plugin:"
+ ,(package-version maven-install-plugin)))
+ (("maven-resources-plugin:[0-9.]+")
+ (string-append "maven-resources-plugin:"
+ ,(package-version maven-resources-plugin)))
+ (("maven-compiler-plugin:[0-9.]+")
+ (string-append "maven-compiler-plugin:"
+ ,(package-version maven-compiler-plugin)))
+ (("maven-surefire-plugin:[0-9.]+")
+ (string-append "maven-surefire-plugin:"
+ ,(package-version maven-surefire-plugin)))
+ (("maven-jar-plugin:[0-9.]+")
+ (string-append "maven-jar-plugin:"
+ ,(package-version maven-jar-plugin))))))
+ (add-after 'fix-plugin-versions 'rebuild
(lambda _
(invoke "ant" "jar")
#t))))))
- 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, 2021/06/22
- 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 <=
- 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
- 14/14: gnu: java-jmh: Switch to maven-build-system., guix-commits, 2021/06/22