1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-15 19:40:46 +02:00

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>
This commit is contained in:
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

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"