From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: Java things Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 14:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149407931332546 (code B ref -1); Sat, 06 May 2017 14:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 May 2017 14:01:53 +0000 Received: from localhost ([127.0.0.1]:58134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d70HR-0008Ss-4l for submit@debbugs.gnu.org; Sat, 06 May 2017 10:01:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d70HO-0008Sd-O8 for submit@debbugs.gnu.org; Sat, 06 May 2017 10:01:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d70HI-0004aE-Fs for submit@debbugs.gnu.org; Sat, 06 May 2017 10:01:45 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d70HI-0004aA-DA for submit@debbugs.gnu.org; Sat, 06 May 2017 10:01:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d70HH-0005Cm-5c for guix-patches@gnu.org; Sat, 06 May 2017 10:01:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d70HE-0004ZV-4t for guix-patches@gnu.org; Sat, 06 May 2017 10:01:43 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21049) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d70HD-0004ZP-Tt for guix-patches@gnu.org; Sat, 06 May 2017 10:01:40 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494079292799889.4724693947061; Sat, 6 May 2017 07:01:32 -0700 (PDT) User-agent: mu4e 0.9.18; emacs 25.1.1 From: Ricardo Wurmus X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Sat, 06 May 2017 16:01:29 +0200 Message-ID: <87wp9u2ifa.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) Several months ago Hartmut posted a couple of unfinished patches to guix-devel. I thought it wouldn’t be too hard to finish them. I was wrong. I still haven’t gotten all of them to build because to do things right I would need to package way too many things. This is a subset of my work to clean up Hartmut’s original patches. The remaining packages require “reflections”, which depends on tomcat and many more unpackaged Java things. I’d just like to get rid of this local branch, to be honest. Note that I had to edit a couple of package sources to cut out dependencies that would have taken too long to package. These changes can be reverted in the future if a better way can be found to handle these cases without introducing dependency cycles. I’ll post the patches once I’ve confirmed that all of them still build with the latest version of Guix. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 02/36] ant-build-system: Add default "check" target. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940849908652 (code B ref 26803); Sat, 06 May 2017 15:37:02 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:30 +0000 Received: from localhost ([127.0.0.1]:58220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71l0-0002FT-AY for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:30 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71ky-0002FC-65 for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:29 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494084984570723.2752393778; Sat, 6 May 2017 08:36:24 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:43 +0200 Message-Id: <20170506153617.3074-2-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * guix/build-system/ant.scm (ant-build): Change default test target to "check"; add "test-dir" argument. * guix/build/ant-build-system.scm (default-build.xml): Add "test-dir" argument; add ant targets "compile-tests" and "check". (configure): Add "test-dir" argument; pass it to "default-build.xml". --- guix/build-system/ant.scm | 4 +++- guix/build/ant-build-system.scm | 40 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index a309a0c86..bf2f3b411 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -93,12 +93,13 @@ (define* (ant-build store name inputs #:key (tests? #t) - (test-target "tests") + (test-target "check") (configure-flags ''()) (make-flags ''()) (build-target "jar") (jar-name #f) (source-dir "src") + (test-dir "src/test") (phases '(@ (guix build ant-build-system) %standard-phases)) (outputs '("out")) @@ -128,6 +129,7 @@ #:build-target ,build-target #:jar-name ,jar-name #:source-dir ,source-dir + #:test-dir ,test-dir #:phases ,phases #:outputs %outputs #:search-paths ',(map search-path-specification->sexp diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 8ec7a9486..4042630a1 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -36,7 +36,7 @@ ;; Code: (define* (default-build.xml jar-name prefix #:optional - (source-dir ".")) + (source-dir ".") (test-dir "./test")) "Create a simple build.xml with standard targets for Ant." (call-with-output-file "build.xml" (lambda (port) @@ -48,6 +48,10 @@ (value "${basedir}/build/jar"))) (property (@ (name "dist.dir") (value ,prefix))) + (property (@ (name "test.home") + (value ,test-dir))) + (property (@ (name "test.classes.dir") + (value "${basedir}/build/test-classes"))) ;; respect the CLASSPATH environment variable (property (@ (name "build.sysclasspath") @@ -63,6 +67,35 @@ (destdir "${classes.dir}") (classpath (@ (refid "classpath")))))) + (target (@ (name "compile-tests")) + (mkdir (@ (dir "${test.classes.dir}"))) + (javac (@ (includeantruntime "false") + (srcdir ,test-dir) + (destdir "${test.classes.dir}")) + (classpath + (pathelement (@ (path "${env.CLASSPATH}"))) + (pathelement (@ (location "${classes.dir}"))) + (pathelement (@ (location "${test.classes.dir}")))))) + + (target (@ (name "check") + (depends "compile-tests")) + (mkdir (@ (dir "${test.home}/test-reports"))) + (junit (@ (printsummary "true") + (showoutput "true") + (fork "yes") + (haltonfailure "yes")) + (classpath + (pathelement (@ (path "${env.CLASSPATH}"))) + (pathelement (@ (location "${test.home}/resources"))) + (pathelement (@ (location "${classes.dir}"))) + (pathelement (@ (location "${test.classes.dir}")))) + (formatter (@ (type "plain") + (usefile "true"))) + (batchtest (@ (fork "yes") + (todir "${test.home}/test-reports")) + (fileset (@ (dir "${test.home}/java")) + (include (@ (name "**/*Test.java" ))))))) + (target (@ (name "jar") (depends "compile")) (mkdir (@ (dir "${jar.dir}"))) @@ -99,12 +132,13 @@ to the default GNU unpack strategy." ((assq-ref gnu:%standard-phases 'unpack) #:source source))) (define* (configure #:key inputs outputs (jar-name #f) - (source-dir "src") #:allow-other-keys) + (source-dir "src") + (test-dir "src/test") #:allow-other-keys) (when jar-name (default-build.xml jar-name (string-append (assoc-ref outputs "out") "/share/java") - source-dir)) + source-dir test-dir)) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) (setenv "CLASSPATH" (generate-classpath inputs))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 01/36] ant-build-system: Allow specifying source directory. References: <87wp9u2ifa.fsf@elephly.net> In-Reply-To: <87wp9u2ifa.fsf@elephly.net> Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Hartmut Goebel Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940849918659 (code B ref 26803); Sat, 06 May 2017 15:37:03 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:31 +0000 Received: from localhost ([127.0.0.1]:58222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71l0-0002FV-Km for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:30 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71ky-0002FE-PE for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:29 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494084981754245.13672299598363; Sat, 6 May 2017 08:36:21 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:42 +0200 Message-Id: <20170506153617.3074-1-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) From: Hartmut Goebel * guix/build-system/ant.scm (ant-build), guix/build/ant-build-system.scm (default-build.xml): Add parameter source-dir. * guix/build/ant-build-system.scm (configure): Pass source-dir on to default-build.xml. * doc/guix.texi (Build Systems): Document it. Co-authored-by: Ricardo Wurmus --- doc/guix.texi | 3 ++- guix/build-system/ant.scm | 2 ++ guix/build/ant-build-system.scm | 10 ++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4446909ed..d2699c048 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3325,7 +3325,8 @@ parameters, respectively. When the original package does not provide a suitable Ant build file, the parameter @code{#:jar-name} can be used to generate a minimal Ant build file @file{build.xml} with tasks to build the specified jar -archive. +archive. In this case the parameter @code{#:source-dir} can be used to +specify the source sub-directory, defaulting to ``src''. The parameter @code{#:build-target} can be used to specify the Ant task that should be run during the @code{build} phase. By default the diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 550f92bc7..a309a0c86 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -98,6 +98,7 @@ (make-flags ''()) (build-target "jar") (jar-name #f) + (source-dir "src") (phases '(@ (guix build ant-build-system) %standard-phases)) (outputs '("out")) @@ -126,6 +127,7 @@ #:test-target ,test-target #:build-target ,build-target #:jar-name ,jar-name + #:source-dir ,source-dir #:phases ,phases #:outputs %outputs #:search-paths ',(map search-path-specification->sexp diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 00a4a46d8..8ec7a9486 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -35,7 +35,8 @@ ;; ;; Code: -(define (default-build.xml jar-name prefix) +(define* (default-build.xml jar-name prefix #:optional + (source-dir ".")) "Create a simple build.xml with standard targets for Ant." (call-with-output-file "build.xml" (lambda (port) @@ -58,7 +59,7 @@ (target (@ (name "compile")) (mkdir (@ (dir "${classes.dir}"))) (javac (@ (includeantruntime "false") - (srcdir "src") + (srcdir ,source-dir) (destdir "${classes.dir}") (classpath (@ (refid "classpath")))))) @@ -98,11 +99,12 @@ to the default GNU unpack strategy." ((assq-ref gnu:%standard-phases 'unpack) #:source source))) (define* (configure #:key inputs outputs (jar-name #f) - #:allow-other-keys) + (source-dir "src") #:allow-other-keys) (when jar-name (default-build.xml jar-name (string-append (assoc-ref outputs "out") - "/share/java"))) + "/share/java") + source-dir)) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) (setenv "CLASSPATH" (generate-classpath inputs))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 04/36] gnu: Add java-plexus-utils. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940849938680 (code B ref 26803); Sat, 06 May 2017 15:37:03 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:33 +0000 Received: from localhost ([127.0.0.1]:58226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71l2-0002Fr-Uq for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:33 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71l1-0002Fi-FC for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:31 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494084990332158.72721635627772; Sat, 6 May 2017 08:36:30 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:45 +0200 Message-Id: <20170506153617.3074-4-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-plexus-utils): New variable. Co-authored-by: Hartmut Goebel --- gnu/packages/java.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ad1ccac83..49b953d26 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1180,3 +1180,55 @@ 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))) + +(define-public java-plexus-utils + (package + (name "java-plexus-utils") + (version "3.0.24") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/codehaus-plexus/" + "plexus-utils/archive/plexus-utils-" + version ".tar.gz")) + (sha256 + (base32 + "1mlwpc6fms24slygv5yvi6fi9hcha2fh0v73p5znpi78bg36i2js")))) + (build-system ant-build-system) + ;; FIXME: The default build.xml does not include a target to install + ;; javadoc files. + (arguments + `(#:jar-name "plexus-utils.jar" + #:source-dir "src/main" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-reference-to-/bin-and-/usr + (lambda _ + (substitute* "src/main/java/org/codehaus/plexus/util/\ +cli/shell/BourneShell.java" + (("/bin/sh") (which "sh")) + (("/usr/") (getcwd))) + #t)) + (add-after 'unpack 'fix-or-disable-broken-tests + (lambda _ + (with-directory-excursion "src/test/java/org/codehaus/plexus/util" + (substitute* '("cli/CommandlineTest.java" + "cli/shell/BourneShellTest.java") + (("/bin/sh") (which "sh")) + (("/bin/echo") (which "echo"))) + + ;; This test depends on MavenProjectStub, but we don't have + ;; a package for Maven. + (delete-file "introspection/ReflectionValueExtractorTest.java") + + ;; FIXME: The command line tests fail, maybe because they use + ;; absolute paths. + (delete-file "cli/CommandlineTest.java")) + #t))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://codehaus-plexus.github.io/plexus-utils/") + (synopsis "Common utilities for the Plexus framework") + (description "This package provides various Java utility classes for the +Plexus framework to ease working with strings, files, command lines, XML and +more.") + (license license:asl2.0))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 03/36] guix: Add java-utils. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Hartmut Goebel Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940849948689 (code B ref 26803); Sat, 06 May 2017 15:37:04 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:34 +0000 Received: from localhost ([127.0.0.1]:58228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71l4-0002G5-8t for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:34 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71l2-0002Fp-CH for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:32 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494084987612310.0103106708409; Sat, 6 May 2017 08:36:27 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:44 +0200 Message-Id: <20170506153617.3074-3-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) From: Hartmut Goebel * guix/build/java-utils.scm: New file. * guix/build-system/ant.scm: Use it. * Makefile.am (MODULES): Add it. Co-authored-by: Ricardo Wurmus --- Makefile.am | 1 + guix/build-system/ant.scm | 2 ++ guix/build/java-utils.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 guix/build/java-utils.scm diff --git a/Makefile.am b/Makefile.am index 8fe9e350c..b09180ba2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -124,6 +124,7 @@ MODULES = \ guix/build/syscalls.scm \ guix/build/gremlin.scm \ guix/build/emacs-utils.scm \ + guix/build/java-utils.scm \ guix/build/lisp-utils.scm \ guix/build/graft.scm \ guix/build/bournish.scm \ diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index bf2f3b411..228b4e60d 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -39,6 +39,7 @@ (define %ant-build-system-modules ;; Build-side modules imported by default. `((guix build ant-build-system) + (guix build java-utils) (guix build syscalls) ,@%gnu-build-system-modules)) @@ -108,6 +109,7 @@ (guile #f) (imported-modules %ant-build-system-modules) (modules '((guix build ant-build-system) + (guix build java-utils) (guix build utils)))) "Build SOURCE with INPUTS." (define builder diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm new file mode 100644 index 000000000..402d377bf --- /dev/null +++ b/guix/build/java-utils.scm @@ -0,0 +1,55 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2016 Ricardo Wurmus +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build java-utils) + #:use-module (guix build utils) + #:export (ant-build-javadoc + install-jars + install-javadoc)) + +;; Copied from haskell-build-system.scm +(define (package-name-version store-dir) + "Given a store directory STORE-DIR return 'name-version' of the package." + (let* ((base (basename store-dir))) + (string-drop base (+ 1 (string-index base #\-))))) + +(define* (ant-build-javadoc #:key (target "javadoc") (make-flags '()) + #:allow-other-keys) + (zero? (apply system* `("ant" ,target ,@make-flags)))) + +(define* (install-jars jar-directory) + "Install jar files from JAR-DIRECTORY to the default target directory. This +is used in case the build.xml does not include an install target." + (lambda* (#:key outputs #:allow-other-keys) + (let ((share (string-append (assoc-ref outputs "out") + "/share/java"))) + (for-each (lambda (f) (install-file f share)) + (find-files jar-directory "\\.jar$")) + #t))) + +(define* (install-javadoc apidoc-directory) + "Install the APIDOC-DIRECTORY to the target directory. This is used to +install javadocs when this is not done by the install target." + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (docs (string-append (or (assoc-ref outputs "doc") out) + "/share/doc/" (package-name-version out) "/"))) + (mkdir-p docs) + (copy-recursively apidoc-directory docs) + #t))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 05/36] gnu: Add java-plexus-interpolation. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Hartmut Goebel Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850038723 (code B ref 26803); Sat, 06 May 2017 15:37:05 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:43 +0000 Received: from localhost ([127.0.0.1]:58233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lC-0002GW-L3 for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:42 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21091) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lA-0002GI-Ce for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:40 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494084993076450.54999107823096; Sat, 6 May 2017 08:36:33 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:46 +0200 Message-Id: <20170506153617.3074-5-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) From: Hartmut Goebel * gnu/packages/java.scm (java-plexus-interplation): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/java.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 49b953d26..2ff9a11a0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1232,3 +1232,33 @@ cli/shell/BourneShell.java" Plexus framework 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 (string-append "https://github.com/codehaus-plexus/" + "plexus-interpolation/archive/" + "plexus-interpolation-" version ".tar.gz")) + (sha256 + (base32 + "1w79ljwk42ymrgy8kqxq4l82pgdj6287gabpfnpkyzbrnclsnfrp")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "plexus-interpolation.jar" + #:source-dir "src/main")) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "http://codehaus-plexus.github.io/plexus-interpolation/") + (synopsis "Java components for interpolating ${} strings and the like") + (description "Plexus interpolator is a 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))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 06/36] gnu: Add java-asm. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850038730 (code B ref 26803); Sat, 06 May 2017 15:37:05 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:43 +0000 Received: from localhost ([127.0.0.1]:58235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lC-0002Ge-Vj for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:43 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lA-0002GH-BF for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:41 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494084995950761.4176063188643; Sat, 6 May 2017 08:36:35 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:47 +0200 Message-Id: <20170506153617.3074-6-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-asm): New variable. --- gnu/packages/java.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2ff9a11a0..2df07bc38 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1262,3 +1262,47 @@ 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))) + +(define-public java-asm + (package + (name "java-asm") + (version "5.2") + (source (origin + (method url-fetch) + (uri (string-append "http://download.forge.ow2.org/asm/" + "asm-" version ".tar.gz")) + (sha256 + (base32 + "0kxvmv5275rnjl7jv0442k3wjnq03ngkb7sghs78avf45pzm4qgr")))) + (build-system ant-build-system) + (arguments + `(#:build-target "compile" + #:test-target "test" + ;; The tests require an old version of Janino, which no longer compiles + ;; with the JDK7. + #:tests? #f + ;; We don't need these extra ant tasks, but the build system asks us to + ;; provide a path anyway. + #:make-flags (list (string-append "-Dobjectweb.ant.tasks.path=foo")) + #:phases + (modify-phases %standard-phases + (add-before 'install 'build-jars + (lambda* (#:key make-flags #:allow-other-keys) + ;; We cannot use the "jar" target because it depends on a couple + ;; of unpackaged, complicated tools. + (mkdir "dist") + (zero? (system* "jar" + "-cf" (string-append "dist/asm-" ,version ".jar") + "-C" "output/build/tmp" ".")))) + (replace 'install + (install-jars "dist"))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://asm.ow2.org/") + (synopsis "Very small and fast Java bytecode manipulation framework") + (description "ASM is an all purpose Java bytecode manipulation and +analysis framework. It can be used to modify existing classes or dynamically +generate classes, directly in binary form. The provided common +transformations and analysis algorithms allow to easily assemble custom +complex transformations and code analysis tools.") + (license license:bsd-3))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 07/36] gnu: Add java-cglib. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850038737 (code B ref 26803); Sat, 06 May 2017 15:37:05 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:43 +0000 Received: from localhost ([127.0.0.1]:58237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lD-0002Gl-7q for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:43 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lC-0002GV-9u for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:42 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494084998859927.397809038936; Sat, 6 May 2017 08:36:38 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:48 +0200 Message-Id: <20170506153617.3074-7-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-cglib): New variable. --- gnu/packages/java.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2df07bc38..7f22661b1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1306,3 +1306,37 @@ generate classes, directly in binary form. The provided common transformations and analysis algorithms allow to easily assemble custom complex transformations and code analysis tools.") (license license:bsd-3))) + +(define-public java-cglib + (package + (name "java-cglib") + (version "3.2.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/cglib/cglib/archive/RELEASE_" + (string-map (lambda (c) (if (char=? c #\.) #\_ c)) version) + ".tar.gz")) + (file-name (string-append "cglib-" version ".tar.gz")) + (sha256 + (base32 + "162dvd4fln76ai8prfharf66pn6r56p3sxx683j5vdyccrd5hi1q")))) + (build-system ant-build-system) + (arguments + `(;; FIXME: tests fail because junit runs + ;; "net.sf.cglib.transform.AbstractTransformTest", which does not seem + ;; to describe a test at all. + #:tests? #f + #:jar-name "cglib.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "cglib") #t))))) + (inputs + `(("java-asm" ,java-asm) + ("java-junit" ,java-junit))) + (home-page "https://github.com/cglib/cglib/") + (synopsis "Java byte code generation library") + (description "The byte code generation library CGLIB is a high level API +to generate and transform Java byte code.") + (license license:asl2.0))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 08/36] gnu: Add java-objenesis. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850058751 (code B ref 26803); Sat, 06 May 2017 15:37:06 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:45 +0000 Received: from localhost ([127.0.0.1]:58240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lF-0002H5-FR for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:45 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lD-0002Gs-PY for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:44 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085001607318.3207619677046; Sat, 6 May 2017 08:36:41 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:49 +0200 Message-Id: <20170506153617.3074-8-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-objenesis): New variable. --- gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7f22661b1..303d64016 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1340,3 +1340,32 @@ complex transformations and code analysis tools.") (description "The byte code generation library CGLIB is a high level API to generate and transform Java byte code.") (license license:asl2.0))) + +(define-public java-objenesis + (package + (name "java-objenesis") + (version "2.5.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/easymock/objenesis/" + "archive/" version ".tar.gz")) + (file-name (string-append "objenesis-" version ".tar.gz")) + (sha256 + (base32 + "1va5qz1i2wawwavhnxfzxnfgrcaflz9p1pg03irrjh4nd3rz8wh6")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "objenesis.jar" + #:source-dir "main/src/" + #:test-dir "main/src/test/")) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "http://objenesis.org/") + (synopsis "Bypass the constructor when creating an object") + (description "Objenesis is a small Java library that serves one purpose: +to instantiate a new object of a particular class. It is common to see +restrictions in libraries stating that classes must require a default +constructor. Objenesis aims to overcome these restrictions by bypassing the +constructor on object instantiation.") + (license license:asl2.0))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 09/36] gnu: Add java-easymock. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850108770 (code B ref 26803); Sat, 06 May 2017 15:37:06 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:50 +0000 Received: from localhost ([127.0.0.1]:58243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lJ-0002HN-Nv for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:49 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21071) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lI-0002HF-8t for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:48 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085004534968.3646029106814; Sat, 6 May 2017 08:36:44 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:50 +0200 Message-Id: <20170506153617.3074-9-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-easymock): New variable. --- gnu/packages/java.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 303d64016..7a1a66027 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1369,3 +1369,64 @@ restrictions in libraries stating that classes must require a default constructor. Objenesis aims to overcome these restrictions by bypassing the constructor on object instantiation.") (license license:asl2.0))) + +(define-public java-easymock + (package + (name "java-easymock") + (version "3.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/easymock/easymock/" + "archive/easymock-" version ".tar.gz")) + (sha256 + (base32 + "1yzg0kv256ndr57gpav46cyv4a1ns5sj722l50zpxk3j6sk9hnmi")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "easymock.jar" + #:source-dir "core/src/main" + #:test-dir "core/src/test" + #:phases + (modify-phases %standard-phases + ;; FIXME: Android support requires the following packages to be + ;; available: com.google.dexmaker.stock.ProxyBuilder + (add-after 'unpack 'delete-android-support + (lambda _ + (with-directory-excursion "core/src/main/java/org/easymock/internal" + (substitute* "MocksControl.java" + (("AndroidSupport.isAndroid\\(\\)") "false") + (("return classProxyFactory = new AndroidClassProxyFactory\\(\\);") "")) + (delete-file "AndroidClassProxyFactory.java")) + #t)) + (add-after 'unpack 'delete-broken-tests + (lambda _ + (with-directory-excursion "core/src/test/java/org/easymock" + ;; This test depends on dexmaker. + (delete-file "tests2/ClassExtensionHelperTest.java") + + ;; This is not a test. + (delete-file "tests/BaseEasyMockRunnerTest.java") + + ;; This test should be executed with a different runner... + (delete-file "tests2/EasyMockAnnotationsTest.java") + ;; ...but deleting it means that we also have to delete these + ;; dependent files. + (delete-file "tests2/EasyMockRunnerTest.java") + (delete-file "tests2/EasyMockRuleTest.java") + + ;; This test fails because the file "easymock.properties" does + ;; not exist. + (delete-file "tests2/EasyMockPropertiesTest.java")) + #t))))) + (inputs + `(("java-asm" ,java-asm) + ("java-cglib" ,java-cglib) + ("java-objenesis" ,java-objenesis))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "http://easymock.org") + (synopsis "Java library providing mock objects for unit tests") + (description "EasyMock is a Java library that provides an easy way to use +mock objects in unit testing.") + (license license:asl2.0))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 10/36] gnu: Add java-jopt-simple. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850128784 (code B ref 26803); Sat, 06 May 2017 15:37:07 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:52 +0000 Received: from localhost ([127.0.0.1]:58246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lM-0002Hc-1A for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:52 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lK-0002HO-9E for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:50 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085007276190.59144927817374; Sat, 6 May 2017 08:36:47 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:51 +0200 Message-Id: <20170506153617.3074-10-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-jopt-simple): 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 7a1a66027..3dc71e4bc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1430,3 +1430,31 @@ constructor on object instantiation.") (description "EasyMock is a Java library that provides an easy way to use mock objects in unit testing.") (license license:asl2.0))) + +(define-public java-jopt-simple + (package + (name "java-jopt-simple") + (version "5.0.3") + (source (origin + (method url-fetch) + (uri (string-append "http://repo1.maven.org/maven2/" + "net/sf/jopt-simple/jopt-simple/" + version "/jopt-simple-" + version "-sources.jar")) + (sha256 + (base32 + "1v8bzmwmw6qq20gm42xyay6vrd567dra4vqwhgjnqqjz1gs9f8qa")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:jar-name "jopt-simple.jar")) + (home-page "https://pholser.github.io/jopt-simple/") + (synopsis "Java library for parsing command line options") + (description "JOpt Simple is a Java library for parsing command line +options, such as those you might pass to an invocation of @code{javac}. In +the interest of striving for simplicity, as closely as possible JOpt Simple +attempts to honor the command line option syntaxes of POSIX @code{getopt} and +GNU @code{getopt_long}. It also aims to make option parser configuration and +retrieval of options and their arguments simple and expressive, without being +overly clever.") + (license license:expat))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 11/36] gnu: java-hamcrest-core: Install all jars without version suffix. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850158800 (code B ref 26803); Sat, 06 May 2017 15:37:07 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:55 +0000 Received: from localhost ([127.0.0.1]:58249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lP-0002Hs-95 for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:55 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lN-0002Hk-PE for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:54 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085010048414.05457769143516; Sat, 6 May 2017 08:36:50 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:52 +0200 Message-Id: <20170506153617.3074-11-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-hamcrest-core)[arguments]: Install all three jars and strip the version suffix. --- gnu/packages/java.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3dc71e4bc..57ef65336 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1081,7 +1081,10 @@ an Ant task that extends the built-in @code{jar} task.") #t)))) (build-system ant-build-system) (arguments - `(#:tests? #f ; Tests require junit + `(#:tests? #f ; Tests require junit + #:modules ((guix build ant-build-system) + (guix build utils) + (srfi srfi-1)) #:make-flags (list (string-append "-Dversion=" ,version)) #:build-target "core" #:phases @@ -1133,10 +1136,23 @@ private Method[] allMethods = getSortedMethods();"))))) #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (install-file (string-append "build/hamcrest-core-" - ,version ".jar") - (string-append (assoc-ref outputs "out") - "/share/java"))))))) + (let* ((target (string-append (assoc-ref outputs "out") + "/share/java/")) + (version-suffix ,(string-append "-" version ".jar")) + (install-without-version-suffix + (lambda (jar) + (copy-file jar + (string-append target + (basename jar version-suffix) + ".jar"))))) + (mkdir-p target) + (for-each + install-without-version-suffix + (find-files "build" + (lambda (name _) + (and (string-suffix? ".jar" name) + (not (string-suffix? "-sources.jar" name))))))) + #t))))) (native-inputs `(("java-qdox-1.12" ,java-qdox-1.12) ("java-jarjar" ,java-jarjar))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 12/36] gnu: Add java-commons-math3. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850168814 (code B ref 26803); Sat, 06 May 2017 15:37:08 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:36:56 +0000 Received: from localhost ([127.0.0.1]:58252 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lQ-0002I6-GE for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:56 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lP-0002Hy-QB for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:56 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085012824346.1086075629215; Sat, 6 May 2017 08:36:52 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:53 +0200 Message-Id: <20170506153617.3074-12-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-commons-math3): New variable. --- gnu/packages/java.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 57ef65336..5d131929c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1474,3 +1474,47 @@ GNU @code{getopt_long}. It also aims to make option parser configuration and retrieval of options and their arguments simple and expressive, without being overly clever.") (license license:expat))) + +(define-public java-commons-math3 + (package + (name "java-commons-math3") + (version "3.6.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/math/source/" + "commons-math3-" version "-src.tar.gz")) + (sha256 + (base32 + "19l6yp44qc5g7wg816nbn5z3zq3xxzwimvbm4a8pczgvpi4i85s6")))) + (build-system ant-build-system) + (arguments + `(#:build-target "jar" + #:test-target "test" + #:make-flags + (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) + (junit (assoc-ref %build-inputs "java-junit"))) + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") + (string-append "-Dhamcrest.jar=" hamcrest + "/share/java/hamcrest-core.jar"))) + #:phases + (modify-phases %standard-phases + ;; We want to build the jar in the build phase and run the tests + ;; later in a separate phase. + (add-after 'unpack 'untangle-targets + (lambda _ + (substitute* "build.xml" + (("name=\"jar\" depends=\"test\"") + "name=\"jar\" depends=\"compile\"")) + #t)) + ;; There is no install target. + (replace 'install + (install-jars "target"))))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "http://commons.apache.org/math/") + (synopsis "Apache Commons mathematics library") + (description "Commons Math is a library of lightweight, self-contained +mathematics and statistics components addressing the most common problems not +available in the Java programming language or Commons Lang.") + (license license:asl2.0))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 13/36] gnu: Add java-jmh. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850208831 (code B ref 26803); Sat, 06 May 2017 15:37:08 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:00 +0000 Received: from localhost ([127.0.0.1]:58255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lT-0002IN-Nn for submit@debbugs.gnu.org; Sat, 06 May 2017 11:36:59 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lR-0002IE-Tu for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:36:58 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085015734274.9227518649459; Sat, 6 May 2017 08:36:55 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:54 +0200 Message-Id: <20170506153617.3074-13-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-jmh): New variable. --- gnu/packages/java.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5d131929c..36d80ff1d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -23,6 +23,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix hg-download) #:use-module (guix utils) #:use-module (guix build-system ant) #:use-module (guix build-system gnu) @@ -1518,3 +1519,48 @@ overly clever.") mathematics and statistics components addressing the most common problems not available in the Java programming language or Commons Lang.") (license license:asl2.0))) + +(define-public java-jmh + (package + (name "java-jmh") + (version "1.17.5") + (source (origin + (method hg-fetch) + (uri (hg-reference + (url "http://hg.openjdk.java.net/code-tools/jmh/") + (changeset version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1fxyxhg9famwcg1prc4cgwb5wzyxqavn3cjm5vz8605xz7x5k084")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jmh-core.jar" + #:source-dir "jmh-core/src/main" + #:test-dir "jmh-core/src/test" + #:phases + (modify-phases %standard-phases + ;; This seems to be a bug in the JDK. It may not be necessary in + ;; future versions of the JDK. + (add-after 'unpack 'fix-bug + (lambda _ + (with-directory-excursion + "jmh-core/src/main/java/org/openjdk/jmh/runner/options" + (substitute* '("IntegerValueConverter.java" + "ThreadsValueConverter.java") + (("public Class valueType") + "public Class valueType"))) + #t))))) + (inputs + `(("java-jopt-simple" ,java-jopt-simple) + ("java-commons-math3" ,java-commons-math3))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "http://openjdk.java.net/projects/code-tools/jmh/") + (synopsis "Benchmark harness for the JVM") + (description "JMH is a Java harness for building, running, and analysing +nano/micro/milli/macro benchmarks written in Java and other languages +targetting the JVM.") + ;; GPLv2 only + (license license:gpl2))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 14/36] gnu: Add java-commons-collections4. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850248877 (code B ref 26803); Sat, 06 May 2017 15:37:09 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:04 +0000 Received: from localhost ([127.0.0.1]:58260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lY-0002J1-0Z for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:04 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lV-0002IV-Vg for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:03 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085018652243.90644577252067; Sat, 6 May 2017 08:36:58 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:55 +0200 Message-Id: <20170506153617.3074-14-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-commons-collections4): New variable. --- gnu/packages/java.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 36d80ff1d..f595af58c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1564,3 +1564,63 @@ nano/micro/milli/macro benchmarks written in Java and other languages targetting the JVM.") ;; GPLv2 only (license license:gpl2))) + +(define-public java-commons-collections4 + (package + (name "java-commons-collections4") + (version "4.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/collections/source/" + "commons-collections4-" version "-src.tar.gz")) + (sha256 + (base32 + "1krfhvggympq4avk7gh6qafzf6b9ip6r1m4lmacikyx04039m0wl")))) + (build-system ant-build-system) + (arguments + `(#:test-target "test" + #:make-flags + (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) + (junit (assoc-ref %build-inputs "java-junit")) + (easymock (assoc-ref %build-inputs "java-easymock"))) + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") + (string-append "-Dhamcrest.jar=" hamcrest + "/share/java/hamcrest-core.jar") + (string-append "-Deasymock.jar=" easymock + "/share/java/easymock.jar"))) + #:phases + (modify-phases %standard-phases + (replace 'install + (install-jars "target"))))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core) + ("java-easymock" ,java-easymock))) + (home-page "http://commons.apache.org/collections/") + (synopsis "Collections framework") + (description "The Java Collections Framework is the recognised standard +for collection handling in Java. Commons-Collections seek to build upon the +JDK classes by providing new interfaces, implementations and utilities. There +are many features, including: + +@itemize +@item @code{Bag} interface for collections that have a number of copies of + each object +@item @code{BidiMap} interface for maps that can be looked up from value to + key as well and key to value +@item @code{MapIterator} interface to provide simple and quick iteration over + maps +@item Transforming decorators that alter each object as it is added to the + collection +@item Composite collections that make multiple collections look like one +@item Ordered maps and sets that retain the order elements are added in, + including an LRU based map +@item Reference map that allows keys and/or values to be garbage collected + under close control +@item Many comparator implementations +@item Many iterator implementations +@item Adapter classes from array and enumerations to collections +@item Utilities to test or create typical set-theory properties of collections + such as union, intersection, and closure. +@end itemize\n") + (license license:asl2.0))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 15/36] gnu: Add java-commons-io. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:37:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Hartmut Goebel Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850278942 (code B ref 26803); Sat, 06 May 2017 15:37:09 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:07 +0000 Received: from localhost ([127.0.0.1]:58270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lb-0002K3-A9 for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:07 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lZ-0002JU-R2 for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:06 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 14940850214933.284422641650849; Sat, 6 May 2017 08:37:01 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:56 +0200 Message-Id: <20170506153617.3074-15-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) From: Hartmut Goebel * gnu/packages/java.scm (java-commons-io): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/java.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f595af58c..c9707d0d2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1624,3 +1624,44 @@ are many features, including: such as union, intersection, and closure. @end itemize\n") (license license:asl2.0))) + +(define-public java-commons-io + (package + (name "java-commons-io") + (version "2.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/io/source/" + "commons-io-" version "-src.tar.gz")) + (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 inputs #:allow-other-keys) + ;; TODO: don't do this; use make-flags + ;; The existence of this file is taken as indicator whether test + ;; dependencies 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")) + #t))) + (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) + ("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))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 16/36] gnu: Add java-commons-lang. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Hartmut Goebel Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850339014 (code B ref 26803); Sat, 06 May 2017 15:38:02 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:13 +0000 Received: from localhost ([127.0.0.1]:58280 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lh-0002LJ-Iv for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:13 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21017) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lg-0002L5-0m for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:12 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085024992331.2349996345156; Sat, 6 May 2017 08:37:04 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:57 +0200 Message-Id: <20170506153617.3074-16-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) From: Hartmut Goebel * gnu/packages/java.scm (java-commons-lang): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/java.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c9707d0d2..7a68b6bd6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1665,3 +1665,58 @@ are many features, including: (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 (string-append "mirror://apache/commons/lang/source/" + "commons-lang-" version "-src.tar.gz")) + (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 'disable-failing-test + (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 @code{java.lang} package in the Sun JDK. The following classes are +included: + +@itemize +@item StringUtils - Helper for @code{java.lang.String}. +@item CharSetUtils - Methods for dealing with @code{CharSets}, which are sets + of characters such as @code{[a-z]} and @code{[abcdez]}. +@item RandomStringUtils - Helper for creating randomised strings. +@item NumberUtils - Helper for @code{java.lang.Number} and its subclasses. +@item NumberRange - A range of numbers with an upper and lower bound. +@item ObjectUtils - Helper for @code{java.lang.Object}. +@item SerializationUtils - Helper for serializing objects. +@item SystemUtils - Utility class defining the Java system properties. +@item NestedException package - A sub-package for the creation of nested + exceptions. +@item Enum package - A sub-package for the creation of enumerated types. +@item Builder package - A sub-package for the creation of @code{equals}, + @code{hashCode}, @code{compareTo} and @code{toString} methods. +@end itemize\n") + (license license:asl2.0))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 17/36] gnu: Add java-commons-lang3. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Hartmut Goebel Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850349021 (code B ref 26803); Sat, 06 May 2017 15:38:02 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:14 +0000 Received: from localhost ([127.0.0.1]:58282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lh-0002LL-T5 for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:14 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lg-0002L7-Go for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:12 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 14940850277981.0293384272620187; Sat, 6 May 2017 08:37:07 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:58 +0200 Message-Id: <20170506153617.3074-17-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) From: Hartmut Goebel * gnu/packages/java.scm (java-commons-lang3): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/java.scm | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7a68b6bd6..3e422ac80 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1720,3 +1720,67 @@ included: @code{hashCode}, @code{compareTo} and @code{toString} methods. @end itemize\n") (license license:asl2.0))) + +(define-public java-commons-lang3 + (package + (name "java-commons-lang3") + (version "3.4") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/lang/source/" + "commons-lang3-" version "-src.tar.gz")) + (sha256 + (base32 "0xpshb9spjhplq5a7mr0y1bgfw8190ik4xj8f569xidfcki1d6kg")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:make-flags + (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-all")) + (junit (assoc-ref %build-inputs "java-junit")) + (easymock (assoc-ref %build-inputs "java-easymock")) + (io (assoc-ref %build-inputs "java-commons-io"))) + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") + (string-append "-Dhamcrest.jar=" hamcrest + "/share/java/hamcrest-all.jar") + (string-append "-Dcommons-io.jar=" io + "/share/java/commons-io-" + ,(package-version java-commons-io) + "-SNAPSHOT.jar") + (string-append "-Deasymock.jar=" easymock + "/share/java/easymock.jar"))) + #: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) + ("java-commons-io" ,java-commons-io) + ("java-hamcrest-all" ,java-hamcrest-all) + ("java-easymock" ,java-easymock))) + (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 @code{java.lang} package in the JDK 5+. The following classes are +included: + +@itemize +@item StringUtils - Helper for @code{java.lang.String}. +@item CharSetUtils - Methods for dealing with @code{CharSets}, which are sets of + characters such as @code{[a-z]} and @code{[abcdez]}. +@item RandomStringUtils - Helper for creating randomised strings. +@item NumberUtils - Helper for @code{java.lang.Number} and its subclasses. +@item NumberRange - A range of numbers with an upper and lower bound. +@item ObjectUtils - Helper for @code{java.lang.Object}. +@item SerializationUtils - Helper for serializing objects. +@item SystemUtils - Utility class defining the Java system properties. +@item NestedException package - A sub-package for the creation of nested + exceptions. +@item Enum package - A sub-package for the creation of enumerated types. +@item Builder package - A sub-package for the creation of @code{equals}, + @code{hashCode}, @code{compareTo} and @code{toString} methods. +@end itemize\n") + (license license:asl2.0))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 18/36] gnu: Add java-commons-cli. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Hartmut Goebel Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850389040 (code B ref 26803); Sat, 06 May 2017 15:38:03 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:18 +0000 Received: from localhost ([127.0.0.1]:58285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lm-0002Lk-5R for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:18 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21111) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lk-0002Lc-PU for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:17 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085030578606.5348122912161; Sat, 6 May 2017 08:37:10 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:35:59 +0200 Message-Id: <20170506153617.3074-18-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) From: Hartmut Goebel * gnu/packages/java.scm (java-commons-cli): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/java.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3e422ac80..0220435af 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1784,3 +1784,40 @@ included: @code{hashCode}, @code{compareTo} and @code{toString} methods. @end itemize\n") (license license:asl2.0))) + +(define-public java-commons-cli + (package + (name "java-commons-cli") + (version "1.3.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/cli/source/" + "commons-cli-" version "-src.tar.gz")) + (sha256 + (base32 + "1fkjn552i12vp3xxk21ws4p70fi0lyjm004vzxsdaz7gdpgyxxyl")))) + (build-system ant-build-system) + ;; TODO: javadoc + (arguments + `(#:jar-name "commons-cli.jar")) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (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 is 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))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 19/36] gnu: Add java-commons-codec. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Hartmut Goebel Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850419067 (code B ref 26803); Sat, 06 May 2017 15:38:03 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:21 +0000 Received: from localhost ([127.0.0.1]:58290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lp-0002MB-D8 for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:21 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lm-0002Lj-2l for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:18 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085033334745.7211773704502; Sat, 6 May 2017 08:37:13 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:00 +0200 Message-Id: <20170506153617.3074-19-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) From: Hartmut Goebel * gnu/packages/java.scm (java-commons-codec): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/java.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0220435af..e4913973d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1821,3 +1821,49 @@ 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 (string-append "mirror://apache/commons/codec/source/" + "commons-codec-" version "-src.tar.gz")) + (sha256 + (base32 + "1w9qg30y4s0x8gnmr2fgj4lyplfn788jqxbcz27lf5kbr6n8xr65")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:make-flags + (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) + (junit (assoc-ref %build-inputs "java-junit"))) + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") + (string-append "-Dhamcrest.jar=" hamcrest + "/share/java/hamcrest-core.jar") + ;; Do not append version to jar. + "-Dfinal.name=commons-codec")) + #:phases + ;; TODO: I don't like this + (modify-phases %standard-phases + (add-after 'build 'build-javadoc + ant-build-javadoc) + (replace 'install + (install-jars "dist")) + ;; TODO: do this if javadoc argument is given? + (add-after 'install 'install-doc + (install-javadoc "dist/docs/api"))))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (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))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 21/36] gnu: Add java-jmock-1. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850439075 (code B ref 26803); Sat, 06 May 2017 15:38:03 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:23 +0000 Received: from localhost ([127.0.0.1]:58292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lq-0002MJ-Lj for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:22 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21081) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lo-0002Ly-IS for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:21 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085038847634.3916699942238; Sat, 6 May 2017 08:37:18 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:02 +0200 Message-Id: <20170506153617.3074-21-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-jmock-1): New variable. --- gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index af6b0761f..3271dd55c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1448,6 +1448,42 @@ constructor on object instantiation.") mock objects in unit testing.") (license license:asl2.0))) +(define-public java-jmock-1 + (package + (name "java-jmock") + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/jmock-developers/" + "jmock-library/archive/" version ".tar.gz")) + (file-name (string-append "jmock-" version ".tar.gz")) + (sha256 + (base32 + "0xmrlhq0fszldkbv281k9463mv496143vvmqwpxp62yzjvdkx9w0")))) + (build-system ant-build-system) + (arguments + `(#:build-target "jars" + #:test-target "run.tests" + #:phases + (modify-phases %standard-phases + (replace 'install (install-jars "build"))))) + (home-page "http://www.jmock.org") + (synopsis "Mock object library for Test Driven Development") + (description "JMock is a library that supports test-driven development of +Java code with mock objects. Mock objects help you design and test the +interactions between the objects in your programs. + +The jMock library + +@itemize +@item makes it quick and easy to define mock objects +@item lets you precisely specify the interactions between + your objects, reducing the brittleness of your tests +@item plugs into your favourite test framework +@item is easy to extend. +@end itemize\n") + (license license:bsd-3))) + (define-public java-jopt-simple (package (name "java-jopt-simple") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 20/36] gnu: Add java-commons-daemon. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Hartmut Goebel Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850439084 (code B ref 26803); Sat, 06 May 2017 15:38:04 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:23 +0000 Received: from localhost ([127.0.0.1]:58294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lq-0002MP-Uw for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:23 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lo-0002Lz-QZ for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:21 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085036105267.6861071213658; Sat, 6 May 2017 08:37:16 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:01 +0200 Message-Id: <20170506153617.3074-20-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) From: Hartmut Goebel * gnu/packages/java.scm (java-commons-daemon): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/java.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e4913973d..af6b0761f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1867,3 +1867,37 @@ phonetic encoding utilities. This is a part of the Apache Commons Project.") (license license:asl2.0))) + +(define-public java-commons-daemon + (package + (name "java-commons-daemon") + (version "1.0.15") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/daemon/source/" + "commons-daemon-" version "-src.tar.gz")) + (sha256 + (base32 + "0ci46kq8jpz084ccwq0mmkahcgsmh20ziclp2jf5i0djqv95gvhi")))) + (build-system ant-build-system) + (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))) -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 22/36] gnu: java-hamcrest-core: Declare test target. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850479108 (code B ref 26803); Sat, 06 May 2017 15:38:05 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:27 +0000 Received: from localhost ([127.0.0.1]:58298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lv-0002Mq-6a for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:27 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lt-0002Mc-GP for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:25 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085041625518.1352115583796; Sat, 6 May 2017 08:37:21 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:03 +0200 Message-Id: <20170506153617.3074-22-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-hamcrest-core)[arguments]: Add value for test-target. --- gnu/packages/java.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3271dd55c..2a5797a5c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1087,6 +1087,7 @@ an Ant task that extends the built-in @code{jar} task.") (guix build utils) (srfi srfi-1)) #:make-flags (list (string-append "-Dversion=" ,version)) + #:test-target "unit-test" #:build-target "core" #:phases (modify-phases %standard-phases -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 23/36] gnu: Add java-hamcrest-all. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850499123 (code B ref 26803); Sat, 06 May 2017 15:38:06 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:29 +0000 Received: from localhost ([127.0.0.1]:58301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lx-0002N5-CE for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:29 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lu-0002Mj-LG for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:26 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085044356854.9224812042005; Sat, 6 May 2017 08:37:24 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:04 +0200 Message-Id: <20170506153617.3074-23-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-hamcrest-all): New variable. --- gnu/packages/java.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2a5797a5c..8006b4d21 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1485,6 +1485,39 @@ The jMock library @end itemize\n") (license license:bsd-3))) +(define-public java-hamcrest-all + (package (inherit java-hamcrest-core) + (name "java-hamcrest-all") + (arguments + (substitute-keyword-arguments (package-arguments java-hamcrest-core) + ;; FIXME: a range of unit tests fail because + ;; org.hamcrest.SelfDescribing is not found, although it is part of the + ;; hamcrest-core library that has just been built. + ((#:tests? _) #f) + ((#:build-target _) "bigjar") + ((#:phases phases) + `(modify-phases ,phases + ;; Some build targets override the classpath, so we need to patch + ;; the build.xml to ensure that required dependencies are on the + ;; classpath. + (add-after 'unpack 'patch-classpath-for-integration + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "build.xml" + (("( build/hamcrest-library-\\$\\{version\\}.jar)" line) + (string-join + (cons line + (append + (find-files (assoc-ref inputs "java-junit") "\\.jar$") + (find-files (assoc-ref inputs "java-jmock") "\\.jar$") + (find-files (assoc-ref inputs "java-easymock") "\\.jar$"))) + ";"))) + #t)))))) + (inputs + `(("java-junit" ,java-junit) + ("java-jmock" ,java-jmock-1) + ("java-easymock" ,java-easymock) + ,@(package-inputs java-hamcrest-core))))) + (define-public java-jopt-simple (package (name "java-jopt-simple") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 24/36] gnu: Add java-jsr305. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850509132 (code B ref 26803); Sat, 06 May 2017 15:38:06 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:30 +0000 Received: from localhost ([127.0.0.1]:58303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71ly-0002ND-Il for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:30 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71lw-0002My-A3 for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:28 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085047080193.272042524183; Sat, 6 May 2017 08:37:27 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:05 +0200 Message-Id: <20170506153617.3074-24-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-jsr305): New variable. --- gnu/packages/java.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8006b4d21..3a104f4c5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1855,6 +1855,29 @@ included: @end itemize\n") (license license:asl2.0))) +(define-public java-jsr305 + (package + (name "java-jsr305") + (version "3.0.1") + (source (origin + (method url-fetch) + (uri (string-append "http://repo1.maven.org/maven2/" + "com/google/code/findbugs/" + "jsr305/" version "/jsr305-" + version "-sources.jar")) + (sha256 + (base32 + "1rh6jin9v7jqpq3kf1swl868l8i94r636n03pzpsmgr8v0lh9j2n")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f ; no tests included + #:jar-name "jsr305.jar")) + (home-page "http://findbugs.sourceforge.net/") + (synopsis "Annotations for the static analyzer called findbugs") + (description "This package provides annotations for the findbugs package. +It provides packages in the @code{javax.annotations} namespace.") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 25/36] gnu: Add java-guava. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850549147 (code B ref 26803); Sat, 06 May 2017 15:38:07 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:34 +0000 Received: from localhost ([127.0.0.1]:58306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71m1-0002NT-RP for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:34 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21145) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71m0-0002NL-7E for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:32 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085049863996.5953919682593; Sat, 6 May 2017 08:37:29 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:06 +0200 Message-Id: <20170506153617.3074-25-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-guava): 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 3a104f4c5..a9faf681d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1878,6 +1878,58 @@ included: It provides packages in the @code{javax.annotations} namespace.") (license license:asl2.0))) +(define-public java-guava + (package + (name "java-guava") + ;; This is the last release of Guava that can be built with Java 7. + (version "20.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/google/guava/" + "releases/download/v" version + "/guava-" version "-sources.jar")) + (sha256 + (base32 + "1gawrs5gi6j5hcfxdgpnfli75vb9pfi4sn09pnc8xacr669yajwr")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f ; no tests included + #:jar-name "guava.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'trim-sources + (lambda _ + (with-directory-excursion "src/com/google/common" + ;; Remove annotations to avoid extra dependencies: + ;; * "j2objc" annotations are used when converting Java to + ;; Objective C; + ;; * "errorprone" annotations catch common Java mistakes at + ;; compile time; + ;; * "IgnoreJRERequirement" is used for Android. + (substitute* (find-files "." "\\.java$") + (("import com.google.j2objc.*") "") + (("import com.google.errorprone.annotation.*") "") + (("import org.codehaus.mojo.animal_sniffer.*") "") + (("@CanIgnoreReturnValue") "") + (("@LazyInit") "") + (("@WeakOuter") "") + (("@RetainedWith") "") + (("@Weak") "") + (("@ForOverride") "") + (("@J2ObjCIncompatible") "") + (("@IgnoreJRERequirement") ""))) + #t))))) + (inputs + `(("java-jsr305" ,java-jsr305))) + (home-page "https://github.com/google/guava") + (synopsis "Google core libraries for Java") + (description "Guava is a set of core libraries that includes new +collection types (such as multimap and multiset), immutable collections, a +graph library, functional types, an in-memory cache, and APIs/utilities for +concurrency, I/O, hashing, primitives, reflection, string processing, and much +more!") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 26/36] gnu: Add java-commons-logging-minimal. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850589165 (code B ref 26803); Sat, 06 May 2017 15:38:07 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:38 +0000 Received: from localhost ([127.0.0.1]:58309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71m6-0002Nl-3p for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:38 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71m4-0002Nd-KA for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:36 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085052580346.0417906838595; Sat, 6 May 2017 08:37:32 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:07 +0200 Message-Id: <20170506153617.3074-26-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-commons-logging-minimal): New variable. --- gnu/packages/java.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a9faf681d..859f9934a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1930,6 +1930,53 @@ concurrency, I/O, hashing, primitives, reflection, string processing, and much more!") (license license:asl2.0))) +;; The java-commons-logging package provides adapters to many different +;; logging frameworks. To avoid an excessive dependency graph we try to build +;; it with only a minimal set of adapters. +(define-public java-commons-logging-minimal + (package + (name "java-commons-logging-minimal") + (version "1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/logging/source/" + "commons-logging-" version "-src.tar.gz")) + (sha256 + (base32 + "10bwcy5w8d7y39n0krlwhnp8ds3kj5zhmzj0zxnkw0qdlsjmsrj9")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f ; avoid dependency on logging frameworks + #:jar-name "commons-logging-minimal.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-adapters-and-tests + (lambda _ + ;; Delete all adapters except for NoOpLog, SimpleLog, and + ;; LogFactoryImpl. NoOpLog is required to build; LogFactoryImpl + ;; is used by applications; SimpleLog is the only actually usable + ;; implementation that does not depend on another logging + ;; framework. + (for-each + (lambda (file) + (delete-file (string-append + "src/main/java/org/apache/commons/logging/impl/" file))) + (list "Jdk13LumberjackLogger.java" + "WeakHashtable.java" + "Log4JLogger.java" + "ServletContextCleaner.java" + "Jdk14Logger.java" + "AvalonLogger.java" + "LogKitLogger.java")) + (delete-file-recursively "src/test") + #t))))) + (home-page "http://commons.apache.org/logging/") + (synopsis "Common API for logging implementations") + (description "The Logging package is a thin bridge between different +logging implementations. A library that uses the commons-logging API can be +used with any logging implementation at runtime.") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 27/36] gnu: Add java-mockito-1. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850609186 (code B ref 26803); Sat, 06 May 2017 15:38:08 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:40 +0000 Received: from localhost ([127.0.0.1]:58312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71m8-0002O1-Br for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:40 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71m6-0002Nr-O6 for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:39 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085055326226.32466708512834; Sat, 6 May 2017 08:37:35 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:08 +0200 Message-Id: <20170506153617.3074-27-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-mockito): New variable. --- gnu/packages/java.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 859f9934a..2cf2821c0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1977,6 +1977,66 @@ logging implementations. A library that uses the commons-logging API can be used with any logging implementation at runtime.") (license license:asl2.0))) +;; This is the last release of the 1.x series. +(define-public java-mockito-1 + (package + (name "java-mockito") + (version "1.10.19") + (source (origin + (method url-fetch) + (uri (string-append "http://repo1.maven.org/maven2/" + "org/mockito/mockito-core/" version + "/mockito-core-" version "-sources.jar")) + (sha256 + (base32 + "0vmiwnwpf83g2q7kj1rislmja8fpvqkixjhawh7nxnygx6pq11kc")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "mockito.jar" + #:tests? #f ; no tests included + ;; FIXME: patch-and-repack does not support jars, so we have to apply + ;; patches in build phases. + #:phases + (modify-phases %standard-phases + ;; Mockito fails to build with our verson of hamcrest without this + ;; definition. + (add-after 'unpack 'fix-hamcrest-build-error + (lambda _ + (substitute* "src/org/mockito/internal/matchers/LocalizedMatcher.java" + (("public Matcher getActualMatcher\\(\\) .*" line) + (string-append " + public void describeMismatch(Object item, Description description) { + actualMatcher.describeMismatch(item, description); + }" + line))) + #t)) + ;; Mockito bundles cglib. We have a cglib package, so let's use + ;; that instead. + (add-after 'unpack 'use-system-libraries + (lambda _ + (with-directory-excursion "src/org/mockito/internal/creation/cglib" + (substitute* '("CGLIBHacker.java" + "CglibMockMaker.java" + "ClassImposterizer.java" + "DelegatingMockitoMethodProxy.java" + "MethodInterceptorFilter.java" + "MockitoNamingPolicy.java" + "SerializableMockitoMethodProxy.java" + "SerializableNoOp.java") + (("import org.mockito.cglib") "import net.sf.cglib"))) + #t))))) + (inputs + `(("java-junit" ,java-junit) + ("java-objenesis" ,java-objenesis) + ("java-cglib" ,java-cglib) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "http://mockito.org") + (synopsis "Mockito is a mock library for Java") + (description "Mockito is a mocking library for Java which lets you write +tests with a clean and simple API. It generates mocks using reflection, and +it records all mock invocations, including methods arguments.") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 28/36] gnu: Add java-httpcomponents-httpcore. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850649197 (code B ref 26803); Sat, 06 May 2017 15:38:08 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:44 +0000 Received: from localhost ([127.0.0.1]:58315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mB-0002OG-LI for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:43 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71m8-0002O0-6i for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:40 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085058082597.3285191603359; Sat, 6 May 2017 08:37:38 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:09 +0200 Message-Id: <20170506153617.3074-28-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-httpcomponents-httpcore): New variable. --- gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2cf2821c0..a770cd4cc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2037,6 +2037,42 @@ tests with a clean and simple API. It generates mocks using reflection, and it records all mock invocations, including methods arguments.") (license license:asl2.0))) +(define-public java-httpcomponents-httpcore + (package + (name "java-httpcomponents-httpcore") + (version "4.4.6") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache//httpcomponents/httpcore/" + "source/httpcomponents-core-" + version "-src.tar.gz")) + (sha256 + (base32 + "02bwcf38y4vgwq7kj2s6q7qrmma641r5lacivm16kgxvb2j6h1vy")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "httpcomponents-httpcore.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "httpcore") #t))))) + (inputs + `(("java-commons-logging-minimal" ,java-commons-logging-minimal) + ("java-commons-lang3" ,java-commons-lang3))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-mockito" ,java-mockito-1))) + (home-page "https://hc.apache.org/httpcomponents-core-4.4.x/index.html") + (synopsis "Low level HTTP transport components") + (description "HttpCore is a set of low level HTTP transport components +that can be used to build custom client and server side HTTP services with a +minimal footprint. HttpCore supports two I/O models: blocking I/O model based +on the classic Java I/O and non-blocking, event driven I/O model based on Java +NIO. + +This package provides the blocking I/O model library.") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 29/36] gnu: Add java-httpcomponents-httpcore-nio. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850659210 (code B ref 26803); Sat, 06 May 2017 15:38:08 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:45 +0000 Received: from localhost ([127.0.0.1]:58318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mC-0002OU-UP for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:45 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21028) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mC-0002OH-2Y for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:44 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085060828741.2890086147903; Sat, 6 May 2017 08:37:40 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:10 +0200 Message-Id: <20170506153617.3074-29-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-httpcomponents-httpcore-nio): New variable. --- gnu/packages/java.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a770cd4cc..620a276d0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2073,6 +2073,28 @@ NIO. This package provides the blocking I/O model library.") (license license:asl2.0))) +(define-public java-httpcomponents-httpcore-nio + (package (inherit java-httpcomponents-httpcore) + (name "java-httpcomponents-httpcore-nio") + (arguments + `(#:jar-name "httpcomponents-httpcore-nio.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "httpcore-nio") #t))))) + (inputs + `(("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) + ("java-hamcrest-core" ,java-hamcrest-core) + ,@(package-inputs java-httpcomponents-httpcore))) + (description "HttpCore is a set of low level HTTP transport components +that can be used to build custom client and server side HTTP services with a +minimal footprint. HttpCore supports two I/O models: blocking I/O model based +on the classic Java I/O and non-blocking, event driven I/O model based on Java +NIO. + +This package provides the non-blocking I/O model library based on Java +NIO."))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 30/36] gnu: Add java-httpcomponents-httpcore-ab. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850679225 (code B ref 26803); Sat, 06 May 2017 15:38:09 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:47 +0000 Received: from localhost ([127.0.0.1]:58321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mF-0002Oj-5O for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:47 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mE-0002Oc-8J for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:46 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 149408506361569.06279303804979; Sat, 6 May 2017 08:37:43 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:11 +0200 Message-Id: <20170506153617.3074-30-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-httpcomponents-httpcore-ab): 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 620a276d0..19642cbfc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2095,6 +2095,24 @@ NIO. This package provides the non-blocking I/O model library based on Java NIO."))) +(define-public java-httpcomponents-httpcore-ab + (package (inherit java-httpcomponents-httpcore) + (name "java-httpcomponents-httpcore-ab") + (arguments + `(#:jar-name "httpcomponents-httpcore-ab.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "httpcore-ab") #t))))) + (inputs + `(("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) + ("java-commons-cli" ,java-commons-cli) + ("java-hamcrest-core" ,java-hamcrest-core) + ,@(package-inputs java-httpcomponents-httpcore))) + (synopsis "Apache HttpCore benchmarking tool") + (description "This package provides the HttpCore benchmarking tool. It is +an Apache AB clone based on HttpCore."))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 31/36] gnu: Add java-httpcomponents-httpclient. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850699241 (code B ref 26803); Sat, 06 May 2017 15:38:09 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:49 +0000 Received: from localhost ([127.0.0.1]:58324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mH-0002Oz-D7 for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:49 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21001) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mG-0002Os-BQ for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:48 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085066401427.4067378463467; Sat, 6 May 2017 08:37:46 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:12 +0200 Message-Id: <20170506153617.3074-31-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-httpcomponents-httpclient): New variable. --- gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 19642cbfc..ee3a2bd2b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2113,6 +2113,42 @@ NIO."))) (description "This package provides the HttpCore benchmarking tool. It is an Apache AB clone based on HttpCore."))) +(define-public java-httpcomponents-httpclient + (package + (name "java-httpcomponents-httpclient") + (version "4.5.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/httpcomponents/httpclient/" + "source/httpcomponents-client-" + version "-src.tar.gz")) + (sha256 + (base32 + "1428399s7qy3cim5wc6f3ks4gl9nf9vkjpfmnlap3jflif7g2pj1")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "httpcomponents-httpclient.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "httpclient") #t))))) + (inputs + `(("java-commons-logging-minimal" ,java-commons-logging-minimal) + ("java-commons-codec" ,java-commons-codec) + ("java-hamcrest-core" ,java-hamcrest-core) + ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) + ("java-mockito" ,java-mockito-1) + ("java-junit" ,java-junit))) + (home-page "https://hc.apache.org/httpcomponents-client-ga/") + (synopsis "HTTP client library for Java") + (description "Although the @code{java.net} package provides basic +functionality for accessing resources via HTTP, it doesn't provide the full +flexibility or functionality needed by many applications. @code{HttpClient} +seeks to fill this void by providing an efficient, up-to-date, and +feature-rich package implementing the client side of the most recent HTTP +standards and recommendations.") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 32/36] gnu: Add java-httpcomponents-httpmime. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850719256 (code B ref 26803); Sat, 06 May 2017 15:38:11 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:51 +0000 Received: from localhost ([127.0.0.1]:58327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mJ-0002PE-LS for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:51 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21109) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mI-0002P7-9s for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:50 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085069202605.4615261796619; Sat, 6 May 2017 08:37:49 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:13 +0200 Message-Id: <20170506153617.3074-32-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-httpcomponents-httpmime): New variable. --- gnu/packages/java.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ee3a2bd2b..4bc03e5ca 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2149,6 +2149,21 @@ feature-rich package implementing the client side of the most recent HTTP standards and recommendations.") (license license:asl2.0))) +(define-public java-httpcomponents-httpmime + (package (inherit java-httpcomponents-httpclient) + (name "java-httpcomponents-httpmime") + (arguments + `(#:jar-name "httpcomponents-httpmime.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "httpmime") #t))))) + (inputs + `(("java-httpcomponents-httpclient" ,java-httpcomponents-httpclient) + ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) + ("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 33/36] gnu: Add java-commons-httpclient. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850769273 (code B ref 26803); Sat, 06 May 2017 15:38:12 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:56 +0000 Received: from localhost ([127.0.0.1]:58330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mN-0002PV-SR for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:56 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mM-0002PN-Cq for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:54 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085071951336.81926060309263; Sat, 6 May 2017 08:37:51 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:14 +0200 Message-Id: <20170506153617.3074-33-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-commons-httpclient): New variable. --- gnu/packages/java.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4bc03e5ca..1639570f9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2164,6 +2164,61 @@ standards and recommendations.") ("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))))) +(define-public java-commons-httpclient + (package + (name "java-commons-httpclient") + (version "3.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/" + "httpcomponents/commons-httpclient/source/" + "commons-httpclient-" version "-src.tar.gz")) + (sha256 + (base32 + "1wlpn3cfy3d4inxy6g7wxcsa8p7sshn6aldk9y4ia3lb879rd97r")))) + (build-system ant-build-system) + (arguments + `(#:make-flags + (let ((junit (assoc-ref %build-inputs "java-junit")) + (codec (assoc-ref %build-inputs "java-commons-codec")) + (logging (assoc-ref %build-inputs "java-commons-logging-minimal"))) + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") + (string-append "-Dcommons-codec.jar=" codec + "/share/java/commons-codec.jar") + (string-append "-Dcommons-logging.jar=" logging + "/share/java/commons-logging-minimal.jar"))) + #:build-target "dist" + #:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-utf8-problems + (lambda _ + ;; These files contain invalid characters. + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* '("src/examples/ClientApp.java" + "src/examples/TrivialApp.java" + "src/test/org/apache/commons/httpclient/TestHttps.java" + "src/test/org/apache/commons/httpclient/TestURIUtil2.java" + "src/java/org/apache/commons/httpclient/\ +HttpContentTooLargeException.java") + (("Ortwin Gl.") "Ortwin Glue")) + (substitute* "src/test/org/apache/commons/httpclient/TestURIUtil2.java" + (("\xe4") "") + (("%C3%A4") ""))) + #t)) + (replace 'install (install-jars "dist"))))) + (inputs + `(("java-commons-logging-minimal" ,java-commons-logging-minimal) + ("java-commons-codec" ,java-commons-codec) + ("java-junit" ,java-junit))) + (home-page "http://hc.apache.org/httpclient-3.x/") + (synopsis "Deprecated HTTP client library for Java") + (description "The Commons HttpClient project is now end of life, and is +no longer being developed. It has been replaced by the Apache HttpComponents +project in its HttpClient and HttpCore modules, which offer better performance +and more flexibility.") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 34/36] gnu: Add java-commons-net. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850799289 (code B ref 26803); Sat, 06 May 2017 15:38:12 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:37:59 +0000 Received: from localhost ([127.0.0.1]:58333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mR-0002Pl-4v for submit@debbugs.gnu.org; Sat, 06 May 2017 11:37:59 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mO-0002Pd-TN for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:37:57 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085074849828.2470921651606; Sat, 6 May 2017 08:37:54 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:15 +0200 Message-Id: <20170506153617.3074-34-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-commons-net): 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 1639570f9..287a7ae69 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2219,6 +2219,34 @@ project in its HttpClient and HttpCore modules, which offer better performance and more flexibility.") (license license:asl2.0))) +(define-public java-commons-net + (package + (name "java-commons-net") + (version "3.6") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/net/source/" + "commons-net-" version "-src.tar.gz")) + (sha256 + (base32 + "0n0cmnddk9qdqhjvka8pc6hd9mn2qi3166f1s6xk32h7rfy1adxr")))) + (build-system ant-build-system) + (arguments + `(;; FIXME: MainTest.java tries to read "examples.properties" (which + ;; should be "resources/examples/examples.properties"), but gets "null" + ;; instead. + #:tests? #f + #:jar-name "commons-net.jar")) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "http://commons.apache.org/net/") + (synopsis "Client library for many basic Internet protocols") + (description "The Apache Commons Net library implements the client side of +many basic Internet protocols. The purpose of the library is to provide +fundamental protocol access, not higher-level abstractions.") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 36/36] gnu: Add java-commons-compress. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850859365 (code B ref 26803); Sat, 06 May 2017 15:38:12 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:38:05 +0000 Received: from localhost ([127.0.0.1]:58342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mW-0002Qq-Cq for submit@debbugs.gnu.org; Sat, 06 May 2017 11:38:05 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mV-0002QG-0q for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:38:03 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 14940850805681017.5857348325962; Sat, 6 May 2017 08:38:00 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:17 +0200 Message-Id: <20170506153617.3074-36-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-commons-compress): New variable. --- gnu/packages/java.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8ecd5bbfc..35e1c315e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2275,6 +2275,50 @@ transfer, etc., and you can integrate its functionality into your own Java programs.") (license license:bsd-3))) +(define-public java-commons-compress + (package + (name "java-commons-compress") + (version "1.13") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/compress/source/" + "commons-compress-" version "-src.tar.gz")) + (sha256 + (base32 + "1vjqvavrn0babffn1kciz6v52ibwq2vwhzlb95hazis3lgllnxc8")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "commons-compress.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-bad-tests + (lambda _ + (with-directory-excursion "src/test/java/org/apache/commons/compress/" + ;; FIXME: These tests really should not fail. Maybe they are + ;; indicative of problems with our Java packaging work. + + ;; This test fails with a null pointer exception. + (delete-file "archivers/sevenz/SevenZOutputFileTest.java") + ;; This test fails to open test resources. + (delete-file "archivers/zip/ExplodeSupportTest.java") + + ;; FIXME: This test adds a dependency on powermock, which is hard to + ;; package at this point. + ;; https://github.com/powermock/powermock + (delete-file "archivers/sevenz/SevenZNativeHeapTest.java")) + #t))))) + (inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core) + ("java-mockito" ,java-mockito-1) + ("java-xz" ,java-xz))) + (home-page "https://commons.apache.org/proper/commons-compress/") + (synopsis "Java library for working with compressed files") + (description "The Apache Commons Compress library defines an API for +working with compressed files such as ar, cpio, Unix dump, tar, zip, gzip, XZ, +Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE, lz4 and Z files.") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 35/36] gnu: Add java-jsch. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 15:38:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14940850859374 (code B ref 26803); Sat, 06 May 2017 15:38:13 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 15:38:05 +0000 Received: from localhost ([127.0.0.1]:58345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mX-0002Qz-IO for submit@debbugs.gnu.org; Sat, 06 May 2017 11:38:05 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21047) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71mV-0002QH-4S for 26803@debbugs.gnu.org; Sat, 06 May 2017 11:38:03 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494085077731527.6790344041403; Sat, 6 May 2017 08:37:57 -0700 (PDT) From: Ricardo Wurmus Date: Sat, 6 May 2017 17:36:16 +0200 Message-Id: <20170506153617.3074-35-rekado@elephly.net> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170506153617.3074-1-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> X-ZohoMailClient: External X-ZohoMail: Z_26063301 SPT_1 Z_26062608 SPT_0 X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) * gnu/packages/java.scm (java-jsch): 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 287a7ae69..8ecd5bbfc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2247,6 +2247,34 @@ many basic Internet protocols. The purpose of the library is to provide fundamental protocol access, not higher-level abstractions.") (license license:asl2.0))) +(define-public java-jsch + (package + (name "java-jsch") + (version "0.1.54") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/jsch/jsch/" + version "/jsch-" version ".zip")) + (sha256 + (base32 + "029rdddyq1mh3ghryh3ki99kba1xkf1d1swjv2vi6lk6zzjy2wdb")))) + (build-system ant-build-system) + (arguments + `(#:build-target "dist" + #:tests? #f ; no tests included + #:phases + (modify-phases %standard-phases + (replace 'install (install-jars "dist"))))) + (native-inputs + `(("unzip" ,unzip))) + (home-page "http://www.jcraft.com/jsch/") + (synopsis "Pure Java implementation of SSH2") + (description "JSch is a pure Java implementation of SSH2. JSch allows you +to connect to an SSH server and use port forwarding, X11 forwarding, file +transfer, etc., and you can integrate its functionality into your own Java +programs.") + (license license:bsd-3))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.12.2 From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 01/36] ant-build-system: Allow specifying source directory. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 20:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14941021704387 (code B ref 26803); Sat, 06 May 2017 20:23:02 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 20:22:50 +0000 Received: from localhost ([127.0.0.1]:58589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76E6-00018h-5S for submit@debbugs.gnu.org; Sat, 06 May 2017 16:22:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76E4-00018V-Ef for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:22:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76Dy-0007kf-9p for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:22:43 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76Dq-0007cm-3i; Sat, 06 May 2017 16:22:34 -0400 Received: from [178.224.66.110] (port=50390 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d76Dp-00039r-DC; Sat, 06 May 2017 16:22:33 -0400 References: <87wp9u2ifa.fsf@elephly.net> <20170506153617.3074-1-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-1-rekado@elephly.net> Date: Sat, 06 May 2017 22:22:28 +0200 Message-ID: <87shkhka63.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > From: Hartmut Goebel > > * guix/build-system/ant.scm (ant-build), > guix/build/ant-build-system.scm (default-build.xml): Add parameter > source-dir. > * guix/build/ant-build-system.scm (configure): Pass source-dir on to > default-build.xml. > * doc/guix.texi (Build Systems): Document it. > > Co-authored-by: Ricardo Wurmus > --- > doc/guix.texi | 3 ++- > guix/build-system/ant.scm | 2 ++ > guix/build/ant-build-system.scm | 10 ++++++---- > 3 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/doc/guix.texi b/doc/guix.texi > index 4446909ed..d2699c048 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -3325,7 +3325,8 @@ parameters, respectively. > When the original package does not provide a suitable Ant build file, > the parameter @code{#:jar-name} can be used to generate a minimal Ant > build file @file{build.xml} with tasks to build the specified jar > -archive. > +archive. In this case the parameter @code{#:source-dir} can be used to > +specify the source sub-directory, defaulting to ``src''. > > The parameter @code{#:build-target} can be used to specify the Ant task > that should be run during the @code{build} phase. By default the > diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm > index 550f92bc7..a309a0c86 100644 > --- a/guix/build-system/ant.scm > +++ b/guix/build-system/ant.scm > @@ -98,6 +98,7 @@ > (make-flags ''()) > (build-target "jar") > (jar-name #f) > + (source-dir "src") > (phases '(@ (guix build ant-build-system) > %standard-phases)) > (outputs '("out")) > @@ -126,6 +127,7 @@ > #:test-target ,test-target > #:build-target ,build-target > #:jar-name ,jar-name > + #:source-dir ,source-dir > #:phases ,phases > #:outputs %outputs > #:search-paths ',(map search-path-specification->sexp > diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm > index 00a4a46d8..8ec7a9486 100644 > --- a/guix/build/ant-build-system.scm > +++ b/guix/build/ant-build-system.scm > @@ -35,7 +35,8 @@ > ;; > ;; Code: > > -(define (default-build.xml jar-name prefix) > +(define* (default-build.xml jar-name prefix #:optional > + (source-dir ".")) > "Create a simple build.xml with standard targets for Ant." > (call-with-output-file "build.xml" > (lambda (port) > @@ -58,7 +59,7 @@ > (target (@ (name "compile")) > (mkdir (@ (dir "${classes.dir}"))) > (javac (@ (includeantruntime "false") > - (srcdir "src") > + (srcdir ,source-dir) > (destdir "${classes.dir}") > (classpath (@ (refid "classpath")))))) > > @@ -98,11 +99,12 @@ to the default GNU unpack strategy." > ((assq-ref gnu:%standard-phases 'unpack) #:source source))) > > (define* (configure #:key inputs outputs (jar-name #f) > - #:allow-other-keys) > + (source-dir "src") #:allow-other-keys) > (when jar-name > (default-build.xml jar-name > (string-append (assoc-ref outputs "out") > - "/share/java"))) > + "/share/java") > + source-dir)) > (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) > (setenv "CLASSPATH" (generate-classpath inputs))) LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 02/36] ant-build-system: Add default "check" target. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 20:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14941025374935 (code B ref 26803); Sat, 06 May 2017 20:29:01 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 20:28:57 +0000 Received: from localhost ([127.0.0.1]:58597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76K0-0001HW-Uj for submit@debbugs.gnu.org; Sat, 06 May 2017 16:28:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76Jz-0001HA-9i for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:28:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76Jp-0000AQ-97 for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:28:49 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54432) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76Jp-0000AM-5O; Sat, 06 May 2017 16:28:45 -0400 Received: from [178.224.66.110] (port=50394 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d76Jm-000699-8J; Sat, 06 May 2017 16:28:43 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-2-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-2-rekado@elephly.net> Date: Sat, 06 May 2017 22:28:36 +0200 Message-ID: <87r301k9vv.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * guix/build-system/ant.scm (ant-build): Change default test target to > "check"; add "test-dir" argument. > * guix/build/ant-build-system.scm (default-build.xml): Add "test-dir" > argument; add ant targets "compile-tests" and "check". > (configure): Add "test-dir" argument; pass it to "default-build.xml". > --- > guix/build-system/ant.scm | 4 +++- > guix/build/ant-build-system.scm | 40 +++++++++++++++++++++++++++++++++++++--- > 2 files changed, 40 insertions(+), 4 deletions(-) > > diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm > index a309a0c86..bf2f3b411 100644 > --- a/guix/build-system/ant.scm > +++ b/guix/build-system/ant.scm > @@ -93,12 +93,13 @@ > (define* (ant-build store name inputs > #:key > (tests? #t) > - (test-target "tests") > + (test-target "check") > (configure-flags ''()) > (make-flags ''()) > (build-target "jar") > (jar-name #f) > (source-dir "src") > + (test-dir "src/test") > (phases '(@ (guix build ant-build-system) > %standard-phases)) > (outputs '("out")) Is this only for 'build.xml' files generated by the ant-build-system? I'm not sure whether there is a consensus within the Java world about the name of a test phase. I think 'check' would be good, because it is consistent with other build systems within Guix. So.. long story short, it looks good to me. > @@ -128,6 +129,7 @@ > #:build-target ,build-target > #:jar-name ,jar-name > #:source-dir ,source-dir > + #:test-dir ,test-dir > #:phases ,phases > #:outputs %outputs > #:search-paths ',(map search-path-specification->sexp > diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm > index 8ec7a9486..4042630a1 100644 > --- a/guix/build/ant-build-system.scm > +++ b/guix/build/ant-build-system.scm > @@ -36,7 +36,7 @@ > ;; Code: > > (define* (default-build.xml jar-name prefix #:optional > - (source-dir ".")) > + (source-dir ".") (test-dir "./test")) > "Create a simple build.xml with standard targets for Ant." > (call-with-output-file "build.xml" > (lambda (port) > @@ -48,6 +48,10 @@ > (value "${basedir}/build/jar"))) > (property (@ (name "dist.dir") > (value ,prefix))) > + (property (@ (name "test.home") > + (value ,test-dir))) > + (property (@ (name "test.classes.dir") > + (value "${basedir}/build/test-classes"))) > > ;; respect the CLASSPATH environment variable > (property (@ (name "build.sysclasspath") > @@ -63,6 +67,35 @@ > (destdir "${classes.dir}") > (classpath (@ (refid "classpath")))))) > > + (target (@ (name "compile-tests")) > + (mkdir (@ (dir "${test.classes.dir}"))) > + (javac (@ (includeantruntime "false") > + (srcdir ,test-dir) > + (destdir "${test.classes.dir}")) > + (classpath > + (pathelement (@ (path "${env.CLASSPATH}"))) > + (pathelement (@ (location "${classes.dir}"))) > + (pathelement (@ (location "${test.classes.dir}")))))) > + > + (target (@ (name "check") > + (depends "compile-tests")) > + (mkdir (@ (dir "${test.home}/test-reports"))) > + (junit (@ (printsummary "true") > + (showoutput "true") > + (fork "yes") > + (haltonfailure "yes")) > + (classpath > + (pathelement (@ (path "${env.CLASSPATH}"))) > + (pathelement (@ (location "${test.home}/resources"))) > + (pathelement (@ (location "${classes.dir}"))) > + (pathelement (@ (location "${test.classes.dir}")))) > + (formatter (@ (type "plain") > + (usefile "true"))) > + (batchtest (@ (fork "yes") > + (todir "${test.home}/test-reports")) > + (fileset (@ (dir "${test.home}/java")) > + (include (@ (name "**/*Test.java" ))))))) > + > (target (@ (name "jar") > (depends "compile")) > (mkdir (@ (dir "${jar.dir}"))) Cool! > @@ -99,12 +132,13 @@ to the default GNU unpack strategy." > ((assq-ref gnu:%standard-phases 'unpack) #:source source))) > > (define* (configure #:key inputs outputs (jar-name #f) > - (source-dir "src") #:allow-other-keys) > + (source-dir "src") > + (test-dir "src/test") #:allow-other-keys) > (when jar-name > (default-build.xml jar-name > (string-append (assoc-ref outputs "out") > "/share/java") > - source-dir)) > + source-dir test-dir)) > (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) > (setenv "CLASSPATH" (generate-classpath inputs))) LGTM. Thanks a lot for this! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 03/36] guix: Add java-utils. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 20:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14941026825388 (code B ref 26803); Sat, 06 May 2017 20:32:01 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 20:31:22 +0000 Received: from localhost ([127.0.0.1]:58619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76ML-0001Oq-HT for submit@debbugs.gnu.org; Sat, 06 May 2017 16:31:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76MK-0001Oc-Iq for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:31:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76ME-0001CU-9k for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:31:15 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54479) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76M8-0001Bc-HR; Sat, 06 May 2017 16:31:08 -0400 Received: from [178.224.66.110] (port=50398 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d76M7-0002Bm-Rc; Sat, 06 May 2017 16:31:08 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-3-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-3-rekado@elephly.net> Date: Sat, 06 May 2017 22:31:02 +0200 Message-ID: <87poflk9rt.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > From: Hartmut Goebel > > * guix/build/java-utils.scm: New file. > * guix/build-system/ant.scm: Use it. > * Makefile.am (MODULES): Add it. > > Co-authored-by: Ricardo Wurmus > --- > Makefile.am | 1 + > guix/build-system/ant.scm | 2 ++ > guix/build/java-utils.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 58 insertions(+) > create mode 100644 guix/build/java-utils.scm > > diff --git a/Makefile.am b/Makefile.am > index 8fe9e350c..b09180ba2 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -124,6 +124,7 @@ MODULES = \ > guix/build/syscalls.scm \ > guix/build/gremlin.scm \ > guix/build/emacs-utils.scm \ > + guix/build/java-utils.scm \ > guix/build/lisp-utils.scm \ > guix/build/graft.scm \ > guix/build/bournish.scm \ > diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm > index bf2f3b411..228b4e60d 100644 > --- a/guix/build-system/ant.scm > +++ b/guix/build-system/ant.scm > @@ -39,6 +39,7 @@ > (define %ant-build-system-modules > ;; Build-side modules imported by default. > `((guix build ant-build-system) > + (guix build java-utils) > (guix build syscalls) > ,@%gnu-build-system-modules)) > > @@ -108,6 +109,7 @@ > (guile #f) > (imported-modules %ant-build-system-modules) > (modules '((guix build ant-build-system) > + (guix build java-utils) > (guix build utils)))) > "Build SOURCE with INPUTS." > (define builder > diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm > new file mode 100644 > index 000000000..402d377bf > --- /dev/null > +++ b/guix/build/java-utils.scm > @@ -0,0 +1,55 @@ > +;;; GNU Guix --- Functional package management for GNU > +;;; Copyright © 2016 Hartmut Goebel > +;;; Copyright © 2016 Ricardo Wurmus > +;;; > +;;; This file is part of GNU Guix. > +;;; > +;;; GNU Guix is free software; you can redistribute it and/or modify it > +;;; under the terms of the GNU General Public License as published by > +;;; the Free Software Foundation; either version 3 of the License, or (at > +;;; your option) any later version. > +;;; > +;;; GNU Guix is distributed in the hope that it will be useful, but > +;;; WITHOUT ANY WARRANTY; without even the implied warranty of > +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +;;; GNU General Public License for more details. > +;;; > +;;; You should have received a copy of the GNU General Public License > +;;; along with GNU Guix. If not, see . > + > +(define-module (guix build java-utils) > + #:use-module (guix build utils) > + #:export (ant-build-javadoc > + install-jars > + install-javadoc)) > + > +;; Copied from haskell-build-system.scm > +(define (package-name-version store-dir) > + "Given a store directory STORE-DIR return 'name-version' of the package." > + (let* ((base (basename store-dir))) > + (string-drop base (+ 1 (string-index base #\-))))) > + > +(define* (ant-build-javadoc #:key (target "javadoc") (make-flags '()) > + #:allow-other-keys) > + (zero? (apply system* `("ant" ,target ,@make-flags)))) > + > +(define* (install-jars jar-directory) > + "Install jar files from JAR-DIRECTORY to the default target directory. This (nitpick "jar" or "JAR") > +is used in case the build.xml does not include an install target." > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((share (string-append (assoc-ref outputs "out") > + "/share/java"))) > + (for-each (lambda (f) (install-file f share)) > + (find-files jar-directory "\\.jar$")) > + #t))) > + > +(define* (install-javadoc apidoc-directory) > + "Install the APIDOC-DIRECTORY to the target directory. This is used to > +install javadocs when this is not done by the install target." > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (docs (string-append (or (assoc-ref outputs "doc") out) > + "/share/doc/" (package-name-version out) "/"))) > + (mkdir-p docs) > + (copy-recursively apidoc-directory docs) > + #t))) (nitpick "javadocs" or "Javadocs") Either way, LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 04/36] gnu: Add java-plexus-utils. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 20:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14941029015714 (code B ref 26803); Sat, 06 May 2017 20:35:02 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 20:35:01 +0000 Received: from localhost ([127.0.0.1]:58625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76Pt-0001U5-7i for submit@debbugs.gnu.org; Sat, 06 May 2017 16:35:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76Pr-0001Tr-K5 for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:34:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76Pj-0001yH-CF for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:34:54 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54513) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76Pj-0001yD-8p; Sat, 06 May 2017 16:34:51 -0400 Received: from [178.224.66.110] (port=50406 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d76Pi-0005Za-Mu; Sat, 06 May 2017 16:34:51 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-4-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-4-rekado@elephly.net> Date: Sat, 06 May 2017 22:34:45 +0200 Message-ID: <87mvapk9lm.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-plexus-utils): New variable. > > Co-authored-by: Hartmut Goebel > --- > gnu/packages/java.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 52 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index ad1ccac83..49b953d26 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1180,3 +1180,55 @@ 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))) > + > +(define-public java-plexus-utils > + (package > + (name "java-plexus-utils") > + (version "3.0.24") > + (source (origin > + (method url-fetch) > + (uri (string-append "https://github.com/codehaus-plexus/" > + "plexus-utils/archive/plexus-utils-" > + version ".tar.gz")) > + (sha256 > + (base32 > + "1mlwpc6fms24slygv5yvi6fi9hcha2fh0v73p5znpi78bg36i2js")))) > + (build-system ant-build-system) > + ;; FIXME: The default build.xml does not include a target to install > + ;; javadoc files. > + (arguments > + `(#:jar-name "plexus-utils.jar" > + #:source-dir "src/main" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'fix-reference-to-/bin-and-/usr > + (lambda _ > + (substitute* "src/main/java/org/codehaus/plexus/util/\ > +cli/shell/BourneShell.java" > + (("/bin/sh") (which "sh")) > + (("/usr/") (getcwd))) > + #t)) > + (add-after 'unpack 'fix-or-disable-broken-tests > + (lambda _ > + (with-directory-excursion "src/test/java/org/codehaus/plexus/util" > + (substitute* '("cli/CommandlineTest.java" > + "cli/shell/BourneShellTest.java") > + (("/bin/sh") (which "sh")) > + (("/bin/echo") (which "echo"))) > + > + ;; This test depends on MavenProjectStub, but we don't have > + ;; a package for Maven. > + (delete-file "introspection/ReflectionValueExtractorTest.java") > + > + ;; FIXME: The command line tests fail, maybe because they use > + ;; absolute paths. > + (delete-file "cli/CommandlineTest.java")) > + #t))))) > + (native-inputs > + `(("java-junit" ,java-junit))) > + (home-page "http://codehaus-plexus.github.io/plexus-utils/") > + (synopsis "Common utilities for the Plexus framework") > + (description "This package provides various Java utility classes for the > +Plexus framework to ease working with strings, files, command lines, XML and > +more.") > + (license license:asl2.0))) I'd prefer moving on rather than fixing the test failure on cli/CommandlineTest.java. LGTM. Thanks a lot! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 05/36] gnu: Add java-plexus-interpolation. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 20:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14941030075885 (code B ref 26803); Sat, 06 May 2017 20:37:01 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 20:36:47 +0000 Received: from localhost ([127.0.0.1]:58629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76RX-0001Wn-Mw for submit@debbugs.gnu.org; Sat, 06 May 2017 16:36:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76RV-0001Wa-KC for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:36:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76RP-0002KV-IN for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:36:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76RK-0002K3-JC; Sat, 06 May 2017 16:36:30 -0400 Received: from [178.224.66.110] (port=50410 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d76RJ-0000SF-VF; Sat, 06 May 2017 16:36:30 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-5-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-5-rekado@elephly.net> Date: Sat, 06 May 2017 22:36:25 +0200 Message-ID: <87lgq9k9iu.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > From: Hartmut Goebel > > * gnu/packages/java.scm (java-plexus-interplation): New variable. > > Co-authored-by: Ricardo Wurmus > --- > gnu/packages/java.scm | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 49b953d26..2ff9a11a0 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1232,3 +1232,33 @@ cli/shell/BourneShell.java" > Plexus framework 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 (string-append "https://github.com/codehaus-plexus/" > + "plexus-interpolation/archive/" > + "plexus-interpolation-" version ".tar.gz")) > + (sha256 > + (base32 > + "1w79ljwk42ymrgy8kqxq4l82pgdj6287gabpfnpkyzbrnclsnfrp")))) > + (build-system ant-build-system) > + (arguments > + `(#:jar-name "plexus-interpolation.jar" > + #:source-dir "src/main")) > + (native-inputs > + `(("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core))) > + (home-page "http://codehaus-plexus.github.io/plexus-interpolation/") > + (synopsis "Java components for interpolating ${} strings and the like") > + (description "Plexus interpolator is a 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))) Maybe: @code{org.codehaus.plexus.utils.interpolation} and @code{plexus-utils}? Either way, LGTM. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 06/36] gnu: Add java-asm. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 20:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14941031906141 (code B ref 26803); Sat, 06 May 2017 20:40:02 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 20:39:50 +0000 Received: from localhost ([127.0.0.1]:58633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76UY-0001az-Hs for submit@debbugs.gnu.org; Sat, 06 May 2017 16:39:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76UW-0001am-UC for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:39:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76UO-0002z1-JR for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:39:43 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76UO-0002yv-G9; Sat, 06 May 2017 16:39:40 -0400 Received: from [178.224.66.110] (port=50414 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d76UN-0003Fw-Vb; Sat, 06 May 2017 16:39:40 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-6-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-6-rekado@elephly.net> Date: Sat, 06 May 2017 22:39:35 +0200 Message-ID: <87k25tk9dk.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-asm): New variable. > --- > gnu/packages/java.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 2ff9a11a0..2df07bc38 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1262,3 +1262,47 @@ 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))) > + > +(define-public java-asm > + (package > + (name "java-asm") > + (version "5.2") > + (source (origin > + (method url-fetch) > + (uri (string-append "http://download.forge.ow2.org/asm/" > + "asm-" version ".tar.gz")) > + (sha256 > + (base32 > + "0kxvmv5275rnjl7jv0442k3wjnq03ngkb7sghs78avf45pzm4qgr")))) > + (build-system ant-build-system) > + (arguments > + `(#:build-target "compile" > + #:test-target "test" > + ;; The tests require an old version of Janino, which no longer compiles > + ;; with the JDK7. > + #:tests? #f Why set the test-target if you disable the tests? > + ;; We don't need these extra ant tasks, but the build system asks us to > + ;; provide a path anyway. > + #:make-flags (list (string-append "-Dobjectweb.ant.tasks.path=foo")) > + #:phases > + (modify-phases %standard-phases > + (add-before 'install 'build-jars > + (lambda* (#:key make-flags #:allow-other-keys) > + ;; We cannot use the "jar" target because it depends on a couple > + ;; of unpackaged, complicated tools. Hehe. :-) > + (mkdir "dist") > + (zero? (system* "jar" > + "-cf" (string-append "dist/asm-" ,version ".jar") > + "-C" "output/build/tmp" ".")))) > + (replace 'install > + (install-jars "dist"))))) > + (native-inputs > + `(("java-junit" ,java-junit))) > + (home-page "http://asm.ow2.org/") > + (synopsis "Very small and fast Java bytecode manipulation framework") > + (description "ASM is an all purpose Java bytecode manipulation and > +analysis framework. It can be used to modify existing classes or dynamically > +generate classes, directly in binary form. The provided common > +transformations and analysis algorithms allow to easily assemble custom > +complex transformations and code analysis tools.") > + (license license:bsd-3))) Otherwise LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 07/36] gnu: Add java-cglib. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 20:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14941032636302 (code B ref 26803); Sat, 06 May 2017 20:42:01 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 20:41:03 +0000 Received: from localhost ([127.0.0.1]:58641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76Vj-0001dZ-2v for submit@debbugs.gnu.org; Sat, 06 May 2017 16:41:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76Vg-0001cx-Go for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:41:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76VY-0003I4-AM for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:40:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54559) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76VY-0003I0-6n; Sat, 06 May 2017 16:40:52 -0400 Received: from [178.224.66.110] (port=50418 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d76VX-0003LH-Iw; Sat, 06 May 2017 16:40:51 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-7-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-7-rekado@elephly.net> Date: Sat, 06 May 2017 22:40:47 +0200 Message-ID: <87inldk9bk.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-cglib): New variable. > --- > gnu/packages/java.scm | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 2df07bc38..7f22661b1 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1306,3 +1306,37 @@ generate classes, directly in binary form. The provided common > transformations and analysis algorithms allow to easily assemble custom > complex transformations and code analysis tools.") > (license license:bsd-3))) > + > +(define-public java-cglib > + (package > + (name "java-cglib") > + (version "3.2.4") > + (source (origin > + (method url-fetch) > + (uri (string-append > + "https://github.com/cglib/cglib/archive/RELEASE_" > + (string-map (lambda (c) (if (char=? c #\.) #\_ c)) version) > + ".tar.gz")) > + (file-name (string-append "cglib-" version ".tar.gz")) > + (sha256 > + (base32 > + "162dvd4fln76ai8prfharf66pn6r56p3sxx683j5vdyccrd5hi1q")))) > + (build-system ant-build-system) > + (arguments > + `(;; FIXME: tests fail because junit runs > + ;; "net.sf.cglib.transform.AbstractTransformTest", which does not seem > + ;; to describe a test at all. > + #:tests? #f > + #:jar-name "cglib.jar" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'chdir > + (lambda _ (chdir "cglib") #t))))) > + (inputs > + `(("java-asm" ,java-asm) > + ("java-junit" ,java-junit))) > + (home-page "https://github.com/cglib/cglib/") > + (synopsis "Java byte code generation library") > + (description "The byte code generation library CGLIB is a high level API > +to generate and transform Java byte code.") > + (license license:asl2.0))) Not sure, but maybe @code{CGLIB}? Either way, LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 08/36] gnu: Add java-objenesis. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 20:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14941033326410 (code B ref 26803); Sat, 06 May 2017 20:43:02 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 20:42:12 +0000 Received: from localhost ([127.0.0.1]:58645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76Wq-0001fK-G1 for submit@debbugs.gnu.org; Sat, 06 May 2017 16:42:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58725) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76Wo-0001f7-Ij for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:42:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76Wi-0003YD-8E for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:42:05 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76Wi-0003Y7-5M; Sat, 06 May 2017 16:42:04 -0400 Received: from [178.224.66.110] (port=50422 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d76Wh-0003OP-J1; Sat, 06 May 2017 16:42:03 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-8-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-8-rekado@elephly.net> Date: Sat, 06 May 2017 22:41:58 +0200 Message-ID: <87h90xk99l.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-objenesis): New variable. > --- > gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 7f22661b1..303d64016 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1340,3 +1340,32 @@ complex transformations and code analysis tools.") > (description "The byte code generation library CGLIB is a high level API > to generate and transform Java byte code.") > (license license:asl2.0))) > + > +(define-public java-objenesis > + (package > + (name "java-objenesis") > + (version "2.5.1") > + (source (origin > + (method url-fetch) > + (uri (string-append "https://github.com/easymock/objenesis/" > + "archive/" version ".tar.gz")) > + (file-name (string-append "objenesis-" version ".tar.gz")) > + (sha256 > + (base32 > + "1va5qz1i2wawwavhnxfzxnfgrcaflz9p1pg03irrjh4nd3rz8wh6")))) > + (build-system ant-build-system) > + (arguments > + `(#:jar-name "objenesis.jar" > + #:source-dir "main/src/" > + #:test-dir "main/src/test/")) > + (native-inputs > + `(("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core))) > + (home-page "http://objenesis.org/") > + (synopsis "Bypass the constructor when creating an object") > + (description "Objenesis is a small Java library that serves one purpose: > +to instantiate a new object of a particular class. It is common to see > +restrictions in libraries stating that classes must require a default > +constructor. Objenesis aims to overcome these restrictions by bypassing the > +constructor on object instantiation.") > + (license license:asl2.0))) LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 07/36] gnu: Add java-cglib. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 20:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149410375713934 (code B ref 26803); Sat, 06 May 2017 20:50:02 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 20:49:17 +0000 Received: from localhost ([127.0.0.1]:58649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76dh-0003cg-89 for submit@debbugs.gnu.org; Sat, 06 May 2017 16:49:17 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d76df-0003cW-5E for 26803@debbugs.gnu.org; Sat, 06 May 2017 16:49:15 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494103752605763.8278123322178; Sat, 6 May 2017 13:49:12 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-7-rekado@elephly.net> <87inldk9bk.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: <87inldk9bk.fsf@gnu.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Sat, 06 May 2017 22:49:09 +0200 Message-ID: <87wp9t4soq.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: >> + (synopsis "Java byte code generation library") >> + (description "The byte code generation library CGLIB is a high level API >> +to generate and transform Java byte code.") >> + (license license:asl2.0))) > > Not sure, but maybe @code{CGLIB}? It’s not the name of a class, just the name of the library, so I prefer not to use @code{} here. > Either way, LGTM! Thanks for taking the time to review this mess! -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 09/36] gnu: Add java-easymock. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 21:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149410613317385 (code B ref 26803); Sat, 06 May 2017 21:29:02 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 21:28:53 +0000 Received: from localhost ([127.0.0.1]:58683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d77G0-0004WK-Vn for submit@debbugs.gnu.org; Sat, 06 May 2017 17:28:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d77Fz-0004W6-QO for 26803@debbugs.gnu.org; Sat, 06 May 2017 17:28:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d77Fr-0005Df-Kr for 26803@debbugs.gnu.org; Sat, 06 May 2017 17:28:46 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d77Fr-0005DY-Gx; Sat, 06 May 2017 17:28:43 -0400 Received: from [31.21.75.66] (port=50636 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d77Fq-00074P-Ry; Sat, 06 May 2017 17:28:43 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-9-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-9-rekado@elephly.net> Date: Sat, 06 May 2017 23:28:39 +0200 Message-ID: <87efw1k73s.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-easymock): New variable. > --- > gnu/packages/java.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 61 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 303d64016..7a1a66027 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1369,3 +1369,64 @@ restrictions in libraries stating that classes must require a default > constructor. Objenesis aims to overcome these restrictions by bypassing the > constructor on object instantiation.") > (license license:asl2.0))) > + > +(define-public java-easymock > + (package > + (name "java-easymock") > + (version "3.4") > + (source (origin > + (method url-fetch) > + (uri (string-append "https://github.com/easymock/easymock/" > + "archive/easymock-" version ".tar.gz")) > + (sha256 > + (base32 > + "1yzg0kv256ndr57gpav46cyv4a1ns5sj722l50zpxk3j6sk9hnmi")))) > + (build-system ant-build-system) > + (arguments > + `(#:jar-name "easymock.jar" > + #:source-dir "core/src/main" > + #:test-dir "core/src/test" > + #:phases > + (modify-phases %standard-phases > + ;; FIXME: Android support requires the following packages to be > + ;; available: com.google.dexmaker.stock.ProxyBuilder > + (add-after 'unpack 'delete-android-support > + (lambda _ > + (with-directory-excursion "core/src/main/java/org/easymock/internal" > + (substitute* "MocksControl.java" > + (("AndroidSupport.isAndroid\\(\\)") "false") > + (("return classProxyFactory = new AndroidClassProxyFactory\\(\\);") "")) > + (delete-file "AndroidClassProxyFactory.java")) > + #t)) > + (add-after 'unpack 'delete-broken-tests > + (lambda _ > + (with-directory-excursion "core/src/test/java/org/easymock" > + ;; This test depends on dexmaker. > + (delete-file "tests2/ClassExtensionHelperTest.java") > + > + ;; This is not a test. > + (delete-file "tests/BaseEasyMockRunnerTest.java") > + > + ;; This test should be executed with a different runner... > + (delete-file "tests2/EasyMockAnnotationsTest.java") > + ;; ...but deleting it means that we also have to delete these > + ;; dependent files. > + (delete-file "tests2/EasyMockRunnerTest.java") > + (delete-file "tests2/EasyMockRuleTest.java") > + > + ;; This test fails because the file "easymock.properties" does > + ;; not exist. > + (delete-file "tests2/EasyMockPropertiesTest.java")) > + #t))))) > + (inputs > + `(("java-asm" ,java-asm) > + ("java-cglib" ,java-cglib) > + ("java-objenesis" ,java-objenesis))) > + (native-inputs > + `(("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core))) > + (home-page "http://easymock.org") > + (synopsis "Java library providing mock objects for unit tests") > + (description "EasyMock is a Java library that provides an easy way to use > +mock objects in unit testing.") > + (license license:asl2.0))) Thanks for the comments on the excluded tests. :) LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 10/36] gnu: Add java-jopt-simple. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 21:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149410629417707 (code B ref 26803); Sat, 06 May 2017 21:32:01 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 21:31:34 +0000 Received: from localhost ([127.0.0.1]:58689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d77Ic-0004bW-Fs for submit@debbugs.gnu.org; Sat, 06 May 2017 17:31:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d77Ia-0004bJ-RB for 26803@debbugs.gnu.org; Sat, 06 May 2017 17:31:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d77IS-0005sP-LJ for 26803@debbugs.gnu.org; Sat, 06 May 2017 17:31:27 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55382) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d77IS-0005sK-IH; Sat, 06 May 2017 17:31:24 -0400 Received: from [31.21.75.66] (port=51230 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d77IS-0003et-0c; Sat, 06 May 2017 17:31:24 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-10-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-10-rekado@elephly.net> Date: Sat, 06 May 2017 23:31:21 +0200 Message-ID: <87d1blk6za.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-jopt-simple): 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 7a1a66027..3dc71e4bc 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1430,3 +1430,31 @@ constructor on object instantiation.") > (description "EasyMock is a Java library that provides an easy way to use > mock objects in unit testing.") > (license license:asl2.0))) > + > +(define-public java-jopt-simple > + (package > + (name "java-jopt-simple") > + (version "5.0.3") > + (source (origin > + (method url-fetch) > + (uri (string-append "http://repo1.maven.org/maven2/" > + "net/sf/jopt-simple/jopt-simple/" > + version "/jopt-simple-" > + version "-sources.jar")) > + (sha256 > + (base32 > + "1v8bzmwmw6qq20gm42xyay6vrd567dra4vqwhgjnqqjz1gs9f8qa")))) > + (build-system ant-build-system) > + (arguments > + `(#:tests? #f ; there are no tests > + #:jar-name "jopt-simple.jar")) > + (home-page "https://pholser.github.io/jopt-simple/") > + (synopsis "Java library for parsing command line options") > + (description "JOpt Simple is a Java library for parsing command line > +options, such as those you might pass to an invocation of @code{javac}. In > +the interest of striving for simplicity, as closely as possible JOpt Simple > +attempts to honor the command line option syntaxes of POSIX @code{getopt} and > +GNU @code{getopt_long}. It also aims to make option parser configuration and > +retrieval of options and their arguments simple and expressive, without being > +overly clever.") > + (license license:expat))) Cool, it is 'syntaxes' indeed! LGTM. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 11/36] gnu: java-hamcrest-core: Install all jars without version suffix. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 21:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149410676418354 (code B ref 26803); Sat, 06 May 2017 21:40:01 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 21:39:24 +0000 Received: from localhost ([127.0.0.1]:58694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d77QC-0004lx-Bu for submit@debbugs.gnu.org; Sat, 06 May 2017 17:39:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d77QA-0004lk-Ev for 26803@debbugs.gnu.org; Sat, 06 May 2017 17:39:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d77Q2-0007l0-3j for 26803@debbugs.gnu.org; Sat, 06 May 2017 17:39:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d77Q2-0007ku-0R; Sat, 06 May 2017 17:39:14 -0400 Received: from [31.21.75.66] (port=51260 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d77Q1-0006tA-EJ; Sat, 06 May 2017 17:39:13 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-11-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-11-rekado@elephly.net> Date: Sat, 06 May 2017 23:39:10 +0200 Message-ID: <87bmr5k6m9.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-hamcrest-core)[arguments]: Install all three > jars and strip the version suffix. > --- > gnu/packages/java.scm | 26 +++++++++++++++++++++----- > 1 file changed, 21 insertions(+), 5 deletions(-) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 3dc71e4bc..57ef65336 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1081,7 +1081,10 @@ an Ant task that extends the built-in @code{jar} task.") > #t)))) > (build-system ant-build-system) > (arguments > - `(#:tests? #f ; Tests require junit > + `(#:tests? #f ; Tests require junit Is this intended? > + #:modules ((guix build ant-build-system) > + (guix build utils) > + (srfi srfi-1)) > #:make-flags (list (string-append "-Dversion=" ,version)) > #:build-target "core" > #:phases > @@ -1133,10 +1136,23 @@ private Method[] allMethods = getSortedMethods();"))))) > #t)) > (replace 'install > (lambda* (#:key outputs #:allow-other-keys) > - (install-file (string-append "build/hamcrest-core-" > - ,version ".jar") > - (string-append (assoc-ref outputs "out") > - "/share/java"))))))) > + (let* ((target (string-append (assoc-ref outputs "out") > + "/share/java/")) > + (version-suffix ,(string-append "-" version ".jar")) > + (install-without-version-suffix > + (lambda (jar) > + (copy-file jar > + (string-append target > + (basename jar version-suffix) > + ".jar"))))) > + (mkdir-p target) > + (for-each > + install-without-version-suffix > + (find-files "build" > + (lambda (name _) > + (and (string-suffix? ".jar" name) > + (not (string-suffix? "-sources.jar" name))))))) > + #t))))) > (native-inputs > `(("java-qdox-1.12" ,java-qdox-1.12) > ("java-jarjar" ,java-jarjar))) Otherwise LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 12/36] gnu: Add java-commons-math3. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 May 2017 21:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149410700518718 (code B ref 26803); Sat, 06 May 2017 21:44:02 +0000 Received: (at 26803) by debbugs.gnu.org; 6 May 2017 21:43:25 +0000 Received: from localhost ([127.0.0.1]:58698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d77U4-0004rq-Sy for submit@debbugs.gnu.org; Sat, 06 May 2017 17:43:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d77U3-0004re-Jc for 26803@debbugs.gnu.org; Sat, 06 May 2017 17:43:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d77Tv-0000bE-Db for 26803@debbugs.gnu.org; Sat, 06 May 2017 17:43:18 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d77Tv-0000bA-Ak; Sat, 06 May 2017 17:43:15 -0400 Received: from [31.21.75.66] (port=51276 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d77Tu-00071t-Kz; Sat, 06 May 2017 17:43:15 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-12-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-12-rekado@elephly.net> Date: Sat, 06 May 2017 23:43:11 +0200 Message-ID: <87a86pk6fk.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-commons-math3): New variable. > --- > gnu/packages/java.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 57ef65336..5d131929c 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1474,3 +1474,47 @@ GNU @code{getopt_long}. It also aims to make option parser configuration and > retrieval of options and their arguments simple and expressive, without being > overly clever.") > (license license:expat))) > + > +(define-public java-commons-math3 > + (package > + (name "java-commons-math3") > + (version "3.6.1") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/commons/math/source/" > + "commons-math3-" version "-src.tar.gz")) > + (sha256 > + (base32 > + "19l6yp44qc5g7wg816nbn5z3zq3xxzwimvbm4a8pczgvpi4i85s6")))) > + (build-system ant-build-system) > + (arguments > + `(#:build-target "jar" > + #:test-target "test" > + #:make-flags > + (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) > + (junit (assoc-ref %build-inputs "java-junit"))) > + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") > + (string-append "-Dhamcrest.jar=" hamcrest > + "/share/java/hamcrest-core.jar"))) > + #:phases > + (modify-phases %standard-phases > + ;; We want to build the jar in the build phase and run the tests > + ;; later in a separate phase. > + (add-after 'unpack 'untangle-targets > + (lambda _ > + (substitute* "build.xml" > + (("name=\"jar\" depends=\"test\"") > + "name=\"jar\" depends=\"compile\"")) > + #t)) Nice! > + ;; There is no install target. > + (replace 'install > + (install-jars "target"))))) That's odd, isn't it? Anyway, cool! > + (native-inputs > + `(("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core))) > + (home-page "http://commons.apache.org/math/") > + (synopsis "Apache Commons mathematics library") > + (description "Commons Math is a library of lightweight, self-contained > +mathematics and statistics components addressing the most common problems not > +available in the Java programming language or Commons Lang.") > + (license license:asl2.0))) LGTM. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: Java things Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2017 10:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149415330423973 (code B ref 26803); Sun, 07 May 2017 10:36:02 +0000 Received: (at 26803) by debbugs.gnu.org; 7 May 2017 10:35:04 +0000 Received: from localhost ([127.0.0.1]:59082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7JWq-0006Eb-JK for submit@debbugs.gnu.org; Sun, 07 May 2017 06:35:04 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:44741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7JWo-0006ED-G8 for 26803@debbugs.gnu.org; Sun, 07 May 2017 06:35:02 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3wLMTK1PHTz1rflQ; Sun, 7 May 2017 12:35:01 +0200 (CEST) Received: from localhost (dynscan01.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3wLMTK0Gbkz3jR9r; Sun, 7 May 2017 12:35:01 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan01.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id FLbrJxaEnFO7; Sun, 7 May 2017 12:35:00 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-140-221.dynamic.mnet-online.de [46.244.140.221]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Sun, 7 May 2017 12:35:00 +0200 (CEST) Received: from [192.168.110.2] (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id B137E602FD; Sun, 7 May 2017 14:30:55 +0200 (CEST) References: <87wp9u2ifa.fsf@elephly.net> From: Hartmut Goebel Organization: crazy-compilers.com Message-ID: <590EF853.9010404@crazy-compilers.com> Date: Sun, 7 May 2017 12:34:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <87wp9u2ifa.fsf@elephly.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) Am 06.05.2017 um 16:01 schrieb Ricardo Wurmus: > Several months ago Hartmut posted a couple of unfinished patches to > guix-devel. I thought it wouldn’t be too hard to finish them. I was > wrong. I still haven’t gotten all of them to build because to do things > right I would need to package way too many things. Thanks for your work. Anyway, I suggest to close this and *not* apply this patches. The reason is: As you may have noticed, I'm working on the maven build system and most of these packages are to be build using maven. (See http://lists.gnu.org/archive/html/guix-devel/2017-04/msg00459.html). I will take care of integrating your changes into that patch series then. WDYT? -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: Java things Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2017 11:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Hartmut Goebel Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14941576804952 (code B ref 26803); Sun, 07 May 2017 11:48:01 +0000 Received: (at 26803) by debbugs.gnu.org; 7 May 2017 11:48:00 +0000 Received: from localhost ([127.0.0.1]:59118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7KfP-0001Ho-M2 for submit@debbugs.gnu.org; Sun, 07 May 2017 07:47:59 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7KfO-0001Hf-7o for 26803@debbugs.gnu.org; Sun, 07 May 2017 07:47:58 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494157671240711.364316175533; Sun, 7 May 2017 04:47:51 -0700 (PDT) References: <87wp9u2ifa.fsf@elephly.net> <590EF853.9010404@crazy-compilers.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: <590EF853.9010404@crazy-compilers.com> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Sun, 07 May 2017 13:47:48 +0200 Message-ID: <87h90whorf.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Hartmut Goebel writes: > Am 06.05.2017 um 16:01 schrieb Ricardo Wurmus: >> Several months ago Hartmut posted a couple of unfinished patches to >> guix-devel. I thought it wouldn’t be too hard to finish them. I was >> wrong. I still haven’t gotten all of them to build because to do things >> right I would need to package way too many things. > > Thanks for your work. > > Anyway, I suggest to close this and *not* apply this patches. The reason > is: As you may have noticed, I'm working on the maven build system and > most of these packages are to be build using maven. (See > http://lists.gnu.org/archive/html/guix-devel/2017-04/msg00459.html). I > will take care of integrating your changes into that patch series then. I think these patches are useful already as they are. This does not conflict with a future maven build system, and we can replace the packages later if it turns out that the maven build system handles the builds better. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 13/36] gnu: Add java-jmh. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2017 19:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149418443528154 (code B ref 26803); Sun, 07 May 2017 19:14:02 +0000 Received: (at 26803) by debbugs.gnu.org; 7 May 2017 19:13:55 +0000 Received: from localhost ([127.0.0.1]:60720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Rcx-0007K1-2x for submit@debbugs.gnu.org; Sun, 07 May 2017 15:13:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Rcv-0007Jq-ID for 26803@debbugs.gnu.org; Sun, 07 May 2017 15:13:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7Rcl-0003h1-DE for 26803@debbugs.gnu.org; Sun, 07 May 2017 15:13:48 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Rcl-0003gw-9x; Sun, 07 May 2017 15:13:43 -0400 Received: from ip112-245-209-87.adsl2.static.versatel.nl ([87.209.245.112]:62106 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d7Rck-0004g7-PT; Sun, 07 May 2017 15:13:43 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-13-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-13-rekado@elephly.net> Date: Sun, 07 May 2017 21:13:35 +0200 Message-ID: <871ss0xyxs.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-jmh): New variable. > --- > gnu/packages/java.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 5d131929c..36d80ff1d 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -23,6 +23,7 @@ > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix packages) > #:use-module (guix download) > + #:use-module (guix hg-download) > #:use-module (guix utils) > #:use-module (guix build-system ant) > #:use-module (guix build-system gnu) > @@ -1518,3 +1519,48 @@ overly clever.") > mathematics and statistics components addressing the most common problems not > available in the Java programming language or Commons Lang.") > (license license:asl2.0))) > + > +(define-public java-jmh > + (package > + (name "java-jmh") > + (version "1.17.5") > + (source (origin > + (method hg-fetch) > + (uri (hg-reference > + (url "http://hg.openjdk.java.net/code-tools/jmh/") > + (changeset version))) > + (file-name (string-append name "-" version "-checkout")) > + (sha256 > + (base32 > + "1fxyxhg9famwcg1prc4cgwb5wzyxqavn3cjm5vz8605xz7x5k084")))) > + (build-system ant-build-system) > + (arguments > + `(#:jar-name "jmh-core.jar" > + #:source-dir "jmh-core/src/main" > + #:test-dir "jmh-core/src/test" > + #:phases > + (modify-phases %standard-phases > + ;; This seems to be a bug in the JDK. It may not be necessary in > + ;; future versions of the JDK. > + (add-after 'unpack 'fix-bug > + (lambda _ > + (with-directory-excursion > + "jmh-core/src/main/java/org/openjdk/jmh/runner/options" > + (substitute* '("IntegerValueConverter.java" > + "ThreadsValueConverter.java") > + (("public Class valueType") > + "public Class valueType"))) > + #t))))) > + (inputs > + `(("java-jopt-simple" ,java-jopt-simple) > + ("java-commons-math3" ,java-commons-math3))) > + (native-inputs > + `(("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core))) > + (home-page "http://openjdk.java.net/projects/code-tools/jmh/") > + (synopsis "Benchmark harness for the JVM") > + (description "JMH is a Java harness for building, running, and analysing > +nano/micro/milli/macro benchmarks written in Java and other languages > +targetting the JVM.") > + ;; GPLv2 only > + (license license:gpl2))) Unfortunately GPLv2 only. LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 14/36] gnu: Add java-commons-collections4. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2017 19:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14941846051561 (code B ref 26803); Sun, 07 May 2017 19:17:01 +0000 Received: (at 26803) by debbugs.gnu.org; 7 May 2017 19:16:45 +0000 Received: from localhost ([127.0.0.1]:60736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Rfh-0000Oq-4M for submit@debbugs.gnu.org; Sun, 07 May 2017 15:16:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41697) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7Rff-0000K6-Cj for 26803@debbugs.gnu.org; Sun, 07 May 2017 15:16:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7RfV-0004WI-CF for 26803@debbugs.gnu.org; Sun, 07 May 2017 15:16:38 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7RfV-0004W8-8k; Sun, 07 May 2017 15:16:33 -0400 Received: from ip112-245-209-87.adsl2.static.versatel.nl ([87.209.245.112]:61097 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d7RfU-0004o4-Pq; Sun, 07 May 2017 15:16:33 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-14-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-14-rekado@elephly.net> Date: Sun, 07 May 2017 21:16:29 +0200 Message-ID: <87zieowk8i.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-commons-collections4): New variable. > --- > gnu/packages/java.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 36d80ff1d..f595af58c 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1564,3 +1564,63 @@ nano/micro/milli/macro benchmarks written in Java and other languages > targetting the JVM.") > ;; GPLv2 only > (license license:gpl2))) > + > +(define-public java-commons-collections4 > + (package > + (name "java-commons-collections4") > + (version "4.1") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/commons/collections/source/" > + "commons-collections4-" version "-src.tar.gz")) > + (sha256 > + (base32 > + "1krfhvggympq4avk7gh6qafzf6b9ip6r1m4lmacikyx04039m0wl")))) > + (build-system ant-build-system) > + (arguments > + `(#:test-target "test" > + #:make-flags > + (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) > + (junit (assoc-ref %build-inputs "java-junit")) > + (easymock (assoc-ref %build-inputs "java-easymock"))) > + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") > + (string-append "-Dhamcrest.jar=" hamcrest > + "/share/java/hamcrest-core.jar") > + (string-append "-Deasymock.jar=" easymock > + "/share/java/easymock.jar"))) > + #:phases Ha! Cool. > + (modify-phases %standard-phases > + (replace 'install > + (install-jars "target"))))) > + (native-inputs > + `(("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core) > + ("java-easymock" ,java-easymock))) > + (home-page "http://commons.apache.org/collections/") > + (synopsis "Collections framework") > + (description "The Java Collections Framework is the recognised standard > +for collection handling in Java. Commons-Collections seek to build upon the > +JDK classes by providing new interfaces, implementations and utilities. There > +are many features, including: > + > +@itemize > +@item @code{Bag} interface for collections that have a number of copies of > + each object > +@item @code{BidiMap} interface for maps that can be looked up from value to > + key as well and key to value > +@item @code{MapIterator} interface to provide simple and quick iteration over > + maps > +@item Transforming decorators that alter each object as it is added to the > + collection > +@item Composite collections that make multiple collections look like one > +@item Ordered maps and sets that retain the order elements are added in, > + including an LRU based map > +@item Reference map that allows keys and/or values to be garbage collected > + under close control > +@item Many comparator implementations > +@item Many iterator implementations > +@item Adapter classes from array and enumerations to collections > +@item Utilities to test or create typical set-theory properties of collections > + such as union, intersection, and closure. > +@end itemize\n") > + (license license:asl2.0))) Very elaborate description. Nice! LGTM. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: Java things Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 May 2017 08:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149423154414733 (code B ref 26803); Mon, 08 May 2017 08:20:01 +0000 Received: (at 26803) by debbugs.gnu.org; 8 May 2017 08:19:04 +0000 Received: from localhost ([127.0.0.1]:32900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7dsl-0003pZ-L1 for submit@debbugs.gnu.org; Mon, 08 May 2017 04:19:03 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:48326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7dsk-0003pM-4f for 26803@debbugs.gnu.org; Mon, 08 May 2017 04:19:02 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3wLwPx3NXlz1rt6q; Mon, 8 May 2017 10:19:01 +0200 (CEST) Received: from localhost (dynscan01.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3wLwPx0vFTz3jgYj; Mon, 8 May 2017 10:19:01 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan01.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id A3Q3sjhlObl7; Mon, 8 May 2017 10:18:59 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-46-244-129-24.dynamic.mnet-online.de [46.244.129.24]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Mon, 8 May 2017 10:18:59 +0200 (CEST) Received: from [192.168.110.2] (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id C5D1260560; Mon, 8 May 2017 12:14:30 +0200 (CEST) References: <87wp9u2ifa.fsf@elephly.net> <590EF853.9010404@crazy-compilers.com> <87h90whorf.fsf@elephly.net> From: Hartmut Goebel Organization: crazy-compilers.com Message-ID: <591029F2.9060806@crazy-compilers.com> Date: Mon, 8 May 2017 10:18:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <87h90whorf.fsf@elephly.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) Am 07.05.2017 um 13:47 schrieb Ricardo Wurmus: > I think these patches are useful already as they are. This does not > conflict with a future maven build system, and we can replace the > packages later if it turns out that the maven build system handles the > builds better. You are right. Sorry for the noise. -- Regards Hartmut Goebel | Hartmut Goebel | h.goebel@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible | From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 15/36] gnu: Add java-commons-io. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 May 2017 10:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149424011127621 (code B ref 26803); Mon, 08 May 2017 10:42:02 +0000 Received: (at 26803) by debbugs.gnu.org; 8 May 2017 10:41:51 +0000 Received: from localhost ([127.0.0.1]:32974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7g6x-0007BR-Am for submit@debbugs.gnu.org; Mon, 08 May 2017 06:41:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7g6v-0007BF-Ok for 26803@debbugs.gnu.org; Mon, 08 May 2017 06:41:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7g6p-00053B-Ka for 26803@debbugs.gnu.org; Mon, 08 May 2017 06:41:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:49521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7g6g-00051m-6L; Mon, 08 May 2017 06:41:34 -0400 Received: from [143.121.198.177] (port=55052 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d7g6f-0004xF-FV; Mon, 08 May 2017 06:41:33 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-15-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-15-rekado@elephly.net> Date: Mon, 08 May 2017 12:41:26 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > From: Hartmut Goebel > > * gnu/packages/java.scm (java-commons-io): New variable. > > Co-authored-by: Ricardo Wurmus > --- > gnu/packages/java.scm | 41 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 41 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index f595af58c..c9707d0d2 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1624,3 +1624,44 @@ are many features, including: > such as union, intersection, and closure. > @end itemize\n") > (license license:asl2.0))) > + > +(define-public java-commons-io > + (package > + (name "java-commons-io") > + (version "2.5") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/commons/io/source/" > + "commons-io-" version "-src.tar.gz")) > + (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 inputs #:allow-other-keys) > + ;; TODO: don't do this; use make-flags > + ;; The existence of this file is taken as indicator whether test > + ;; dependencies 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")) > + #t))) I'm not sure how the result of the code here could be achieved using 'make-flags', so is the TODO item referring to an already-removed piece of code? > + (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) > + ("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))) Otherwise, LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 16/36] gnu: Add java-commons-lang. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 May 2017 10:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149424039528074 (code B ref 26803); Mon, 08 May 2017 10:47:01 +0000 Received: (at 26803) by debbugs.gnu.org; 8 May 2017 10:46:35 +0000 Received: from localhost ([127.0.0.1]:32979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7gBW-0007Ij-V1 for submit@debbugs.gnu.org; Mon, 08 May 2017 06:46:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7gBV-0007IT-Qi for 26803@debbugs.gnu.org; Mon, 08 May 2017 06:46:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7gBP-0006ML-IQ for 26803@debbugs.gnu.org; Mon, 08 May 2017 06:46:28 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:49559) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7gBH-0006Ku-BL; Mon, 08 May 2017 06:46:19 -0400 Received: from [143.121.198.177] (port=55060 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d7gBG-0005HS-8r; Mon, 08 May 2017 06:46:18 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-16-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-16-rekado@elephly.net> Date: Mon, 08 May 2017 12:46:15 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > From: Hartmut Goebel > > * gnu/packages/java.scm (java-commons-lang): New variable. > > Co-authored-by: Ricardo Wurmus > --- > gnu/packages/java.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 55 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index c9707d0d2..7a68b6bd6 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1665,3 +1665,58 @@ are many features, including: > (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 (string-append "mirror://apache/commons/lang/source/" > + "commons-lang-" version "-src.tar.gz")) > + (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 'disable-failing-test > + (lambda _ > + ;; Disable a failing test > + (substitute* "src/test/java/org/apache/commons/lang/\ > +time/FastDateFormatTest.java" > + (("public void testFormat\\(\\)") > + "public void disabled_testFormat()")) > + #t)) Since you're renaming the function, I suppose removing the function would also work, which would not create any "dead code". But that probably requires a separate patch file, which will break more easily on an update. So long story short: This is OK to me, even though I don't like producing code that won't be run anyway. > + (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 @code{java.lang} package in the Sun JDK. The following classes are > +included: > + > +@itemize > +@item StringUtils - Helper for @code{java.lang.String}. > +@item CharSetUtils - Methods for dealing with @code{CharSets}, which are sets > + of characters such as @code{[a-z]} and @code{[abcdez]}. > +@item RandomStringUtils - Helper for creating randomised strings. > +@item NumberUtils - Helper for @code{java.lang.Number} and its subclasses. > +@item NumberRange - A range of numbers with an upper and lower bound. > +@item ObjectUtils - Helper for @code{java.lang.Object}. > +@item SerializationUtils - Helper for serializing objects. > +@item SystemUtils - Utility class defining the Java system properties. > +@item NestedException package - A sub-package for the creation of nested > + exceptions. > +@item Enum package - A sub-package for the creation of enumerated types. > +@item Builder package - A sub-package for the creation of @code{equals}, > + @code{hashCode}, @code{compareTo} and @code{toString} methods. > +@end itemize\n") > + (license license:asl2.0))) I've seen the '\n' on an earlier patch as well. Why is it neccessary? Otherwise, LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 17/36] gnu: Add java-commons-lang3. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 May 2017 11:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149424246431133 (code B ref 26803); Mon, 08 May 2017 11:22:01 +0000 Received: (at 26803) by debbugs.gnu.org; 8 May 2017 11:21:04 +0000 Received: from localhost ([127.0.0.1]:32992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7git-000862-Fh for submit@debbugs.gnu.org; Mon, 08 May 2017 07:21:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7gir-00085C-EU for 26803@debbugs.gnu.org; Mon, 08 May 2017 07:21:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7gil-0006io-0A for 26803@debbugs.gnu.org; Mon, 08 May 2017 07:20:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7gie-0006iJ-NO; Mon, 08 May 2017 07:20:48 -0400 Received: from [143.121.198.177] (port=56526 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d7gie-0005ri-5e; Mon, 08 May 2017 07:20:48 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-17-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-17-rekado@elephly.net> Date: Mon, 08 May 2017 13:20:45 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > From: Hartmut Goebel > > * gnu/packages/java.scm (java-commons-lang3): New variable. > > Co-authored-by: Ricardo Wurmus > --- > gnu/packages/java.scm | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 64 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 7a68b6bd6..3e422ac80 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1720,3 +1720,67 @@ included: > @code{hashCode}, @code{compareTo} and @code{toString} methods. > @end itemize\n") > (license license:asl2.0))) > + > +(define-public java-commons-lang3 > + (package > + (name "java-commons-lang3") > + (version "3.4") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/commons/lang/source/" > + "commons-lang3-" version "-src.tar.gz")) > + (sha256 > + (base32 "0xpshb9spjhplq5a7mr0y1bgfw8190ik4xj8f569xidfcki1d6kg")))) > + (build-system ant-build-system) > + (outputs '("out" "doc")) > + (arguments > + `(#:test-target "test" > + #:make-flags > + (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-all")) > + (junit (assoc-ref %build-inputs "java-junit")) > + (easymock (assoc-ref %build-inputs "java-easymock")) > + (io (assoc-ref %build-inputs "java-commons-io"))) > + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") > + (string-append "-Dhamcrest.jar=" hamcrest > + "/share/java/hamcrest-all.jar") > + (string-append "-Dcommons-io.jar=" io > + "/share/java/commons-io-" > + ,(package-version java-commons-io) > + "-SNAPSHOT.jar") > + (string-append "-Deasymock.jar=" easymock > + "/share/java/easymock.jar"))) > + #: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) > + ("java-commons-io" ,java-commons-io) > + ("java-hamcrest-all" ,java-hamcrest-all) > + ("java-easymock" ,java-easymock))) > + (home-page "http://commons.apache.org/lang/") > + (synopsis "Extension of the java.lang package (for Java 5+)") Is the (for Java 5+) still relevant? Even 6 has been deprecated, so it seems to be for any supported Java version now. > + (description "The Commons Lang components contains a set of Java classes > +that provide helper methods for standard Java classes, especially those found > +in the @code{java.lang} package in the JDK 5+. The following classes are Same here. > +included: > + > +@itemize > +@item StringUtils - Helper for @code{java.lang.String}. > +@item CharSetUtils - Methods for dealing with @code{CharSets}, which are sets of > + characters such as @code{[a-z]} and @code{[abcdez]}. > +@item RandomStringUtils - Helper for creating randomised strings. > +@item NumberUtils - Helper for @code{java.lang.Number} and its subclasses. > +@item NumberRange - A range of numbers with an upper and lower bound. > +@item ObjectUtils - Helper for @code{java.lang.Object}. > +@item SerializationUtils - Helper for serializing objects. > +@item SystemUtils - Utility class defining the Java system properties. > +@item NestedException package - A sub-package for the creation of nested > + exceptions. > +@item Enum package - A sub-package for the creation of enumerated types. > +@item Builder package - A sub-package for the creation of @code{equals}, > + @code{hashCode}, @code{compareTo} and @code{toString} methods. > +@end itemize\n") > + (license license:asl2.0))) Either way, LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 18/36] gnu: Add java-commons-cli. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 May 2017 14:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149425281622383 (code B ref 26803); Mon, 08 May 2017 14:14:02 +0000 Received: (at 26803) by debbugs.gnu.org; 8 May 2017 14:13:36 +0000 Received: from localhost ([127.0.0.1]:34448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7jPr-0005ox-Rv for submit@debbugs.gnu.org; Mon, 08 May 2017 10:13:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7jPq-0005oi-4I for 26803@debbugs.gnu.org; Mon, 08 May 2017 10:13:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7jPj-0003F2-Qb for 26803@debbugs.gnu.org; Mon, 08 May 2017 10:13:28 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52417) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7jPa-0003Ba-SF; Mon, 08 May 2017 10:13:18 -0400 Received: from [143.121.198.177] (port=58376 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d7jPa-0007Fm-9X; Mon, 08 May 2017 10:13:18 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-18-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-18-rekado@elephly.net> Date: Mon, 08 May 2017 16:13:15 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > From: Hartmut Goebel > > * gnu/packages/java.scm (java-commons-cli): New variable. > > Co-authored-by: Ricardo Wurmus > --- > gnu/packages/java.scm | 37 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 3e422ac80..0220435af 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1784,3 +1784,40 @@ included: > @code{hashCode}, @code{compareTo} and @code{toString} methods. > @end itemize\n") > (license license:asl2.0))) > + > +(define-public java-commons-cli > + (package > + (name "java-commons-cli") > + (version "1.3.1") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/commons/cli/source/" > + "commons-cli-" version "-src.tar.gz")) > + (sha256 > + (base32 > + "1fkjn552i12vp3xxk21ws4p70fi0lyjm004vzxsdaz7gdpgyxxyl")))) > + (build-system ant-build-system) > + ;; TODO: javadoc > + (arguments > + `(#:jar-name "commons-cli.jar")) > + (native-inputs > + `(("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core))) > + (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 is 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))) Even though there's a to-do for the Javadoc documentation stuff, this is LGTM, because it is not essential to its functioning. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 19/36] gnu: Add java-commons-codec. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 10:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944109695908 (code B ref 26803); Wed, 10 May 2017 10:10:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 10:09:29 +0000 Received: from localhost ([127.0.0.1]:35097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8OYj-0001XE-BD for submit@debbugs.gnu.org; Wed, 10 May 2017 06:09:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8OYh-0001Wy-3L for 26803@debbugs.gnu.org; Wed, 10 May 2017 06:09:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8OYa-0006q5-R8 for 26803@debbugs.gnu.org; Wed, 10 May 2017 06:09:22 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:56167) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8OYU-0006oq-Pq; Wed, 10 May 2017 06:09:14 -0400 Received: from [143.121.198.177] (port=41554 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8OYU-0005XP-3i; Wed, 10 May 2017 06:09:14 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-19-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen Message-ID: In-reply-to: <20170506153617.3074-19-rekado@elephly.net> Date: Wed, 10 May 2017 12:09:04 +0200 MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > From: Hartmut Goebel > > * gnu/packages/java.scm (java-commons-codec): New variable. > > Co-authored-by: Ricardo Wurmus > --- > gnu/packages/java.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 0220435af..e4913973d 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1821,3 +1821,49 @@ 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 (string-append "mirror://apache/commons/codec/source/" > + "commons-codec-" version "-src.tar.gz")) > + (sha256 > + (base32 > + "1w9qg30y4s0x8gnmr2fgj4lyplfn788jqxbcz27lf5kbr6n8xr65")))) > + (build-system ant-build-system) > + (outputs '("out" "doc")) > + (arguments > + `(#:test-target "test" > + #:make-flags > + (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) > + (junit (assoc-ref %build-inputs "java-junit"))) > + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") > + (string-append "-Dhamcrest.jar=" hamcrest > + "/share/java/hamcrest-core.jar") > + ;; Do not append version to jar. > + "-Dfinal.name=commons-codec")) > + #:phases > + ;; TODO: I don't like this > + (modify-phases %standard-phases > + (add-after 'build 'build-javadoc > + ant-build-javadoc) > + (replace 'install > + (install-jars "dist")) > + ;; TODO: do this if javadoc argument is given? > + (add-after 'install 'install-doc > + (install-javadoc "dist/docs/api"))))) Is this a good moment to look into these TODOs? I don't think they are that bad, and the output includes the Javadoc stuff, right? > + (native-inputs > + `(("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core))) > + (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))) LGTM. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 20/36] gnu: Add java-commons-daemon. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 10:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944111416157 (code B ref 26803); Wed, 10 May 2017 10:13:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 10:12:21 +0000 Received: from localhost ([127.0.0.1]:35101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8ObU-0001bF-QC for submit@debbugs.gnu.org; Wed, 10 May 2017 06:12:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8ObS-0001b1-Lc for 26803@debbugs.gnu.org; Wed, 10 May 2017 06:12:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8ObM-0007mF-M7 for 26803@debbugs.gnu.org; Wed, 10 May 2017 06:12:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:56199) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8ObH-0007lQ-Pe; Wed, 10 May 2017 06:12:07 -0400 Received: from [143.121.198.177] (port=41558 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8ObH-0005gB-4Y; Wed, 10 May 2017 06:12:07 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-20-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-20-rekado@elephly.net> Date: Wed, 10 May 2017 12:12:04 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > From: Hartmut Goebel > > * gnu/packages/java.scm (java-commons-daemon): New variable. > > Co-authored-by: Ricardo Wurmus > --- > gnu/packages/java.scm | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index e4913973d..af6b0761f 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1867,3 +1867,37 @@ phonetic encoding utilities. > > This is a part of the Apache Commons Project.") > (license license:asl2.0))) > + > +(define-public java-commons-daemon > + (package > + (name "java-commons-daemon") > + (version "1.0.15") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/commons/daemon/source/" > + "commons-daemon-" version "-src.tar.gz")) > + (sha256 > + (base32 > + "0ci46kq8jpz084ccwq0mmkahcgsmh20ziclp2jf5i0djqv95gvhi")))) > + (build-system ant-build-system) > + (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 I'm not sure about the usage of the @code{}, but maybe @code{Daemon} or 'Daemon'? > +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 maybe Java instead? > +for your architecture which is provided by the jsvc package. maybe @code{jsvc}? > + > +This is a part of the Apache Commons Project.") > + (license license:asl2.0))) Otherwise LGTM. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 21/36] gnu: Add java-jmock-1. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 10:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944113266469 (code B ref 26803); Wed, 10 May 2017 10:16:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 10:15:26 +0000 Received: from localhost ([127.0.0.1]:35111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8OeT-0001gH-Ml for submit@debbugs.gnu.org; Wed, 10 May 2017 06:15:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8OeS-0001g4-Ht for 26803@debbugs.gnu.org; Wed, 10 May 2017 06:15:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8OeK-0000LC-AG for 26803@debbugs.gnu.org; Wed, 10 May 2017 06:15:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:56257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8OeK-0000L8-64; Wed, 10 May 2017 06:15:16 -0400 Received: from [143.121.198.177] (port=41566 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8OeJ-00060B-IK; Wed, 10 May 2017 06:15:15 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-21-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-21-rekado@elephly.net> Date: Wed, 10 May 2017 12:15:12 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-jmock-1): New variable. > --- > gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index af6b0761f..3271dd55c 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1448,6 +1448,42 @@ constructor on object instantiation.") > mock objects in unit testing.") > (license license:asl2.0))) > > +(define-public java-jmock-1 > + (package > + (name "java-jmock") > + (version "1.2.0") > + (source (origin > + (method url-fetch) > + (uri (string-append "https://github.com/jmock-developers/" > + "jmock-library/archive/" version ".tar.gz")) > + (file-name (string-append "jmock-" version ".tar.gz")) > + (sha256 > + (base32 > + "0xmrlhq0fszldkbv281k9463mv496143vvmqwpxp62yzjvdkx9w0")))) > + (build-system ant-build-system) > + (arguments > + `(#:build-target "jars" > + #:test-target "run.tests" > + #:phases > + (modify-phases %standard-phases > + (replace 'install (install-jars "build"))))) > + (home-page "http://www.jmock.org") > + (synopsis "Mock object library for Test Driven Development") I think it should be "test-driven development" (lowercase and a -). > + (description "JMock is a library that supports test-driven development of Like on this line. > +Java code with mock objects. Mock objects help you design and test the > +interactions between the objects in your programs. > + > +The jMock library > + > +@itemize > +@item makes it quick and easy to define mock objects > +@item lets you precisely specify the interactions between > + your objects, reducing the brittleness of your tests > +@item plugs into your favourite test framework > +@item is easy to extend. > +@end itemize\n") > + (license license:bsd-3))) > + > (define-public java-jopt-simple > (package > (name "java-jopt-simple") Otherwise LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 22/36] gnu: java-hamcrest-core: Declare test target. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 10:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944113546511 (code B ref 26803); Wed, 10 May 2017 10:16:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 10:15:54 +0000 Received: from localhost ([127.0.0.1]:35114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Oew-0001gx-1S for submit@debbugs.gnu.org; Wed, 10 May 2017 06:15:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Oeu-0001gj-O0 for 26803@debbugs.gnu.org; Wed, 10 May 2017 06:15:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8Oem-0000aE-Go for 26803@debbugs.gnu.org; Wed, 10 May 2017 06:15:47 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:56262) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8Oem-0000aA-Dc; Wed, 10 May 2017 06:15:44 -0400 Received: from [143.121.198.177] (port=41570 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8Oel-00061i-Ow; Wed, 10 May 2017 06:15:44 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-22-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-22-rekado@elephly.net> Date: Wed, 10 May 2017 12:15:40 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-hamcrest-core)[arguments]: Add value for > test-target. > --- > gnu/packages/java.scm | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 3271dd55c..2a5797a5c 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1087,6 +1087,7 @@ an Ant task that extends the built-in @code{jar} task.") > (guix build utils) > (srfi srfi-1)) > #:make-flags (list (string-append "-Dversion=" ,version)) > + #:test-target "unit-test" > #:build-target "core" > #:phases > (modify-phases %standard-phases LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 05/36] gnu: Add java-plexus-interpolation. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 10:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944130559236 (code B ref 26803); Wed, 10 May 2017 10:45:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 10:44:15 +0000 Received: from localhost ([127.0.0.1]:35132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8P6N-0002Ou-FW for submit@debbugs.gnu.org; Wed, 10 May 2017 06:44:15 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8P6L-0002Ol-JV for 26803@debbugs.gnu.org; Wed, 10 May 2017 06:44:14 -0400 Received: from localhost (141.80.148.89 [141.80.148.89]) by mx.zohomail.com with SMTPS id 14944130452315.992598857275993; Wed, 10 May 2017 03:44:05 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-5-rekado@elephly.net> <87lgq9k9iu.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: <87lgq9k9iu.fsf@gnu.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 12:44:02 +0200 Message-ID: <871srxhtzh.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> From: Hartmut Goebel >> >> * gnu/packages/java.scm (java-plexus-interplation): New variable. >> >> Co-authored-by: Ricardo Wurmus >> --- […] >> + (description "Plexus interpolator is a 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))) > > Maybe: @code{org.codehaus.plexus.utils.interpolation} and > @code{plexus-utils}? Good catch, thanks! -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 06/36] gnu: Add java-asm. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944247018941 (code B ref 26803); Wed, 10 May 2017 13:59:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 13:58:21 +0000 Received: from localhost ([127.0.0.1]:36798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8S8D-0002K9-7g for submit@debbugs.gnu.org; Wed, 10 May 2017 09:58:21 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8S8A-0002Jz-Uc for 26803@debbugs.gnu.org; Wed, 10 May 2017 09:58:19 -0400 Received: from localhost (141.80.148.89 [141.80.148.89]) by mx.zohomail.com with SMTPS id 1494424695821823.4417924125819; Wed, 10 May 2017 06:58:15 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-6-rekado@elephly.net> <87k25tk9dk.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: <87k25tk9dk.fsf@gnu.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 15:58:13 +0200 Message-ID: <87vap8hkzu.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: >> +(define-public java-asm >> + (package >> + (name "java-asm") >> + (version "5.2") >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "http://download.forge.ow2.org/asm/" >> + "asm-" version ".tar.gz")) >> + (sha256 >> + (base32 >> + "0kxvmv5275rnjl7jv0442k3wjnq03ngkb7sghs78avf45pzm4qgr")))) >> + (build-system ant-build-system) >> + (arguments >> + `(#:build-target "compile" >> + #:test-target "test" >> + ;; The tests require an old version of Janino, which no longer compiles >> + ;; with the JDK7. >> + #:tests? #f > > Why set the test-target if you disable the tests? You’re right, that doesn’t make much sense. I’ll remove it. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 11/36] gnu: java-hamcrest-core: Install all jars without version suffix. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 14:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944248659273 (code B ref 26803); Wed, 10 May 2017 14:02:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 14:01:05 +0000 Received: from localhost ([127.0.0.1]:36802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SAq-0002PT-MD for submit@debbugs.gnu.org; Wed, 10 May 2017 10:01:04 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SAo-0002PL-OH for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:01:03 -0400 Received: from localhost (141.80.148.89 [141.80.148.89]) by mx.zohomail.com with SMTPS id 1494424856140521.4341168464668; Wed, 10 May 2017 07:00:56 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-11-rekado@elephly.net> <87bmr5k6m9.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: <87bmr5k6m9.fsf@gnu.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 16:00:53 +0200 Message-ID: <87tw4shkve.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-hamcrest-core)[arguments]: Install all three >> jars and strip the version suffix. >> --- >> gnu/packages/java.scm | 26 +++++++++++++++++++++----- >> 1 file changed, 21 insertions(+), 5 deletions(-) >> >> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm >> index 3dc71e4bc..57ef65336 100644 >> --- a/gnu/packages/java.scm >> +++ b/gnu/packages/java.scm >> @@ -1081,7 +1081,10 @@ an Ant task that extends the built-in @code{jar} task.") >> #t)))) >> (build-system ant-build-system) >> (arguments >> - `(#:tests? #f ; Tests require junit >> + `(#:tests? #f ; Tests require junit > > Is this intended? No (but it’s indented). I’ll remove it. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 12/36] gnu: Add java-commons-math3. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 14:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944249179337 (code B ref 26803); Wed, 10 May 2017 14:02:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 14:01:57 +0000 Received: from localhost ([127.0.0.1]:36805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SBh-0002QX-40 for submit@debbugs.gnu.org; Wed, 10 May 2017 10:01:57 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21047) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SBf-0002QQ-Og for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:01:56 -0400 Received: from localhost (141.80.148.89 [141.80.148.89]) by mx.zohomail.com with SMTPS id 149442491366689.64158598409131; Wed, 10 May 2017 07:01:53 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-12-rekado@elephly.net> <87a86pk6fk.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: <87a86pk6fk.fsf@gnu.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 16:01:50 +0200 Message-ID: <87shkchktt.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-commons-math3): New variable. >> --- […] >> + ;; There is no install target. >> + (replace 'install >> + (install-jars "target"))))) > > That's odd, isn't it? Anyway, cool! Unfortunately, in Java land it’s not rare at all. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 15/36] gnu: Add java-commons-io. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 14:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149442545210108 (code B ref 26803); Wed, 10 May 2017 14:11:01 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 14:10:52 +0000 Received: from localhost ([127.0.0.1]:36816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SKK-0002cy-Cg for submit@debbugs.gnu.org; Wed, 10 May 2017 10:10:52 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21055) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SKI-0002cp-LX for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:10:51 -0400 Received: from localhost (141.80.148.89 [141.80.148.89]) by mx.zohomail.com with SMTPS id 1494425442114602.4854202951178; Wed, 10 May 2017 07:10:42 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-15-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 16:10:39 +0200 Message-ID: <87r2zwhkf4.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> From: Hartmut Goebel >> >> * gnu/packages/java.scm (java-commons-io): New variable. >> >> Co-authored-by: Ricardo Wurmus >> --- […] >> + (arguments >> + `(#:test-target "test" >> + #:phases >> + (modify-phases %standard-phases >> + (add-after 'unpack 'symlink-junit.jar >> + (lambda* (#:key inputs #:allow-other-keys) >> + ;; TODO: don't do this; use make-flags >> + ;; The existence of this file is taken as indicator whether test >> + ;; dependencies 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")) >> + #t))) > > I'm not sure how the result of the code here could be achieved > using 'make-flags', so is the TODO item referring to an already-removed > piece of code? Oh, I forgot about this. It’s actually pretty easy to do this with make-flags: #:make-flags (list (string-append "-Djunit.jar=" (assoc-ref %build-inputs "java-junit") "/share/java/junit.jar")) Much nicer than symlinking things! I’ll push it with this change. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 16/36] gnu: Add java-commons-lang. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 14:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149442563510372 (code B ref 26803); Wed, 10 May 2017 14:14:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 14:13:55 +0000 Received: from localhost ([127.0.0.1]:36820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SNG-0002hE-TS for submit@debbugs.gnu.org; Wed, 10 May 2017 10:13:55 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SNE-0002h5-4j for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:13:53 -0400 Received: from localhost (141.80.148.89 [141.80.148.89]) by mx.zohomail.com with SMTPS id 1494425626731274.643861074681; Wed, 10 May 2017 07:13:46 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-16-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 16:13:44 +0200 Message-ID: <87pofghk9z.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> From: Hartmut Goebel >> >> * gnu/packages/java.scm (java-commons-lang): New variable. >> >> Co-authored-by: Ricardo Wurmus >> --- […] >> + (arguments >> + `(#:test-target "test" >> + #:phases >> + (modify-phases %standard-phases >> + (add-after 'build 'build-javadoc ant-build-javadoc) >> + (add-before 'check 'disable-failing-test >> + (lambda _ >> + ;; Disable a failing test >> + (substitute* "src/test/java/org/apache/commons/lang/\ >> +time/FastDateFormatTest.java" >> + (("public void testFormat\\(\\)") >> + "public void disabled_testFormat()")) >> + #t)) > > Since you're renaming the function, I suppose removing the function > would also work, which would not create any "dead code". But that > probably requires a separate patch file, which will break more easily > on an update. > > So long story short: This is OK to me, even though I don't like > producing code that won't be run anyway. I agree in principle, but this is the Java way of disabling a test. Tests are considered tests only when the procedures start with the string “test”, so renaming the test causes it not to be executed. Removing requires much more effort because it requires an actual patch. Since it’s just a test (and not library code) I think it’s acceptable not to delete it. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 17/36] gnu: Add java-commons-lang3. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 14:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149442621011294 (code B ref 26803); Wed, 10 May 2017 14:24:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 14:23:30 +0000 Received: from localhost ([127.0.0.1]:36837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SWY-0002w6-Cr for submit@debbugs.gnu.org; Wed, 10 May 2017 10:23:30 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21021) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SWW-0002vu-MH for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:23:29 -0400 Received: from localhost (141.80.148.89 [141.80.148.89]) by mx.zohomail.com with SMTPS id 1494426202052122.50344832342228; Wed, 10 May 2017 07:23:22 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-17-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 16:23:19 +0200 Message-ID: <87o9v0hju0.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> From: Hartmut Goebel >> >> * gnu/packages/java.scm (java-commons-lang3): New variable. >> >> Co-authored-by: Ricardo Wurmus >> --- […] >> + (home-page "http://commons.apache.org/lang/") >> + (synopsis "Extension of the java.lang package (for Java 5+)") > > Is the (for Java 5+) still relevant? Even 6 has been deprecated, so it > seems to be for any supported Java version now. > >> + (description "The Commons Lang components contains a set of Java classes >> +that provide helper methods for standard Java classes, especially those found >> +in the @code{java.lang} package in the JDK 5+. The following classes are > > Same here. I think you’re right. I’ve removed mention of JDK 5+, because it doesn’t seem very useful any more. Thanks! -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 16/36] gnu: Add java-commons-lang. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 14:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149442621611311 (code B ref 26803); Wed, 10 May 2017 14:24:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 14:23:36 +0000 Received: from localhost ([127.0.0.1]:36840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SWd-0002wN-Kg for submit@debbugs.gnu.org; Wed, 10 May 2017 10:23:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SWc-0002vw-7X for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:23:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8SWV-0007GB-Vf for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:23:28 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8SWO-0007BI-Jd; Wed, 10 May 2017 10:23:20 -0400 Received: from [143.121.198.177] (port=44364 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8SWN-0004r8-Um; Wed, 10 May 2017 10:23:20 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-16-rekado@elephly.net> <87pofghk9z.fsf@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen Message-ID: In-reply-to: <87pofghk9z.fsf@elephly.net> Date: Wed, 10 May 2017 16:23:14 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > Roel Janssen writes: > >> Ricardo Wurmus writes: >> >>> From: Hartmut Goebel >>> >>> * gnu/packages/java.scm (java-commons-lang): New variable. >>> >>> Co-authored-by: Ricardo Wurmus >>> --- > […] >>> + (arguments >>> + `(#:test-target "test" >>> + #:phases >>> + (modify-phases %standard-phases >>> + (add-after 'build 'build-javadoc ant-build-javadoc) >>> + (add-before 'check 'disable-failing-test >>> + (lambda _ >>> + ;; Disable a failing test >>> + (substitute* "src/test/java/org/apache/commons/lang/\ >>> +time/FastDateFormatTest.java" >>> + (("public void testFormat\\(\\)") >>> + "public void disabled_testFormat()")) >>> + #t)) >> >> Since you're renaming the function, I suppose removing the function >> would also work, which would not create any "dead code". But that >> probably requires a separate patch file, which will break more easily >> on an update. >> >> So long story short: This is OK to me, even though I don't like >> producing code that won't be run anyway. > > I agree in principle, but this is the Java way of disabling a test. > Tests are considered tests only when the procedures start with the > string “test”, so renaming the test causes it not to be executed. > Removing requires much more effort because it requires an actual patch. > Since it’s just a test (and not library code) I think it’s acceptable > not to delete it. I agree. So, LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 15/36] gnu: Add java-commons-io. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 14:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149442626011396 (code B ref 26803); Wed, 10 May 2017 14:25:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 14:24:20 +0000 Received: from localhost ([127.0.0.1]:36845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SXM-0002xk-0A for submit@debbugs.gnu.org; Wed, 10 May 2017 10:24:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34019) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SXK-0002xY-QG for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:24:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8SXE-0007gV-DW for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:24:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8SX8-0007e1-VV; Wed, 10 May 2017 10:24:07 -0400 Received: from [143.121.198.177] (port=44370 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8SX8-0004uu-79; Wed, 10 May 2017 10:24:06 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-15-rekado@elephly.net> <87r2zwhkf4.fsf@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <87r2zwhkf4.fsf@elephly.net> Date: Wed, 10 May 2017 16:24:02 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > Roel Janssen writes: > >> Ricardo Wurmus writes: >> >>> From: Hartmut Goebel >>> >>> * gnu/packages/java.scm (java-commons-io): New variable. >>> >>> Co-authored-by: Ricardo Wurmus >>> --- > […] >>> + (arguments >>> + `(#:test-target "test" >>> + #:phases >>> + (modify-phases %standard-phases >>> + (add-after 'unpack 'symlink-junit.jar >>> + (lambda* (#:key inputs #:allow-other-keys) >>> + ;; TODO: don't do this; use make-flags >>> + ;; The existence of this file is taken as indicator whether test >>> + ;; dependencies 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")) >>> + #t))) >> >> I'm not sure how the result of the code here could be achieved >> using 'make-flags', so is the TODO item referring to an already-removed >> piece of code? > > Oh, I forgot about this. It’s actually pretty easy to do this with > make-flags: > > #:make-flags > (list (string-append "-Djunit.jar=" > (assoc-ref %build-inputs "java-junit") > "/share/java/junit.jar")) > > Much nicer than symlinking things! > I’ll push it with this change. Yes, definitely. Very nice! Is the "lib" directory automatically created this way? LGTM. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 19/36] gnu: Add java-commons-codec. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 14:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149442636111568 (code B ref 26803); Wed, 10 May 2017 14:26:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 14:26:01 +0000 Received: from localhost ([127.0.0.1]:36853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SYz-00030S-Js for submit@debbugs.gnu.org; Wed, 10 May 2017 10:26:01 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21011) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8SYx-00030J-1l for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:25:59 -0400 Received: from localhost (141.80.148.89 [141.80.148.89]) by mx.zohomail.com with SMTPS id 1494426355022595.0710928460032; Wed, 10 May 2017 07:25:55 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-19-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 16:25:52 +0200 Message-ID: <87mvakhjpr.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> From: Hartmut Goebel >> >> * gnu/packages/java.scm (java-commons-codec): New variable. >> >> Co-authored-by: Ricardo Wurmus >> --- […] >> + (arguments >> + `(#:test-target "test" >> + #:make-flags >> + (let ((hamcrest (assoc-ref %build-inputs "java-hamcrest-core")) >> + (junit (assoc-ref %build-inputs "java-junit"))) >> + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") >> + (string-append "-Dhamcrest.jar=" hamcrest >> + "/share/java/hamcrest-core.jar") >> + ;; Do not append version to jar. >> + "-Dfinal.name=commons-codec")) >> + #:phases >> + ;; TODO: I don't like this >> + (modify-phases %standard-phases >> + (add-after 'build 'build-javadoc >> + ant-build-javadoc) >> + (replace 'install >> + (install-jars "dist")) >> + ;; TODO: do this if javadoc argument is given? >> + (add-after 'install 'install-doc >> + (install-javadoc "dist/docs/api"))))) > > Is this a good moment to look into these TODOs? I don't think they are > that bad, and the output includes the Javadoc stuff, right? Yeah, I think I don’t feel so strongly about this any more. I’ve removed the TODOs. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 15/36] gnu: Add java-commons-io. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 14:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149442691212400 (code B ref 26803); Wed, 10 May 2017 14:36:01 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 14:35:12 +0000 Received: from localhost ([127.0.0.1]:36859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Shs-0003Dw-JH for submit@debbugs.gnu.org; Wed, 10 May 2017 10:35:12 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Shr-0003Do-AK for 26803@debbugs.gnu.org; Wed, 10 May 2017 10:35:12 -0400 Received: from localhost (141.80.148.89 [141.80.148.89]) by mx.zohomail.com with SMTPS id 1494426901880319.96385201706516; Wed, 10 May 2017 07:35:01 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-15-rekado@elephly.net> <87r2zwhkf4.fsf@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 16:34:58 +0200 Message-ID: <87lgq4hjal.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> Roel Janssen writes: >> >>> Ricardo Wurmus writes: >>> >>>> From: Hartmut Goebel >>>> >>>> * gnu/packages/java.scm (java-commons-io): New variable. >>>> >>>> Co-authored-by: Ricardo Wurmus >>>> --- >> […] >>>> + (arguments >>>> + `(#:test-target "test" >>>> + #:phases >>>> + (modify-phases %standard-phases >>>> + (add-after 'unpack 'symlink-junit.jar >>>> + (lambda* (#:key inputs #:allow-other-keys) >>>> + ;; TODO: don't do this; use make-flags >>>> + ;; The existence of this file is taken as indicator whether test >>>> + ;; dependencies 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")) >>>> + #t))) >>> >>> I'm not sure how the result of the code here could be achieved >>> using 'make-flags', so is the TODO item referring to an already-removed >>> piece of code? >> >> Oh, I forgot about this. It’s actually pretty easy to do this with >> make-flags: >> >> #:make-flags >> (list (string-append "-Djunit.jar=" >> (assoc-ref %build-inputs "java-junit") >> "/share/java/junit.jar")) >> >> Much nicer than symlinking things! >> I’ll push it with this change. > > Yes, definitely. Very nice! > Is the "lib" directory automatically created this way? We don’t need it. Instead of putting the file where the defaults want it to be we just tell it to look elsewhere, so no directory needs to be created at all. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 21/36] gnu: Add java-jmock-1. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 16:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149443202819833 (code B ref 26803); Wed, 10 May 2017 16:01:01 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 16:00:28 +0000 Received: from localhost ([127.0.0.1]:36912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8U2O-00059p-16 for submit@debbugs.gnu.org; Wed, 10 May 2017 12:00:28 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8U2M-00059g-Ju for 26803@debbugs.gnu.org; Wed, 10 May 2017 12:00:27 -0400 Received: from localhost (x2f7f8bb.dyn.telefonica.de [2.247.248.187]) by mx.zohomail.com with SMTPS id 1494432024453744.5361694985188; Wed, 10 May 2017 09:00:24 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-21-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 18:00:19 +0200 Message-ID: <87h90shfcc.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-jmock-1): New variable. >> --- […] >> + (arguments >> + `(#:build-target "jars" >> + #:test-target "run.tests" >> + #:phases >> + (modify-phases %standard-phases >> + (replace 'install (install-jars "build"))))) >> + (home-page "http://www.jmock.org") >> + (synopsis "Mock object library for Test Driven Development") > > I think it should be "test-driven development" (lowercase and a -). You are right! -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 20/36] gnu: Add java-commons-daemon. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 16:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: Hartmut Goebel , 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149443219320081 (code B ref 26803); Wed, 10 May 2017 16:04:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 16:03:13 +0000 Received: from localhost ([127.0.0.1]:36916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8U53-0005Do-H5 for submit@debbugs.gnu.org; Wed, 10 May 2017 12:03:13 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8U51-0005Dh-Sk for 26803@debbugs.gnu.org; Wed, 10 May 2017 12:03:12 -0400 Received: from localhost (x2f7f8bb.dyn.telefonica.de [2.247.248.187]) by mx.zohomail.com with SMTPS id 1494432186331588.1058477875624; Wed, 10 May 2017 09:03:06 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-20-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 18:03:02 +0200 Message-ID: <87fugchf7t.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> From: Hartmut Goebel >> >> * gnu/packages/java.scm (java-commons-daemon): New variable. >> >> Co-authored-by: Ricardo Wurmus >> --- >> gnu/packages/java.scm | 34 ++++++++++++++++++++++++++++++++++ >> 1 file changed, 34 insertions(+) >> >> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm >> index e4913973d..af6b0761f 100644 >> --- a/gnu/packages/java.scm >> +++ b/gnu/packages/java.scm >> @@ -1867,3 +1867,37 @@ phonetic encoding utilities. >> >> This is a part of the Apache Commons Project.") >> (license license:asl2.0))) >> + >> +(define-public java-commons-daemon >> + (package >> + (name "java-commons-daemon") >> + (version "1.0.15") >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "mirror://apache/commons/daemon/source/" >> + "commons-daemon-" version "-src.tar.gz")) >> + (sha256 >> + (base32 >> + "0ci46kq8jpz084ccwq0mmkahcgsmh20ziclp2jf5i0djqv95gvhi")))) >> + (build-system ant-build-system) >> + (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 > > I'm not sure about the usage of the @code{}, but maybe @code{Daemon} or > 'Daemon'? I think it’s fine the way it is. The project name is Daemon; the jar/class name is different, so @code{} would not be appropriate. >> +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 > > maybe Java instead? Yes, you’re right. >> +for your architecture which is provided by the jsvc package. > > maybe @code{jsvc}? If we had @package{} I would have used it here, but @code{} wouldn’t be right either. (We also don’t have a jsvc package yet, so … not sure.) -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 22/36] gnu: java-hamcrest-core: Declare test target. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 16:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149443227320195 (code B ref 26803); Wed, 10 May 2017 16:05:01 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 16:04:33 +0000 Received: from localhost ([127.0.0.1]:36920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8U6K-0005Ff-Sa for submit@debbugs.gnu.org; Wed, 10 May 2017 12:04:33 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8U6J-0005FX-AH for 26803@debbugs.gnu.org; Wed, 10 May 2017 12:04:31 -0400 Received: from localhost (x2f7f8bb.dyn.telefonica.de [2.247.248.187]) by mx.zohomail.com with SMTPS id 1494432267249390.0003314387584; Wed, 10 May 2017 09:04:27 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-22-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 18:04:10 +0200 Message-ID: <87efvwhf5x.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-hamcrest-core)[arguments]: Add value for >> test-target. >> --- >> gnu/packages/java.scm | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm >> index 3271dd55c..2a5797a5c 100644 >> --- a/gnu/packages/java.scm >> +++ b/gnu/packages/java.scm >> @@ -1087,6 +1087,7 @@ an Ant task that extends the built-in @code{jar} task.") >> (guix build utils) >> (srfi srfi-1)) >> #:make-flags (list (string-append "-Dversion=" ,version)) >> + #:test-target "unit-test" >> #:build-target "core" >> #:phases >> (modify-phases %standard-phases > > LGTM! Thank you very much for your review so far! I’ve pushed the packages up to this one. Less than 14 to go for this patch set :) -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 23/36] gnu: Add java-hamcrest-all. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 18:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944393736666 (code B ref 26803); Wed, 10 May 2017 18:03:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 18:02:53 +0000 Received: from localhost ([127.0.0.1]:37045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Vwp-0001jR-SI for submit@debbugs.gnu.org; Wed, 10 May 2017 14:02:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8Vwn-0001jE-H3 for 26803@debbugs.gnu.org; Wed, 10 May 2017 14:02:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8Vwf-0000Rk-CS for 26803@debbugs.gnu.org; Wed, 10 May 2017 14:02:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8Vwf-0000Rg-8k; Wed, 10 May 2017 14:02:41 -0400 Received: from ip112-245-209-87.adsl2.static.versatel.nl ([87.209.245.112]:50559 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8Vwe-0002eF-NB; Wed, 10 May 2017 14:02:41 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-23-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-23-rekado@elephly.net> Date: Wed, 10 May 2017 20:02:37 +0200 Message-ID: <87efvwbneq.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-hamcrest-all): New variable. > --- > gnu/packages/java.scm | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 2a5797a5c..8006b4d21 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1485,6 +1485,39 @@ The jMock library > @end itemize\n") > (license license:bsd-3))) > > +(define-public java-hamcrest-all > + (package (inherit java-hamcrest-core) > + (name "java-hamcrest-all") > + (arguments > + (substitute-keyword-arguments (package-arguments java-hamcrest-core) > + ;; FIXME: a range of unit tests fail because > + ;; org.hamcrest.SelfDescribing is not found, although it is part of the > + ;; hamcrest-core library that has just been built. This looks like fun.. :-) > + ((#:tests? _) #f) > + ((#:build-target _) "bigjar") > + ((#:phases phases) > + `(modify-phases ,phases > + ;; Some build targets override the classpath, so we need to patch > + ;; the build.xml to ensure that required dependencies are on the > + ;; classpath. > + (add-after 'unpack 'patch-classpath-for-integration > + (lambda* (#:key inputs #:allow-other-keys) > + (substitute* "build.xml" > + (("( build/hamcrest-library-\\$\\{version\\}.jar)" line) > + (string-join > + (cons line > + (append > + (find-files (assoc-ref inputs "java-junit") "\\.jar$") > + (find-files (assoc-ref inputs "java-jmock") "\\.jar$") > + (find-files (assoc-ref inputs "java-easymock") "\\.jar$"))) > + ";"))) > + #t)))))) > + (inputs > + `(("java-junit" ,java-junit) > + ("java-jmock" ,java-jmock-1) > + ("java-easymock" ,java-easymock) > + ,@(package-inputs java-hamcrest-core))))) > + > (define-public java-jopt-simple > (package > (name "java-jopt-simple") I learned some new constructs in this patch. Anyway, LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 24/36] gnu: Add java-jsr305. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 18:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944394626810 (code B ref 26803); Wed, 10 May 2017 18:05:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 18:04:22 +0000 Received: from localhost ([127.0.0.1]:37051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8VyI-0001lm-9c for submit@debbugs.gnu.org; Wed, 10 May 2017 14:04:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8VyF-0001lY-OQ for 26803@debbugs.gnu.org; Wed, 10 May 2017 14:04:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8Vy7-0000o0-Ip for 26803@debbugs.gnu.org; Wed, 10 May 2017 14:04:14 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8Vy7-0000nw-El; Wed, 10 May 2017 14:04:11 -0400 Received: from ip112-245-209-87.adsl2.static.versatel.nl ([87.209.245.112]:56157 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8Vy6-00056H-Pz; Wed, 10 May 2017 14:04:11 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-24-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-24-rekado@elephly.net> Date: Wed, 10 May 2017 20:04:07 +0200 Message-ID: <87d1bgbnc8.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-jsr305): New variable. > --- > gnu/packages/java.scm | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 8006b4d21..3a104f4c5 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1855,6 +1855,29 @@ included: > @end itemize\n") > (license license:asl2.0))) > > +(define-public java-jsr305 > + (package > + (name "java-jsr305") > + (version "3.0.1") > + (source (origin > + (method url-fetch) > + (uri (string-append "http://repo1.maven.org/maven2/" > + "com/google/code/findbugs/" > + "jsr305/" version "/jsr305-" > + version "-sources.jar")) > + (sha256 > + (base32 > + "1rh6jin9v7jqpq3kf1swl868l8i94r636n03pzpsmgr8v0lh9j2n")))) > + (build-system ant-build-system) > + (arguments > + `(#:tests? #f ; no tests included > + #:jar-name "jsr305.jar")) > + (home-page "http://findbugs.sourceforge.net/") > + (synopsis "Annotations for the static analyzer called findbugs") > + (description "This package provides annotations for the findbugs package. > +It provides packages in the @code{javax.annotations} namespace.") Yes! I think I start to understand it now. javax.annotations is code-related because it's the name of the namespace.. Hence, @code{}. > + (license license:asl2.0))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") This looks straightforward, so LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 25/36] gnu: Add java-guava. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 18:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944395937001 (code B ref 26803); Wed, 10 May 2017 18:07:01 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 18:06:33 +0000 Received: from localhost ([127.0.0.1]:37055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8W0O-0001oq-MR for submit@debbugs.gnu.org; Wed, 10 May 2017 14:06:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8W0N-0001of-Od for 26803@debbugs.gnu.org; Wed, 10 May 2017 14:06:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8W0F-0001cO-I5 for 26803@debbugs.gnu.org; Wed, 10 May 2017 14:06:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8W0F-0001cK-EK; Wed, 10 May 2017 14:06:23 -0400 Received: from ip112-245-209-87.adsl2.static.versatel.nl ([87.209.245.112]:56210 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8W0E-0001fy-MG; Wed, 10 May 2017 14:06:23 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-25-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-25-rekado@elephly.net> Date: Wed, 10 May 2017 20:06:18 +0200 Message-ID: <87bmr0bn8l.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-guava): 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 3a104f4c5..a9faf681d 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1878,6 +1878,58 @@ included: > It provides packages in the @code{javax.annotations} namespace.") > (license license:asl2.0))) > > +(define-public java-guava > + (package > + (name "java-guava") > + ;; This is the last release of Guava that can be built with Java 7. > + (version "20.0") > + (source (origin > + (method url-fetch) > + (uri (string-append "https://github.com/google/guava/" > + "releases/download/v" version > + "/guava-" version "-sources.jar")) > + (sha256 > + (base32 > + "1gawrs5gi6j5hcfxdgpnfli75vb9pfi4sn09pnc8xacr669yajwr")))) > + (build-system ant-build-system) > + (arguments > + `(#:tests? #f ; no tests included Not really important. But should we indent the comments this way? > + #:jar-name "guava.jar" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'trim-sources > + (lambda _ > + (with-directory-excursion "src/com/google/common" > + ;; Remove annotations to avoid extra dependencies: > + ;; * "j2objc" annotations are used when converting Java to > + ;; Objective C; > + ;; * "errorprone" annotations catch common Java mistakes at > + ;; compile time; > + ;; * "IgnoreJRERequirement" is used for Android. > + (substitute* (find-files "." "\\.java$") > + (("import com.google.j2objc.*") "") > + (("import com.google.errorprone.annotation.*") "") > + (("import org.codehaus.mojo.animal_sniffer.*") "") > + (("@CanIgnoreReturnValue") "") > + (("@LazyInit") "") > + (("@WeakOuter") "") > + (("@RetainedWith") "") > + (("@Weak") "") > + (("@ForOverride") "") > + (("@J2ObjCIncompatible") "") > + (("@IgnoreJRERequirement") ""))) > + #t))))) > + (inputs > + `(("java-jsr305" ,java-jsr305))) > + (home-page "https://github.com/google/guava") > + (synopsis "Google core libraries for Java") > + (description "Guava is a set of core libraries that includes new > +collection types (such as multimap and multiset), immutable collections, a > +graph library, functional types, an in-memory cache, and APIs/utilities for > +concurrency, I/O, hashing, primitives, reflection, string processing, and much > +more!") > + (license license:asl2.0))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 26/36] gnu: Add java-commons-logging-minimal. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 18:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14944397717248 (code B ref 26803); Wed, 10 May 2017 18:10:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 18:09:31 +0000 Received: from localhost ([127.0.0.1]:37059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8W3H-0001sq-7H for submit@debbugs.gnu.org; Wed, 10 May 2017 14:09:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8W3F-0001sd-HX for 26803@debbugs.gnu.org; Wed, 10 May 2017 14:09:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8W37-0002oo-27 for 26803@debbugs.gnu.org; Wed, 10 May 2017 14:09:24 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8W36-0002oP-Ur; Wed, 10 May 2017 14:09:21 -0400 Received: from ip112-245-209-87.adsl2.static.versatel.nl ([87.209.245.112]:63000 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8W36-0005f0-FH; Wed, 10 May 2017 14:09:20 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-26-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <20170506153617.3074-26-rekado@elephly.net> Date: Wed, 10 May 2017 20:09:17 +0200 Message-ID: <87a86kbn3m.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-commons-logging-minimal): New variable. > --- > gnu/packages/java.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 47 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index a9faf681d..859f9934a 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1930,6 +1930,53 @@ concurrency, I/O, hashing, primitives, reflection, string processing, and much > more!") > (license license:asl2.0))) > > +;; The java-commons-logging package provides adapters to many different > +;; logging frameworks. To avoid an excessive dependency graph we try to build > +;; it with only a minimal set of adapters. > +(define-public java-commons-logging-minimal > + (package > + (name "java-commons-logging-minimal") > + (version "1.2") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/commons/logging/source/" > + "commons-logging-" version "-src.tar.gz")) > + (sha256 > + (base32 > + "10bwcy5w8d7y39n0krlwhnp8ds3kj5zhmzj0zxnkw0qdlsjmsrj9")))) > + (build-system ant-build-system) > + (arguments > + `(#:tests? #f ; avoid dependency on logging frameworks > + #:jar-name "commons-logging-minimal.jar" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'delete-adapters-and-tests > + (lambda _ > + ;; Delete all adapters except for NoOpLog, SimpleLog, and > + ;; LogFactoryImpl. NoOpLog is required to build; LogFactoryImpl > + ;; is used by applications; SimpleLog is the only actually usable > + ;; implementation that does not depend on another logging > + ;; framework. > + (for-each > + (lambda (file) > + (delete-file (string-append > + "src/main/java/org/apache/commons/logging/impl/" file))) > + (list "Jdk13LumberjackLogger.java" > + "WeakHashtable.java" > + "Log4JLogger.java" > + "ServletContextCleaner.java" > + "Jdk14Logger.java" > + "AvalonLogger.java" > + "LogKitLogger.java")) > + (delete-file-recursively "src/test") Interesting. > + #t))))) > + (home-page "http://commons.apache.org/logging/") > + (synopsis "Common API for logging implementations") > + (description "The Logging package is a thin bridge between different > +logging implementations. A library that uses the commons-logging API can be > +used with any logging implementation at runtime.") > + (license license:asl2.0))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") LGTM! I have to fix the Guile 2.0 -> 2.2 transition now, so it'll take a little longer before I can comment on the next patch. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 25/36] gnu: Add java-guava. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 19:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149444542715780 (code B ref 26803); Wed, 10 May 2017 19:44:02 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 19:43:47 +0000 Received: from localhost ([127.0.0.1]:37122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8XWV-00046R-Iz for submit@debbugs.gnu.org; Wed, 10 May 2017 15:43:47 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8XWT-00046I-PT for 26803@debbugs.gnu.org; Wed, 10 May 2017 15:43:46 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494445423211239.45679382747653; Wed, 10 May 2017 12:43:43 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-25-rekado@elephly.net> <87bmr0bn8l.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: <87bmr0bn8l.fsf@gnu.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 21:43:39 +0200 Message-ID: <87bmr0h504.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-guava): 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 3a104f4c5..a9faf681d 100644 >> --- a/gnu/packages/java.scm >> +++ b/gnu/packages/java.scm >> @@ -1878,6 +1878,58 @@ included: >> It provides packages in the @code{javax.annotations} namespace.") >> (license license:asl2.0))) >> >> +(define-public java-guava >> + (package >> + (name "java-guava") >> + ;; This is the last release of Guava that can be built with Java 7. >> + (version "20.0") >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "https://github.com/google/guava/" >> + "releases/download/v" version >> + "/guava-" version "-sources.jar")) >> + (sha256 >> + (base32 >> + "1gawrs5gi6j5hcfxdgpnfli75vb9pfi4sn09pnc8xacr669yajwr")))) >> + (build-system ant-build-system) >> + (arguments >> + `(#:tests? #f ; no tests included > > Not really important. But should we indent the comments this way? This is what Emacs does when indenting the whole expression. I have no preference either way, so I left it. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 26/36] gnu: Add java-commons-logging-minimal. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 19:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149444560716113 (code B ref 26803); Wed, 10 May 2017 19:47:01 +0000 Received: (at 26803) by debbugs.gnu.org; 10 May 2017 19:46:47 +0000 Received: from localhost ([127.0.0.1]:37126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8XZP-0004Bp-2S for submit@debbugs.gnu.org; Wed, 10 May 2017 15:46:47 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8XZN-0004Bh-Bf for 26803@debbugs.gnu.org; Wed, 10 May 2017 15:46:45 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 149444560179619.354358913306328; Wed, 10 May 2017 12:46:41 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-26-rekado@elephly.net> <87a86kbn3m.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: <87a86kbn3m.fsf@gnu.org> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 10 May 2017 21:46:38 +0200 Message-ID: <87a86kh4v5.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-commons-logging-minimal): New variable. >> --- […] > > LGTM! > > I have to fix the Guile 2.0 -> 2.2 transition now, so it'll take a > little longer before I can comment on the next patch. Thank you very much! I’ve pushed the patches up to this point. 10 to go! Lets see if someone else would like to join the party and review the rest :) -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 27/36] gnu: Add java-mockito-1. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449044518408 (code B ref 26803); Thu, 11 May 2017 08:15:01 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:14:05 +0000 Received: from localhost ([127.0.0.1]:37583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jEb-0004mp-02 for submit@debbugs.gnu.org; Thu, 11 May 2017 04:14:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jEY-0004mF-LG for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:14:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8jEQ-0004xp-8r for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:13:57 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47654) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8jEQ-0004xM-46; Thu, 11 May 2017 04:13:54 -0400 Received: from [143.121.198.177] (port=45632 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8jEO-0007DR-Nv; Thu, 11 May 2017 04:13:53 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-27-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-27-rekado@elephly.net> Date: Thu, 11 May 2017 10:13:49 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-mockito): New variable. > --- > gnu/packages/java.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 859f9934a..2cf2821c0 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1977,6 +1977,66 @@ logging implementations. A library that uses the commons-logging API can be > used with any logging implementation at runtime.") > (license license:asl2.0))) > > +;; This is the last release of the 1.x series. > +(define-public java-mockito-1 > + (package > + (name "java-mockito") > + (version "1.10.19") > + (source (origin > + (method url-fetch) > + (uri (string-append "http://repo1.maven.org/maven2/" > + "org/mockito/mockito-core/" version > + "/mockito-core-" version "-sources.jar")) > + (sha256 > + (base32 > + "0vmiwnwpf83g2q7kj1rislmja8fpvqkixjhawh7nxnygx6pq11kc")))) > + (build-system ant-build-system) > + (arguments > + `(#:jar-name "mockito.jar" > + #:tests? #f ; no tests included > + ;; FIXME: patch-and-repack does not support jars, so we have to apply > + ;; patches in build phases. > + #:phases > + (modify-phases %standard-phases > + ;; Mockito fails to build with our verson of hamcrest without this > + ;; definition. > + (add-after 'unpack 'fix-hamcrest-build-error > + (lambda _ > + (substitute* "src/org/mockito/internal/matchers/LocalizedMatcher.java" > + (("public Matcher getActualMatcher\\(\\) .*" line) > + (string-append " > + public void describeMismatch(Object item, Description description) { > + actualMatcher.describeMismatch(item, description); > + }" > + line))) > + #t)) I understand this is easier and possibly less error-prone than creating a patch file instead, but how far are we going with adding/removing code inside the package recipes? As far as the actual code addition goes, it is pretty straightforward: It adds a function that hamcrest expects is available. Maybe add a comment describing this? Then it's OK to me. > + ;; Mockito bundles cglib. We have a cglib package, so let's use > + ;; that instead. > + (add-after 'unpack 'use-system-libraries > + (lambda _ > + (with-directory-excursion "src/org/mockito/internal/creation/cglib" > + (substitute* '("CGLIBHacker.java" > + "CglibMockMaker.java" > + "ClassImposterizer.java" > + "DelegatingMockitoMethodProxy.java" > + "MethodInterceptorFilter.java" > + "MockitoNamingPolicy.java" > + "SerializableMockitoMethodProxy.java" > + "SerializableNoOp.java") > + (("import org.mockito.cglib") "import net.sf.cglib"))) > + #t))))) Nice unbundling! > + (inputs > + `(("java-junit" ,java-junit) > + ("java-objenesis" ,java-objenesis) > + ("java-cglib" ,java-cglib) > + ("java-hamcrest-core" ,java-hamcrest-core))) > + (home-page "http://mockito.org") > + (synopsis "Mockito is a mock library for Java") > + (description "Mockito is a mocking library for Java which lets you write > +tests with a clean and simple API. It generates mocks using reflection, and > +it records all mock invocations, including methods arguments.") > + (license license:asl2.0))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") Otherwise, LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 28/36] gnu: Add java-httpcomponents-httpcore. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449059318648 (code B ref 26803); Thu, 11 May 2017 08:17:01 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:16:33 +0000 Received: from localhost ([127.0.0.1]:37587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jGz-0004qh-GY for submit@debbugs.gnu.org; Thu, 11 May 2017 04:16:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jGy-0004qT-1m for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:16:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8jGp-0007jW-S0 for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:16:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8jGp-0007jP-O1; Thu, 11 May 2017 04:16:23 -0400 Received: from [143.121.198.177] (port=45658 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8jGm-0007Pe-Ty; Thu, 11 May 2017 04:16:21 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-28-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-28-rekado@elephly.net> Date: Thu, 11 May 2017 10:16:17 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-httpcomponents-httpcore): New variable. > --- > gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 2cf2821c0..a770cd4cc 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -2037,6 +2037,42 @@ tests with a clean and simple API. It generates mocks using reflection, and > it records all mock invocations, including methods arguments.") > (license license:asl2.0))) > > +(define-public java-httpcomponents-httpcore > + (package > + (name "java-httpcomponents-httpcore") > + (version "4.4.6") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache//httpcomponents/httpcore/" > + "source/httpcomponents-core-" > + version "-src.tar.gz")) > + (sha256 > + (base32 > + "02bwcf38y4vgwq7kj2s6q7qrmma641r5lacivm16kgxvb2j6h1vy")))) > + (build-system ant-build-system) > + (arguments > + `(#:jar-name "httpcomponents-httpcore.jar" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'chdir > + (lambda _ (chdir "httpcore") #t))))) > + (inputs > + `(("java-commons-logging-minimal" ,java-commons-logging-minimal) > + ("java-commons-lang3" ,java-commons-lang3))) > + (native-inputs > + `(("java-junit" ,java-junit) > + ("java-mockito" ,java-mockito-1))) > + (home-page "https://hc.apache.org/httpcomponents-core-4.4.x/index.html") > + (synopsis "Low level HTTP transport components") > + (description "HttpCore is a set of low level HTTP transport components > +that can be used to build custom client and server side HTTP services with a > +minimal footprint. HttpCore supports two I/O models: blocking I/O model based > +on the classic Java I/O and non-blocking, event driven I/O model based on Java > +NIO. I think you're referring to "HttpCore" as in the API. Is an API @code{}? > + > +This package provides the blocking I/O model library.") > + (license license:asl2.0))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") LGTM. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 29/36] gnu: Add java-httpcomponents-httpcore-nio. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449071518829 (code B ref 26803); Thu, 11 May 2017 08:19:02 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:18:35 +0000 Received: from localhost ([127.0.0.1]:37591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jIw-0004tc-Ut for submit@debbugs.gnu.org; Thu, 11 May 2017 04:18:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jIv-0004tQ-Mk for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:18:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8jIn-0001Oy-Gc for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:18:28 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8jIn-0001Oq-DB; Thu, 11 May 2017 04:18:25 -0400 Received: from [143.121.198.177] (port=45664 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8jIm-0007Ws-LG; Thu, 11 May 2017 04:18:25 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-29-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-29-rekado@elephly.net> Date: Thu, 11 May 2017 10:18:21 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-httpcomponents-httpcore-nio): New variable. > --- > gnu/packages/java.scm | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index a770cd4cc..620a276d0 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -2073,6 +2073,28 @@ NIO. > This package provides the blocking I/O model library.") > (license license:asl2.0))) > > +(define-public java-httpcomponents-httpcore-nio > + (package (inherit java-httpcomponents-httpcore) > + (name "java-httpcomponents-httpcore-nio") > + (arguments > + `(#:jar-name "httpcomponents-httpcore-nio.jar" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'chdir > + (lambda _ (chdir "httpcore-nio") #t))))) > + (inputs > + `(("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) > + ("java-hamcrest-core" ,java-hamcrest-core) > + ,@(package-inputs java-httpcomponents-httpcore))) > + (description "HttpCore is a set of low level HTTP transport components > +that can be used to build custom client and server side HTTP services with a > +minimal footprint. HttpCore supports two I/O models: blocking I/O model based > +on the classic Java I/O and non-blocking, event driven I/O model based on Java > +NIO. > + > +This package provides the non-blocking I/O model library based on Java > +NIO."))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") Same suggestion as the 'java-httpcomponents-httpcore' patch. @code{HttpCore} or just HttpCore? I don't know, so it's up to you. :-) Otherwise, LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 27/36] gnu: Add java-mockito-1. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449094519174 (code B ref 26803); Thu, 11 May 2017 08:23:02 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:22:25 +0000 Received: from localhost ([127.0.0.1]:37596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jMf-0004zB-Ft for submit@debbugs.gnu.org; Thu, 11 May 2017 04:22:25 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21107) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jMd-0004z1-Hs for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:22:24 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494490938220564.6424926633977; Thu, 11 May 2017 01:22:18 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-27-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Thu, 11 May 2017 10:22:14 +0200 Message-ID: <871srvhkg9.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-mockito): New variable. >> --- >> gnu/packages/java.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 60 insertions(+) >> >> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm >> index 859f9934a..2cf2821c0 100644 >> --- a/gnu/packages/java.scm >> +++ b/gnu/packages/java.scm >> @@ -1977,6 +1977,66 @@ logging implementations. A library that uses the commons-logging API can be >> used with any logging implementation at runtime.") >> (license license:asl2.0))) >> >> +;; This is the last release of the 1.x series. >> +(define-public java-mockito-1 >> + (package >> + (name "java-mockito") >> + (version "1.10.19") >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "http://repo1.maven.org/maven2/" >> + "org/mockito/mockito-core/" version >> + "/mockito-core-" version "-sources.jar")) >> + (sha256 >> + (base32 >> + "0vmiwnwpf83g2q7kj1rislmja8fpvqkixjhawh7nxnygx6pq11kc")))) >> + (build-system ant-build-system) >> + (arguments >> + `(#:jar-name "mockito.jar" >> + #:tests? #f ; no tests included >> + ;; FIXME: patch-and-repack does not support jars, so we have to apply >> + ;; patches in build phases. >> + #:phases >> + (modify-phases %standard-phases >> + ;; Mockito fails to build with our verson of hamcrest without this >> + ;; definition. >> + (add-after 'unpack 'fix-hamcrest-build-error >> + (lambda _ >> + (substitute* "src/org/mockito/internal/matchers/LocalizedMatcher.java" >> + (("public Matcher getActualMatcher\\(\\) .*" line) >> + (string-append " >> + public void describeMismatch(Object item, Description description) { >> + actualMatcher.describeMismatch(item, description); >> + }" >> + line))) >> + #t)) > > I understand this is easier and possibly less error-prone than creating > a patch file instead, but how far are we going with adding/removing code > inside the package recipes? There’s a FIXME comment above the #:phases. I would like to use a patch in this case, but patch-and-repack does not support jars. We usually unpack the sources, apply the patches, and then repack the sources, but this currently doesn’t work for jars. This is why I must do this in build phases. > As far as the actual code addition goes, it is pretty straightforward: > It adds a function that hamcrest expects is available. Maybe add a > comment describing this? Then it's OK to me. Okay, I’ll add a better comment here. Thanks! -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 30/36] gnu: Add java-httpcomponents-httpcore-ab. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449144519952 (code B ref 26803); Thu, 11 May 2017 08:31:01 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:30:45 +0000 Received: from localhost ([127.0.0.1]:37602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jUj-0005Bj-DX for submit@debbugs.gnu.org; Thu, 11 May 2017 04:30:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57851) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jUh-0005BX-5L for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:30:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8jUY-0002MM-Lp for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:30:37 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47940) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8jUY-0002M3-I4; Thu, 11 May 2017 04:30:34 -0400 Received: from [143.121.198.177] (port=45746 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8jUX-0002mK-DW; Thu, 11 May 2017 04:30:33 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-30-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-30-rekado@elephly.net> Date: Thu, 11 May 2017 10:30:30 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-httpcomponents-httpcore-ab): 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 620a276d0..19642cbfc 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -2095,6 +2095,24 @@ NIO. > This package provides the non-blocking I/O model library based on Java > NIO."))) > > +(define-public java-httpcomponents-httpcore-ab > + (package (inherit java-httpcomponents-httpcore) > + (name "java-httpcomponents-httpcore-ab") > + (arguments > + `(#:jar-name "httpcomponents-httpcore-ab.jar" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'chdir > + (lambda _ (chdir "httpcore-ab") #t))))) > + (inputs > + `(("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) > + ("java-commons-cli" ,java-commons-cli) > + ("java-hamcrest-core" ,java-hamcrest-core) > + ,@(package-inputs java-httpcomponents-httpcore))) > + (synopsis "Apache HttpCore benchmarking tool") > + (description "This package provides the HttpCore benchmarking tool. It is > +an Apache AB clone based on HttpCore."))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") HttpCore again. LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 31/36] gnu: Add java-httpcomponents-httpclient. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449155620121 (code B ref 26803); Thu, 11 May 2017 08:33:02 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:32:36 +0000 Received: from localhost ([127.0.0.1]:37606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jWV-0005ET-Og for submit@debbugs.gnu.org; Thu, 11 May 2017 04:32:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jWT-0005ED-1L for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:32:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8jWJ-0003ok-1x for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:32:27 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8jWI-0003oe-Ue; Thu, 11 May 2017 04:32:22 -0400 Received: from [143.121.198.177] (port=45752 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8jWI-0004V0-6u; Thu, 11 May 2017 04:32:22 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-31-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-31-rekado@elephly.net> Date: Thu, 11 May 2017 10:32:19 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-httpcomponents-httpclient): New variable. > --- > gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 19642cbfc..ee3a2bd2b 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -2113,6 +2113,42 @@ NIO."))) > (description "This package provides the HttpCore benchmarking tool. It is > an Apache AB clone based on HttpCore."))) > > +(define-public java-httpcomponents-httpclient > + (package > + (name "java-httpcomponents-httpclient") > + (version "4.5.3") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/httpcomponents/httpclient/" > + "source/httpcomponents-client-" > + version "-src.tar.gz")) > + (sha256 > + (base32 > + "1428399s7qy3cim5wc6f3ks4gl9nf9vkjpfmnlap3jflif7g2pj1")))) > + (build-system ant-build-system) > + (arguments > + `(#:jar-name "httpcomponents-httpclient.jar" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'chdir > + (lambda _ (chdir "httpclient") #t))))) > + (inputs > + `(("java-commons-logging-minimal" ,java-commons-logging-minimal) > + ("java-commons-codec" ,java-commons-codec) > + ("java-hamcrest-core" ,java-hamcrest-core) > + ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) > + ("java-mockito" ,java-mockito-1) > + ("java-junit" ,java-junit))) > + (home-page "https://hc.apache.org/httpcomponents-client-ga/") > + (synopsis "HTTP client library for Java") > + (description "Although the @code{java.net} package provides basic I thought package names weren't supposed to be @code{}ed. > +functionality for accessing resources via HTTP, it doesn't provide the full > +flexibility or functionality needed by many applications. @code{HttpClient} > +seeks to fill this void by providing an efficient, up-to-date, and > +feature-rich package implementing the client side of the most recent HTTP > +standards and recommendations.") > + (license license:asl2.0))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") Otherwise, LGTM. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 32/36] gnu: Add java-httpcomponents-httpmime. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449159120194 (code B ref 26803); Thu, 11 May 2017 08:34:01 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:33:11 +0000 Received: from localhost ([127.0.0.1]:37610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jX5-0005Fe-1f for submit@debbugs.gnu.org; Thu, 11 May 2017 04:33:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jX2-0005FQ-29 for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:33:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8jWr-0004H1-U1 for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:33:03 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8jWr-0004Gm-QE; Thu, 11 May 2017 04:32:57 -0400 Received: from [143.121.198.177] (port=45758 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8jWr-0005F7-2E; Thu, 11 May 2017 04:32:57 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-32-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-32-rekado@elephly.net> Date: Thu, 11 May 2017 10:32:54 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-httpcomponents-httpmime): New variable. > --- > gnu/packages/java.scm | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index ee3a2bd2b..4bc03e5ca 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -2149,6 +2149,21 @@ feature-rich package implementing the client side of the most recent HTTP > standards and recommendations.") > (license license:asl2.0))) > > +(define-public java-httpcomponents-httpmime > + (package (inherit java-httpcomponents-httpclient) > + (name "java-httpcomponents-httpmime") > + (arguments > + `(#:jar-name "httpcomponents-httpmime.jar" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'chdir > + (lambda _ (chdir "httpmime") #t))))) > + (inputs > + `(("java-httpcomponents-httpclient" ,java-httpcomponents-httpclient) > + ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) > + ("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core))))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 33/36] gnu: Add java-commons-httpclient. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449175120439 (code B ref 26803); Thu, 11 May 2017 08:36:01 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:35:51 +0000 Received: from localhost ([127.0.0.1]:37624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jZf-0005Ja-Ke for submit@debbugs.gnu.org; Thu, 11 May 2017 04:35:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jZc-0005JM-P3 for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:35:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8jZS-00075d-Ji for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:35:43 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8jZS-00075X-G8; Thu, 11 May 2017 04:35:38 -0400 Received: from [143.121.198.177] (port=45762 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8jZR-0006Ye-DH; Thu, 11 May 2017 04:35:37 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-33-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-33-rekado@elephly.net> Date: Thu, 11 May 2017 10:35:34 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-commons-httpclient): New variable. > --- > gnu/packages/java.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 55 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 4bc03e5ca..1639570f9 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -2164,6 +2164,61 @@ standards and recommendations.") > ("java-junit" ,java-junit) > ("java-hamcrest-core" ,java-hamcrest-core))))) > > +(define-public java-commons-httpclient > + (package > + (name "java-commons-httpclient") > + (version "3.1") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/" > + "httpcomponents/commons-httpclient/source/" > + "commons-httpclient-" version "-src.tar.gz")) > + (sha256 > + (base32 > + "1wlpn3cfy3d4inxy6g7wxcsa8p7sshn6aldk9y4ia3lb879rd97r")))) > + (build-system ant-build-system) > + (arguments > + `(#:make-flags > + (let ((junit (assoc-ref %build-inputs "java-junit")) > + (codec (assoc-ref %build-inputs "java-commons-codec")) > + (logging (assoc-ref %build-inputs "java-commons-logging-minimal"))) > + (list (string-append "-Djunit.jar=" junit "/share/java/junit.jar") > + (string-append "-Dcommons-codec.jar=" codec > + "/share/java/commons-codec.jar") > + (string-append "-Dcommons-logging.jar=" logging > + "/share/java/commons-logging-minimal.jar"))) > + #:build-target "dist" > + #:test-target "test" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'fix-utf8-problems > + (lambda _ > + ;; These files contain invalid characters. > + (with-fluids ((%default-port-encoding "ISO-8859-1")) > + (substitute* '("src/examples/ClientApp.java" > + "src/examples/TrivialApp.java" > + "src/test/org/apache/commons/httpclient/TestHttps.java" > + "src/test/org/apache/commons/httpclient/TestURIUtil2.java" > + "src/java/org/apache/commons/httpclient/\ > +HttpContentTooLargeException.java") > + (("Ortwin Gl.") "Ortwin Glue")) > + (substitute* "src/test/org/apache/commons/httpclient/TestURIUtil2.java" > + (("\xe4") "") > + (("%C3%A4") ""))) > + #t)) > + (replace 'install (install-jars "dist"))))) > + (inputs > + `(("java-commons-logging-minimal" ,java-commons-logging-minimal) > + ("java-commons-codec" ,java-commons-codec) > + ("java-junit" ,java-junit))) > + (home-page "http://hc.apache.org/httpclient-3.x/") > + (synopsis "Deprecated HTTP client library for Java") Now that sound wonderful.. ;) > + (description "The Commons HttpClient project is now end of life, and is > +no longer being developed. It has been replaced by the Apache HttpComponents > +project in its HttpClient and HttpCore modules, which offer better performance > +and more flexibility.") > + (license license:asl2.0))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") I guess we need it for some dependency. Is it possible to use the java-httpcomponents-httpclient for these? If we really need this package, then the recipe looks good to me, but I think it'be better to not need an already deprecated version of something that does networking stuff. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 34/36] gnu: Add java-commons-net. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449203420918 (code B ref 26803); Thu, 11 May 2017 08:41:01 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:40:34 +0000 Received: from localhost ([127.0.0.1]:37635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jeE-0005RJ-Gs for submit@debbugs.gnu.org; Thu, 11 May 2017 04:40:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jeD-0005R7-1w for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:40:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8je3-0003Zk-3j for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:40:28 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8je3-0003Zd-0r; Thu, 11 May 2017 04:40:23 -0400 Received: from [143.121.198.177] (port=45830 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8je2-0005nN-E4; Thu, 11 May 2017 04:40:22 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-34-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-34-rekado@elephly.net> Date: Thu, 11 May 2017 10:40:19 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-commons-net): 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 1639570f9..287a7ae69 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -2219,6 +2219,34 @@ project in its HttpClient and HttpCore modules, which offer better performance > and more flexibility.") > (license license:asl2.0))) > > +(define-public java-commons-net > + (package > + (name "java-commons-net") > + (version "3.6") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/commons/net/source/" > + "commons-net-" version "-src.tar.gz")) > + (sha256 > + (base32 > + "0n0cmnddk9qdqhjvka8pc6hd9mn2qi3166f1s6xk32h7rfy1adxr")))) > + (build-system ant-build-system) > + (arguments > + `(;; FIXME: MainTest.java tries to read "examples.properties" (which > + ;; should be "resources/examples/examples.properties"), but gets "null" > + ;; instead. This sounds fixable in a substitute construct. But maybe I am wrong about it. Would you like to try that first? > + #:tests? #f > + #:jar-name "commons-net.jar")) > + (native-inputs > + `(("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core))) > + (home-page "http://commons.apache.org/net/") > + (synopsis "Client library for many basic Internet protocols") > + (description "The Apache Commons Net library implements the client side of > +many basic Internet protocols. The purpose of the library is to provide > +fundamental protocol access, not higher-level abstractions.") > + (license license:asl2.0))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") Otherwise, LGTM. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 35/36] gnu: Add java-jsch. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449209721028 (code B ref 26803); Thu, 11 May 2017 08:42:02 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:41:37 +0000 Received: from localhost ([127.0.0.1]:37639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jfC-0005T4-QH for submit@debbugs.gnu.org; Thu, 11 May 2017 04:41:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jfB-0005Sp-4V for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:41:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8jf1-00042A-2J for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:41:28 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8jf0-000426-VR; Thu, 11 May 2017 04:41:22 -0400 Received: from [143.121.198.177] (port=45834 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8jf0-0005qD-0V; Thu, 11 May 2017 04:41:22 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-35-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-35-rekado@elephly.net> Date: Thu, 11 May 2017 10:41:18 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-jsch): 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 287a7ae69..8ecd5bbfc 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -2247,6 +2247,34 @@ many basic Internet protocols. The purpose of the library is to provide > fundamental protocol access, not higher-level abstractions.") > (license license:asl2.0))) > > +(define-public java-jsch > + (package > + (name "java-jsch") > + (version "0.1.54") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://sourceforge/jsch/jsch/" > + version "/jsch-" version ".zip")) > + (sha256 > + (base32 > + "029rdddyq1mh3ghryh3ki99kba1xkf1d1swjv2vi6lk6zzjy2wdb")))) > + (build-system ant-build-system) > + (arguments > + `(#:build-target "dist" > + #:tests? #f ; no tests included > + #:phases > + (modify-phases %standard-phases > + (replace 'install (install-jars "dist"))))) > + (native-inputs > + `(("unzip" ,unzip))) > + (home-page "http://www.jcraft.com/jsch/") > + (synopsis "Pure Java implementation of SSH2") > + (description "JSch is a pure Java implementation of SSH2. JSch allows you > +to connect to an SSH server and use port forwarding, X11 forwarding, file > +transfer, etc., and you can integrate its functionality into your own Java > +programs.") > + (license license:bsd-3))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") LGTM! And this looks like an interesting library. Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 36/36] gnu: Add java-commons-compress. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449284522185 (code B ref 26803); Thu, 11 May 2017 08:55:02 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:54:05 +0000 Received: from localhost ([127.0.0.1]:37649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jrI-0005lk-Tp for submit@debbugs.gnu.org; Thu, 11 May 2017 04:54:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8jrH-0005lH-H5 for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:54:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8jr8-00018H-7y for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:53:58 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8jr8-00018D-4O; Thu, 11 May 2017 04:53:54 -0400 Received: from [143.121.198.177] (port=45910 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8jr7-0006XE-JA; Thu, 11 May 2017 04:53:53 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-36-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <20170506153617.3074-36-rekado@elephly.net> Date: Thu, 11 May 2017 10:53:49 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > * gnu/packages/java.scm (java-commons-compress): New variable. > --- > gnu/packages/java.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm > index 8ecd5bbfc..35e1c315e 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -2275,6 +2275,50 @@ transfer, etc., and you can integrate its functionality into your own Java > programs.") > (license license:bsd-3))) > > +(define-public java-commons-compress > + (package > + (name "java-commons-compress") > + (version "1.13") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/commons/compress/source/" > + "commons-compress-" version "-src.tar.gz")) > + (sha256 > + (base32 > + "1vjqvavrn0babffn1kciz6v52ibwq2vwhzlb95hazis3lgllnxc8")))) > + (build-system ant-build-system) > + (arguments > + `(#:jar-name "commons-compress.jar" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'delete-bad-tests > + (lambda _ > + (with-directory-excursion "src/test/java/org/apache/commons/compress/" > + ;; FIXME: These tests really should not fail. Maybe they are > + ;; indicative of problems with our Java packaging work. We should definitely take note of this. > + ;; This test fails with a null pointer exception. > + (delete-file "archivers/sevenz/SevenZOutputFileTest.java") > + > + ;; This test fails to open test resources. > + (delete-file "archivers/zip/ExplodeSupportTest.java") > + > + ;; FIXME: This test adds a dependency on powermock, which is hard to > + ;; package at this point. > + ;; https://github.com/powermock/powermock > + (delete-file "archivers/sevenz/SevenZNativeHeapTest.java")) > + #t))))) > + (inputs > + `(("java-junit" ,java-junit) > + ("java-hamcrest-core" ,java-hamcrest-core) > + ("java-mockito" ,java-mockito-1) > + ("java-xz" ,java-xz))) > + (home-page "https://commons.apache.org/proper/commons-compress/") > + (synopsis "Java library for working with compressed files") > + (description "The Apache Commons Compress library defines an API for > +working with compressed files such as ar, cpio, Unix dump, tar, zip, gzip, XZ, > +Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE, lz4 and Z files.") > + (license license:asl2.0))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") LGTM. I think this concludes the first batch of Java packages. Thanks a lot for this very important work! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 27/36] gnu: Add java-mockito-1. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 08:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449304622503 (code B ref 26803); Thu, 11 May 2017 08:58:02 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 08:57:26 +0000 Received: from localhost ([127.0.0.1]:37660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8juX-0005qs-MQ for submit@debbugs.gnu.org; Thu, 11 May 2017 04:57:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8juW-0005qU-Mi for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:57:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8juN-0002ut-LH for 26803@debbugs.gnu.org; Thu, 11 May 2017 04:57:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8juN-0002uO-D5; Thu, 11 May 2017 04:57:15 -0400 Received: from [143.121.198.177] (port=45918 helo=cog147) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8juM-0006zn-GN; Thu, 11 May 2017 04:57:14 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-27-rekado@elephly.net> <871srvhkg9.fsf@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Roel Janssen In-reply-to: <871srvhkg9.fsf@elephly.net> Date: Thu, 11 May 2017 10:57:11 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > Roel Janssen writes: > >> Ricardo Wurmus writes: >> >>> * gnu/packages/java.scm (java-mockito): New variable. >>> --- >>> gnu/packages/java.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ >>> 1 file changed, 60 insertions(+) >>> >>> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm >>> index 859f9934a..2cf2821c0 100644 >>> --- a/gnu/packages/java.scm >>> +++ b/gnu/packages/java.scm >>> @@ -1977,6 +1977,66 @@ logging implementations. A library that uses the commons-logging API can be >>> used with any logging implementation at runtime.") >>> (license license:asl2.0))) >>> >>> +;; This is the last release of the 1.x series. >>> +(define-public java-mockito-1 >>> + (package >>> + (name "java-mockito") >>> + (version "1.10.19") >>> + (source (origin >>> + (method url-fetch) >>> + (uri (string-append "http://repo1.maven.org/maven2/" >>> + "org/mockito/mockito-core/" version >>> + "/mockito-core-" version "-sources.jar")) >>> + (sha256 >>> + (base32 >>> + "0vmiwnwpf83g2q7kj1rislmja8fpvqkixjhawh7nxnygx6pq11kc")))) >>> + (build-system ant-build-system) >>> + (arguments >>> + `(#:jar-name "mockito.jar" >>> + #:tests? #f ; no tests included >>> + ;; FIXME: patch-and-repack does not support jars, so we have to apply >>> + ;; patches in build phases. >>> + #:phases >>> + (modify-phases %standard-phases >>> + ;; Mockito fails to build with our verson of hamcrest without this >>> + ;; definition. >>> + (add-after 'unpack 'fix-hamcrest-build-error >>> + (lambda _ >>> + (substitute* "src/org/mockito/internal/matchers/LocalizedMatcher.java" >>> + (("public Matcher getActualMatcher\\(\\) .*" line) >>> + (string-append " >>> + public void describeMismatch(Object item, Description description) { >>> + actualMatcher.describeMismatch(item, description); >>> + }" >>> + line))) >>> + #t)) >> >> I understand this is easier and possibly less error-prone than creating >> a patch file instead, but how far are we going with adding/removing code >> inside the package recipes? > > There’s a FIXME comment above the #:phases. I would like to use a patch > in this case, but patch-and-repack does not support jars. We usually > unpack the sources, apply the patches, and then repack the sources, but > this currently doesn’t work for jars. > > This is why I must do this in build phases. Right. Too bad this doesn't work for Java archives. >> As far as the actual code addition goes, it is pretty straightforward: >> It adds a function that hamcrest expects is available. Maybe add a >> comment describing this? Then it's OK to me. > > Okay, I’ll add a better comment here. > > Thanks! Okay. LGTM! Kind regards, Roel Janssen From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 24/36] gnu: Add java-jsr305. Resent-From: julien lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 09:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149449488632213 (code B ref 26803); Thu, 11 May 2017 09:29:01 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 09:28:06 +0000 Received: from localhost ([127.0.0.1]:37706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8kOE-0008NV-FP for submit@debbugs.gnu.org; Thu, 11 May 2017 05:28:06 -0400 Received: from dau94-h03-89-91-205-84.dsl.sta.abo.bbox.fr ([89.91.205.84]:33283 helo=skaro.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8kOC-0008N1-OX for 26803@debbugs.gnu.org; Thu, 11 May 2017 05:28:05 -0400 Received: from localhost (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTP id 782167FAA6 for <26803@debbugs.gnu.org>; Thu, 11 May 2017 11:27:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=lepiller.eu; s=default; t=1494494878; bh=0IUcn9Gpote40CKyyfdotNH76ZKsIIRcwLWF0EJFRTQ=; h=Date:From:To:Subject:In-Reply-To:References:From; b=lAT4FbuP2K4QMx9SCd5sH4vBkxONM4vK8rp1frlmbi2/+Pc75cbZ0Gza5N5/+C69j R1CRFwkjitimBuF76srB9FGSDwgF03FlolqNBPfrlRhNmwZ8L/cNyn8RRUA1J/IcjX 4h+5kICNIvAXUWcnY2X+Mx2SRFNbhQF6yGq88pfkMZvguYmncNw6MzBbKDEBtNgoSi nB4YWhcw+lxe9zwejd853in3jsZ6V02KJSHDItFC3CflC9yop5WrpXookdCOktjIj1 q2jvOiqy1XRkiKkpcAMC2YRo/IVapvbNYMj0Ol2vGdPqBaFXV0q1Mnaj/rMvb7bwN8 roPzENs8OukLr1KrMt6+OHDUBCsgCAuMJSjgHZpr7DQKWkJ/+Ee5KsT1b3fz8I+Xo4 a4TzJvORMtYgNZApoJmBs+tTlbZ6+2q3or9lsn/ETiqcR5GW6dpNitupF4z/Zv5MZR YEZyZxlJCvIswFFCYdFZ1s2i+yY1ATk7BNOsA59s3BGQiUD+4R8pJpgPHd7JK681kW Dm6pbpe0NJzfeNzLX5dw6L8mqgKXTYGiaiocz2pS8BXh+VkAiKPqqg6z0xO0b8YmhQ vuUAs8evOWRPcMc+X0Gt7qGdXrIOIolE2NyDfVYuc6jdHiJB7g/MtTN2X/Wi+N5JXP CtE6dMkeCaYuFWNxwrwKzBuM= X-Virus-Scanned: Debian amavisd-new at lepiller.eu Received: from skaro.lepiller.eu ([127.0.0.1]) by localhost (lepiller.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IKudZd18CLCY for <26803@debbugs.gnu.org>; Thu, 11 May 2017 11:27:52 +0200 (CEST) Received: from webmail.lepiller.eu (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTPA id 0432C7F8A7 for <26803@debbugs.gnu.org>; Thu, 11 May 2017 11:27:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=lepiller.eu; s=default; t=1494494872; bh=0IUcn9Gpote40CKyyfdotNH76ZKsIIRcwLWF0EJFRTQ=; h=Date:From:To:Subject:In-Reply-To:References:From; b=pP6s9mR+nR9MzOFHiyC/clMe/ifmDBQ5kCrcGVpbQ+KkzGlC/5MNRfMO4QoQq0w1R veZxaZ44AHzMQGXVzn9u1Wa6+JmGx2RQkZ2ZZlJtFJZoOieHHUKvQukUflpTg1+OvO 0IzQ9ffJZ9zoFGKwN/IukwIijmkKRvmcS+0CuxQXUQx54BA0uxXmjzFf8AxyJdkoie ruG8Afn7tjFPU5Ep3pj2pkaTS03ZIc735MclEuI/h+BT9dEonhM+JLEmAiaWzVIumt RzlIOD3zaC9asKc3v9T578ZM8OuaUgwwINkhIv0LhPA1ytdukTmhRn33RAOSQx3/+P TK+B9ffBO1+Cq3j7fJSGMwKNn1c5wOANkpFa8q3qPsY9xrbWAVlDl9GGdiVL6LG/eP JPj/uhKoSYHeJrHVnhuvyymHhUsKXdzSs5BUHmDO7n2pAtu2b2w71YInBgu/V24Rci VRcfZU/j5N40a7HxGKgQDkh85lXcGF3Tl/jVmbS1ukzHrhiAViRHFyx7fmv8rrEiGM tHtP8JV2fkHQM8Zt5PvFpGmNg+1OlDc/2Y5M5HSHIplYiTVEZcycSpwmKI2hjSpARd /tJJkrH5R2gdVahy4N3poITOgQMyAtghlqGmkx8MyYn2sT93BG0u8Z98zF27AheBDA A9sgzsRkNlEiqBm6OscVDyUY= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Thu, 11 May 2017 11:27:51 +0200 From: julien lepiller In-Reply-To: <87d1bgbnc8.fsf@gnu.org> References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-24-rekado@elephly.net> <87d1bgbnc8.fsf@gnu.org> Message-ID: <9ba238e0365e1d0537dcf80c614c5c53@lepiller.eu> X-Sender: julien@lepiller.eu User-Agent: Roundcube Webmail/1.2.5 X-Spam-Score: 0.4 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.4 (/) Le 2017-05-10 20:04, Roel Janssen a écrit : > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-jsr305): New variable. >> --- >> gnu/packages/java.scm | 23 +++++++++++++++++++++++ >> 1 file changed, 23 insertions(+) >> >> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm >> index 8006b4d21..3a104f4c5 100644 >> --- a/gnu/packages/java.scm >> +++ b/gnu/packages/java.scm >> @@ -1855,6 +1855,29 @@ included: >> @end itemize\n") >> (license license:asl2.0))) >> >> +(define-public java-jsr305 >> + (package >> + (name "java-jsr305") >> + (version "3.0.1") >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "http://repo1.maven.org/maven2/" >> + "com/google/code/findbugs/" >> + "jsr305/" version "/jsr305-" >> + version "-sources.jar")) >> + (sha256 >> + (base32 >> + >> "1rh6jin9v7jqpq3kf1swl868l8i94r636n03pzpsmgr8v0lh9j2n")))) >> + (build-system ant-build-system) >> + (arguments >> + `(#:tests? #f ; no tests included >> + #:jar-name "jsr305.jar")) >> + (home-page "http://findbugs.sourceforge.net/") >> + (synopsis "Annotations for the static analyzer called findbugs") >> + (description "This package provides annotations for the findbugs >> package. >> +It provides packages in the @code{javax.annotations} namespace.") > > Yes! I think I start to understand it now. javax.annotations is > code-related because it's the name of the namespace.. Hence, @code{}. > >> + (license license:asl2.0))) >> + >> (define-public java-commons-cli >> (package >> (name "java-commons-cli") > > This looks straightforward, so LGTM! > > Kind regards, > Roel Janssen Hi, I found a version 3.0.2 on github, although I'm not sure whether that's the "official" jsr305 : (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/amaembo/jsr-305.git") (commit "d7734b13c61492982784560ed5b4f4bd6cf9bb2c"))) (file-name (string-append name "-" version)) (sha256 (base32 "1wk159136pgc6i54drbq2whazfmdilvfqlxj3k19s9dfwbayf621")))) From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 25/36] gnu: Add java-guava. Resent-From: julien lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 May 2017 09:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.1494495504684 (code B ref 26803); Thu, 11 May 2017 09:39:02 +0000 Received: (at 26803) by debbugs.gnu.org; 11 May 2017 09:38:24 +0000 Received: from localhost ([127.0.0.1]:37712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8kYC-0000Ax-GY for submit@debbugs.gnu.org; Thu, 11 May 2017 05:38:24 -0400 Received: from dau94-h03-89-91-205-84.dsl.sta.abo.bbox.fr ([89.91.205.84]:33356 helo=skaro.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8kYA-0000Ak-Pp for 26803@debbugs.gnu.org; Thu, 11 May 2017 05:38:23 -0400 Received: from localhost (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTP id A0FB57FAA6 for <26803@debbugs.gnu.org>; Thu, 11 May 2017 11:38:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=lepiller.eu; s=default; t=1494495496; bh=EmFQ7wLxvVVoc1DYB12FKCXu8FzchDXzk2cU9PRbhII=; h=Date:From:To:Subject:In-Reply-To:References:From; b=PPKY2yAiZewddbkrkPqQh5dO/pUTGY2FOGLG8erJDTXphP0wZukU7Y6+lEuzrw0+t gopoZVtkjKE4jxKX08juPYljvpmVMIbrVjElt9eEqZ7vJlZbpaEcMFlj9XOWA7uYeO rWvN+H8m+cyMQqEDVUCwBDaGeA+vtiNn4Nk8XucffpltTC8ILTEK0WyDGt9ZJBO9BD RuYbD9mJLl+qWfG0OH28pb11Mk6NOUCaWNV7xCZW85z2blC3fp4UQIvGIjRXOAV1oV zy+/aG/Ee7ydenM72y6FiVnJ70dZxHOWb5K78kz7IMGyGNJ9oTlesqLnwOjocjQc7e 9DeEarUkOzE36asd8N2ABhc+PPqRAK7N+2vyP+hsw48EHKHiSz0qdwpMUbEjkKytvh 9MUBWPthqBLMhFUoIWY1ufL4BfeCtdEsZi7gglVlwQVOs5ciITCuI6Z7jg1Z662rRV aitEj/5jzGZKhMGIiplPtLSMVb8Ma+J44t/StaBXhR3Usjha24FJ64lFfI6kRELcZa lnLMFdbW0yL76KtxB86VI51FqK2BBNbDGF+J2XfyK/e+Zt8S4z5zZQQdxNGcSo/P7X vz6Dj1O6xmC/4Skqot8HUQvVwIirJcPjnLLBHo696u4L4G2HfdMawwOfgQGUAvN/4/ VvIj08qg/RXCQTv7iEzQnJEU= X-Virus-Scanned: Debian amavisd-new at lepiller.eu Received: from skaro.lepiller.eu ([127.0.0.1]) by localhost (lepiller.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WF_46b_FPwWf for <26803@debbugs.gnu.org>; Thu, 11 May 2017 11:38:11 +0200 (CEST) Received: from webmail.lepiller.eu (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTPA id 978E97F8A7 for <26803@debbugs.gnu.org>; Thu, 11 May 2017 11:38:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=lepiller.eu; s=default; t=1494495490; bh=EmFQ7wLxvVVoc1DYB12FKCXu8FzchDXzk2cU9PRbhII=; h=Date:From:To:Subject:In-Reply-To:References:From; b=CBHna6KXmViSX9JkRbiMWpLg1sHz6bfS6ZqnSGam4r4vwnRKPz0FxwxBOPwmJpwc7 2fWThFrWIpIRjCtlPvEstEtFHsidAWAGPVADO6D5BUg4xUWx+cEIYT2y44h7OV+ov0 RdUcUYYhWutCwHF0B7pvQ6bIKKAhZ9Q2b2hWhbrQpdaA9VZG7kLAzs5TYGyRb4IJ4u VLfyOp0sT9nrxXkWgig0MHxLqWO5lLXAox6i2np4NUetUWKfhKK3XhBoTHmuEY/PWM F4X0/3Av0d/+aK1Z/Hkna/Cvx1wxyj9XxNVj9BoUDwFs4D6+n1kXepz+UJ519IVavk ibsmPzmo9EaFriNCuGqn4O6sGaNWM/Fv2JD7T7ss64Urt+uYZAxYEICD9m1tYPTEDD rqiEHMkXBAg4Yj41CLpslrJ/vMtSKgoI4VOxobfh3Sf2jQ0pL1rfBLUrg1gEIe8D80 ECkfjsAmHTMMWBzD4n5982WT5aSuOSXP/Xip516dp3XQo3oDRgOgYJhsrbmF94WzaV RehWeoaaALcQ0qUibWmgvt8mNI0DWSaHO7RaWEAypc30xJ/p1KKhbugH0wZI4j/XYs 0e+oPzmkZbX7ssZG/FU4nncsMndhzmjIcI7dwpBEzKalz8BT2hD1C5nkxW5VxjxC0W GY8+V71QBJhxfcBLgEC/ZeqQ= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Thu, 11 May 2017 11:38:10 +0200 From: julien lepiller In-Reply-To: <20170506153617.3074-25-rekado@elephly.net> References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-25-rekado@elephly.net> Message-ID: <85ba3b6cdecd80a6cae89a9d58d6d0d9@lepiller.eu> X-Sender: julien@lepiller.eu User-Agent: Roundcube Webmail/1.2.5 X-Spam-Score: 0.4 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.4 (/) Le 2017-05-06 17:36, Ricardo Wurmus a écrit : > * gnu/packages/java.scm (java-guava): 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 3a104f4c5..a9faf681d 100644 > --- a/gnu/packages/java.scm > +++ b/gnu/packages/java.scm > @@ -1878,6 +1878,58 @@ included: > It provides packages in the @code{javax.annotations} namespace.") > (license license:asl2.0))) > > +(define-public java-guava > + (package > + (name "java-guava") > + ;; This is the last release of Guava that can be built with Java > 7. > + (version "20.0") > + (source (origin > + (method url-fetch) > + (uri (string-append "https://github.com/google/guava/" > + "releases/download/v" version > + "/guava-" version "-sources.jar")) > + (sha256 > + (base32 > + > "1gawrs5gi6j5hcfxdgpnfli75vb9pfi4sn09pnc8xacr669yajwr")))) > + (build-system ant-build-system) > + (arguments > + `(#:tests? #f ; no tests included > + #:jar-name "guava.jar" > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'trim-sources > + (lambda _ > + (with-directory-excursion "src/com/google/common" > + ;; Remove annotations to avoid extra dependencies: > + ;; * "j2objc" annotations are used when converting Java > to > + ;; Objective C; > + ;; * "errorprone" annotations catch common Java > mistakes at > + ;; compile time; > + ;; * "IgnoreJRERequirement" is used for Android. > + (substitute* (find-files "." "\\.java$") > + (("import com.google.j2objc.*") "") > + (("import com.google.errorprone.annotation.*") "") > + (("import org.codehaus.mojo.animal_sniffer.*") "") > + (("@CanIgnoreReturnValue") "") > + (("@LazyInit") "") > + (("@WeakOuter") "") > + (("@RetainedWith") "") > + (("@Weak") "") > + (("@ForOverride") "") > + (("@J2ObjCIncompatible") "") > + (("@IgnoreJRERequirement") ""))) > + #t))))) > + (inputs > + `(("java-jsr305" ,java-jsr305))) > + (home-page "https://github.com/google/guava") > + (synopsis "Google core libraries for Java") > + (description "Guava is a set of core libraries that includes new > +collection types (such as multimap and multiset), immutable > collections, a > +graph library, functional types, an in-memory cache, and > APIs/utilities for > +concurrency, I/O, hashing, primitives, reflection, string processing, > and much > +more!") > + (license license:asl2.0))) > + > (define-public java-commons-cli > (package > (name "java-commons-cli") Hi, I have a recipe for errorprone, j2objc and animal-sniffer, although they're still WIP. I simply split them in two, one part with the annotations only that are required for guava, and the rest that requires guava. This requires patches to get two separate jar files. I'll send something this evening. Anyway, if that works, I think we can start by this recipe and add the annotation packages later. From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 31/36] gnu: Add java-httpcomponents-httpclient. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 19:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149487749126187 (code B ref 26803); Mon, 15 May 2017 19:45:01 +0000 Received: (at 26803) by debbugs.gnu.org; 15 May 2017 19:44:51 +0000 Received: from localhost ([127.0.0.1]:46935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dALvG-0006oI-P7 for submit@debbugs.gnu.org; Mon, 15 May 2017 15:44:50 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dALvE-0006oA-TN for 26803@debbugs.gnu.org; Mon, 15 May 2017 15:44:49 -0400 Received: from localhost (port-92-200-147-163.dynamic.qsc.de [92.200.147.163]) by mx.zohomail.com with SMTPS id 1494877486506953.6612693364783; Mon, 15 May 2017 12:44:46 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-31-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Mon, 15 May 2017 21:44:43 +0200 Message-ID: <877f1h7vmc.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-httpcomponents-httpclient): New variable. >> --- >> gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ >> 1 file changed, 36 insertions(+) >> >> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm >> index 19642cbfc..ee3a2bd2b 100644 >> --- a/gnu/packages/java.scm >> +++ b/gnu/packages/java.scm >> @@ -2113,6 +2113,42 @@ NIO."))) >> (description "This package provides the HttpCore benchmarking tool. It is >> an Apache AB clone based on HttpCore."))) >> >> +(define-public java-httpcomponents-httpclient >> + (package >> + (name "java-httpcomponents-httpclient") >> + (version "4.5.3") >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "mirror://apache/httpcomponents/httpclient/" >> + "source/httpcomponents-client-" >> + version "-src.tar.gz")) >> + (sha256 >> + (base32 >> + "1428399s7qy3cim5wc6f3ks4gl9nf9vkjpfmnlap3jflif7g2pj1")))) >> + (build-system ant-build-system) >> + (arguments >> + `(#:jar-name "httpcomponents-httpclient.jar" >> + #:phases >> + (modify-phases %standard-phases >> + (add-after 'unpack 'chdir >> + (lambda _ (chdir "httpclient") #t))))) >> + (inputs >> + `(("java-commons-logging-minimal" ,java-commons-logging-minimal) >> + ("java-commons-codec" ,java-commons-codec) >> + ("java-hamcrest-core" ,java-hamcrest-core) >> + ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) >> + ("java-mockito" ,java-mockito-1) >> + ("java-junit" ,java-junit))) >> + (home-page "https://hc.apache.org/httpcomponents-client-ga/") >> + (synopsis "HTTP client library for Java") >> + (description "Although the @code{java.net} package provides basic > > I thought package names weren't supposed to be @code{}ed. This is a Java namespace, not a Guix package. It is only used in import statements, so it’s code. “java.net” belongs to the standard library, so it also doesn’t have a separate project name (unlike these Apache projects). -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 33/36] gnu: Add java-commons-httpclient. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 19:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149487783126690 (code B ref 26803); Mon, 15 May 2017 19:51:01 +0000 Received: (at 26803) by debbugs.gnu.org; 15 May 2017 19:50:31 +0000 Received: from localhost ([127.0.0.1]:46939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAM0l-0006wQ-FS for submit@debbugs.gnu.org; Mon, 15 May 2017 15:50:31 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAM0i-0006wH-Sc for 26803@debbugs.gnu.org; Mon, 15 May 2017 15:50:29 -0400 Received: from localhost (port-92-200-147-163.dynamic.qsc.de [92.200.147.163]) by mx.zohomail.com with SMTPS id 1494877826699721.7979773747288; Mon, 15 May 2017 12:50:26 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-33-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Mon, 15 May 2017 21:50:23 +0200 Message-ID: <8760h17vcw.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-commons-httpclient): New variable. >> --- […] > I guess we need it for some dependency. Is it possible to use the > java-httpcomponents-httpclient for these? Unfortunately, java-httpcomponents-httpclient has a completely different API, so it cannot be used as a drop-in replacement. > If we really need this package, then the recipe looks good to me, but I > think it'be better to not need an already deprecated version of > something that does networking stuff. I agree. My current patch sets do not include packages that need it, so I’ll drop it. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 34/36] gnu: Add java-commons-net. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 19:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149487804627000 (code B ref 26803); Mon, 15 May 2017 19:55:02 +0000 Received: (at 26803) by debbugs.gnu.org; 15 May 2017 19:54:06 +0000 Received: from localhost ([127.0.0.1]:46943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAM4D-00071Q-VZ for submit@debbugs.gnu.org; Mon, 15 May 2017 15:54:06 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21027) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAM4C-00071H-4e for 26803@debbugs.gnu.org; Mon, 15 May 2017 15:54:04 -0400 Received: from localhost (port-92-200-147-163.dynamic.qsc.de [92.200.147.163]) by mx.zohomail.com with SMTPS id 1494878040327815.5113142837835; Mon, 15 May 2017 12:54:00 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-34-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Mon, 15 May 2017 21:53:57 +0200 Message-ID: <874lwl7v6y.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-commons-net): New variable. >> --- […] >> + (arguments >> + `(;; FIXME: MainTest.java tries to read "examples.properties" (which >> + ;; should be "resources/examples/examples.properties"), but gets "null" >> + ;; instead. > > This sounds fixable in a substitute construct. But maybe I am wrong > about it. Would you like to try that first? I tried it, but it’s more complicated than just a substitution. It could be a problem of the ant-build-system’s default “build.xml”, which might not include do the right thing for resources. I don’t know yet what the right thing would be, and it’s just a guess. Although I don’t like the ambiguity, I’d rather investigate this later and keep the FIXME for now. We’ll be able to detect problems with the ant-build-system only once we have enough Java packages to actually build big applications. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 35/36] gnu: Add java-jsch. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 19:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Roel Janssen Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.149487810227103 (code B ref 26803); Mon, 15 May 2017 19:56:02 +0000 Received: (at 26803) by debbugs.gnu.org; 15 May 2017 19:55:02 +0000 Received: from localhost ([127.0.0.1]:46956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAM57-00072s-6r for submit@debbugs.gnu.org; Mon, 15 May 2017 15:55:01 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAM54-00072j-Ri for 26803@debbugs.gnu.org; Mon, 15 May 2017 15:54:59 -0400 Received: from localhost (port-92-200-147-163.dynamic.qsc.de [92.200.147.163]) by mx.zohomail.com with SMTPS id 149487809170068.49529120783075; Mon, 15 May 2017 12:54:51 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-35-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Mon, 15 May 2017 21:54:49 +0200 Message-ID: <8737c57v5i.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-jsch): 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 287a7ae69..8ecd5bbfc 100644 >> --- a/gnu/packages/java.scm >> +++ b/gnu/packages/java.scm >> @@ -2247,6 +2247,34 @@ many basic Internet protocols. The purpose of the library is to provide >> fundamental protocol access, not higher-level abstractions.") >> (license license:asl2.0))) >> >> +(define-public java-jsch >> + (package >> + (name "java-jsch") >> + (version "0.1.54") >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "mirror://sourceforge/jsch/jsch/" >> + version "/jsch-" version ".zip")) >> + (sha256 >> + (base32 >> + "029rdddyq1mh3ghryh3ki99kba1xkf1d1swjv2vi6lk6zzjy2wdb")))) >> + (build-system ant-build-system) >> + (arguments >> + `(#:build-target "dist" >> + #:tests? #f ; no tests included >> + #:phases >> + (modify-phases %standard-phases >> + (replace 'install (install-jars "dist"))))) >> + (native-inputs >> + `(("unzip" ,unzip))) >> + (home-page "http://www.jcraft.com/jsch/") >> + (synopsis "Pure Java implementation of SSH2") >> + (description "JSch is a pure Java implementation of SSH2. JSch allows you >> +to connect to an SSH server and use port forwarding, X11 forwarding, file >> +transfer, etc., and you can integrate its functionality into your own Java >> +programs.") >> + (license license:bsd-3))) >> + >> (define-public java-commons-cli >> (package >> (name "java-commons-cli") > > LGTM! And this looks like an interesting library. Yes, but it cannot only be used with Java… :) -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From unknown Sat Sep 13 08:57:08 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ricardo Wurmus Subject: bug#26803: closed (Re: bug#26803: [PATCH 36/36] gnu: Add java-commons-compress.) Message-ID: References: <871srp7v21.fsf@elephly.net> <87wp9u2ifa.fsf@elephly.net> X-Gnu-PR-Message: they-closed 26803 X-Gnu-PR-Package: guix-patches Reply-To: 26803@debbugs.gnu.org Date: Mon, 15 May 2017 19:58:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1494878282-27364-1" This is a multi-part message in MIME format... ------------=_1494878282-27364-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26803: Java things which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26803@debbugs.gnu.org. --=20 26803: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26803 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1494878282-27364-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26803-done) by debbugs.gnu.org; 15 May 2017 19:57:15 +0000 Received: from localhost ([127.0.0.1]:46961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAM7G-00076R-QD for submit@debbugs.gnu.org; Mon, 15 May 2017 15:57:14 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAM7F-00076J-JI for 26803-done@debbugs.gnu.org; Mon, 15 May 2017 15:57:13 -0400 Received: from localhost (port-92-200-147-163.dynamic.qsc.de [92.200.147.163]) by mx.zohomail.com with SMTPS id 149487822978181.8754056776927; Mon, 15 May 2017 12:57:09 -0700 (PDT) References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-36-rekado@elephly.net> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Ricardo Wurmus To: Roel Janssen Subject: Re: bug#26803: [PATCH 36/36] gnu: Add java-commons-compress. In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Mon, 15 May 2017 21:56:54 +0200 Message-ID: <871srp7v21.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-Debbugs-Envelope-To: 26803-done Cc: 26803-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) Roel Janssen writes: > Ricardo Wurmus writes: > >> * gnu/packages/java.scm (java-commons-compress): New variable. >> --- […] >> + (arguments >> + `(#:jar-name "commons-compress.jar" >> + #:phases >> + (modify-phases %standard-phases >> + (add-after 'unpack 'delete-bad-tests >> + (lambda _ >> + (with-directory-excursion "src/test/java/org/apache/commons/compress/" >> + ;; FIXME: These tests really should not fail. Maybe they are >> + ;; indicative of problems with our Java packaging work. > > We should definitely take note of this. Indeed. This really looks like a problem with the ant-build-system as I wrote in another email. > I think this concludes the first batch of Java packages. > > Thanks a lot for this very important work! Yay! Thank you so much for taking the time to review this mess! I’m closing this bug and will push the remaining packages in a moment. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net ------------=_1494878282-27364-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 6 May 2017 14:01:53 +0000 Received: from localhost ([127.0.0.1]:58134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d70HR-0008Ss-4l for submit@debbugs.gnu.org; Sat, 06 May 2017 10:01:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d70HO-0008Sd-O8 for submit@debbugs.gnu.org; Sat, 06 May 2017 10:01:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d70HI-0004aE-Fs for submit@debbugs.gnu.org; Sat, 06 May 2017 10:01:45 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d70HI-0004aA-DA for submit@debbugs.gnu.org; Sat, 06 May 2017 10:01:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d70HH-0005Cm-5c for guix-patches@gnu.org; Sat, 06 May 2017 10:01:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d70HE-0004ZV-4t for guix-patches@gnu.org; Sat, 06 May 2017 10:01:43 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21049) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d70HD-0004ZP-Tt for guix-patches@gnu.org; Sat, 06 May 2017 10:01:40 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1494079292799889.4724693947061; Sat, 6 May 2017 07:01:32 -0700 (PDT) User-agent: mu4e 0.9.18; emacs 25.1.1 From: Ricardo Wurmus To: guix-patches@gnu.org Subject: Java things X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Sat, 06 May 2017 16:01:29 +0200 Message-ID: <87wp9u2ifa.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) Several months ago Hartmut posted a couple of unfinished patches to guix-devel. I thought it wouldn’t be too hard to finish them. I was wrong. I still haven’t gotten all of them to build because to do things right I would need to package way too many things. This is a subset of my work to clean up Hartmut’s original patches. The remaining packages require “reflections”, which depends on tomcat and many more unpackaged Java things. I’d just like to get rid of this local branch, to be honest. Note that I had to edit a couple of package sources to cut out dependencies that would have taken too long to package. These changes can be reverted in the future if a better way can be found to handle these cases without introducing dependency cycles. I’ll post the patches once I’ve confirmed that all of them still build with the latest version of Guix. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net ------------=_1494878282-27364-1-- From unknown Sat Sep 13 08:57:08 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26803: [PATCH 31/36] gnu: Add java-httpcomponents-httpclient. Resent-From: Roel Janssen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2017 21:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Cc: 26803@debbugs.gnu.org Received: via spool by 26803-submit@debbugs.gnu.org id=B26803.14948836662911 (code B ref 26803); Mon, 15 May 2017 21:28:01 +0000 Received: (at 26803) by debbugs.gnu.org; 15 May 2017 21:27:46 +0000 Received: from localhost ([127.0.0.1]:47043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dANWs-0000ks-8q for submit@debbugs.gnu.org; Mon, 15 May 2017 17:27:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dANWq-0000kg-F7 for 26803@debbugs.gnu.org; Mon, 15 May 2017 17:27:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dANWg-0005Pc-Ua for 26803@debbugs.gnu.org; Mon, 15 May 2017 17:27:39 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55082) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dANWg-0005PV-QG; Mon, 15 May 2017 17:27:34 -0400 Received: from ip112-245-209-87.adsl2.static.versatel.nl ([87.209.245.112]:57459 helo=antelope) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dANWf-0005ua-Av; Mon, 15 May 2017 17:27:33 -0400 References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-31-rekado@elephly.net> <877f1h7vmc.fsf@elephly.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Roel Janssen In-reply-to: <877f1h7vmc.fsf@elephly.net> Date: Mon, 15 May 2017 23:26:51 +0200 Message-ID: <87k25hdd5w.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Ricardo Wurmus writes: > Roel Janssen writes: > >> Ricardo Wurmus writes: >> >>> * gnu/packages/java.scm (java-httpcomponents-httpclient): New variable. >>> --- >>> gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++ >>> 1 file changed, 36 insertions(+) >>> >>> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm >>> index 19642cbfc..ee3a2bd2b 100644 >>> --- a/gnu/packages/java.scm >>> +++ b/gnu/packages/java.scm >>> @@ -2113,6 +2113,42 @@ NIO."))) >>> (description "This package provides the HttpCore benchmarking tool. It is >>> an Apache AB clone based on HttpCore."))) >>> >>> +(define-public java-httpcomponents-httpclient >>> + (package >>> + (name "java-httpcomponents-httpclient") >>> + (version "4.5.3") >>> + (source (origin >>> + (method url-fetch) >>> + (uri (string-append "mirror://apache/httpcomponents/httpclient/" >>> + "source/httpcomponents-client-" >>> + version "-src.tar.gz")) >>> + (sha256 >>> + (base32 >>> + "1428399s7qy3cim5wc6f3ks4gl9nf9vkjpfmnlap3jflif7g2pj1")))) >>> + (build-system ant-build-system) >>> + (arguments >>> + `(#:jar-name "httpcomponents-httpclient.jar" >>> + #:phases >>> + (modify-phases %standard-phases >>> + (add-after 'unpack 'chdir >>> + (lambda _ (chdir "httpclient") #t))))) >>> + (inputs >>> + `(("java-commons-logging-minimal" ,java-commons-logging-minimal) >>> + ("java-commons-codec" ,java-commons-codec) >>> + ("java-hamcrest-core" ,java-hamcrest-core) >>> + ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore) >>> + ("java-mockito" ,java-mockito-1) >>> + ("java-junit" ,java-junit))) >>> + (home-page "https://hc.apache.org/httpcomponents-client-ga/") >>> + (synopsis "HTTP client library for Java") >>> + (description "Although the @code{java.net} package provides basic >> >> I thought package names weren't supposed to be @code{}ed. > > This is a Java namespace, not a Guix package. It is only used in import > statements, so it’s code. “java.net” belongs to the standard library, > so it also doesn’t have a separate project name (unlike these Apache > projects). Maybe the "... @code{java.net} >>>package<<<" should be rephrased to "... @code{java.net} namespace provided by this package ...". Either way is fine though, this is nitpicking at its finest.. ;) Kind regards, Roel Janssen