From patchwork Sat May 4 22:37:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 13894 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BD3C216F9C; Sat, 4 May 2019 23:38:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2A17F16F99 for ; Sat, 4 May 2019 23:38:08 +0100 (BST) Received: from localhost ([127.0.0.1]:33622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3IF-0003bG-Pk for patchwork@mira.cbaines.net; Sat, 04 May 2019 18:38:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3IC-0003ax-5L for guix-patches@gnu.org; Sat, 04 May 2019 18:38:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3IA-0005zC-EZ for guix-patches@gnu.org; Sat, 04 May 2019 18:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39031) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hN3I9-0005xw-PO for guix-patches@gnu.org; Sat, 04 May 2019 18:38:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hN3I9-0007Vr-LV for guix-patches@gnu.org; Sat, 04 May 2019 18:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35570] [PATCH 1/8] gnu: ant-build-system: Don't override symlinks. Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 May 2019 22:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35570@debbugs.gnu.org Received: via spool by 35570-submit@debbugs.gnu.org id=B35570.155700944028825 (code B ref 35570); Sat, 04 May 2019 22:38:01 +0000 Received: (at 35570) by debbugs.gnu.org; 4 May 2019 22:37:20 +0000 Received: from localhost ([127.0.0.1]:52575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3HT-0007Uq-KJ for submit@debbugs.gnu.org; Sat, 04 May 2019 18:37:19 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:57026 helo=bjoernhoefling.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3HS-0007Uj-Dt for 35570@debbugs.gnu.org; Sat, 04 May 2019 18:37:18 -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 8C7533F85A for <35570@debbugs.gnu.org>; Sun, 5 May 2019 00:37:17 +0200 (CEST) Date: Sun, 5 May 2019 00:37:16 +0200 From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20190505003716.4a38433e@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches When repacking jar-files, don't work on symlinks: Otherwise, they would be overridden with the repacked jar-file. * guix/build/ant-build-system.scm (regular-jar-file-predicate): New procedure. (generate-jar-indices, strip-jar-timestamps): Use it. --- guix/build/ant-build-system.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index d79a2d55ed..0fec06f497 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2018 Ricardo Wurmus +;;; Copyright © 2019 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -171,6 +172,12 @@ to the default GNU unpack strategy." #:allow-other-keys) (apply invoke `("ant" ,build-target ,@make-flags))) +(define (regular-jar-file-predicate file stat) + "Predicate returning true if FILE is ending on '.jar' +and STAT indicates it is a regular file." + (and ((file-name-predicate "\\.jar$") file stat) + (eq? 'regular (stat:type stat)))) + (define* (generate-jar-indices #:key outputs #:allow-other-keys) "Generate file \"META-INF/INDEX.LIST\". This file does not use word wraps and is preferred over \"META-INF/MANIFEST.MF\", which does use word wraps, @@ -181,7 +188,10 @@ dependencies of this jar file." (invoke "jar" "-i" jar)) (for-each (match-lambda ((output . directory) - (for-each generate-index (find-files directory "\\.jar$")))) + (for-each generate-index + (find-files + directory + regular-jar-file-predicate)))) outputs) #t) @@ -222,7 +232,8 @@ repack them. This is necessary to ensure that archives are reproducible." (for-each (match-lambda ((output . directory) - (for-each repack-archive (find-files directory "\\.jar$")))) + (for-each repack-archive + (find-files directory regular-jar-file-predicate)))) outputs) #t) From patchwork Sat May 4 22:37:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 13895 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 554E416FA0; Sat, 4 May 2019 23:39:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 88F0616F99 for ; Sat, 4 May 2019 23:39:07 +0100 (BST) Received: from localhost ([127.0.0.1]:33624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3JD-0003gr-5g for patchwork@mira.cbaines.net; Sat, 04 May 2019 18:39:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3JA-0003ge-Ha for guix-patches@gnu.org; Sat, 04 May 2019 18:39:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3J8-0006eB-PC for guix-patches@gnu.org; Sat, 04 May 2019 18:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39038) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hN3J8-0006e0-FX for guix-patches@gnu.org; Sat, 04 May 2019 18:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hN3J8-0007Xc-BC for guix-patches@gnu.org; Sat, 04 May 2019 18:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35570] [PATCH 2/8] gnu: java-javaee-servletapi: Don't use unstable tarball. Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 May 2019 22:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155700948828915 (code B ref -1); Sat, 04 May 2019 22:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:38:08 +0000 Received: from localhost ([127.0.0.1]:52579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3IG-0007WJ-14 for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3IE-0007Vq-Ko for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:34315) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3I8-0005xK-Ee for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3I5-0003am-D2 for guix-patches@gnu.org; Sat, 04 May 2019 18:38:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3I4-0005wU-Ce for guix-patches@gnu.org; Sat, 04 May 2019 18:37:57 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35764 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3I3-0005w9-FQ for guix-patches@gnu.org; Sat, 04 May 2019 18:37:56 -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 D3A7B3F85A for ; Sun, 5 May 2019 00:37:54 +0200 (CEST) Date: Sun, 5 May 2019 00:37:54 +0200 From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20190505003754.3c696a98@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-javaee-servletapi)[source]: Use git-fetch. --- gnu/packages/java.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) "0s03lj8w5an70lkqbjycgfrfk0kc07vbfav91jzk87gh3awf9ksl")))) (build-system ant-build-system) (arguments `(#:jar-name "javax-servletapi.jar" diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9664d749fb..f92b3d5e89 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2019 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -2836,14 +2837,15 @@ API and version 2.1 of the Java ServerPages API.") (package (name "java-javaee-servletapi") (version "3.1.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/javaee/servlet-spec/" - "archive/" version ".zip")) - (file-name (string-append name "-" version ".zip")) - (sha256 - (base32 - "0m6p13vgfb1ihich1jp5j6fqlhkjsrkn32c86bsbkryp38ipwg8w")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/javaee/servlet-spec.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + From patchwork Sat May 4 22:38:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 13896 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4E37216FA0; Sat, 4 May 2019 23:39:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3EC2D16F9B for ; Sat, 4 May 2019 23:39:09 +0100 (BST) Received: from localhost ([127.0.0.1]:33630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3JE-0003iC-Rl for patchwork@mira.cbaines.net; Sat, 04 May 2019 18:39:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3JB-0003gf-BE for guix-patches@gnu.org; Sat, 04 May 2019 18:39:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3J9-0006eK-1U for guix-patches@gnu.org; Sat, 04 May 2019 18:39:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hN3J8-0006eG-V0 for guix-patches@gnu.org; Sat, 04 May 2019 18:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hN3J8-0007Xl-ST for guix-patches@gnu.org; Sat, 04 May 2019 18:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35570] [PATCH 3/8] gnu: java-javaee-servletapi: Add properties-files to jar. Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 May 2019 22:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155700952228963 (code B ref -1); Sat, 04 May 2019 22:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:38:42 +0000 Received: from localhost ([127.0.0.1]:52582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Ik-0007X2-Dn for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43223) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Ii-0007Wp-HL for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:57701) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3Ic-0006LI-Lx for submit@debbugs.gnu.org; Sat, 04 May 2019 18:38:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3Ib-0003fx-GN for guix-patches@gnu.org; Sat, 04 May 2019 18:38:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3Ia-0006H8-3t for guix-patches@gnu.org; Sat, 04 May 2019 18:38:29 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35766 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3IZ-0006G8-Tj for guix-patches@gnu.org; Sat, 04 May 2019 18:38:28 -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 70E713F85A for ; Sun, 5 May 2019 00:38:24 +0200 (CEST) Date: Sun, 5 May 2019 00:38:23 +0200 From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20190505003823.453451b5@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (jav-javaee-servletapi)[arguments]: Add phase 'copy-resources' to copy properties-files. --- gnu/packages/java.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f92b3d5e89..9b635699f6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2851,7 +2851,25 @@ API and version 2.1 of the Java ServerPages API.") `(#:jar-name "javax-servletapi.jar" ;; no tests #:tests? #f - #:source-dir "src/main/java")) + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes/javax/servlet/http") + (let ((from-prefix "src/main/java/javax/servlet/") + (to-prefix "build/classes/javax/servlet/")) + (for-each (lambda (f) + (copy-file (string-append from-prefix f) + (string-append to-prefix f))) + (list "LocalStrings_ja.properties" + "LocalStrings.properties" + "LocalStrings_fr.properties" + "http/LocalStrings_es.properties" + "http/LocalStrings_ja.properties" + "http/LocalStrings.properties" + "http/LocalStrings_fr.properties"))) + #t))))) (native-inputs `(("unzip" ,unzip))) (home-page "https://javaee.github.io/servlet-spec/") From patchwork Sat May 4 22:39:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 13897 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C5CFB16F9C; Sat, 4 May 2019 23:40:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id EF7B016F99 for ; Sat, 4 May 2019 23:40:06 +0100 (BST) Received: from localhost ([127.0.0.1]:33647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3KA-0003pQ-Jx for patchwork@mira.cbaines.net; Sat, 04 May 2019 18:40:06 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#35570] [PATCH 4/8] gnu: Remove dependencies on java-tomcat, use servlet API Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 May 2019 22:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155700956829057 (code B ref -1); Sat, 04 May 2019 22:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:39:28 +0000 Received: from localhost ([127.0.0.1]:52587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3JU-0007YW-A9 for submit@debbugs.gnu.org; Sat, 04 May 2019 18:39:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3JS-0007YK-JK for submit@debbugs.gnu.org; Sat, 04 May 2019 18:39:23 -0400 Received: from lists.gnu.org ([209.51.188.17]:59973) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3JN-0006jv-Cx for submit@debbugs.gnu.org; Sat, 04 May 2019 18:39:17 -0400 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?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20190505003912.2d6e5d84@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 © 2018 Julien Lepiller ;;; Copyright © 2019 Tobias Geerinckx-Rite +;;; Copyright © 2019 Björn Höfling ;;; ;;; 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 © 2018 Mădălin Ionel Patrașcu ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019 Björn Höfling ;;; ;;; 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) From patchwork Sat May 4 22:41:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 13898 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2481916F9C; Sat, 4 May 2019 23:42:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8FCF916F99 for ; Sat, 4 May 2019 23:42:06 +0100 (BST) Received: from localhost ([127.0.0.1]:33666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3M6-0004DQ-5W for patchwork@mira.cbaines.net; Sat, 04 May 2019 18:42:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3M3-0004CO-UQ for guix-patches@gnu.org; Sat, 04 May 2019 18:42:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3M2-0001VD-LO for guix-patches@gnu.org; Sat, 04 May 2019 18:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39051) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hN3M2-0001Uu-Ii for guix-patches@gnu.org; Sat, 04 May 2019 18:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hN3M2-0007cm-C0 for guix-patches@gnu.org; Sat, 04 May 2019 18:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35570] [PATCH 5/8] gnu: java-commons-daemon: Update to 1.1.0. Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 May 2019 22:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155700968629252 (code B ref -1); Sat, 04 May 2019 22:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:41:26 +0000 Received: from localhost ([127.0.0.1]:52592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3LR-0007bk-Va for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3LR-0007bX-3b for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:46892) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3LL-0000G9-SX for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3LK-00040e-SM for guix-patches@gnu.org; Sat, 04 May 2019 18:41:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3LJ-0000As-PN for guix-patches@gnu.org; Sat, 04 May 2019 18:41:18 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35770 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3LJ-0000Af-JM for guix-patches@gnu.org; Sat, 04 May 2019 18:41:17 -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 DD9DB3F85A for ; Sun, 5 May 2019 00:41:16 +0200 (CEST) Date: Sun, 5 May 2019 00:41:16 +0200 From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20190505004116.6a1a3f08@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java (java-commons-daemon): Update to 1.1.0. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) `(#:test-target "test" diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9b635699f6..3e0198b6aa 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6248,14 +6248,14 @@ This is a part of the Apache Commons Project.") (define-public java-commons-daemon (package (name "java-commons-daemon") - (version "1.0.15") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/daemon/source/" "commons-daemon-" version "-src.tar.gz")) (sha256 (base32 - "0ci46kq8jpz084ccwq0mmkahcgsmh20ziclp2jf5i0djqv95gvhi")))) + "141gkhfzv5v3pdhic6y4ardq2dhsa3v36j8wmmhy6f8mac48fp7n")))) (build-system ant-build-system) (arguments From patchwork Sat May 4 22:41:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 13899 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E5AA516F9C; Sat, 4 May 2019 23:42:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5B8FA16F99 for ; Sat, 4 May 2019 23:42:17 +0100 (BST) Received: from localhost ([127.0.0.1]:33668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3MG-0004Jh-V1 for patchwork@mira.cbaines.net; Sat, 04 May 2019 18:42:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3M4-0004CP-0z for guix-patches@gnu.org; Sat, 04 May 2019 18:42:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3M2-0001VN-VU for guix-patches@gnu.org; Sat, 04 May 2019 18:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39052) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hN3M2-0001VI-So for guix-patches@gnu.org; Sat, 04 May 2019 18:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hN3M2-0007cu-QL for guix-patches@gnu.org; Sat, 04 May 2019 18:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35570] [PATCH 6/8] gnu: Add java-ecj in version 4.6.3. Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 May 2019 22:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155700970929288 (code B ref -1); Sat, 04 May 2019 22:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:41:49 +0000 Received: from localhost ([127.0.0.1]:52595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Lp-0007cK-CG for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43744) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Ln-0007c7-TF for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:55359) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3Li-0000f4-OT for submit@debbugs.gnu.org; Sat, 04 May 2019 18:41:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3Lh-00043C-Lj for guix-patches@gnu.org; Sat, 04 May 2019 18:41:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3Lg-0000d9-JA for guix-patches@gnu.org; Sat, 04 May 2019 18:41:41 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35772 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3Lg-0000by-CF for guix-patches@gnu.org; Sat, 04 May 2019 18:41:40 -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 E78B13F85A for ; Sun, 5 May 2019 00:41:39 +0200 (CEST) Date: Sun, 5 May 2019 00:41:39 +0200 From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20190505004139.370990ba@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-ecj): New variable. --- gnu/packages/java.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (let ((revision 38938) (base-version "14.12.0")) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3e0198b6aa..df151013fd 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2363,6 +2363,45 @@ Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n" (native-inputs `(("unzip" ,unzip))))) +(define-public java-ecj + (package (inherit java-ecj-3) + (version "4.6.3") + (source + (origin + (method url-fetch) + (uri (string-append + "http://archive.eclipse.org/eclipse/downloads/drops4/R-" + version + "-201703010400/ecjsrc-" + version + ".jar")) + (sha256 + (base32 + "11cfgsdgznja1pvlxkjbqykxd7pcd5655vkm7s44xmahmap15gpl")))) + (arguments + `(#:tests? #f ; none included + #:build-target "build" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build.xml + (lambda _ + (substitute* "src/build.xml" + (("^.*MANIFEST.*$") + "")) + #t)) + (add-after 'unpack 'fix-prop + (lambda _ + (substitute* "src/build.xml" + (("^.*properties.*$") + " + ")) + #t)) + (add-before 'build 'chdir + (lambda _ + (chdir "src") + #t)) + (replace 'install (install-jars "."))))))) + (define-public java-cisd-base From patchwork Sat May 4 22:42:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 13901 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 449BF16F9C; Sat, 4 May 2019 23:43:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B1E3116F99 for ; Sat, 4 May 2019 23:43:09 +0100 (BST) Received: from localhost ([127.0.0.1]:33674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3N7-0004eH-9g for patchwork@mira.cbaines.net; Sat, 04 May 2019 18:43:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3N3-0004bz-D1 for guix-patches@gnu.org; Sat, 04 May 2019 18:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3N2-0002zM-0J for guix-patches@gnu.org; Sat, 04 May 2019 18:43:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39059) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hN3N0-0002yb-CC for guix-patches@gnu.org; Sat, 04 May 2019 18:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hN3N0-0007ek-8m for guix-patches@gnu.org; Sat, 04 May 2019 18:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35570] [PATCH 7/8] gnu: java-tomcat: Build the full Tomcat package. Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 May 2019 22:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155700973829363 (code B ref -1); Sat, 04 May 2019 22:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:42:18 +0000 Received: from localhost ([127.0.0.1]:52600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3MH-0007dX-PL for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3MF-0007dK-CO for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:46492) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3MA-0001h2-7q for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3M9-0004EG-1T for guix-patches@gnu.org; Sat, 04 May 2019 18:42:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3M7-0001d1-RM for guix-patches@gnu.org; Sat, 04 May 2019 18:42:09 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35774 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3M7-0001ab-Gv for guix-patches@gnu.org; Sat, 04 May 2019 18:42:07 -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 1426A3F85A for ; Sun, 5 May 2019 00:42:07 +0200 (CEST) Date: Sun, 5 May 2019 00:42:06 +0200 From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20190505004206.23197eea@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Currently java-tomcat uses the deploy build target. In that way, it is built like a library, with only the jar files. This commit will change the arget to deploy to build the full tomcat package. * gnu/packages/web.scm (java-tomcat)[source]: Remove bat-files in snippet. [inputs]: Remove java-eclipse-jdt-core, add java-commons-daemon, java-ecj. [native-inputs]: Remove. [arguments]: Use "deploy" build-target, add phases 'modify-deploy, 'symlink-commons-daemon, 'symlink-java-ecj, change 'install phase. --- gnu/packages/web.scm | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) + (out-lib (string-append (assoc-ref outputs "out") "/lib")) + (target (string-append out-lib "/java-ecj.jar"))) + (symlink java-ecj-jar target) + #t))) (add-after 'unpack 'generate-properties (lambda _ ;; This could have been passed to make-flags, but getcwd returns @@ -5592,7 +5619,10 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (string-append "base.path=" (getcwd) "/downloads\n")))) #t)) (replace 'install - (install-jars "output/build/lib"))))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "output/build" out)) + #t))))) (home-page "https://tomcat.apache.org") (synopsis "Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3d9070f169..cb9af0a781 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5552,14 +5552,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (snippet '(begin (for-each delete-file (find-files "." "\\.jar$")) + (for-each delete-file (find-files "." "\\.bat$")) #t)))) (build-system ant-build-system) (inputs - `(("java-eclipse-jdt-core" ,java-eclipse-jdt-core))) - (native-inputs - `(("java-junit" ,java-junit))) + `(("java-commons-daemon" ,java-commons-daemon) + ("java-ecj" ,java-ecj))) (arguments - `(#:build-target "package" + `(#:build-target "deploy" #:tests? #f; requires downloading some files. #:phases (modify-phases %standard-phases @@ -5582,6 +5582,33 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (("")) #t)) + (add-after 'unpack 'modify-deploy + (lambda _ + ;; The Tomcat build downloads and copies these files to the + ;; bin and lib directory. + ;; We instead symlink to the input (see below). + (substitute* "build.xml" + (("") "")) + #t)) + (add-after 'install 'symlink-commons-daemon + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((commons-daemon (assoc-ref inputs "java-commons-daemon")) + (files (find-files commons-daemon "commons-daemon-.*\\.jar")) + (daemon-jar (car files)) + (out-bin (string-append (assoc-ref outputs "out") "/bin")) + (target (string-append out-bin "/commons-daemon.jar"))) + (symlink daemon-jar target) + #t))) + (add-after 'install 'symlink-java-ecj + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((java-ecj (assoc-ref inputs "java-ecj")) + (files (find-files java-ecj "ecj.*\\.jar")) + (java-ecj-jar (car files)) From patchwork Sat May 4 22:42:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= X-Patchwork-Id: 13900 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AF19616F9C; Sat, 4 May 2019 23:43:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5514D16F99 for ; Sat, 4 May 2019 23:43:08 +0100 (BST) Received: from localhost ([127.0.0.1]:33672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3N5-0004dH-T5 for patchwork@mira.cbaines.net; Sat, 04 May 2019 18:43:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3N3-0004bx-BP for guix-patches@gnu.org; Sat, 04 May 2019 18:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3N1-0002zE-Uu for guix-patches@gnu.org; Sat, 04 May 2019 18:43:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hN3N0-0002ym-Si for guix-patches@gnu.org; Sat, 04 May 2019 18:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hN3N0-0007er-O3 for guix-patches@gnu.org; Sat, 04 May 2019 18:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35570] [PATCH 8/8] gnu: java-tomcat: Update to 8.5.40. Resent-From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 May 2019 22:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155700976229404 (code B ref -1); Sat, 04 May 2019 22:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2019 22:42:42 +0000 Received: from localhost ([127.0.0.1]:52603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Mg-0007eB-6J for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44027) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hN3Mf-0007dx-B9 for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:52771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hN3Ma-0002Rk-6U for submit@debbugs.gnu.org; Sat, 04 May 2019 18:42:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3MZ-0004Qf-AU for guix-patches@gnu.org; Sat, 04 May 2019 18:42:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hN3MY-0002OH-EK for guix-patches@gnu.org; Sat, 04 May 2019 18:42:35 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:35776 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hN3MY-0002MA-7U for guix-patches@gnu.org; Sat, 04 May 2019 18:42:34 -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 C48933F85A for ; Sun, 5 May 2019 00:42:33 +0200 (CEST) Date: Sun, 5 May 2019 00:42:33 +0200 From: =?utf-8?b?QmrDtnJuIEjDtmZsaW5n?= Message-ID: <20190505004233.0c878053@alma-ubu> In-Reply-To: <20190505003450.3bc9058a@alma-ubu> References: <20190505003450.3bc9058a@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/web.scm (java-tomcat): Update to 8.5.40. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cb9af0a781..2f1818dd3d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5539,14 +5539,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (define-public java-tomcat (package (name "java-tomcat") - (version "8.5.38") + (version "8.5.40") (source (origin (method url-fetch) (uri (string-append "mirror://apache/tomcat/tomcat-8/v" version "/src/apache-tomcat-" version "-src.tar.gz")) (sha256 (base32 - "13pbsyk39g1qph82nngp54mqycmg60rxlxwy4yszsssahrqnggb2")) + "0isv1cya8iq6ijgg5sshpy3p4j4gs7708n559n9vzy20zbylnhi0")) (modules '((guix build utils))) ;; Delete bundled jars. (snippet