roptat pushed a commit to branch master
in repository guix.
commit 10eddaca0e0012fd6894ae9c5d59eaf4d0efa351
Author: Björn Höfling <[email protected]>
Date: Sat Jul 21 10:23:28 2018 +0200
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 <[email protected]>
---
gnu/packages/java.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7f7cf52..d6c88f5 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
