amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: maven-enforcer-api: Update to 3.0.0.

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/java.scm
View file

@ -10746,11 +10746,6 @@ annotations.")
#:make-flags (list "-DDATE" "(no date for reproducibility)") #:make-flags (list "-DDATE" "(no date for reproducibility)")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'install 'fix-pom
(lambda _
(substitute* "pom.xml"
(("org.apache-extras.beanshell") "org.beanshell"))
#t))
(replace 'install (replace 'install
(install-from-pom "pom.xml"))))) (install-from-pom "pom.xml")))))
(inputs (inputs

19
gnu/packages/maven.scm
View file

@ -2836,16 +2836,14 @@ Maven project dependencies.")
(define-public maven-enforcer-api (define-public maven-enforcer-api
(package (package
(name "maven-enforcer-api") (name "maven-enforcer-api")
(version "3.0.0-M3") (version "3.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://apache/maven/enforcer/" (uri (string-append "mirror://apache/maven/enforcer/"
"enforcer-" version "-source-release.zip")) "enforcer-" version "-source-release.zip"))
(sha256 (sha256
(base32 (base32
"014cwj0dqa69nnlzcin8pk9wsjmmg71vsbcpb16cibcjpm6h9wjg")) "1479yp58jv788xc1jc2sbdxpajlbvwlk60639vd2h4s8r6x7naqh"))))
(patches
(search-patches "maven-enforcer-api-fix-old-dependencies.patch"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "maven-enforcer-api.jar" `(#:jar-name "maven-enforcer-api.jar"
@ -2879,12 +2877,13 @@ Maven project dependencies.")
(add-before 'install 'fix-pom-versions (add-before 'install 'fix-pom-versions
(lambda _ (lambda _
(substitute* "pom.xml" (substitute* "pom.xml"
(("3.8.1") ,(package-version java-commons-lang3)) (("<maven.version>.*</maven.version>")
(("1.4.1") ,(package-version maven-resolver-util)) ,(string-append "<maven.version>" (package-version maven)
(("1.12") ,(package-version java-commons-codec)) "</maven.version>"))
(("<version>2.2</version>") (("2.11.0") ,(package-version java-commons-io))
,(string-append "<version>" (package-version maven-dependency-tree) (("3.12.0") ,(package-version java-commons-lang3))
"</version>"))))) (("1.6.1") ,(package-version maven-resolver-util))
(("1.15") ,(package-version java-commons-codec)))))
(replace 'install (replace 'install
(install-pom-file "pom.xml"))))) (install-pom-file "pom.xml")))))
(propagated-inputs (propagated-inputs