From patchwork Tue Dec 21 22:45:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35562 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 38B1027BBEA; Tue, 21 Dec 2021 23:10:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F068627BBE9 for ; Tue, 21 Dec 2021 23:10:35 +0000 (GMT) Received: from localhost ([::1]:38660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzoHD-000492-5H for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 18:10:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzoDx-0008RW-S9 for guix-patches@gnu.org; Tue, 21 Dec 2021 18:07:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzoDm-0005x0-ES for guix-patches@gnu.org; Tue, 21 Dec 2021 18:07:13 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzoDm-00008g-7q for guix-patches@gnu.org; Tue, 21 Dec 2021 18:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52723] [PATCH 23/26] gnu: maven-enforcer-api: Update to 3.0.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 23:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52723 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52723@debbugs.gnu.org Received: via spool by 52723-submit@debbugs.gnu.org id=B52723.1640128014513 (code B ref 52723); Tue, 21 Dec 2021 23:07:02 +0000 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 23:06:54 +0000 Received: from localhost ([127.0.0.1]:56100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzoDb-000085-JC for submit@debbugs.gnu.org; Tue, 21 Dec 2021 18:06:54 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsy-0007uN-SJ for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:47 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 8755bda1 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:30 +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-transfer-encoding; s=dkim; bh=9rDvKSVLHy63BmDbjbV13kkvI pbDeHf6joCqBc3LAfs=; b=H/FWG1WgCG+sYJeQSiCNkqPQX2QHgCNijMKN+dXU9 BpbT3RHx517gk0lsnKnJpwcOzE7gmVPhrNcUvSDOzlX22U6wD+KPNtwInz6n5C38 2Zw+ASMOVKCyuqfzliI1Phvi8JYI0zkMky+dGAhjJgTzjen0MO5KFZY8iPVup1Do rH6jvu34fdKUK8B+XhI9KOeu9bjGPMCLGZIR+F6tgShIphMxaFywnYZNLQntsSX9 OWRWGgeoy5onstvVwUqx8okeu07wFC4VDCCK+OASWILTl9q9OITkGdvyIeFqRCQ4 K+y0c0BDOi4hegL2KbVINfcJYnea/GJQ5In1vaDuuHQ2g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id bac0ed44 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:28 +0000 (UTC) From: Julien Lepiller Date: Tue, 21 Dec 2021 23:45:07 +0100 Message-Id: <463a5bb87e0f1d80d3ad6836458ab7b9e22c65e0.1640126679.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu> References: <20211221234231.44299f63@tachikoma.lepiller.eu> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven.scm (maven-enforcer-api): Update to 3.0.0. * gnu/packages/java.scm (java-bsh): Do not patch pom file anymore. --- gnu/packages/java.scm | 5 ----- gnu/packages/maven.scm | 19 +++++++++---------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 463cf51bcb..0e6a9601e4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11068,11 +11068,6 @@ (define-public java-bsh #:make-flags (list "-DDATE" "(no date for reproducibility)") #:phases (modify-phases %standard-phases - (add-before 'install 'fix-pom - (lambda _ - (substitute* "pom.xml" - (("org.apache-extras.beanshell") "org.beanshell")) - #t)) (replace 'install (install-from-pom "pom.xml"))))) (inputs diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 3e17e79752..d0424a3d08 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2739,16 +2739,14 @@ (define-public maven-common-artifact-filters-3.1.0 (define-public maven-enforcer-api (package (name "maven-enforcer-api") - (version "3.0.0-M3") + (version "3.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/enforcer/" "enforcer-" version "-source-release.zip")) (sha256 (base32 - "014cwj0dqa69nnlzcin8pk9wsjmmg71vsbcpb16cibcjpm6h9wjg")) - (patches - (search-patches "maven-enforcer-api-fix-old-dependencies.patch")))) + "1479yp58jv788xc1jc2sbdxpajlbvwlk60639vd2h4s8r6x7naqh")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-enforcer-api.jar" @@ -2782,12 +2780,13 @@ (define maven-enforcer-parent-pom (add-before 'install 'fix-pom-versions (lambda _ (substitute* "pom.xml" - (("3.8.1") ,(package-version java-commons-lang3)) - (("1.4.1") ,(package-version maven-resolver-util)) - (("1.12") ,(package-version java-commons-codec)) - (("2.2") - ,(string-append "" (package-version maven-dependency-tree) - ""))))) + ((".*") + ,(string-append "" (package-version maven) + "")) + (("2.11.0") ,(package-version java-commons-io)) + (("3.12.0") ,(package-version java-commons-lang3)) + (("1.6.1") ,(package-version maven-resolver-util)) + (("1.15") ,(package-version java-commons-codec))))) (replace 'install (install-pom-file "pom.xml"))))) (propagated-inputs