From: Julien Lepiller <julien@lepiller.eu>
To: 48766@debbugs.gnu.org
Subject: [bug#48766] [PATCH 11/14] gnu: maven-core: Hardcode versions we have in Guix.
Date: Tue, 1 Jun 2021 00:44:24 +0200 [thread overview]
Message-ID: <20210531224427.13300-11-julien@lepiller.eu> (raw)
In-Reply-To: <20210531224427.13300-1-julien@lepiller.eu>
* 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 8f63ee9be2..9d65e9b56d 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))))))
--
2.31.1
next prev parent reply other threads:[~2021-05-31 22:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 22:41 [bug#48766] [PATCH] gnu: java-jmh: Switch to maven-build-system Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 01/14] guix: java-utils: Factorize pom.xml generation Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 02/14] guix: maven: Simplify finding version and group information Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 03/14] guix: maven: Simplify finding local packages and modules Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 04/14] guix: maven: Support fixing extensions Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 05/14] guix: maven: Support fixing modules Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 06/14] guix: maven: Look in local packages when searching for package version Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 07/14] guix: maven: Use a temporary file to fix pom files Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 08/14] guix: java-utils: Look for actual jar files Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 09/14] gnu: Add java-jopt-simple-4 Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 10/14] gnu: java-commons-math3: Install to maven repository Julien Lepiller
2021-05-31 22:44 ` Julien Lepiller [this message]
2021-05-31 22:44 ` [bug#48766] [PATCH 12/14] gnu: maven-enforcer-parent-pom: Fix pom Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 13/14] gnu: java-jmh: Update to 1.32 Julien Lepiller
2021-05-31 22:44 ` [bug#48766] [PATCH 14/14] gnu: java-jmh: Switch to maven-build-system Julien Lepiller
2021-06-22 11:13 ` bug#48766: [PATCH] " 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=20210531224427.13300-11-julien@lepiller.eu \
--to=julien@lepiller.eu \
--cc=48766@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).