From: Roel Janssen <roel@gnu.org>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: 26803@debbugs.gnu.org
Subject: bug#26803: [PATCH 27/36] gnu: Add java-mockito-1.
Date: Thu, 11 May 2017 10:57:11 +0200 [thread overview]
Message-ID: <rbur2zvpy8o.fsf@gnu.org> (raw)
In-Reply-To: <871srvhkg9.fsf@elephly.net>
Ricardo Wurmus writes:
> Roel Janssen <roel@gnu.org> writes:
>
>> Ricardo Wurmus writes:
>>
>>> * gnu/packages/java.scm (java-mockito): New variable.
>>> ---
>>> gnu/packages/java.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
>>> 1 file changed, 60 insertions(+)
>>>
>>> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
>>> index 859f9934a..2cf2821c0 100644
>>> --- a/gnu/packages/java.scm
>>> +++ b/gnu/packages/java.scm
>>> @@ -1977,6 +1977,66 @@ logging implementations. A library that uses the commons-logging API can be
>>> used with any logging implementation at runtime.")
>>> (license license:asl2.0)))
>>>
>>> +;; This is the last release of the 1.x series.
>>> +(define-public java-mockito-1
>>> + (package
>>> + (name "java-mockito")
>>> + (version "1.10.19")
>>> + (source (origin
>>> + (method url-fetch)
>>> + (uri (string-append "http://repo1.maven.org/maven2/"
>>> + "org/mockito/mockito-core/" version
>>> + "/mockito-core-" version "-sources.jar"))
>>> + (sha256
>>> + (base32
>>> + "0vmiwnwpf83g2q7kj1rislmja8fpvqkixjhawh7nxnygx6pq11kc"))))
>>> + (build-system ant-build-system)
>>> + (arguments
>>> + `(#:jar-name "mockito.jar"
>>> + #:tests? #f ; no tests included
>>> + ;; FIXME: patch-and-repack does not support jars, so we have to apply
>>> + ;; patches in build phases.
>>> + #:phases
>>> + (modify-phases %standard-phases
>>> + ;; Mockito fails to build with our verson of hamcrest without this
>>> + ;; definition.
>>> + (add-after 'unpack 'fix-hamcrest-build-error
>>> + (lambda _
>>> + (substitute* "src/org/mockito/internal/matchers/LocalizedMatcher.java"
>>> + (("public Matcher getActualMatcher\\(\\) .*" line)
>>> + (string-append "
>>> + public void describeMismatch(Object item, Description description) {
>>> + actualMatcher.describeMismatch(item, description);
>>> + }"
>>> + line)))
>>> + #t))
>>
>> I understand this is easier and possibly less error-prone than creating
>> a patch file instead, but how far are we going with adding/removing code
>> inside the package recipes?
>
> There’s a FIXME comment above the #:phases. I would like to use a patch
> in this case, but patch-and-repack does not support jars. We usually
> unpack the sources, apply the patches, and then repack the sources, but
> this currently doesn’t work for jars.
>
> This is why I must do this in build phases.
Right. Too bad this doesn't work for Java archives.
>> As far as the actual code addition goes, it is pretty straightforward:
>> It adds a function that hamcrest expects is available. Maybe add a
>> comment describing this? Then it's OK to me.
>
> Okay, I’ll add a better comment here.
>
> Thanks!
Okay. LGTM!
Kind regards,
Roel Janssen
next prev parent reply other threads:[~2017-05-11 8:58 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-06 14:01 bug#26803: Java things Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 01/36] ant-build-system: Allow specifying source directory Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 02/36] ant-build-system: Add default "check" target Ricardo Wurmus
2017-05-06 20:28 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 03/36] guix: Add java-utils Ricardo Wurmus
2017-05-06 20:31 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 04/36] gnu: Add java-plexus-utils Ricardo Wurmus
2017-05-06 20:34 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 05/36] gnu: Add java-plexus-interpolation Ricardo Wurmus
2017-05-06 20:36 ` Roel Janssen
2017-05-10 10:44 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 06/36] gnu: Add java-asm Ricardo Wurmus
2017-05-06 20:39 ` Roel Janssen
2017-05-10 13:58 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 07/36] gnu: Add java-cglib Ricardo Wurmus
2017-05-06 20:40 ` Roel Janssen
2017-05-06 20:49 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 08/36] gnu: Add java-objenesis Ricardo Wurmus
2017-05-06 20:41 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 09/36] gnu: Add java-easymock Ricardo Wurmus
2017-05-06 21:28 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 10/36] gnu: Add java-jopt-simple Ricardo Wurmus
2017-05-06 21:31 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 11/36] gnu: java-hamcrest-core: Install all jars without version suffix Ricardo Wurmus
2017-05-06 21:39 ` Roel Janssen
2017-05-10 14:00 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 12/36] gnu: Add java-commons-math3 Ricardo Wurmus
2017-05-06 21:43 ` Roel Janssen
2017-05-10 14:01 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 13/36] gnu: Add java-jmh Ricardo Wurmus
2017-05-07 19:13 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 14/36] gnu: Add java-commons-collections4 Ricardo Wurmus
2017-05-07 19:16 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 15/36] gnu: Add java-commons-io Ricardo Wurmus
2017-05-08 10:41 ` Roel Janssen
2017-05-10 14:10 ` Ricardo Wurmus
2017-05-10 14:24 ` Roel Janssen
2017-05-10 14:34 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 16/36] gnu: Add java-commons-lang Ricardo Wurmus
2017-05-08 10:46 ` Roel Janssen
2017-05-10 14:13 ` Ricardo Wurmus
2017-05-10 14:23 ` Roel Janssen
2017-05-06 15:35 ` bug#26803: [PATCH 17/36] gnu: Add java-commons-lang3 Ricardo Wurmus
2017-05-08 11:20 ` Roel Janssen
2017-05-10 14:23 ` Ricardo Wurmus
2017-05-06 15:35 ` bug#26803: [PATCH 18/36] gnu: Add java-commons-cli Ricardo Wurmus
2017-05-08 14:13 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 19/36] gnu: Add java-commons-codec Ricardo Wurmus
2017-05-10 10:09 ` Roel Janssen
2017-05-10 14:25 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 20/36] gnu: Add java-commons-daemon Ricardo Wurmus
2017-05-10 10:12 ` Roel Janssen
2017-05-10 16:03 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 21/36] gnu: Add java-jmock-1 Ricardo Wurmus
2017-05-10 10:15 ` Roel Janssen
2017-05-10 16:00 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 22/36] gnu: java-hamcrest-core: Declare test target Ricardo Wurmus
2017-05-10 10:15 ` Roel Janssen
2017-05-10 16:04 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 23/36] gnu: Add java-hamcrest-all Ricardo Wurmus
2017-05-10 18:02 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 24/36] gnu: Add java-jsr305 Ricardo Wurmus
2017-05-10 18:04 ` Roel Janssen
2017-05-11 9:27 ` julien lepiller
2017-05-06 15:36 ` bug#26803: [PATCH 25/36] gnu: Add java-guava Ricardo Wurmus
2017-05-10 18:06 ` Roel Janssen
2017-05-10 19:43 ` Ricardo Wurmus
2017-05-11 9:38 ` julien lepiller
2017-05-06 15:36 ` bug#26803: [PATCH 26/36] gnu: Add java-commons-logging-minimal Ricardo Wurmus
2017-05-10 18:09 ` Roel Janssen
2017-05-10 19:46 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 27/36] gnu: Add java-mockito-1 Ricardo Wurmus
2017-05-11 8:13 ` Roel Janssen
2017-05-11 8:22 ` Ricardo Wurmus
2017-05-11 8:57 ` Roel Janssen [this message]
2017-05-06 15:36 ` bug#26803: [PATCH 28/36] gnu: Add java-httpcomponents-httpcore Ricardo Wurmus
2017-05-11 8:16 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 29/36] gnu: Add java-httpcomponents-httpcore-nio Ricardo Wurmus
2017-05-11 8:18 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 30/36] gnu: Add java-httpcomponents-httpcore-ab Ricardo Wurmus
2017-05-11 8:30 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 31/36] gnu: Add java-httpcomponents-httpclient Ricardo Wurmus
2017-05-11 8:32 ` Roel Janssen
2017-05-15 19:44 ` Ricardo Wurmus
2017-05-15 21:26 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 32/36] gnu: Add java-httpcomponents-httpmime Ricardo Wurmus
2017-05-11 8:32 ` Roel Janssen
2017-05-06 15:36 ` bug#26803: [PATCH 33/36] gnu: Add java-commons-httpclient Ricardo Wurmus
2017-05-11 8:35 ` Roel Janssen
2017-05-15 19:50 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 34/36] gnu: Add java-commons-net Ricardo Wurmus
2017-05-11 8:40 ` Roel Janssen
2017-05-15 19:53 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 35/36] gnu: Add java-jsch Ricardo Wurmus
2017-05-11 8:41 ` Roel Janssen
2017-05-15 19:54 ` Ricardo Wurmus
2017-05-06 15:36 ` bug#26803: [PATCH 36/36] gnu: Add java-commons-compress Ricardo Wurmus
2017-05-11 8:53 ` Roel Janssen
2017-05-15 19:56 ` Ricardo Wurmus
2017-05-06 20:22 ` bug#26803: [PATCH 01/36] ant-build-system: Allow specifying source directory Roel Janssen
2017-05-07 10:34 ` bug#26803: Java things Hartmut Goebel
2017-05-07 11:47 ` Ricardo Wurmus
2017-05-08 8:18 ` Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=rbur2zvpy8o.fsf@gnu.org \
--to=roel@gnu.org \
--cc=26803@debbugs.gnu.org \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.