diff options
author | Julien Lepiller <julien@lepiller.eu> | 2020-05-16 22:15:53 +0200 |
---|---|---|
committer | Julien Lepiller <julien@lepiller.eu> | 2020-07-17 04:12:11 +0200 |
commit | ba03666d298e05ba9d549cf4e83b7e383f648894 (patch) | |
tree | c36c195c58f761d3fc17639d4e8325fa988ded4c /gnu/packages/java.scm | |
parent | b916b6382ee32a2ed8cd83378a42cb76c0dd2014 (diff) | |
download | guix-ba03666d298e05ba9d549cf4e83b7e383f648894.tar guix-ba03666d298e05ba9d549cf4e83b7e383f648894.tar.gz |
gnu: java-commons-codec: Update to 1.14.
* gnu/packages/java.scm (java-commons-codec): Update to 1.14.
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r-- | gnu/packages/java.scm | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3af375758c..1ad659ccd9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6913,33 +6913,38 @@ This is a part of the Apache Commons Project.") (define-public java-commons-codec (package (name "java-commons-codec") - (version "1.10") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/codec/source/" "commons-codec-" version "-src.tar.gz")) (sha256 (base32 - "1w9qg30y4s0x8gnmr2fgj4lyplfn788jqxbcz27lf5kbr6n8xr65")))) + "11xr0agckkhm91pb5akf2mbk84yd54gyr178wj57gsm97fi7nkh9")))) (build-system ant-build-system) - (outputs '("out" "doc")) (arguments - `(#:test-target "test" - #:make-flags - (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) - (junit (assoc-ref %build-inputs "java-junit"))) - (list (string-append "-Djunit.jar=" (car (find-files junit "jar$"))) - (string-append "-Dhamcrest.jar=" (car (find-files hamcrest "jar$"))) - ;; Do not append version to jar. - "-Dfinal.name=commons-codec")) + `(#:jar-name "java-commons-codec.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:test-exclude (list "**/*AbstractTest.java") #:phases (modify-phases %standard-phases - (add-after 'build 'build-javadoc ant-build-javadoc) - (replace 'install (install-jars "dist")) - (add-after 'install 'install-doc (install-javadoc "dist/docs/api"))))) + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" + "build/classes") + #t)) + (add-before 'check 'copy-test-resources + (lambda _ + (copy-recursively "src/test/resources" + "build/test-classes") + #t)) + (replace 'install (install-from-pom "pom.xml"))))) (native-inputs - `(("java-junit" ,java-junit) - ("java-hamcrest-core" ,java-hamcrest-core))) + `(("java-commons-lang3" ,java-commons-lang3) + ("java-junit" ,java-junit))) + (propagated-inputs + `(("apache-commons-parent-pom" ,apache-commons-parent-pom-50))) (home-page "https://commons.apache.org/codec/") (synopsis "Common encoders and decoders such as Base64, Hex, Phonetic and URLs") (description "The codec package contains simple encoder and decoders for |