From 04a91c7019782b8a908de113526bca6785de5797 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 21 Dec 2021 02:53:29 +0100 Subject: gnu: maven-enforcer-api: Update to 3.0.0. * 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/maven.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages/maven.scm') diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index e76c28e48c..d98e2855be 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2836,16 +2836,14 @@ Maven project dependencies.") (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" @@ -2879,12 +2877,13 @@ Maven project dependencies.") (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 -- cgit 1.4.1