From patchwork Sun Oct 16 08:48:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43438 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 31AB227BBEA; Sun, 16 Oct 2022 09:50:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4E82027BBE9 for ; Sun, 16 Oct 2022 09:50:56 +0100 (BST) Received: from localhost ([::1]:33840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojzMF-00062Q-Fq for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 04:50:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojzLO-00061z-Rn for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojzLO-0000TE-Iq for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojzLO-0005qx-E9 for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 1/8] gnu: Add java-brotli. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 08:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58553@debbugs.gnu.org Received: via spool by 58553-submit@debbugs.gnu.org id=B58553.166591014122327 (code B ref 58553); Sun, 16 Oct 2022 08:50:02 +0000 Received: (at 58553) by debbugs.gnu.org; 16 Oct 2022 08:49:01 +0000 Received: from localhost ([127.0.0.1]:43299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKO-0005ny-Vx for submit@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:01 -0400 Received: from lepiller.eu ([89.234.186.109]:56966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKK-0005nc-Il for 58553@debbugs.gnu.org; Sun, 16 Oct 2022 04:48:59 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id aa0e2332 for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=HKVDEWt66n0o6qMvjAvIT6oSJ IKGYnHThd0BFHe5IPU=; b=D8kabwfnlzVS0K/Lq0GhMpfN16PvUvIwCuB0Zrf1z VZRa0jl7W6on8L+bL22ZBFFKX6fBcHF4SrBj+U0AaXzZWEfm/vaA8zBXaatVbH9A 5cQQPyMmEnYz3PMzJcTstkdwe0yX8Pn4zGsX9xq5K3Djk/NDhbi4a0N19eoGCgLS mZyJJSKomlXHD8nwrJh6flz0oz6ou0KKwN9qar5bTIiUhyJVop0TlvW9isChPrG3 uvd5CaWa42O2kLAMxMxu0VRAzp67vDHcbsl0tUXgWrbnuxX+dEkgi0cD3GVVFCeO f7VK6Dbz65tcA31/g75cWkY0+jvrU/2q2EM/tYEkYQftg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id a62fbf39 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:53 +0000 (UTC) From: Julien Lepiller Date: Sun, 16 Oct 2022 10:48:31 +0200 Message-Id: <20221016084838.25584-1-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221015233630.4da3d935@sybil.lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/compression.scm (java-brotli): New variable. --- gnu/packages/compression.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 684979018c..8d47913713 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -58,6 +58,7 @@ (define-module (gnu packages compression) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system ant) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -81,6 +82,7 @@ (define-module (gnu packages compression) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) + #:use-module (gnu packages java) #:use-module (gnu packages llvm) #:use-module (gnu packages man) #:use-module (gnu packages maths) @@ -2239,6 +2241,19 @@ (define-public python-brotli (define-public python-google-brotli (deprecated-package "python-google-brotli" python-brotli)) +(define-public java-brotli + (package + (inherit brotli) + (name "java-brotli") + (build-system ant-build-system) + (arguments + `(#:jar-name "java-brotli.jar" + #:source-dir "java" + ;; Tests are mixed in with java sources, the ant build system + ;; doesn't allow that + #:tests? #f)) + (native-inputs (list java-junit)))) + (define-public ucl (package (name "ucl") From patchwork Sun Oct 16 08:48:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43444 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1618827BBEA; Sun, 16 Oct 2022 09:51:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8288327BBE9 for ; Sun, 16 Oct 2022 09:51:13 +0100 (BST) Received: from localhost ([::1]:50588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojzMW-0006yP-NM for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 04:51:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojzLP-00062G-PO for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojzLP-0000Yy-HM for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojzLP-0005rE-CC for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 2/8] gnu: Add java-zstd. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 08:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58553@debbugs.gnu.org Received: via spool by 58553-submit@debbugs.gnu.org id=B58553.166591014622387 (code B ref 58553); Sun, 16 Oct 2022 08:50:03 +0000 Received: (at 58553) by debbugs.gnu.org; 16 Oct 2022 08:49:06 +0000 Received: from localhost ([127.0.0.1]:43308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKT-0005ov-RW for submit@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:06 -0400 Received: from lepiller.eu ([89.234.186.109]:56966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKN-0005nc-UF for 58553@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:00 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ca2f539b for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=reEZcSOXCWRYQSwPrJMNKwxwv 73FbFM4vjy1r0jYuzk=; b=Zp7ET9ck2+ftQbwjRs9TvlAxs5cGm2M4TwZaslLP+ NeH0r8HRvld1HsrjTXToUyi3UyYabSg0/tfgOZ6FXWN+Z/AE/j8lQjLiCndx6Jl/ mLilkrwHjRkmuEs0k607hfMC7WugnGd+2SKDNXwo2PUdU2fvNRdYSg90g8eoSYjb eJBbp3yy1xAUYLUNOI4dGxu5y3o7yftYY8JFcnRUqVIjaBFvEbW1ONHh/EMJu7dy SMoQmOvPc7zPzoOBVbWmMRO5BB5nkRLoEjuLeD0NUzt+T9Xed7/QpcZhvTQ+ap8G TdKvhVgAc5HhI1JSinQCSKM/EsOpW//phvb7DTgB9EGfQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id da288574 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:53 +0000 (UTC) From: Julien Lepiller Date: Sun, 16 Oct 2022 10:48:32 +0200 Message-Id: <20221016084838.25584-2-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016084838.25584-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221016084838.25584-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-zstd): New variable. --- gnu/packages/java-compression.scm | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 32d04a2fa6..74bf335fcc 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -322,3 +322,43 @@ (define-public java-xz (description "Tukaani-xz is an implementation of xz compression/decompression algorithms in Java.") (license license:public-domain))) + +(define-public java-zstd + (package + (name "java-zstd") + (version "1.5.2-3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/luben/zstd-jni") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z26z04sc4j6k0g4gvq4xc86mc4wiyp1j7z5hh6wpqgmy9b6h2zb")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "java-zstd.jar" + #:source-dir "src/main/java" + #:tests? #f; Require scala + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-version + (lambda _ + (with-output-to-file "src/main/java/com/github/luben/zstd/util/ZstdVersion.java" + (lambda _ + (format #t "package com.github.luben.zstd.util; + +public class ZstdVersion { + public static final String VERSION = \"~a\"; +}" ,version)))))))) + (inputs + `(("zstd" ,zstd))) + (home-page "https://github.com/luben/zstd-jni") + (synopsis "JNI bindings for Zstd native library") + (description "Zstd, short for Zstandard, is a lossless compression +algorithm, which provides both good compression ratio and speed for standard +compression needs. This package provides JNI bindings for Zstd native +library that provides fast and high compression lossless algorithm for +Android, Java and all JVM languages.") + (license license:bsd-2))) From patchwork Sun Oct 16 08:48:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43442 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4A44B27BBEA; Sun, 16 Oct 2022 09:51:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 025E127BBE9 for ; Sun, 16 Oct 2022 09:51:07 +0100 (BST) Received: from localhost ([::1]:42864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojzMQ-0006bq-4S for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 04:51:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojzLP-000626-7V for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojzLO-0000TK-UP for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojzLO-0005r5-Py for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 3/8] gnu: Add java-ow-util-ant-tasks. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 08:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58553@debbugs.gnu.org Received: via spool by 58553-submit@debbugs.gnu.org id=B58553.166591014522380 (code B ref 58553); Sun, 16 Oct 2022 08:50:02 +0000 Received: (at 58553) by debbugs.gnu.org; 16 Oct 2022 08:49:05 +0000 Received: from localhost ([127.0.0.1]:43306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKT-0005os-Eq for submit@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:05 -0400 Received: from lepiller.eu ([89.234.186.109]:56974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKN-0005nh-UZ for 58553@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:00 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f0815dac for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=6ne3O5Wo9v/1PfF6FiCp9Yo5a e+P3AwHVRor9WGY1jw=; b=S1XIw2EhmfOnQDGiC3RB3CHWO/6bydmFNiSF6Af4y EIBAPn+iR71OqB7KLG2duguk1UtcByZdgrmfrRGxdgzXMbwl1D4ZGyLumTri13jD zJVn6GA8AxZ3FPdm+8PFgAhyedqhi/9dcY7CtouwxU37yssP+PzHhSdv1Yi5+mpf xBCPKZrVg7kq7skrgZEdKaE9pdCNLeq+LrqJzcOGYgqjVeQUi0X9IAsquaTc+RYN ZQ69Xzztho+8IY8GsnCVD3U3Gd8cjgxHyuqlKGpGZNQgVL8fe0b3C4Os50vtFMtG H4QxYqJjSZ6ThXiPPS0HLMv6Bk4uagrXs1t3BMDrtyhpQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 8ac28cd3 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:54 +0000 (UTC) From: Julien Lepiller Date: Sun, 16 Oct 2022 10:48:33 +0200 Message-Id: <20221016084838.25584-3-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016084838.25584-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221016084838.25584-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-ow-util-ant-tasks): 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 3ab324cce9..dec80d3e51 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5197,6 +5197,42 @@ (define-public java-modello-plugins-xpp3 (description "The modello XPP3 plugin generates XML readers and writers based on the XPP3 API (XML Pull Parser)."))) +(define-public java-ow-util-ant-tasks + (package + (name "java-ow-util-ant-tasks") + (version "1.3.2") + (source (origin + (method url-fetch) + (uri (string-append + "http://deb.debian.org/debian/pool/main/o/ow-util-ant-tasks/" + "ow-util-ant-tasks_" version ".orig.tar.gz")) + (sha256 + (base32 + "1y5ln1g36aligwcadqksdj18i5ghqnxn523wjbzy2zyd7w58fgy5")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "ow-util-ant-tasks.jar" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (add-before 'build 'delete-cyclic-dependency + (lambda _ + ;; This file depends on asm-3, which depends on this package + (delete-file "src/org/objectweb/util/ant/DependencyAnalyzer.java") + ;; This file depends on xalan + (delete-file "src/org/objectweb/util/ant/Xalan2Liaison.java"))) + (add-before 'build 'fix-new-ant + (lambda _ + (substitute* "src/org/objectweb/util/ant/MultipleCopy.java" + ((", destFile.getAbsolutePath\\(\\)") + ", new String[] { destFile.getAbsolutePath() }"))))))) + (home-page "https://packages.debian.org/source/stretch/ow-util-ant-tasks") + (synopsis "Replacement for base ant tasks") + (description "This library is used in the legacy build process of several +key frameworks developed by ObjectWeb, among them legacy versions of the +ObjectWeb ASM bytecode manipulation framework.") + (license license:lgpl2.0+))) + (define-public java-asm (package (name "java-asm") From patchwork Sun Oct 16 08:48:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43439 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B590627BBE9; Sun, 16 Oct 2022 09:50:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7CEB127BBE9 for ; Sun, 16 Oct 2022 09:50:58 +0100 (BST) Received: from localhost ([::1]:33844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojzMH-00063s-JP for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 04:50:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojzLQ-00062N-79 for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojzLP-0000d0-VS for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojzLP-0005rM-RK for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 4/8] gnu: Add java-asm-3. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 08:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58553@debbugs.gnu.org Received: via spool by 58553-submit@debbugs.gnu.org id=B58553.166591014622394 (code B ref 58553); Sun, 16 Oct 2022 08:50:03 +0000 Received: (at 58553) by debbugs.gnu.org; 16 Oct 2022 08:49:06 +0000 Received: from localhost ([127.0.0.1]:43310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKU-0005p2-7U for submit@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:06 -0400 Received: from lepiller.eu ([89.234.186.109]:56974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKO-0005nh-R1 for 58553@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:01 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 8770ed61 for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=78zBHbCaQnkx4ZD2TVQt7IkxC zafMhYvgw5VBURBGM4=; b=Ky0XQjnTr1QAJ79Yh5VSvBiI0R7naOPsbt27Z2efy qfaK75rdhrZmdgqz8MlnyswT5lqRjJHhWwXercRQsfTs/lbj53BgiVWS+9pxdMhV 0w6jfRHfqH1mB7R6+9n+W27/Ir3NY3P8TR9fzce/Yy+S/+wZQHfksjB1ZzmYM7YU VhqgEwYMfQcqZ9lyeL8DU1zXMqkviSURNODSEA2fZ8AKmbROtS8L7m4dRcDAB7Aa OKejUkAYgBB/9tKiP6/ewvUSs5wjXRRhS2jh6O1aB0xrCkXbKzQrXTPKwLLnJHF5 BzaN6iJwzWHnotBct9w2xWlLwmsgftB5mPg6AZL9mp81w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id cb6d11d1 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:54 +0000 (UTC) From: Julien Lepiller Date: Sun, 16 Oct 2022 10:48:34 +0200 Message-Id: <20221016084838.25584-4-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016084838.25584-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221016084838.25584-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-asm): New variable. --- gnu/packages/java.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index dec80d3e51..7bf29622e1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5332,6 +5332,31 @@ (define java-asm-bootstrap ((#:tests? _) #f))) (native-inputs `()))) +(define-public java-asm-3 + (package + (inherit java-asm) + (version "3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.ow2.org/asm/asm") + (commit "ASM_3_1"))) + (file-name (git-file-name "java-asm" version)) + (sha256 + (base32 + "0xbyf2sl8j6mrvfpg2da0vjdp906rac62l66gkk82x5cn3vc30h4")) + (modules '((guix build utils))) + (snippet `(for-each delete-file (find-files "." "\\.jar$"))))) + (arguments + `(#:build-target "jar" + #:test-target "test" + #:tests? #f; require legacy test software + #:phases + (modify-phases %standard-phases + (replace 'install (install-jars "output/dist")) + (delete 'generate-jar-indices)))) + (native-inputs (list java-ow-util-ant-tasks)))) + (define-public java-asm-8 (package (inherit java-asm) From patchwork Sun Oct 16 08:48:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43440 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 35D9027BBE9; Sun, 16 Oct 2022 09:50:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A802D27BBEA for ; Sun, 16 Oct 2022 09:50:58 +0100 (BST) Received: from localhost ([::1]:33852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojzMH-00064J-Qu for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 04:50:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojzLQ-00062U-Jy for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojzLQ-0000e3-CE for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojzLQ-0005rT-7f for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 5/8] gnu: java-commons-compress: Update to 1.21. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 08:50:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58553@debbugs.gnu.org Received: via spool by 58553-submit@debbugs.gnu.org id=B58553.166591014722402 (code B ref 58553); Sun, 16 Oct 2022 08:50:04 +0000 Received: (at 58553) by debbugs.gnu.org; 16 Oct 2022 08:49:07 +0000 Received: from localhost ([127.0.0.1]:43312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKU-0005p9-He for submit@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:06 -0400 Received: from lepiller.eu ([89.234.186.109]:56966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKP-0005nc-3j for 58553@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:02 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 8f2a7182 for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=I4p7WT6tzRmMyG01h5R5Ow7X2 JTP4Z4ryJa6MK3Bgps=; b=bxb8qusI0IiZCWSINFk3vZiIPLipMFCIGEft6GE2x z2RiV+j7XcsyDQ8sMwkwU9cICRdrydnbzfb1Dvgs1EF75QD92JHk4Q4Dw7gqObP3 V9LGKjqJjeMTrq9NpAeoLba/8+ubyN10ioPJHMY9sTKc9E73smI/jDcIpNow9pht A87tAX90RhxZDQJOEdmJCvnb9WjsCTAxImALrARzGUP1sLuOfVstrImEQZ/jAg3a jrDzrSVEWRQq/Ll0sbpzU7EYlLxVVzEN3tSu8Sv9E2RcF6c0rwBMwenOuFjWBEaq POeZp0xx+BnW6qGQ/ykPJ3hpAl4KKPoRHY7fsSKXCzg/A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 29859d6f (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:54 +0000 (UTC) From: Julien Lepiller Date: Sun, 16 Oct 2022 10:48:35 +0200 Message-Id: <20221016084838.25584-5-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016084838.25584-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221016084838.25584-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-commons-compress): Update to 1.21. (java-osgi-annotation, java-osgi-core): Create pom file and install from it. * gnu/packages/maven.scm (java-surefire-parent-pom): Fix pom fixing. --- gnu/packages/java.scm | 45 +++++++++++++++++++++--------------------- gnu/packages/maven.scm | 3 +-- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7bf29622e1..eadb928eec 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6828,40 +6828,29 @@ (define-public java-jsch (define-public java-commons-compress (package (name "java-commons-compress") - (version "1.13") + (version "1.21") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/compress/source/" "commons-compress-" version "-src.tar.gz")) (sha256 (base32 - "1vjqvavrn0babffn1kciz6v52ibwq2vwhzlb95hazis3lgllnxc8")))) + "1rkpb6xcyly1wnbx4q6iq6p5hrr0h1d0ppb5r07psc75cbmizjry")))) (build-system ant-build-system) (arguments `(#:jar-name "commons-compress.jar" + #:source-dir "src/main/java" + #:tests? #f; requires java-mockito-3 #: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)) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs - (list java-xz apache-commons-parent-pom-41)) - (native-inputs - (list java-junit java-mockito-1)) + (list java-asm-3 + java-brotli + java-osgi-core + java-xz + java-zstd + apache-commons-parent-pom-52)) (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 @@ -6923,7 +6912,12 @@ (define-public java-osgi-annotation (build-system ant-build-system) (arguments `(#:tests? #f ; no tests - #:jar-name "osgi-annotation.jar")) + #:jar-name "osgi-annotation.jar" + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-pom + (generate-pom.xml "pom.xml" "osgi" "osgi-annotation" ,version)) + (replace 'install (install-from-pom "pom.xml"))))) (home-page "https://www.osgi.org") (synopsis "Annotation module of OSGi framework") (description @@ -6948,7 +6942,12 @@ (define-public java-osgi-core (build-system ant-build-system) (arguments `(#:tests? #f ; no tests - #:jar-name "osgi-core.jar")) + #:jar-name "osgi-core.jar" + #:phases + (modify-phases %standard-phases + (add-before 'install 'create-pom + (generate-pom.xml "pom.xml" "org.osgi" "org.osgi.core" ,version)) + (replace 'install (install-from-pom "pom.xml"))))) (inputs (list java-osgi-annotation)) (home-page "https://www.osgi.org") diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index b7794c4e89..d3e5677669 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3462,8 +3462,7 @@ (define-public java-surefire-parent-pom (add-before 'install 'fix-pom-dependency-versions (lambda _ (substitute* "pom.xml" - (("1.11") ,(package-version java-commons-compress)) - (("1.13") ,(package-version java-commons-codec))) + (("1.11") ,(package-version java-commons-codec))) (substitute* "pom.xml" (("commonsLang3Version>.*") (string-append From patchwork Sun Oct 16 08:48:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43441 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7644F27BBEA; Sun, 16 Oct 2022 09:50:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 47D5A27BBE9 for ; Sun, 16 Oct 2022 09:50:59 +0100 (BST) Received: from localhost ([::1]:46272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojzMI-00067c-DH for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 04:50:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojzLR-00063A-3w for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44245) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojzLQ-0000e9-O4 for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojzLQ-0005ra-Jg for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 6/8] gnu: java-opening-hours-parser: Update to 0.27.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 08:50:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58553@debbugs.gnu.org Received: via spool by 58553-submit@debbugs.gnu.org id=B58553.166591014722409 (code B ref 58553); Sun, 16 Oct 2022 08:50:04 +0000 Received: (at 58553) by debbugs.gnu.org; 16 Oct 2022 08:49:07 +0000 Received: from localhost ([127.0.0.1]:43314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKV-0005pH-1D for submit@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:07 -0400 Received: from lepiller.eu ([89.234.186.109]:56974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKP-0005nh-T0 for 58553@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:02 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 5a41126c for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=mzNAr5btQEaln3m+UkijCURSq 3pnYuDXeiM+e74JyBs=; b=YyulqFmDzhB1BKJA1ZLyRQrNbpiKPEVbpVptjHDKr ycb4lorAafkoWxhMM0Gyw4HfBc8At+sRu1hD+GvTnyRPrI9XMieB2D6KT+wyaz2G U2nHqdfS/P68oPvIlGdtrf1u9rcakQ+ENV7cJwB3ys+mISqE4ZQgFz4FjAtY7OJ+ opWG73jZes27lclkIKc1ooQfdmf3Nnhfv6UodTbbyubJZot/LY4y3qNqHh5pmK+1 4ci8jgXIvQr5xO2FxENruxpscPyR+hQRLnRZE+ptENi6HJNfx2TmSbBJRDPFkbhE lpOOd8omkBZ7w6WQNgw7I2Bt3o+Q9vbOB2FxtX6F0DTzg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 35e16287 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:54 +0000 (UTC) From: Julien Lepiller Date: Sun, 16 Oct 2022 10:48:36 +0200 Message-Id: <20221016084838.25584-6-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016084838.25584-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221016084838.25584-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (java-opening-hours-parser): Update to 0.27.0. --- gnu/packages/geo.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5e484c6e1c..faec60ebcc 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1664,7 +1664,7 @@ (define-public java-jmapviewer (define-public java-opening-hours-parser (package (name "java-opening-hours-parser") - (version "0.23.0") + (version "0.27.0") (source (origin (method git-fetch) (uri (git-reference @@ -1673,11 +1673,12 @@ (define-public java-opening-hours-parser (file-name (git-file-name name version)) (sha256 (base32 - "0yhbd2ix6h506aljh0jkrnp28m4xcqdcdpnqm30fn08kawdgxgsh")))) + "1sw5ccxqw4ly5hzxnnljjqx4876gyvagi10sg8r9w25n211lq0x4")))) (build-system ant-build-system) (arguments `(#:jar-name "java-opening-hours-parser.jar" #:source-dir "src/main/java" + #:test-exclude (list "**/IndividualTest.java") #:phases (modify-phases %standard-phases (add-before 'build 'copy-resources @@ -1692,8 +1693,7 @@ (define-public java-opening-hours-parser "-DEBUG_TOKEN_MANAGER=false" "-JDK_VERSION=1.8" "-GRAMMAR_ENCODING=UTF-8" (string-append "-OUTPUT_DIRECTORY=" dir) - file)) - #t))))) + file))))))) (inputs (list java-jetbrains-annotations)) (native-inputs From patchwork Sun Oct 16 08:48:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43443 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6238127BBEA; Sun, 16 Oct 2022 09:51:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 00CE827BBE9 for ; Sun, 16 Oct 2022 09:51:08 +0100 (BST) Received: from localhost ([::1]:42896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojzMR-0006h6-5u for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 04:51:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojzLR-00063g-EX for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44246) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojzLR-0000eH-5r for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojzLR-0005rj-1o for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 7/8] gnu: java-commons-jcs: Update to 3.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 08:50:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58553@debbugs.gnu.org Received: via spool by 58553-submit@debbugs.gnu.org id=B58553.166591014722416 (code B ref 58553); Sun, 16 Oct 2022 08:50:05 +0000 Received: (at 58553) by debbugs.gnu.org; 16 Oct 2022 08:49:07 +0000 Received: from localhost ([127.0.0.1]:43316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKV-0005pO-C8 for submit@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:07 -0400 Received: from lepiller.eu ([89.234.186.109]:56966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKQ-0005nc-Gl for 58553@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:03 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f198ebb7 for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=YZ0ppmc1e/JRyDsqm/DPTL62O e1fY6QDmjinZRo8Kqc=; b=h0tVawrr9ZAITM5n4N3eXIut6Ego/0vT1BLKaRy8x XTmaK5tH5Wa0UYTQ8wmOMDirp212E/yMuTWXDtJfj+B7DD4zd8hD9SyeUPSy2NAy Aum6w0jiJ3H93EUOcZvY8rdI0TYm0+SbdEIbAcluW3q2iU8Npe9TfJ47zZ+ZFwu5 QPiy1zlayxgxHQI1VGUa7Bq7ETAE2OA8kAxWBMyF+qXj/fJOKf/4vZlF24hLCm1H UluKYo8IVYr/exmAgMoSyUbUrBmJcZqhy1Z4lMW4noAO7kMZHN9jXFycdUy0aMj8 4+wQKqiauDgbAjB1m1M7p0YoypA6X46Rf+H0ZsU7Lhf7A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id a8da45da (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:55 +0000 (UTC) From: Julien Lepiller Date: Sun, 16 Oct 2022 10:48:37 +0200 Message-Id: <20221016084838.25584-7-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016084838.25584-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221016084838.25584-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-commons-jcs): Update to 3.1. (josm)[arguments]: Remove now unneeded phase. --- gnu/packages/geo.scm | 9 --------- gnu/packages/java.scm | 28 +++++++++------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index faec60ebcc..0ab711c501 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1756,15 +1756,6 @@ (define-public josm "1970-01-01 00:00:00 +0000" "")))) #t)) - (add-before 'build 'fix-jcs - (lambda _ - ;; This version of JOSM uses an unreleased version of commons-jcs, - ;; which has renamed its classes to another namespace. Rename them - ;; back so they can be used with our version of jcs. - (substitute* (find-files "." ".*.java$") - (("jcs3") "jcs") - (("ICache.NAME_COMPONENT_DELIMITER") "\":\"")) - #t)) (add-before 'build 'fix-classpath (lambda* (#:key inputs #:allow-other-keys) (setenv "CLASSPATH" diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index eadb928eec..5eef883495 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6369,36 +6369,26 @@ (define-public java-commons-dbcp (define-public java-commons-jcs (package (name "java-commons-jcs") - (version "2.2.1") + (version "3.1") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/jcs/source/" - "commons-jcs-dist-" version "-src.tar.gz")) + "commons-jcs3-dist-" version "-src.tar.gz")) (sha256 (base32 - "0syhq2npjbrl0azqfjm0gvash1qd5qjy4qmysxcrqjsk0nf9fa1q")))) + "0y1lm1xnsj99bf7y9mkvbzqfy8dr7ac8zcbkpsjgzb9vhabfsbac")))) (build-system ant-build-system) (arguments `(#:jar-name "commons-jcs.jar" #:source-dir "commons-jcs-core/src/main/java" #:test-dir "commons-jcs-core/src/test" - #:tests? #f; requires hsqldb - #:phases - (modify-phases %standard-phases - (add-before 'build 'prepare - (lambda _ - (with-directory-excursion - "commons-jcs-core/src/main/java/org/apache/commons/jcs" - (substitute* - "auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java" - (("commons.dbcp") "commons.dbcp2") - ((".*\\.setMaxActive.*") "")) - ;;; Remove dependency on velocity-tools - (delete-file "admin/servlet/JCSAdminServlet.java")) - #t))))) + #:tests? #f)); requires hsqldb (propagated-inputs - (list java-classpathx-servletapi java-commons-logging-minimal - java-commons-httpclient java-commons-dbcp)) + (list java-classpathx-servletapi + java-commons-dbcp + java-httpcomponents-httpclient + java-httpcomponents-httpcore + java-log4j-api)) (native-inputs (list java-junit)) (home-page "https://commons.apache.org/proper/commons-jcs/") From patchwork Sun Oct 16 08:48:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43445 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1CD2227BBEA; Sun, 16 Oct 2022 09:51:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D70FB27BBE9 for ; Sun, 16 Oct 2022 09:51:19 +0100 (BST) Received: from localhost ([::1]:41828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojzMd-0007AW-1h for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 04:51:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojzLS-00064g-Uv for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojzLR-0000eT-KM for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojzLR-0005rq-Fu for guix-patches@gnu.org; Sun, 16 Oct 2022 04:50:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 8/8] gnu: josm: Udpate to 18570. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 08:50:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58553 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58553@debbugs.gnu.org Received: via spool by 58553-submit@debbugs.gnu.org id=B58553.166591014822423 (code B ref 58553); Sun, 16 Oct 2022 08:50:05 +0000 Received: (at 58553) by debbugs.gnu.org; 16 Oct 2022 08:49:08 +0000 Received: from localhost ([127.0.0.1]:43318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKV-0005pV-PY for submit@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:08 -0400 Received: from lepiller.eu ([89.234.186.109]:56974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojzKR-0005nh-2g for 58553@debbugs.gnu.org; Sun, 16 Oct 2022 04:49:03 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 7adf161f for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=VQoX82M2aOWi2Rpv+ZzRkXHKh NM0ZiX67Y8S6hN3j3U=; b=nLwIAeaPQFcjDRDuEobqbYV2B/Bh7iVsdMVv00Ijb 1EX/vh9lwibGZF4tLhzzSYojZXaDZerJCMyvRWA5bphgaw10J6bZc8e315EuJfIk 7UTYRsxS/DSwzkus8pRKLZJC/HU/MxNAN3KtgRZCaKagAOigIOytCO4LKPjdZN8W edPFd3T7Rb/f6n6wRjDcC5XthePxnuRJaoE+NTsf8KetPjhl4TohlrBtHvEvuipG N6vX2SafA9FVcIQ42DAhJ1dvmmGtQoMQZtajGJEdQX9wgrbZF7mXmcUIxVrT5iIw KbIPdDm30ZoY+XAVwb/GcBKdJ1PxjHLj6kdZeHtAmmlPg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 6c7ccd69 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sun, 16 Oct 2022 08:48:55 +0000 (UTC) From: Julien Lepiller Date: Sun, 16 Oct 2022 10:48:38 +0200 Message-Id: <20221016084838.25584-8-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221016084838.25584-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221016084838.25584-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (josm): Update to 18570. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0ab711c501..41197b0d06 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1707,7 +1707,7 @@ (define-public java-opening-hours-parser (define-public josm (package (name "josm") - (version "18360") + (version "18570") (source (origin (method svn-fetch) (uri (svn-reference @@ -1716,7 +1716,7 @@ (define-public josm (recursive? #f))) (sha256 (base32 - "0j7fhzh6hs2b5r1a3d1xpy6f5r6q1kh79bck28raang8ldd754c6")) + "1msymjsprjiazn7p05jp3xhkasdk4sbppixyy6g9lvj4pnb5c9h4")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet