[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/08: gnu: Remove dependencies on java-tomcat, use servlet API instead.
From: |
guix-commits |
Subject: |
04/08: gnu: Remove dependencies on java-tomcat, use servlet API instead. |
Date: |
Sun, 13 Oct 2019 16:49:40 -0400 (EDT) |
hoebjo pushed a commit to branch staging
in repository guix.
commit 53ba191b3b94c7961d703b58b9aaa2ebb6fe0429
Author: Björn Höfling <address@hidden>
Date: Mon Mar 4 20:53:43 2019 +0100
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.
---
gnu/packages/maven.scm | 5 +++--
gnu/packages/web.scm | 10 +++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index d383f16..592cc74 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 <address@hidden>
;;; Copyright © 2019 Tobias Geerinckx-Rite <address@hidden>
+;;; Copyright © 2019 Björn Höfling <address@hidden>
;;;
;;; 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)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 6e89c3a..a1c5593 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)
- branch staging updated (8df9249 -> d99e7ee), guix-commits, 2019/10/13
- 03/08: gnu: java-javaee-servletapi: Add properties-files to jar., guix-commits, 2019/10/13
- 01/08: gnu: ant-build-system: Don't override symlinks., guix-commits, 2019/10/13
- 02/08: gnu: java-javaee-servletapi: Don't use unstable tarball., guix-commits, 2019/10/13
- 04/08: gnu: Remove dependencies on java-tomcat, use servlet API instead.,
guix-commits <=
- 07/08: gnu: java-tomcat: Build the full Tomcat package., guix-commits, 2019/10/13
- 05/08: gnu: java-commons-daemon: Update to 1.1.0., guix-commits, 2019/10/13
- 06/08: gnu: Add java-ecj in version 4.6.3., guix-commits, 2019/10/13
- 08/08: gnu: java-tomcat: Update to 8.5.46., guix-commits, 2019/10/13