summaryrefslogtreecommitdiff
path: root/gnu/packages/java.scm
diff options
context:
space:
mode:
authorBjörn Höfling <bjoern.hoefling@bjoernhoefling.de>2018-07-21 10:23:28 +0200
committerJulien Lepiller <julien@lepiller.eu>2018-07-25 00:27:08 +0200
commit10eddaca0e0012fd6894ae9c5d59eaf4d0efa351 (patch)
treef0a1ca84ba2fcdce3898a959fba994132753e1c0 /gnu/packages/java.scm
parentb1ccd2a1ecdd0732194b015844a02599e764a3a9 (diff)
downloadpatches-10eddaca0e0012fd6894ae9c5d59eaf4d0efa351.tar
patches-10eddaca0e0012fd6894ae9c5d59eaf4d0efa351.tar.gz
gnu: java: Use java-classpathx-servletapi instead of java-tomcat where possible.
* gnu/package/java.scm (java-commons-jxpath)[inputs]: Remove java-tomcat, add java-classpathx-servletapi. (java-guice-servlet)[inputs]: Likewise. Signed-off-by: Julien Lepiller <julien@lepiller.eu>
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r--gnu/packages/java.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7f7cf52a64..d6c88f56be 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4449,7 +4449,7 @@ these scripting language engines.")
#:tests? #f
#:source-dir "src/java"))
(inputs
- `(("java-tomcat" ,java-tomcat)
+ `(("servlet" ,java-classpathx-servletapi)
("java-jdom" ,java-jdom)
("java-commons-beanutils" ,java-commons-beanutils)))
(native-inputs
@@ -7944,7 +7944,7 @@ Java 6 and above.")
#:tests? #f)); FIXME: not in a java subdir
(inputs
`(("guice" ,java-guice)
- ("servlet" ,java-tomcat)
+ ("servlet" ,java-classpathx-servletapi)
,@(package-inputs java-guice)))))
(define-public java-assertj