me
/
guix
Archived
1
0
Fork 0

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>
master
Björn Höfling 2018-07-21 10:23:28 +02:00 committed by Julien Lepiller
parent b1ccd2a1ec
commit 10eddaca0e
No known key found for this signature in database
GPG Key ID: 43111F4520086A0C
1 changed files with 2 additions and 2 deletions

View File

@ -4449,7 +4449,7 @@ these scripting language engines.")
#:tests? #f #:tests? #f
#:source-dir "src/java")) #:source-dir "src/java"))
(inputs (inputs
`(("java-tomcat" ,java-tomcat) `(("servlet" ,java-classpathx-servletapi)
("java-jdom" ,java-jdom) ("java-jdom" ,java-jdom)
("java-commons-beanutils" ,java-commons-beanutils))) ("java-commons-beanutils" ,java-commons-beanutils)))
(native-inputs (native-inputs
@ -7944,7 +7944,7 @@ Java 6 and above.")
#:tests? #f)); FIXME: not in a java subdir #:tests? #f)); FIXME: not in a java subdir
(inputs (inputs
`(("guice" ,java-guice) `(("guice" ,java-guice)
("servlet" ,java-tomcat) ("servlet" ,java-classpathx-servletapi)
,@(package-inputs java-guice))))) ,@(package-inputs java-guice)))))
(define-public java-assertj (define-public java-assertj