me
/
guix
Archived
1
0
Fork 0
Code

gnu: java: Use java-javaee-servletapi instead of java-tomcat. 

* gnu/packages/java.scm(java-eclipse-sisu-inject)[inputs]: Remove java-tomcat, add java-javaee-servletapi.
(logback-core)[inputs]: Likewise.
* gnu/packages/maven.scm (maven-wagon-provider-test)[inputs]: Likewise.
* gnu/packages/web.scm (java-eclipse-jetty-webapp)[inputs]: Likewise.
(java-eclipse-jetty-server)[inputs]: Likewise.
(java-eclipse-jetty-http)[inputs]: Likewise.
(java-eclipse-jetty-jmx)[inputs]: Likewise.
(java-eclipse-jetty-io)[inputs]: Likewise.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
master
Björn Höfling 2018-07-21 10:24:25 +02:00 committed by Julien Lepiller
parent 10d62a88bf
commit 4b472f6a06
No known key found for this signature in database
GPG Key ID: 43111F4520086A0C
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/java.scm
View File

@ -10144,7 +10144,7 @@ and reporting) project dependencies. It is characterized by the following:
`(("java-guice" ,java-guice)
("java-guice-servlet" ,java-guice-servlet)
("java-javax-inject" ,java-javax-inject)
("java-tomcat" ,java-tomcat)
("java-javaee-servletapi" ,java-javaee-servletapi)
("java-junit" ,java-junit)
("java-slf4j-api" ,java-slf4j-api)
("java-jsr305" ,java-jsr305)
@ -10339,7 +10339,7 @@ static code analysis or code manipulation.")))
#t)))))
(inputs
`(("java-javax-mail" ,java-javax-mail)
("java-tomcat" ,java-tomcat)
("servlet" ,java-javaee-servletapi)
("java-commons-compiler" ,java-commons-compiler)
("java-janino" ,java-janino)))
(native-inputs
@ -10383,7 +10383,7 @@ This module lays the groundwork for the other two modules.")
(find-files (assoc-ref inputs input)
".*.jar"))
'("java-logback-core" "java-slf4j-api"
"java-commons-compiler" "java-tomcat"
"java-commons-compiler" "servlet"
"groovy")))
":"))
(apply invoke "groovyc" "-d" "build/classes" "-j"

2
gnu/packages/maven.scm
View File

@ -428,7 +428,7 @@ artifact and repository handling code.")
("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
("java-slf4j-api" ,java-slf4j-api)
("java-tomcat" ,java-tomcat)
("java-javaee-servletapi" ,java-javaee-servletapi)
("maven-wagon-provider-api" ,maven-wagon-provider-api)))
(synopsis "Test classes from maven-wagon")
(description "Maven Wagon is a transport abstraction that is used in Maven's

10
gnu/packages/web.scm
View File

@ -5938,7 +5938,7 @@ or embedded instantiation. This package provides utility classes.")
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat)
("servlet" ,java-javaee-servletapi)
("util" ,java-eclipse-jetty-util)))
(synopsis "Jetty :: IO Utility")
(description "The Jetty Web Server provides an HTTP server and Servlet
@ -5981,7 +5981,7 @@ or embedded instantiation. This package provides IO-related utility classes."))
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat)
("servlet" ,java-javaee-servletapi)
("io" ,java-eclipse-jetty-io)
("util" ,java-eclipse-jetty-util)))
(synopsis "Jetty :: Http Utility")
@ -6016,7 +6016,7 @@ or embedded instantiation. This package provides HTTP-related utility classes."
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat)
("servlet" ,java-javaee-servletapi)
("util" ,java-eclipse-jetty-util)))
(synopsis "Jetty :: JMX Management")
(description "The Jetty Web Server provides an HTTP server and Servlet
@ -6097,7 +6097,7 @@ or embedded instantiation. This package provides the JMX management.")))
#t)))))
(inputs
`(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat)
("servlet" ,java-javaee-servletapi)
("http" ,java-eclipse-jetty-http)
("io" ,java-eclipse-jetty-io)
("jmx" ,java-eclipse-jetty-jmx)
@ -6293,7 +6293,7 @@ container.")))
("java-eclipse-jetty-servlet" ,java-eclipse-jetty-servlet)
("java-eclipse-jetty-security" ,java-eclipse-jetty-security)
("java-eclipse-jetty-xml" ,java-eclipse-jetty-xml)
("java-tomcat" ,java-tomcat)))
("java-javaee-servletapi" ,java-javaee-servletapi)))
(native-inputs
`(("java-eclipse-jetty-io" ,java-eclipse-jetty-io)
,@(package-native-inputs java-eclipse-jetty-util)))))