aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Lepiller <julien@lepiller.eu>2019-04-30 12:36:49 +0200
committerJulien Lepiller <julien@lepiller.eu>2019-04-30 12:41:11 +0200
commit6f737ae68f6616466fafdb33427f2d1b0d23f23e (patch)
treea1d3501abbd11cc18c8284fd26aa3113b3106c67
parent0cd8efcc8c954ba4dafb97bbc68bc1d39fa48d14 (diff)
downloadguix-6f737ae68f6616466fafdb33427f2d1b0d23f23e.tar
guix-6f737ae68f6616466fafdb33427f2d1b0d23f23e.tar.gz
gnu: java-plexus-archiver: Update to 4.1.0.
* gnu/packages/java.scm (java-plexus-archiver): Update to 4.1.0.
-rw-r--r--gnu/packages/java.scm12
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 762d5d0e87..9664d749fb 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3416,14 +3416,14 @@ reusing it in maven.")
(define-public java-plexus-archiver
(package
(name "java-plexus-archiver")
- (version "3.5")
+ (version "4.1.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/codehaus-plexus/plexus-archiver"
"/archive/plexus-archiver-" version ".tar.gz"))
(sha256
(base32
- "0iv1j7khra6icqh3jndng3iipfmkc7l5jq2y802cm8r575v75pyv"))))
+ "0ry6i92gli0mvdmfih2vgs0lkf9yvx18h2ajxim66yg6yipnp0hg"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "plexus-archiver.jar"
@@ -3439,6 +3439,11 @@ reusing it in maven.")
(delete-file
"src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java")
#t))
+ (add-before 'check 'fix-test-building
+ (lambda _
+ (substitute* "build.xml"
+ (("srcdir=\"src/test\"") "srcdir=\"src/test/java\""))
+ #t))
(add-before 'build 'copy-resources
(lambda _
(mkdir-p "build/classes/META-INF/plexus")
@@ -3455,7 +3460,8 @@ reusing it in maven.")
("snappy" ,java-snappy)
("java-jsr305" ,java-jsr305)))
(native-inputs
- `(("junit" ,java-junit)
+ `(("java-hamcrest-core" ,java-hamcrest-core)
+ ("junit" ,java-junit)
("classworld" ,java-plexus-classworlds)
("xbean" ,java-geronimo-xbean-reflect)
("xz" ,java-tukaani-xz)