[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/26: gnu: maven-enforcer-api: Update to 3.0.0.
From: |
guix-commits |
Subject: |
23/26: gnu: maven-enforcer-api: Update to 3.0.0. |
Date: |
Sat, 5 Feb 2022 14:18:59 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit 04a91c7019782b8a908de113526bca6785de5797
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Tue Dec 21 02:53:29 2021 +0100
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/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 7d01a81e47..9b07022b54 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -10746,11 +10746,6 @@ annotations.")
#: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 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))
- (("<version>2.2</version>")
- ,(string-append "<version>" (package-version
maven-dependency-tree)
- "</version>")))))
+ (("<maven.version>.*</maven.version>")
+ ,(string-append "<maven.version>" (package-version maven)
+ "</maven.version>"))
+ (("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
- 01/26: gnu: Add apache-parent-pom-23., (continued)
- 01/26: gnu: Add apache-parent-pom-23., guix-commits, 2022/02/05
- 13/26: gnu: java-eclipse-sisu-inject: Update to 0.3.5., guix-commits, 2022/02/05
- 12/26: gnu: java-jsr250: Use proper source., guix-commits, 2022/02/05
- 16/26: gnu: java-plexus-container-default-bootstrap: Update to 2.1.0., guix-commits, 2022/02/05
- 03/26: gnu: Add plexus-parent-pom-8., guix-commits, 2022/02/05
- 06/26: gnu: java-commons-codec: Use latest commons parent., guix-commits, 2022/02/05
- 10/26: gnu: java-plexus-sec-dispatcher: Update to 2.0., guix-commits, 2022/02/05
- 20/26: gnu: Add java-sonatype-aether-util-1.13., guix-commits, 2022/02/05
- 04/26: gnu: Add maven-parent-pom-34., guix-commits, 2022/02/05
- 05/26: gnu: maven-parent-pom: Fix dependency versions., guix-commits, 2022/02/05
- 23/26: gnu: maven-enforcer-api: Update to 3.0.0.,
guix-commits <=
- 24/26: gnu: maven-wagon-provider-api: Update to 3.4.3., guix-commits, 2022/02/05
- 02/26: gnu: Add apache-commons-parent-pom-52., guix-commits, 2022/02/05
- 17/26: gnu: Add java-sonatype-aether-api-1.13., guix-commits, 2022/02/05
- 19/26: gnu: Add java-sonatype-aether-test-util-1.13., guix-commits, 2022/02/05
- 21/26: gnu: maven-dependency-tree: Update to 3.1.0., guix-commits, 2022/02/05
- 22/26: guix: maven: Fix java parser., guix-commits, 2022/02/05
- 14/26: gnu: java-eclipse-sisu-plexus: Update to 0.3.5., guix-commits, 2022/02/05
- 07/26: gnu: java-plexus-utils: Default to the newer one., guix-commits, 2022/02/05
- 09/26: gnu: java-plexus-cipher: Update to 2.0., guix-commits, 2022/02/05
- 11/26: gnu: Add java-jvnet-parent-pom-3., guix-commits, 2022/02/05