ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove dependencies on java-tomcat, use servlet API instead.

Browse source 
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.
This commit is contained in:
Björn Höfling 2019-03-04 20:53:43 +01:00
parent 8ea8d607f9
commit 53ba191b3b
No known key found for this signature in database
GPG key ID: BF286CB6593E5FFD
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/maven.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Tobias Geerinckx-Rite <me@tobias.gr> ;;; Copyright © 2019 Tobias Geerinckx-Rite <me@tobias.gr>
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -523,7 +524,7 @@ (define-public maven-wagon-tck-http
(inputs (inputs
`(("java-plexus-util" ,java-plexus-utils) `(("java-plexus-util" ,java-plexus-utils)
("maven-wagon-provider-api" ,maven-wagon-provider-api) ("maven-wagon-provider-api" ,maven-wagon-provider-api)
("java-tomcat" ,java-tomcat) ("java-javaee-servletapi" ,java-javaee-servletapi)
("java-slf4j-api" ,java-slf4j-api) ("java-slf4j-api" ,java-slf4j-api)
("java-commons-codec" ,java-commons-codec) ("java-commons-codec" ,java-commons-codec)
("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
@ -663,7 +664,7 @@ (define-public maven-wagon-http
("java-jdom2" ,java-jdom2) ("java-jdom2" ,java-jdom2)
("java-asm" ,java-asm) ("java-asm" ,java-asm)
("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
("java-tomcat" ,java-tomcat) ("java-javaee-servletapi" ,java-javaee-servletapi)
("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2) ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2) ("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2) ("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2)

10
gnu/packages/web.scm
View file

@ -5869,7 +5869,7 @@ (define-public java-eclipse-jetty-util
#t))))) #t)))))
(inputs (inputs
`(("slf4j" ,java-slf4j-api) `(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat))) ("servlet" ,java-javaee-servletapi)))
(native-inputs (native-inputs
`(("junit" ,java-junit) `(("junit" ,java-junit)
("hamcrest" ,java-hamcrest-all) ("hamcrest" ,java-hamcrest-all)
@ -6057,7 +6057,7 @@ (define java-eclipse-jetty-http-test-classes
#t))))) #t)))))
(inputs (inputs
`(("slf4j" ,java-slf4j-api) `(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat) ("java-javaee-servletapi" ,java-javaee-servletapi)
("http" ,java-eclipse-jetty-http) ("http" ,java-eclipse-jetty-http)
("io" ,java-eclipse-jetty-io) ("io" ,java-eclipse-jetty-io)
("util" ,java-eclipse-jetty-util))))) ("util" ,java-eclipse-jetty-util)))))
@ -6152,7 +6152,7 @@ (define-public java-eclipse-jetty-security
#t))))) #t)))))
(inputs (inputs
`(("slf4j" ,java-slf4j-api) `(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat) ("servlet" ,java-javaee-servletapi)
("http" ,java-eclipse-jetty-http) ("http" ,java-eclipse-jetty-http)
("server" ,java-eclipse-jetty-server) ("server" ,java-eclipse-jetty-server)
("util" ,java-eclipse-jetty-util))) ("util" ,java-eclipse-jetty-util)))
@ -6195,7 +6195,7 @@ (define-public java-eclipse-jetty-servlet
#t))))) #t)))))
(inputs (inputs
`(("slf4j" ,java-slf4j-api) `(("slf4j" ,java-slf4j-api)
("servlet" ,java-tomcat) ("java-javaee-servletapi" ,java-javaee-servletapi)
("http" ,java-eclipse-jetty-http) ("http" ,java-eclipse-jetty-http)
("http-test" ,java-eclipse-jetty-http-test-classes) ("http-test" ,java-eclipse-jetty-http-test-classes)
("io" ,java-eclipse-jetty-io) ("io" ,java-eclipse-jetty-io)
@ -6330,7 +6330,7 @@ (define-public java-eclipse-jetty-webapp-9.2
("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2) ("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-security-9.2" ,java-eclipse-jetty-security-9.2)
("java-eclipse-jetty-xml-9.2" ,java-eclipse-jetty-xml-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))) ,@(package-inputs java-eclipse-jetty-util-9.2)))
(native-inputs (native-inputs
`(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2) `(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)