From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:57845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3K8-0003pH-2e for guix-patches@gnu.org; Sat, 04 May 2019 18:40:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3K6-00072A-QF for guix-patches@gnu.org; Sat, 04 May 2019 18:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39044) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hN3K6-000721-NO for guix-patches@gnu.org; Sat, 04 May 2019 18:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hN3K6-0007ZR-HM for guix-patches@gnu.org; Sat, 04 May 2019 18:40:02 -0400 Subject: [bug#35570] [PATCH 4/8] gnu: Remove dependencies on java-tomcat, use servlet API Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:57758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3JM-0003mF-2u for guix-patches@gnu.org; Sat, 04 May 2019 18:39:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3JK-0006iW-BA for guix-patches@gnu.org; Sat, 04 May 2019 18:39:16 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35768 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3JK-0006iK-2B for guix-patches@gnu.org; Sat, 04 May 2019 18:39:14 -0400 Received: from alma-ubu (p508AC174.dip0.t-ipconnect.de [80.138.193.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 913F63F85A for ; Sun, 5 May 2019 00:39:13 +0200 (CEST) Date: Sun, 5 May 2019 00:39:12 +0200 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20190505003912.2d6e5d84@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/dCEsEQ=0qIYlEO_mth8V_/B"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35570@debbugs.gnu.org --Sig_/dCEsEQ=0qIYlEO_mth8V_/B Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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 | 11 ++++++----- 2 files changed, 9 insertions(+), 7 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 =C2=A9 2018 Julien Lepiller ;;; Copyright =C2=A9 2019 Tobias Geerinckx-Rite +;;; Copyright =C2=A9 2019 Bj=C3=B6rn H=C3=B6fling ;;; ;;; 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 7242ede3be..3d9070f169 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -31,6 +31,7 @@ ;;; Copyright =C2=A9 2018 M=C4=83d=C4=83lin Ionel Patra=C8=99cu ;;; Copyright =C2=A9 2018 Alex Vong ;;; Copyright =C2=A9 2019 Nicolas Goaziou +;;; Copyright =C2=A9 2019 Bj=C3=B6rn H=C3=B6fling ;;; ;;; This file is part of GNU Guix. ;;; @@ -5702,7 +5703,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) @@ -5890,7 +5891,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))))) @@ -5985,7 +5986,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))) @@ -6028,7 +6029,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) @@ -6163,7 +6164,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) --=20 2.21.0 --Sig_/dCEsEQ=0qIYlEO_mth8V_/B Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM4UkAAKCRC/KGy2WT5f /duxAJ9VIRgJ3a8kW+GFn6qSPcG085ubswCgjieqtro/DQqp8+ajZBHwz8pEACE= =kYWG -----END PGP SIGNATURE----- --Sig_/dCEsEQ=0qIYlEO_mth8V_/B--