From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3Utf-0000jF-JY for guix-patches@gnu.org; Sat, 14 Oct 2017 18:27:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3Uta-0000Ep-Mk for guix-patches@gnu.org; Sat, 14 Oct 2017 18:27:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60240) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e3Uta-0000Ej-Ib for guix-patches@gnu.org; Sat, 14 Oct 2017 18:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e3Uta-00064x-D5 for guix-patches@gnu.org; Sat, 14 Oct 2017 18:27:02 -0400 Subject: [bug#28841] [PATCH 06/24] gnu: Add java-eclipse-jetty-util-9.2. Resent-Message-ID: From: julien@lepiller.eu Date: Sun, 15 Oct 2017 00:23:31 +0200 Message-Id: <20171014222349.12902-6-julien@lepiller.eu> In-Reply-To: <20171014222349.12902-1-julien@lepiller.eu> References: <20171014233216.49c852f7@lepiller.eu> <20171014222349.12902-1-julien@lepiller.eu> 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: 28841@debbugs.gnu.org From: Julien Lepiller * gnu/packages/java.scm (java-eclipse-jetty-util-9.2): New variable. --- gnu/packages/java.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 30312a3d9..33037a53d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6210,3 +6210,44 @@ Java WebSocket specifications are developed under the Java Community Process.") container capable of serving static and dynamic content either from a standalone or embedded instantiation. This package provides utility classes.") (license (list license:epl1.0 license:asl2.0)))) + +;; This version is required by maven-wagon +(define-public java-eclipse-jetty-util-9.2 + (package + (inherit java-eclipse-jetty-util) + (version "9.2.22") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/eclipse/jetty.project/" + "archive/jetty-" version ".v20170606.tar.gz")) + (sha256 + (base32 + "1i51qlsd7h06d35kx5rqpzbfadbcszycx1iwr6vz7qc9gf9f29la")))) + (arguments + `(#:jar-name "eclipse-jetty-util.jar" + #:source-dir "src/main/java" + #:jdk ,icedtea-8 + #:test-exclude + (list "**/Abstract*.java" + ;; requires network + "**/InetAddressSetTest.java" + ;; Assumes we are using maven + "**/TypeUtilTest.java" + ;; We don't have an implementation for slf4j + "**/LogTest.java" + ;; Error on the style of log + "**/StdErrLogTest.java") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + (chdir "jetty-util"))) + (add-before 'check 'fix-sources + (lambda _ + (let ((src "src/test/java/org/eclipse/jetty/util/resource")) + (substitute* (string-append src "/AbstractFSResourceTest.java") + (("testdir.getDir\\(\\)") "testdir.getPath().toFile()") + (("testdir.getFile\\(\"foo\"\\)") + "testdir.getPathFile(\"foo\").toFile()") + (("testdir.getFile\\(name\\)") + "testdir.getPathFile(name).toFile()")))))))))) -- 2.14.2