From f91fceb920cc1c191c86326c21de046937184969 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Jul 2021 21:47:26 +0200 Subject: gnu: java-commons-codec: Don't return #t from phases. * gnu/packages/java.scm (java-commons-codec)[arguments]: Don't return #t from phases. --- gnu/packages/java.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 64df5a2e24a..2c4c3451ad4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7969,13 +7969,11 @@ This is a part of the Apache Commons Project.") (add-before 'build 'copy-resources (lambda _ (copy-recursively "src/main/resources" - "build/classes") - #t)) + "build/classes"))) (add-before 'check 'copy-test-resources (lambda _ (copy-recursively "src/test/resources" - "build/test-classes") - #t)) + "build/test-classes"))) (replace 'install (install-from-pom "pom.xml"))))) (native-inputs `(("java-commons-lang3" ,java-commons-lang3) -- cgit v1.3 From 94ec198506c11d1151bccfe5d51f44d562e9b5d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Jul 2021 22:13:02 +0200 Subject: gnu: java-commons-codec: Fix build on non-huge-memory machines. * gnu/packages/java.scm (java-commons-codec)[arguments]: Add a new 'skip-ravenous-test phase. --- gnu/packages/java.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2c4c3451ad4..c75adcaf0ef 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7974,6 +7974,14 @@ This is a part of the Apache Commons Project.") (lambda _ (copy-recursively "src/test/resources" "build/test-classes"))) + (add-before 'check 'skip-ravenous-test + (lambda _ + ;; This test admits to being "memory hungry", but reliably fails + ;; even on a machine that should have plenty (12 GiB). Skip it. + (substitute* + "src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java" + (("\\bassertEnsureBufferSizeExpandsToMaxBufferSize.*;") + "return;")))) (replace 'install (install-from-pom "pom.xml"))))) (native-inputs `(("java-commons-lang3" ,java-commons-lang3) -- cgit v1.3 From 3e8537c1464ac6749234492802d930a965f7efbd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Jul 2021 21:38:09 +0200 Subject: gnu: java-commons-codec: Update to 1.15. * gnu/packages/java.scm (java-commons-codec): Update to 1.15. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c75adcaf0ef..621a6fe9149 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7950,14 +7950,14 @@ This is a part of the Apache Commons Project.") (define-public java-commons-codec (package (name "java-commons-codec") - (version "1.14") + (version "1.15") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/codec/source/" "commons-codec-" version "-src.tar.gz")) (sha256 (base32 - "11xr0agckkhm91pb5akf2mbk84yd54gyr178wj57gsm97fi7nkh9")))) + "01z9qmg8fd8d7p7xxipwj1vi9bmvpgqyi29kldjz2x6vzwm171jj")))) (build-system ant-build-system) (arguments `(#:jar-name "java-commons-codec.jar" -- cgit v1.3