diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2021-12-21 02:53:29 +0100 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2022-02-05 20:16:34 +0100 |
| commit | 04a91c7019782b8a908de113526bca6785de5797 (patch) | |
| tree | dc603dd20ccf2ac2c7ebb6be68436a12e7801be3 | |
| parent | fb1a9c11e5ec928704c98dd633301bbdd7f3e8f4 (diff) | |
| download | guix-patches-04a91c7019782b8a908de113526bca6785de5797.tar guix-patches-04a91c7019782b8a908de113526bca6785de5797.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/java.scm | 5 | ||||
| -rw-r--r-- | 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 |