From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgnCM-00089S-7F for guix-patches@gnu.org; Sat, 21 Jul 2018 04:25:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgnCI-0005C6-Qr for guix-patches@gnu.org; Sat, 21 Jul 2018 04:25:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:45167) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fgnCI-0005Bx-MI for guix-patches@gnu.org; Sat, 21 Jul 2018 04:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fgnCI-0000So-G6 for guix-patches@gnu.org; Sat, 21 Jul 2018 04:25:02 -0400 Subject: [bug#32231] [PATCH 5/8] gnu: java: Use java-javaee-servletapi instead of java-tomcat. Resent-Message-ID: Date: Sat, 21 Jul 2018 10:24:25 +0200 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20180721102425.6abc72c1@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_/9p=wls2VwydH18.IuoHtwZL"; 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_/9p=wls2VwydH18.IuoHtwZL Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable * gnu/packages/java.scm(java-eclipse-sisu-inject)[inputs]: Remove java-tomc= at, add java-javaee-servletapi. (logback-core)[inputs]: Likewise. * gnu/packages/maven.scm (maven-wagon-provider-test)[inputs]: Likewise. * gnu/packages/web.scm (java-eclipse-jetty-webapp)[inputs]: Likewise. (java-eclipse-jetty-server)[inputs]: Likewise. (java-eclipse-jetty-http)[inputs]: Likewise. (java-eclipse-jetty-jmx)[inputs]: Likewise. (java-eclipse-jetty-io)[inputs]: Likewise. --- gnu/packages/java.scm | 6 +++--- gnu/packages/maven.scm | 2 +- gnu/packages/web.scm | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b60aedd..2ba6d76 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10144,7 +10144,7 @@ and reporting) project dependencies. It is charact= erized by the following: `(("java-guice" ,java-guice) ("java-guice-servlet" ,java-guice-servlet) ("java-javax-inject" ,java-javax-inject) - ("java-tomcat" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ("java-junit" ,java-junit) ("java-slf4j-api" ,java-slf4j-api) ("java-jsr305" ,java-jsr305) @@ -10339,7 +10339,7 @@ static code analysis or code manipulation."))) #t))))) (inputs `(("java-javax-mail" ,java-javax-mail) - ("java-tomcat" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("java-commons-compiler" ,java-commons-compiler) ("java-janino" ,java-janino))) (native-inputs @@ -10383,7 +10383,7 @@ This module lays the groundwork for the other two m= odules.") (find-files (assoc-ref inputs = input) ".*.jar")) '("java-logback-core" "java-slf4= j-api" - "java-commons-compiler" "java-= tomcat" + "java-commons-compiler" "servl= et" "groovy"))) ":")) (apply invoke "groovyc" "-d" "build/classes" "-j" diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index a3e5687..34fbce0 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -428,7 +428,7 @@ artifact and repository handling code.") ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2) ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2) ("java-slf4j-api" ,java-slf4j-api) - ("java-tomcat" ,java-tomcat) + ("java-javaee-servletapi" ,java-javaee-servletapi) ("maven-wagon-provider-api" ,maven-wagon-provider-api))) (synopsis "Test classes from maven-wagon") (description "Maven Wagon is a transport abstraction that is used in M= aven's diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b76f111..e2ca538 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5938,7 +5938,7 @@ or embedded instantiation. This package provides uti= lity classes.") #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("util" ,java-eclipse-jetty-util))) (synopsis "Jetty :: IO Utility") (description "The Jetty Web Server provides an HTTP server and Servlet @@ -5981,7 +5981,7 @@ or embedded instantiation. This package provides IO-= related utility classes.")) #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("io" ,java-eclipse-jetty-io) ("util" ,java-eclipse-jetty-util))) (synopsis "Jetty :: Http Utility") @@ -6016,7 +6016,7 @@ or embedded instantiation. This package provides HTT= P-related utility classes." #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("util" ,java-eclipse-jetty-util))) (synopsis "Jetty :: JMX Management") (description "The Jetty Web Server provides an HTTP server and Servlet @@ -6097,7 +6097,7 @@ or embedded instantiation. This package provides the= JMX management."))) #t))))) (inputs `(("slf4j" ,java-slf4j-api) - ("servlet" ,java-tomcat) + ("servlet" ,java-javaee-servletapi) ("http" ,java-eclipse-jetty-http) ("io" ,java-eclipse-jetty-io) ("jmx" ,java-eclipse-jetty-jmx) @@ -6293,7 +6293,7 @@ container."))) ("java-eclipse-jetty-servlet" ,java-eclipse-jetty-servlet) ("java-eclipse-jetty-security" ,java-eclipse-jetty-security) ("java-eclipse-jetty-xml" ,java-eclipse-jetty-xml) - ("java-tomcat" ,java-tomcat))) + ("java-tomcat" ,java-javaee-servletapi))) (native-inputs `(("java-eclipse-jetty-io" ,java-eclipse-jetty-io) ,@(package-native-inputs java-eclipse-jetty-util))))) --=20 2.7.4 --Sig_/9p=wls2VwydH18.IuoHtwZL Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAltS7boACgkQvyhstlk+X/1c1gCfRubBcImg27fBfepKgY0COY53 P6gAn36uhfHdjA3ishc+gpDZRrgW16MU =rlXr -----END PGP SIGNATURE----- --Sig_/9p=wls2VwydH18.IuoHtwZL--