From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76Pv-0007zN-Vx for guix-patches@gnu.org; Sat, 06 May 2017 16:35:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76Pu-00020e-Ro for guix-patches@gnu.org; Sat, 06 May 2017 16:35:04 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d76Pu-00020A-OA for guix-patches@gnu.org; Sat, 06 May 2017 16:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d76Pu-0001UN-HF for guix-patches@gnu.org; Sat, 06 May 2017 16:35:02 -0400 Subject: bug#26803: [PATCH 04/36] gnu: Add java-plexus-utils. Resent-Message-ID: References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-4-rekado@elephly.net> From: Roel Janssen In-reply-to: <20170506153617.3074-4-rekado@elephly.net> Date: Sat, 06 May 2017 22:34:45 +0200 Message-ID: <87mvapk9lm.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Ricardo Wurmus writes: > * gnu/packages/java.scm (java-plexus-utils): New variable. > > Co-authored-by: Hartmut Goebel > --- > gnu/packages/java.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 52 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index ad1ccac83..49b953d26 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1180,3 +1180,55 @@ testing frameworks, mocking libraries and UI validation rules.") > JUnit provides assertions for testing expected results, test fixtures for > sharing common test data, and test runners for running tests.") > (license license:epl1.0))) > + > +(define-public java-plexus-utils > + (package > + (name "java-plexus-utils") > + (version "3.0.24") > + (source (origin > + (method url-fetch) > + (uri (string-append "https://github.com/codehaus-plexus/" > + "plexus-utils/archive/plexus-utils-" > + version ".tar.gz")) > + (sha256 > + (base32 > + "1mlwpc6fms24slygv5yvi6fi9hcha2fh0v73p5znpi78bg36i2js")))) > + (build-system ant-build-system) > + ;; FIXME: The default build.xml does not include a target to install > + ;; javadoc files. > + (arguments > + `(#:jar-name "plexus-utils.jar" > + #:source-dir "src/main" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'fix-reference-to-/bin-and-/usr > + (lambda _ > + (substitute* "src/main/java/org/codehaus/plexus/util/\ > +cli/shell/BourneShell.java" > + (("/bin/sh") (which "sh")) > + (("/usr/") (getcwd))) > + #t)) > + (add-after 'unpack 'fix-or-disable-broken-tests > + (lambda _ > + (with-directory-excursion "src/test/java/org/codehaus/plexus/util" > + (substitute* '("cli/CommandlineTest.java" > + "cli/shell/BourneShellTest.java") > + (("/bin/sh") (which "sh")) > + (("/bin/echo") (which "echo"))) > + > + ;; This test depends on MavenProjectStub, but we don't have > + ;; a package for Maven. > + (delete-file "introspection/ReflectionValueExtractorTest.java") > + > + ;; FIXME: The command line tests fail, maybe because they use > + ;; absolute paths. > + (delete-file "cli/CommandlineTest.java")) > + #t))))) > + (native-inputs > + `(("java-junit" ,java-junit))) > + (home-page "http://codehaus-plexus.github.io/plexus-utils/") > + (synopsis "Common utilities for the Plexus framework") > + (description "This package provides various Java utility classes for the > +Plexus framework to ease working with strings, files, command lines, XML and > +more.") > + (license license:asl2.0))) I'd prefer moving on rather than fixing the test failure on cli/CommandlineTest.java. LGTM. Thanks a lot! Kind regards, Roel Janssen