From patchwork Thu Jul 11 20:26:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14572 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 94C5A17204; Thu, 11 Jul 2019 21:27: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 75D35171FF for ; Thu, 11 Jul 2019 21:27:10 +0100 (BST) Received: from localhost ([::1]:45058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlfeo-0004uo-61 for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60707) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlfek-0004uB-FM for guix-patches@gnu.org; Thu, 11 Jul 2019 16:27:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlfej-000555-4i for guix-patches@gnu.org; Thu, 11 Jul 2019 16:27:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58095) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlfej-000550-19 for guix-patches@gnu.org; Thu, 11 Jul 2019 16:27:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlfeg-0006rK-UQ for guix-patches@gnu.org; Thu, 11 Jul 2019 16:27:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH v4] daemon: Set ownership of kept build directories to the calling user. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287681026267 (code B ref 36605); Thu, 11 Jul 2019 20:27:02 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:26:50 +0000 Received: from localhost ([127.0.0.1]:38662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeT-0006pV-JD for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:49 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:35258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeR-0006pJ-UN for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:48 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zB6BSzz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:46 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zB3JPrz1qqkP for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:46 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 6f2Q_1qd0fR2 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:45 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:45 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id BAD77603AC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:48 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:09 +0200 Message-Id: <20190711202644.32014-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <58494E16.9010909@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> 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 Fixes . * nix/libstore/globals.hh (Settings) Add clientUid and clientGid. * nix/nix-daemon/nix-daemon.cc (daemonLoop] Store UID and GID of the caller in settings. * nix/libstore/build.cc (_chown): New function. (DerivationGoal::deleteTmpDir): Use it, change ownership of build directory if it is kept and the new owner is not root. --- nix/libstore/build.cc | 21 +++++++++++++++++++++ nix/libstore/globals.hh | 6 ++++++ nix/nix-daemon/nix-daemon.cc | 12 ++++++++++++ 3 files changed, 39 insertions(+) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index 889ee3d..e823001 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -2631,6 +2631,21 @@ void DerivationGoal::closeLogFile() } +static void _chown(const Path & path, uid_t uid, gid_t gid) +{ + checkInterrupt(); + + if (lchown(path.c_str(), uid, gid) == -1) { + throw SysError(format("change owner and group of `%1%'") % path); + } + struct stat st = lstat(path); + if (S_ISDIR(st.st_mode)) { + for (auto & i : readDirectory(path)) + _chown(path + "/" + i.name, uid, gid); + } +} + + void DerivationGoal::deleteTmpDir(bool force) { if (tmpDir != "") { @@ -2639,6 +2654,12 @@ void DerivationGoal::deleteTmpDir(bool force) format("note: keeping build directory `%2%'") % drvPath % tmpDir); chmod(tmpDir.c_str(), 0755); + // Change the ownership if clientUid is set. Never change the + // ownership or the group to "root" for security reasons. + if (settings.clientUid != (uid_t) -1 && settings.clientUid != 0) { + _chown(tmpDir, settings.clientUid, + settings.clientGid != 0 ? settings.clientGid : -1); + } } else deletePath(tmpDir); diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh index 8c07e36..7beb1a5 100644 --- a/nix/libstore/globals.hh +++ b/nix/libstore/globals.hh @@ -70,6 +70,12 @@ struct Settings { subgoal of the same goal) fails. */ bool keepGoing; + /* User and groud id of the client issuing the build request. Used to set + the owner and group of the kept temporary directories of failed + builds. */ + uid_t clientUid; + gid_t clientGid; + /* Whether, if we cannot realise the known closure corresponding to a derivation, we should try to normalise the derivation instead. */ diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc index 682f9a2..47b67d5 100644 --- a/nix/nix-daemon/nix-daemon.cc +++ b/nix/nix-daemon/nix-daemon.cc @@ -960,6 +960,18 @@ static void daemonLoop() strncpy(argvSaved[1], processName.c_str(), strlen(argvSaved[1])); } +#if defined(SO_PEERCRED) + /* Store the client's user and group for this connection. This + has to be done in the forked process since it is per + connection. */ + settings.clientUid = cred.uid; + settings.clientGid = cred.gid; +#else + /* Setting these to -1 means: do not change */ + settings.clientUid = (uid_t) -1; + settings.clientGid = (gid_t) -1; +#endif + /* Handle the connection. */ from.fd = remote; to.fd = remote; From patchwork Thu Jul 11 20:26:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14581 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 C012217200; Thu, 11 Jul 2019 21:28: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 autolearn=unavailable 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 8BAD8171FE for ; Thu, 11 Jul 2019 21:28:12 +0100 (BST) Received: from localhost ([::1]:45084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffn-0005h3-TR for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32905) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffj-0005cT-T4 for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffh-00061i-ST for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58171) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffg-00060m-AE for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffg-0006yj-58 for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 2/3] guix: ant-build-system: add empty `tests` target to default build.xml. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683226520 (code B ref 36605); Thu, 11 Jul 2019 20:28:04 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:12 +0000 Received: from localhost ([127.0.0.1]:38705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfep-0006tf-Pe for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:11 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:39504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfej-0006rj-Fg for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:05 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zX1kqZz1rYXJ for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:04 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zX1cwCz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id BMJpeHaCWzHh for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:03 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:03 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id DDBB2606CD for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:20 +0200 Message-Id: <20190711202644.32014-12-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 This avoids the need to set #:tests? #f whenever using #:jar-name (and thus using the default build.xml). * guix/build/ant-build-system.scm (default-build.xml): Add attribute to sxml expression. --- guix/build/ant-build-system.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index fe7bae5..2cc6bb9 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -70,6 +70,7 @@ (arg (@ (line ,(string-append "-cf ${jar.dir}/" jar-name " -C ${classes.dir} .")))))) + (target (@ (name "tests"))) (target (@ (name "install")) (copy (@ (todir "${dist.dir}")) (fileset (@ (dir "${jar.dir}")) From patchwork Thu Jul 11 20:26:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14585 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 702F017203; Thu, 11 Jul 2019 21:28: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=unavailable 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 32363171FE for ; Thu, 11 Jul 2019 21:28:17 +0100 (BST) Received: from localhost ([::1]:45094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffr-0005yf-8P for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32945) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffl-0005g5-RD for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffj-00063n-Su for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58172) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffg-000614-Oy for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffg-0006yq-KK for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 3/3] gnu: Remove now useless #:tests? #f from java-packages. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683226527 (code B ref 36605); Thu, 11 Jul 2019 20:28:04 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:12 +0000 Received: from localhost ([127.0.0.1]:38707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeq-0006th-1s for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:12 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:52487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfek-0006s5-KO for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:06 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zZ19jQz1rB8y for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:06 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zZ15C3z1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id rGoBqS8e6NKi for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:04 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:04 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id EFF77606D0 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:21 +0200 Message-Id: <20190711202644.32014-13-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 With the last commit, when #:jar-name is given, a dummy test-target always exists. * gnu/packages/java.scm (java-junit, java-swt, java-xz): Remove build-argument `#:tests?'. --- gnu/packages/java.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7387235..e8d09dd 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -84,7 +84,6 @@ (build-system ant-build-system) (arguments `(#:jar-name "swt.jar" - #:tests? #f ; no "check" target #:phases (modify-phases %standard-phases (replace 'unpack @@ -1054,8 +1053,7 @@ build process and its dependencies, whereas Make uses Makefile format.") "0x6vn9dp9kxk83x2fp3394n95dk8fx9yg8jns9371iqsn0vy8ih1")))) (build-system ant-build-system) (arguments - `(#:tests? #f ; There are no tests to run. - #:jar-name ,(string-append "xz-" version ".jar") + `(#:jar-name ,(string-append "xz-" version ".jar") #:phases (modify-phases %standard-phases ;; The unpack phase enters the "maven" directory by accident. @@ -1248,8 +1246,7 @@ testing frameworks, mocking libraries and UI validation rules.") #t)))) (build-system ant-build-system) (arguments - `(#:tests? #f ; no tests - #:jar-name "junit.jar")) + `(#:jar-name "junit.jar")) (inputs `(("java-hamcrest-core" ,java-hamcrest-core))) (home-page "http://junit.org/") From patchwork Thu Jul 11 20:26:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14590 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 0FAA217200; Thu, 11 Jul 2019 21:28:23 +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=unavailable 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 BE296171FE for ; Thu, 11 Jul 2019 21:28:22 +0100 (BST) Received: from localhost ([::1]:45110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffy-0006Ky-5U for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33036) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffo-0005qD-2L for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffl-00066z-RW for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58177) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffj-00062x-DD for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffj-0006zR-7h for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 04/12] gnu: Add java-plexus-utils. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684026591 (code B ref 36605); Thu, 11 Jul 2019 20:28:07 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:20 +0000 Received: from localhost ([127.0.0.1]:38720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfex-0006ui-IB for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:19 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:48144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfes-0006uM-Ol for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:15 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zk2FTTz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:14 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zk284gz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:14 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 9kNQVzQzvk5C for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:13 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:13 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 36C9F608B5 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:26 +0200 Message-Id: <20190711202644.32014-18-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 * gnu/packages/java.scm (codehaus-plexus-url): New function. (java-plexus-utils): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e8d09dd..0dfd9fa 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1256,3 +1256,35 @@ testing frameworks, mocking libraries and UI validation rules.") JUnit provides assertions for testing expected results, test fixtures for sharing common test data, and test runners for running tests.") (license license:epl1.0))) + +; +; codehaus plexus +; + +(define* (codehaus-plexus-url projname version) + (let ((projname (string-append "plexus-" projname))) + (string-append "https://github.com/codehaus-plexus/" projname + "/archive/" projname "-" version ".tar.gz"))) + +(define-public java-plexus-utils + (package + (name "java-plexus-utils") + (version "3.0.24") + (source (origin + (method url-fetch) + (uri (codehaus-plexus-url "utils" version)) + (sha256 + (base32 "1mlwpc6fms24slygv5yvi6fi9hcha2fh0v73p5znpi78bg36i2js")))) + (build-system ant-build-system) + ; todo: javadoc + (arguments + `(#:tests? #f ; todo: tests + #:jar-name (string-append "plexus-utils-" ,version ".jar") + #:src-dir "src/main")) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://codehaus-plexus.github.io/plexus-utils/") + (synopsis "Common utilities for the Plexus framework") + (description "Various Java utility classes to ease working with strings, +files, command lines, XML and more.") + (license license:asl2.0))) From patchwork Thu Jul 11 20:26:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14600 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 40AF317200; Thu, 11 Jul 2019 21:28:31 +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=unavailable 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 F06F4171FE for ; Thu, 11 Jul 2019 21:28:30 +0100 (BST) Received: from localhost ([::1]:45140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlfg6-00077R-Lk for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33202) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffs-00068c-2r for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffm-00067f-1z for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58178) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffj-00063T-Sb for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffj-0006zZ-N8 for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 05/12] gnu: Add java-plexus-interpolation. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684026602 (code B ref 36605); Thu, 11 Jul 2019 20:28:07 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:20 +0000 Received: from localhost ([127.0.0.1]:38723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfex-0006uq-VJ for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:20 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:49060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeu-0006uW-Gi for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:16 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zm0SWGz1rB8y for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:16 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zm0MGFz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id xyTWslXiZQho for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:14 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:14 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 438AC608C9 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:27 +0200 Message-Id: <20190711202644.32014-19-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 * gnu/packages/java.scm (java-plexus-interplation): New variable. --- gnu/packages/java.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0dfd9fa..3687c7e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1288,3 +1288,31 @@ sharing common test data, and test runners for running tests.") (description "Various Java utility classes to ease working with strings, files, command lines, XML and more.") (license license:asl2.0))) + +(define-public java-plexus-interpolation + (package + (name "java-plexus-interpolation") + (version "1.23") + (source (origin + (method url-fetch) + (uri (codehaus-plexus-url "interpolation" version)) + (sha256 (base32 "1w79ljwk42ymrgy8kqxq4l82pgdj6287gabpfnpkyzbrnclsnfrp")))) + (build-system ant-build-system) + ; todo: javadoc + (arguments + `(#:tests? #f ; todo: tests + #:jar-name (string-append "plexus-interpolation-" ,version ".jar") + #:src-dir "src/main")) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://codehaus-plexus.github.io/plexus-interpolation/") + (synopsis "Java components for interpolating ${} strings and the like") + (description "Plexus interpolator is the outgrowth of multiple iterations +of development focused on providing a more modular, flexible interpolation +framework for the expression language style commonly seen in Maven, Plexus, +and other related projects. + +It has its foundation in the org.codehaus.plexus.utils.interpolation package +within plexus-utils, but has been separated in order to allow these two +libraries to vary independently of one another.") + (license license:asl2.0))) From patchwork Thu Jul 11 20:26:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14588 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 31C4617202; Thu, 11 Jul 2019 21:28:21 +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=unavailable 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 D161E17200 for ; Thu, 11 Jul 2019 21:28:20 +0100 (BST) Received: from localhost ([::1]:45106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffv-00069M-44 for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33035) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffo-0005q1-2N for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffm-00067k-2a for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58179) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffk-00064B-Bh for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffk-0006zg-6e for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 06/12] gnu: Add java-commons-cli. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684326627 (code B ref 36605); Thu, 11 Jul 2019 20:28:08 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:23 +0000 Received: from localhost ([127.0.0.1]:38727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff1-0006vJ-Eg for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:23 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:55490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfex-0006uf-Gh for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:20 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zq0TGZz1rB8y for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:19 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zq0P5Mz1qqkM for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:19 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id c0lfXCbMbOZV for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:16 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:16 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 4AFCA608D2 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:28 +0200 Message-Id: <20190711202644.32014-20-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 * gnu/packages/java.scm (appache-commons-url): New function. (java-commons-cli): New variable. --- gnu/packages/java.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3687c7e..a83423d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1316,3 +1316,51 @@ It has its foundation in the org.codehaus.plexus.utils.interpolation package within plexus-utils, but has been separated in order to allow these two libraries to vary independently of one another.") (license license:asl2.0))) + +; +; apache commons +; + +(define* (apache-commons-url projname version + #:optional (basename + (string-append "commons-" projname))) + (string-append "mirror://apache/commons/" projname "/source/" + basename "-" version "-src.tar.gz")) + +(define-public java-commons-cli + (package + (name "java-commons-cli") + (version "1.3.1") + (source (origin + (method url-fetch) + (uri (apache-commons-url "cli" version)) + (sha256 (base32 "1fkjn552i12vp3xxk21ws4p70fi0lyjm004vzxsdaz7gdpgyxxyl")))) + (build-system ant-build-system) + ; todo: javadoc + (arguments + ; commons-cli does not provida a proper build.xml but seems to require + ; maven for building + `(#:jar-name (string-append "commons-cli-" ,version ".jar") + #:phases + (modify-phases %standard-phases + (delete 'check)))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/cli/") + (synopsis "Command line arguments and options parsing library") + (description "The Apache Commons CLI library provides an API for parsing +command line options passed to programs. It's also able to print help messages +detailing the options available for a command line tool. + +Commons CLI supports different types of options: + +@itemize +@item POSIX like options (ie. tar -zxvf foo.tar.gz) +@item GNU like long options (ie. du --human-readable --max-depth=1) +@item Java like properties (ie. java -Djava.awt.headless=true Foo) +@item Short options with value attached (ie. gcc -O2 foo.c) +@item long options with single hyphen (ie. ant -projecthelp) +@end itemize + +This is a part of the Apache Commons Project.") + (license license:asl2.0))) From patchwork Thu Jul 11 20:26:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14586 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 BFF0C17200; Thu, 11 Jul 2019 21:28:18 +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=unavailable 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 71B82171FE for ; Thu, 11 Jul 2019 21:28:18 +0100 (BST) Received: from localhost ([::1]:45102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlfft-00065n-To for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33050) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffo-0005rC-9x for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffl-00067X-Vw for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffk-00064R-Qz for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffk-0006zp-MJ for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 07/12] gnu: Add java-commons-codec. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684426634 (code B ref 36605); Thu, 11 Jul 2019 20:28:08 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:24 +0000 Received: from localhost ([127.0.0.1]:38729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff1-0006vR-OL for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:23 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:48764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfez-0006v8-C2 for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:21 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zr6XsZz1rHD6 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:20 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zr6SHKz1qqkM for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:20 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id oUxC2wRp0pvW for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:19 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:19 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 62C23608F0 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:29 +0200 Message-Id: <20190711202644.32014-21-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 * gnu/packages/java.scm (java-commons-codec): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a83423d..a5d3a25 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1364,3 +1364,35 @@ Commons CLI supports different types of options: This is a part of the Apache Commons Project.") (license license:asl2.0))) + +(define-public java-commons-codec + (package + (name "java-commons-codec") + (version "1.10") + (source (origin + (method url-fetch) + (uri (apache-commons-url "codec" version)) + (sha256 (base32 "1w9qg30y4s0x8gnmr2fgj4lyplfn788jqxbcz27lf5kbr6n8xr65")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + ; commons-cli does not provida a proper build.xml but seems to require + ; maven for building + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (delete 'check) ; todo: need to pass junit to classpath + (add-after 'build 'build-javadoc ant-build-javadoc) + (replace 'install (install-jars "dist")) + (add-after 'install 'install-doc (install-javadoc "dist/docs/api"))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/codec/") + (synopsis "Common encoders and decoders such as Base64, Hex, Phonetic and URLs") + (description "The codec package contains simple encoder and decoders for +various formats such as Base64 and Hexadecimal. In addition to these widely +used encoders and decoders, the codec package also maintains a collection of +phonetic encoding utilities. + +This is a part of the Apache Commons Project.") + (license license:asl2.0))) From patchwork Thu Jul 11 20:26:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14587 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 B551F17200; Thu, 11 Jul 2019 21:28:19 +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=unavailable 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 7B484171FE for ; Thu, 11 Jul 2019 21:28:19 +0100 (BST) Received: from localhost ([::1]:45104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffu-000660-NO for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33049) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffo-0005r5-7L for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffm-00067r-2m for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58181) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffl-00065t-Bz for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffl-0006zw-7E for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 08/12] gnu: Add java-commons-daemon. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684726652 (code B ref 36605); Thu, 11 Jul 2019 20:28:09 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:27 +0000 Received: from localhost ([127.0.0.1]:38732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff5-0006vm-0k for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:27 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:48822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff1-0006vI-6I for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:23 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zt5FlNz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:22 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zt58Wcz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id ivbg1iEcmTwS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:21 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:21 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 7510F608FD for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:30 +0200 Message-Id: <20190711202644.32014-22-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 * gnu/packages/java.scm (java-commons-daemon): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a5d3a25..e200296 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1396,3 +1396,35 @@ phonetic encoding utilities. This is a part of the Apache Commons Project.") (license license:asl2.0))) + +(define-public java-commons-daemon ; build, todo: verify results + (package (name "java-commons-daemon") + (version "1.0.15") + (source (origin + (method url-fetch) + (uri (apache-commons-url "daemon" version)) + (sha256 + (base32 "0ci46kq8jpz084ccwq0mmkahcgsmh20ziclp2jf5i0djqv95gvhi")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-javadoc ant-build-javadoc) + (replace 'install (install-jars "dist")) + (add-after 'install 'install-doc (install-javadoc "dist/docs/api"))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/daemon/") + (synopsis "Library to launch Java applications as daemons") + (description "The Daemon package from Apache Commons can be used to +implement Java applications which can be launched as daemons. For example the +program will be notified about a shutdown so that it can perform cleanup tasks +before its process of execution is destroyed by the operation system. + +This package contains the java library. You will also need the actual binary +for your architecture which is provided by the jsvc package. + +This is a part of the Apache Commons Project.") + (license license:asl2.0))) From patchwork Thu Jul 11 20:26:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14595 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 0DE0C17202; Thu, 11 Jul 2019 21:28:27 +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=unavailable 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 AF29B171FE for ; Thu, 11 Jul 2019 21:28:26 +0100 (BST) Received: from localhost ([::1]:45126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlfg2-0006gp-7e for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33124) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffp-0005xM-NZ for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffm-000686-7E for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffm-00067B-1S for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffl-000703-My for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 09/12] gnu: Add java-commons-io. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684726663 (code B ref 36605); Thu, 11 Jul 2019 20:28:09 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:27 +0000 Received: from localhost ([127.0.0.1]:38735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff5-0006vp-CL for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:27 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:36677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff2-0006vd-Ub for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:25 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zw3VDQz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:24 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zw3Nyvz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id WytD8MddE9Ya for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:23 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:23 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 90DE86091E for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:31 +0200 Message-Id: <20190711202644.32014-23-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 * gnu/packages/java.scm (java-commons-io): New variable. --- gnu/packages/java.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e200296..3af8cd0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1428,3 +1428,45 @@ for your architecture which is provided by the jsvc package. This is a part of the Apache Commons Project.") (license license:asl2.0))) + +(define-public java-commons-io + (package + (name "java-commons-io") + (version "2.5") + (source (origin + (method url-fetch) + (uri (apache-commons-url "io" version)) + (sha256 (base32 "0q5y41jrcjvx9hzs47x5kdhnasdy6rm4bzqd2jxl02w717m7a7v3")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'symlink-junit.jar + (lambda* (#:key source #:allow-other-keys) + ; the existance of this file is taken as indicator whether test + ; dependencis will to be downloaded. + (let ((junit (assoc-ref inputs "java-junit")) + (junit-version "4.12")) ; from build.xml + (mkdir-p "lib") + (symlink (string-append junit "/share/java/junit.jar") + (string-append "lib/junit-" junit-version ".jar"))))) + (add-after 'build 'build-javadoc ant-build-javadoc) + (add-after 'configure 'patch-build.xml + (lambda* _ + (substitute* "build.xml" + ; set current year to a fixed value, you may want to update + ; this when updating the package version + (("]+>") + "")))) + (replace 'install (install-jars "target")) + (add-after 'install 'install-doc (install-javadoc "target/apidocs"))))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "http://commons.apache.org/io/") + (synopsis "Common useful IO related classes") + (description "Commons-IO contains utility classes, stream implementations, +file filters and endian classes.") + (license license:asl2.0))) From patchwork Thu Jul 11 20:26:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14599 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 47D6217200; Thu, 11 Jul 2019 21:28:30 +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=unavailable 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 099EB171FE for ; Thu, 11 Jul 2019 21:28:30 +0100 (BST) Received: from localhost ([::1]:45138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlfg5-00072d-MW for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33149) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffq-0005yp-3N for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffm-000693-Ik for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58183) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffm-00068T-DJ for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffm-00070B-7J for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 10/12] gnu: Add java-commons-lang. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287685126688 (code B ref 36605); Thu, 11 Jul 2019 20:28:10 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:31 +0000 Received: from localhost ([127.0.0.1]:38739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff8-0006wG-OZ for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:31 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:37917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff4-0006vl-QW for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:27 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zy2bKqz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:26 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zy2Rx0z1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:26 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id Yq4cYM2CWXOl for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:24 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:24 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id A311960938 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:32 +0200 Message-Id: <20190711202644.32014-24-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 * gnu/packages/java.scm (java-commons-lang): New variables. --- gnu/packages/java.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3af8cd0..5a90d05 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1470,3 +1470,51 @@ This is a part of the Apache Commons Project.") (description "Commons-IO contains utility classes, stream implementations, file filters and endian classes.") (license license:asl2.0))) + +(define-public java-commons-lang + (package + (name "java-commons-lang") + (version "2.6") + (source (origin + (method url-fetch) + (uri (apache-commons-url "lang" version)) + (sha256 (base32 "1mxwagqadzx1b2al7i0z1v0r235aj2njdyijf02szq0vhmqrfiq5")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-javadoc ant-build-javadoc) + (add-before 'check 'fix-test-framework + (lambda _ + ;; disable a failing test + (substitute* "src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java" + (("public void testFormat\\(\\)") + "public void disabled_testFormat()")) + #t)) + (replace 'install (install-jars "target")) + (add-after 'install 'install-doc (install-javadoc "target/apidocs"))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/lang/") + (synopsis "Extension of the java.lang package") + (description "The Commons Lang components contains a set of Java classes +that provide helper methods for standard Java classes, especially those found +in the java.lang package in the Sun JDK. The following classes are included: + + * StringUtils - Helper for java.lang.String. + * CharSetUtils - Methods for dealing with CharSets, which are sets of + characters such as [a-z] and [abcdez]. + * RandomStringUtils - Helper for creating randomised Strings. + * NumberUtils - Helper for java.lang.Number and its subclasses. + * NumberRange - A range of numbers with an upper and lower bound. + * ObjectUtils - Helper for java.lang.Object. + * SerializationUtils - Helper for serializing Objects. + * SystemUtils - Utility class defining the Java system properties. + * NestedException package - A sub-package for the creation of nested + exceptions. + * Enum package - A sub-package for the creation of enumerated types. + * Builder package - A sub-package for the creation of equals, hashCode, + compareTo and toString methods.") + (license license:asl2.0))) From patchwork Thu Jul 11 20:26:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14597 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 E4ADA17202; Thu, 11 Jul 2019 21:28:28 +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=unavailable 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 A50A9171FE for ; Thu, 11 Jul 2019 21:28:28 +0100 (BST) Received: from localhost ([::1]:45130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlfg4-0006tG-0i for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33091) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffp-0005ut-2k for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffn-00069n-1t for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58184) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffm-00069U-SZ for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffm-00070I-Lw for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 11/12] gnu: Add java-commons-lang3. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287685126695 (code B ref 36605); Thu, 11 Jul 2019 20:28:10 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:31 +0000 Received: from localhost ([127.0.0.1]:38741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff9-0006wP-2W for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:31 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:37486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff6-0006w6-Lg for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:29 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l7001YfWz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:28 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l7001SMsz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:28 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id ADFm6uAr4-_O for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:26 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:26 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id B557960974 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:33 +0200 Message-Id: <20190711202644.32014-25-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 * gnu/packages/java.scm (java-commons-lang3): New variable. --- gnu/packages/java.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5a90d05..b7971a3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1518,3 +1518,55 @@ in the java.lang package in the Sun JDK. The following classes are included: * Builder package - A sub-package for the creation of equals, hashCode, compareTo and toString methods.") (license license:asl2.0))) + +(define-public java-commons-lang3 + (package + (name "java-commons-lang3") + (version "3.4") + (source (origin + (method url-fetch) + (uri (apache-commons-url "lang" version "commons-lang3")) + (sha256 + (base32 "0xpshb9spjhplq5a7mr0y1bgfw8190ik4xj8f569xidfcki1d6kg")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + `(#:tests? #f + #:test-target "test" ; requirements are missing, see below + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-javadoc ant-build-javadoc) + (replace 'install (install-jars "target")) + (add-after 'install 'install-doc (install-javadoc "target/apidocs"))))) + ;(native-inputs + ; `(("java-junit" ,java-junit))) + ; todo: tests. Requier hamcrest, commons-io, easymock. jar paths need to + ; be written into a properties files. See buld.xml in the source. + (home-page "http://commons.apache.org/lang/") + (synopsis "Extension of the java.lang package (for Java 5+)") + (description "The Commons Lang components contains a set of Java classes +that provide helper methods for standard Java classes, especially those found +in the java.lang package in the JDK 5+. The following classes are included: + + * StringUtils - Helper for java.lang.String. + * CharSetUtils - Methods for dealing with CharSets, which are sets of + characters such as [a-z] and [abcdez]. + * RandomStringUtils - Helper for creating randomised Strings. + * NumberUtils - Helper for java.lang.Number and its subclasses. + * NumberRange - A range of numbers with an upper and lower bound. + * ObjectUtils - Helper for java.lang.Object. + * SerializationUtils - Helper for serializing Objects. + * SystemUtils - Utility class defining the Java system properties. + * NestedException package - A sub-package for the creation of nested + exceptions. + * Enum package - A sub-package for the creation of enumerated types. + * Builder package - A sub-package for the creation of equals, hashCode, + compareTo and toString methods. + +Commons Lang 3.x use a different package (org.apache.commons.lang3) than the +previous versions (Commonas Lang 1.x and 2.x, which use +org.apache.commons.lang), allowing it to be used at the same time as an +earlier version. + +Commons Lang 3.x is only compatible with JDK 1.5+ ") + (license license:asl2.0))) From patchwork Thu Jul 11 20:26:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 14592 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 D85CD17200; Thu, 11 Jul 2019 21:28:23 +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=unavailable 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 998C7171FE for ; Thu, 11 Jul 2019 21:28:23 +0100 (BST) Received: from localhost ([::1]:45114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffy-0006OL-U7 for patchwork@mira.cbaines.net; Thu, 11 Jul 2019 16:28:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33084) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffp-0005uM-11 for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffn-0006Aq-Gc for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58185) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffn-0006AO-AG for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffn-00070Q-5d for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 12/12] gnu: Add java-commons-bcel. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287685526719 (code B ref 36605); Thu, 11 Jul 2019 20:28:11 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:35 +0000 Received: from localhost ([127.0.0.1]:38745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlffC-0006ws-J0 for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:34 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:52454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff8-0006wE-GJ for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:30 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l7020LjRz1rJCN for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:30 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l7020FSBz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:30 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id VG6UvxUCOV61 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:28 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:28 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id C7EE0603AC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:34 +0200 Message-Id: <20190711202644.32014-26-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> 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 * gnu/packages/java.scm (java-commons-bcel): New variable. --- gnu/packages/java.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b7971a3..b1e1ecc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1327,6 +1327,24 @@ libraries to vary independently of one another.") (string-append "mirror://apache/commons/" projname "/source/" basename "-" version "-src.tar.gz")) +(define-public java-commons-bcel + (package + (name "java-commons-bcel") + (version "6.0") + (source (origin + (method url-fetch) + (uri (apache-commons-url "bcel" version "bcel")) + (sha256 (base32 "0n39601zcj7ymjihfv53r260mf3n8kj6bqhxv90dw5sgc7qbjqxr")))) + (build-system ant-build-system) + ; todo: tests, javadoc + (arguments + `(#:jar-name (string-append "commons-bcel-" ,version ".jar") + #:src-dir "src/main")) + (home-page "http://commons.apache.org/bcel/") + (synopsis "Apache Commons Bytecode Engineering Library") + (description "") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli")