summaryrefslogtreecommitdiff
path: root/gnu/packages/web.scm
diff options
context:
space:
mode:
authorBjörn Höfling <bjoern.hoefling@bjoernhoefling.de>2019-03-04 20:53:43 +0100
committerBjörn Höfling <bjoern.hoefling@bjoernhoefling.de>2019-10-13 22:35:04 +0200
commit53ba191b3b94c7961d703b58b9aaa2ebb6fe0429 (patch)
treeb1a5da2a88f75a574dd11ebf9641b91db413f1da /gnu/packages/web.scm
parent8ea8d607f978bbbf5d3062a52797f106a2beb041 (diff)
gnu: Remove dependencies on java-tomcat, use servlet API instead.
These packages are using java-tomcat as a dependency where they actually only need a servlet API. * gnu/packages/maven.scm (maven-wagon-tck-http)[inputs]: Remove java-tomcat, add java-javaee-servletapi. (maven-wagon-http)[native-inputs]: Same here. * gnu/packages/web.scm (java-eclipse-jetty-util)[inputs]: Same here. (java-eclipse-jetty-http-test-classes)[inputs]: Same here. (java-eclipse-jetty-security)[inputs]: Same here. (java-eclipse-jetty-servlet)[inputs]: Same here. (java-eclipse-jetty-webapp-9.2)[inputs]: Same here.
Diffstat (limited to 'gnu/packages/web.scm')
-rw-r--r--gnu/packages/web.scm10
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 6e89c3a406..a1c5593ee8 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5869,7 +5869,7 @@ Web Server.")
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
- ("servlet" ,java-tomcat)))
+ ("servlet" ,java-javaee-servletapi)))
(native-inputs
`(("junit" ,java-junit)
("hamcrest" ,java-hamcrest-all)
@@ -6057,7 +6057,7 @@ or embedded instantiation. This package provides the JMX management.")))
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
- ("servlet" ,java-tomcat)
+ ("java-javaee-servletapi" ,java-javaee-servletapi)
("http" ,java-eclipse-jetty-http)
("io" ,java-eclipse-jetty-io)
("util" ,java-eclipse-jetty-util)))))
@@ -6152,7 +6152,7 @@ artifact.")))
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
- ("servlet" ,java-tomcat)
+ ("servlet" ,java-javaee-servletapi)
("http" ,java-eclipse-jetty-http)
("server" ,java-eclipse-jetty-server)
("util" ,java-eclipse-jetty-util)))
@@ -6195,7 +6195,7 @@ infrastructure")))
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
- ("servlet" ,java-tomcat)
+ ("java-javaee-servletapi" ,java-javaee-servletapi)
("http" ,java-eclipse-jetty-http)
("http-test" ,java-eclipse-jetty-http-test-classes)
("io" ,java-eclipse-jetty-io)
@@ -6330,7 +6330,7 @@ container.")))
("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
("java-eclipse-jetty-xml-9.2" ,java-eclipse-jetty-xml-9.2)
- ("java-tomcat" ,java-tomcat)
+ ("java-javaee-servletapi" ,java-javaee-servletapi)
,@(package-inputs java-eclipse-jetty-util-9.2)))
(native-inputs
`(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)