diff options
| author | Björn Höfling <bjoern.hoefling@bjoernhoefling.de> | 2019-03-04 20:53:43 +0100 |
|---|---|---|
| committer | Björn Höfling <bjoern.hoefling@bjoernhoefling.de> | 2019-10-13 22:35:04 +0200 |
| commit | 53ba191b3b94c7961d703b58b9aaa2ebb6fe0429 (patch) | |
| tree | b1a5da2a88f75a574dd11ebf9641b91db413f1da /gnu/packages/maven.scm | |
| parent | 8ea8d607f978bbbf5d3062a52797f106a2beb041 (diff) | |
| download | guix-53ba191b3b94c7961d703b58b9aaa2ebb6fe0429.tar.gz | |
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/maven.scm')
| -rw-r--r-- | gnu/packages/maven.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index d383f16255..592cc74f2d 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; 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. ;;; @@ -523,7 +524,7 @@ gets and puts artifacts using the file system."))) (inputs `(("java-plexus-util" ,java-plexus-utils) ("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-commons-codec" ,java-commons-codec) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) @@ -663,7 +664,7 @@ wagon providers supporting HTTP."))) ("java-jdom2" ,java-jdom2) ("java-asm" ,java-asm) ("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-io-9.2" ,java-eclipse-jetty-io-9.2) ("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2) |