From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgnBN-0007iS-V0 for guix-patches@gnu.org; Sat, 21 Jul 2018 04:24:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgnBK-0004pc-RB for guix-patches@gnu.org; Sat, 21 Jul 2018 04:24:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:45159) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fgnBK-0004pW-M1 for guix-patches@gnu.org; Sat, 21 Jul 2018 04:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fgnBK-0000Qm-Fq for guix-patches@gnu.org; Sat, 21 Jul 2018 04:24:02 -0400 Subject: [bug#32231] [PATCH 3/8] gnu: java: Use java-classpathx-servletapi instead of java-tomcat where possible. Resent-Message-ID: Date: Sat, 21 Jul 2018 10:23:28 +0200 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20180721102328.6d5e1b4c@alma-ubu> In-Reply-To: <20180721101401.63dee9b6@alma-ubu> References: <20180721101401.63dee9b6@alma-ubu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/2AJfIse/Wy3nFBtJom=HfDX"; 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: 32231@debbugs.gnu.org --Sig_/2AJfIse/Wy3nFBtJom=HfDX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable * gnu/package/java.scm (java-commons-jxpath)[inputs]: Remove java-tomcat, a= dd java-classpathx-servletapi. (java-guice-servlet)[inputs]: Likewise. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7f7cf52..d6c88f5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4449,7 +4449,7 @@ these scripting language engines.") #:tests? #f #:source-dir "src/java")) (inputs - `(("java-tomcat" ,java-tomcat) + `(("servlet" ,java-classpathx-servletapi) ("java-jdom" ,java-jdom) ("java-commons-beanutils" ,java-commons-beanutils))) (native-inputs @@ -7944,7 +7944,7 @@ Java 6 and above.") #:tests? #f)); FIXME: not in a java subdir (inputs `(("guice" ,java-guice) - ("servlet" ,java-tomcat) + ("servlet" ,java-classpathx-servletapi) ,@(package-inputs java-guice))))) =20 (define-public java-assertj --=20 2.7.4 --Sig_/2AJfIse/Wy3nFBtJom=HfDX Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAltS7YEACgkQvyhstlk+X/11fgCfdWYkhzWjswZUdfmAJCTBwr3m f0AAniqVlnC+Iql2w/QdUhTjEqdLjtuL =bzUq -----END PGP SIGNATURE----- --Sig_/2AJfIse/Wy3nFBtJom=HfDX--