TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: maven: Update to 3.8.5.

Browse source 
* gnu/packages/maven.scm (maven-pom): Update to 3.8.5.
(maven-model-builder)[arguments]: Build from the subdirectory to work
around a test issue.
(maven-3.0-model-builder)[arguments]: Fix accordingly.
This commit is contained in:
Julien Lepiller 2022-03-13 22:19:28 +01:00
parent 6dbce7d815
commit 7bdead3fce
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/maven.scm
View file

@ -1117,13 +1117,13 @@ (define-public maven-wagon-http
(define maven-pom (define maven-pom
(package (package
(name "maven-pom") (name "maven-pom")
(version "3.8.4") (version "3.8.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://apache/maven/" (uri (string-append "mirror://apache/maven/"
"maven-3/" version "/source/" "maven-3/" version "/source/"
"apache-maven-" version "-src.tar.gz")) "apache-maven-" version "-src.tar.gz"))
(sha256 (base32 "16xbhkhhp05gskgbhrf1ia8riivvkhpk822n9xgnad61f9hzp2r9")) (sha256 (base32 "01y0fjvlvgy1bl3mdhbjll2xhzpli6aklqb3w29xpbgk6frxn3d6"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1197,7 +1197,7 @@ (define maven-pom
(replace 'install (replace 'install
(install-pom-file "pom.xml"))))) (install-pom-file "pom.xml")))))
(propagated-inputs (propagated-inputs
`(("maven-parent-pom-34" ,maven-parent-pom-34))) (list maven-parent-pom-35))
(home-page "https://maven.apache.org/") (home-page "https://maven.apache.org/")
(synopsis "Build system") (synopsis "Build system")
(description "Apache Maven is a software project management and comprehension (description "Apache Maven is a software project management and comprehension
@ -1389,29 +1389,29 @@ (define-public maven-model-builder
(name "maven-model-builder") (name "maven-model-builder")
(arguments (arguments
`(#:jar-name "maven-model-builder.jar" `(#:jar-name "maven-model-builder.jar"
#:source-dir "maven-model-builder/src/main/java" #:source-dir "src/main/java"
#:jdk ,icedtea-8 #:jdk ,icedtea-8
#:test-dir "maven-model-builder/src/test" #:test-dir "src/test"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'chdir
(lambda _
;; Required for tests that rely on the package's default
;; locations, that reference ${basedir}/src/test.
(chdir "maven-model-builder")))
(add-before 'build 'copy-resources (add-before 'build 'copy-resources
(lambda _ (lambda _
(copy-recursively "maven-model-builder/src/main/resources" (copy-recursively "src/main/resources"
"build/classes") "build/classes")
#t)) #t))
(add-before 'build 'generate-sisu-named (add-before 'build 'generate-sisu-named
(lambda _ (lambda _
(mkdir-p "build/classes/META-INF/sisu") (mkdir-p "build/classes/META-INF/sisu")
(chmod "sisu.sh" #o755) (chmod "../sisu.sh" #o755)
(invoke "./sisu.sh" "maven-model-builder/src/main/java" (invoke "../sisu.sh" "src/main/java"
"build/classes/META-INF/sisu/javax.inject.Named"))) "build/classes/META-INF/sisu/javax.inject.Named")))
(add-before 'check 'fix-paths
(lambda _
(substitute* (find-files "maven-model-builder/src/test/java" ".*.java")
(("src/test") "maven-model-builder/src/test"))
#t))
(replace 'install (replace 'install
(install-from-pom "maven-model-builder/pom.xml"))))) (install-from-pom "pom.xml")))))
(propagated-inputs (propagated-inputs
(list java-plexus-interpolation (list java-plexus-interpolation
java-plexus-utils java-plexus-utils
@ -2403,12 +2403,12 @@ (define-public maven-3.0-model-builder
(add-before 'build 'generate-components.xml (add-before 'build 'generate-components.xml
(lambda _ (lambda _
(mkdir-p "build/classes/META-INF/plexus") (mkdir-p "build/classes/META-INF/plexus")
(chmod "components.sh" #o755) (chmod "../components.sh" #o755)
(invoke "./components.sh" "maven-model-builder/src/main/java" (invoke "../components.sh" "src/main/java"
"build/classes/META-INF/plexus/components.xml"))) "build/classes/META-INF/plexus/components.xml")))
(add-before 'check 'remove-failing-test (add-before 'check 'remove-failing-test
(lambda _ (lambda _
(delete-file "maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java"))))))) (delete-file "src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java")))))))
(propagated-inputs (propagated-inputs
`(("java-plexus-component-annotations" ,java-plexus-component-annotations) `(("java-plexus-component-annotations" ,java-plexus-component-annotations)
,@(filter ,@(filter