summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorJulien Lepiller <julien@lepiller.eu>2017-10-10 23:12:14 +0200
committerJulien Lepiller <julien@lepiller.eu>2017-10-23 22:54:38 +0200
commit5010671d4d58ff9f7cf8d2d5451f8bff636ede0d (patch)
treeb766e0cd568e5e48fa48ca5d217fd4c19300295f /gnu/packages
parent1657d62ae5f77a0a0755689e1995759044b82374 (diff)
downloadguix-5010671d4d58ff9f7cf8d2d5451f8bff636ede0d.tar.gz
gnu: Add java-eclipse-jetty-util-9.2.
* gnu/packages/web.scm (java-eclipse-jetty-util-9.2): New variable.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/web.scm45
1 files changed, 45 insertions, 0 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index cd84d9c150..dfe02a68f3 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5550,3 +5550,48 @@ Web Server.")
 container capable of serving static and dynamic content either from a standalone
 or embedded instantiation.  This package provides utility classes.")
     (license (list l:epl1.0 l: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")
+             #t))
+         (add-before 'build 'fix-test-sources
+           (lambda _
+             ;; We need to fix issues caused by changes in newer versions of
+             ;; jetty-test-helper
+             (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()")))
+             #t)))))))