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.
This commit is contained in:
Julien Lepiller 2021-12-21 02:53:29 +01:00
parent fb1a9c11e5
commit 04a91c7019
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
2 changed files with 9 additions and 15 deletions

View file

@ -10746,11 +10746,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

View file

@ -2836,16 +2836,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"
@ -2879,12 +2877,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))
(("<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