From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CJoLEUNntWBYOwAAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 00:46:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id gO9WDENntWBybgAAbx9fmQ (envelope-from ) for ; Mon, 31 May 2021 22:46:27 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B702D27A57 for ; Tue, 1 Jun 2021 00:46:26 +0200 (CEST) Received: from localhost ([::1]:52834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnqfx-00084i-Qq for larch@yhetil.org; Mon, 31 May 2021 18:46:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnqfa-0007Yn-UC for guix-patches@gnu.org; Mon, 31 May 2021 18:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnqfa-0008Ev-Mi for guix-patches@gnu.org; Mon, 31 May 2021 18:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lnqfa-00043h-L3 for guix-patches@gnu.org; Mon, 31 May 2021 18:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48766] [PATCH 11/14] gnu: maven-core: Hardcode versions we have in Guix. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 May 2021 22:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48766@debbugs.gnu.org Received: via spool by 48766-submit@debbugs.gnu.org id=B48766.162250111615510 (code B ref 48766); Mon, 31 May 2021 22:46:02 +0000 Received: (at 48766) by debbugs.gnu.org; 31 May 2021 22:45:16 +0000 Received: from localhost ([127.0.0.1]:35193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnqeq-000422-9c for submit@debbugs.gnu.org; Mon, 31 May 2021 18:45:16 -0400 Received: from lepiller.eu ([89.234.186.109]:38958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnqeK-0003xm-R2 for 48766@debbugs.gnu.org; Mon, 31 May 2021 18:44:46 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 1718245e for <48766@debbugs.gnu.org>; Mon, 31 May 2021 22:44:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=poamOIHE5e8+ CfQpo9JuITwTdSvZpAKQLkWwk9CVDj8=; b=Fn+80HimZ+Qvy8jrKDdGVlsUL513 wa/Dmm5u53I+kAhsM7GIZMP+eXTomc3CPBBXApg0g+fGE5e3jwaD6lurx13QFYXr rWUJ2X/wOopqw50LeafqMumsrdLAkQ0wbPyDouq5s/FXisJ/7ZEfz80fHxcZCy9X pV0hMNUGwEhqefByR1gdq7XWmZJk2Es2+b/p2CPAg7C2KgjtQaQrl/1DRwg9kxn/ NulTKz3Gc+y+T/x531hcNufgt/3c8kRfrHU/M3MlUp4Ex+6x4oGhzHLGSQhxiF+Y oHKa8/FGm22vV3HuxFPTfnVhRP9TZuiBAGr+I2YiPWtby1nG8IZ8yEJfMQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id bd3c7f21 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <48766@debbugs.gnu.org>; Mon, 31 May 2021 22:44:40 +0000 (UTC) From: Julien Lepiller Date: Tue, 1 Jun 2021 00:44:24 +0200 Message-Id: <20210531224427.13300-11-julien@lepiller.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531224427.13300-1-julien@lepiller.eu> References: <20210601004100.69baa2d0@tachikoma.lepiller.eu> <20210531224427.13300-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1622501186; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Dxr3k7tjWu5oqE3x56tUbv3aCsfJK+C9VEGCHhE2U/A=; b=dKKT78J+/3C/YOjL/KOWMmaEm3M2IBy/u65LuM+bkPK5lwtW5H/heixFeNWAmXz2fJ2ekL CyGOPKqsWvzV2MjEkkCKpeV0lb+NDpWJcFk0a8ju7Ev7Zty/cGSoAZYld/nhKPGjOrLuPZ HeFpFZ0C69AsvcNxE25xF6IYJKwnvbcj/YpaynqhdU0TbGCrZErdgibgd5PHyX6uZEsZxm XE08c3y8Z99+2YY/NdugDIYTTQI46i7sjDNgl2lR5dPiQapvgnqQ6MVShiTgMMGGQDiV9G 7Nd/U94c96vRemVIDJ5/hMrXRnINZT9t7xJmf7sg+3qh60c1z4z7/7eYCOl8xQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622501186; a=rsa-sha256; cv=none; b=GvWuFApmcdYtfCchsmUbWvHkwoX475QzVmtmQ+F6V4gaO+MVtwQTpcqKEUUcyqf3hJmpwe ll5HMuamtLstYPSvGLCxS7cx5co6IJ/Xx9izxiZ1GFW47dL1HPSYwAycCOauO4JB4p3/Tf bzgz8or+/HcJqvsaSERUEinc9dKtjajegcLgxZybsf361622UygqODWETg9VpG62U3MfL+ 6WYnmBZlgqT4/aMx8+r6FkXiedH5IQTKEio8TmALTUT5TdG6OipKd2foRlqFBN8oolSlvL 4S6y3tOZfEQFbMzWofV5IOonXTVom/2D4Y3e7HJzfB7QmRNQKc+SyDXCbu+9AQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Fn+80Him; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Fn+80Him; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: B702D27A57 X-Spam-Score: -0.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: KOsCmsO2Zttc * 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 +;;; Copyright © 2018-2021 Julien Lepiller ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2020 Efraim Flashner @@ -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