From patchwork Sat Oct 15 21:39:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43430 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 A82B727BBEA; Sat, 15 Oct 2022 22:40:26 +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 6A54C27BBE9 for ; Sat, 15 Oct 2022 22:40:26 +0100 (BST) Received: from localhost ([::1]:50694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojotI-0003hV-QH for patchwork@mira.cbaines.net; Sat, 15 Oct 2022 17:40:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojot0-0003h8-Nv for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43659) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojot0-0004kw-9m for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojot0-0008KB-4R for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 1/7] gnu: Add java-brotli. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Oct 2022 21:40: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.166586998231892 (code B ref 58553); Sat, 15 Oct 2022 21:40:02 +0000 Received: (at 58553) by debbugs.gnu.org; 15 Oct 2022 21:39:42 +0000 Received: from localhost ([127.0.0.1]:42720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosf-0008IF-MG for submit@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:42 -0400 Received: from lepiller.eu ([89.234.186.109]:40376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosc-0008I5-J6 for 58553@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:41 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2e74959c for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:36 +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=O3LIoAAi8CK91RVZK8XDu3rokQ0sR54W50784WA3S saZ+IzvbFhoH3yX7bZf00qzEs2S0WUVZ8ACe9WsidnoTR8D9PT7R6CYazDdMPPhX m9ySEP1TVAg3kYEV+6JfIixMGFxKUg3B/hyCNZy1aKD/z589LvBZZpHj9f20Q/BD Y+mYoopwRczABdZPv5OQOk/H15qn8im5yfg6943DGYzcT8t5SbRyO6RDHgOlSOG1 RzKEebae44G34dV5bvns6iF/VXs2d0w4c2AhufVbubBpAzldmM0jw/aC+CHkjOyz Fgs93wFzOqEZ2GjUiBV6E98VVPb/amj1OMid1wAg8W8PQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id dcd4f793 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:35 +0000 (UTC) From: Julien Lepiller Date: Sat, 15 Oct 2022 23:39:19 +0200 Message-Id: <20221015213925.6447-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 Sat Oct 15 21:39:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43431 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 EA17C27BBEA; Sat, 15 Oct 2022 22:40:29 +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 9B40927BBE9 for ; Sat, 15 Oct 2022 22:40:29 +0100 (BST) Received: from localhost ([::1]:50708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojotQ-0003hz-Pq for patchwork@mira.cbaines.net; Sat, 15 Oct 2022 17:40:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojot1-0003hF-2m for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojot0-0004pc-PU for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojot0-0008KJ-Ju for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 2/7] gnu: Add java-zstd. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Oct 2022 21:40: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.166586998531928 (code B ref 58553); Sat, 15 Oct 2022 21:40:02 +0000 Received: (at 58553) by debbugs.gnu.org; 15 Oct 2022 21:39:45 +0000 Received: from localhost ([127.0.0.1]:42726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosj-0008Ig-6C for submit@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:45 -0400 Received: from lepiller.eu ([89.234.186.109]:40376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosf-0008I5-D1 for 58553@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:41 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f3d1f0b6 for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:37 +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=K1xKc3qciYgWHZ5lDYcl3JDrJSkrozuv4u1h3/vei E5x2FO5ByWONOZMHW4cmUX59N0Is2GNIPpENfVc7rd7HSlRkyMc0QjkTWrOMskam 4rq49QAArxg4wjhq4nj5JSEGl/N52XVAti4D2b54byb9hRELJeCjFnFTF5+K6pr0 2ppMDiTON7OLC2qdZMJBEOb57umd9HpubRT9RWAbzDDidJpStpGE22cZ6xslJTAX 98hFV1kMeotIfRaRxpqkK0f+jpwK3V40BP3M/V9C9rg+NQo/iN6lKaDbP7JpCj0S T/ObjaQSqYOE5S+5lgDpDQvTk6iBXOXPuxJnt/sY+TDUA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id eeef8bd1 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:35 +0000 (UTC) From: Julien Lepiller Date: Sat, 15 Oct 2022 23:39:20 +0200 Message-Id: <20221015213925.6447-2-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221015213925.6447-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221015213925.6447-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 Sat Oct 15 21:39:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43432 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 8CA7B27BBEA; Sat, 15 Oct 2022 22:40:41 +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 5266027BBE9 for ; Sat, 15 Oct 2022 22:40:41 +0100 (BST) Received: from localhost ([::1]:50730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojotc-0003m0-Gf for patchwork@mira.cbaines.net; Sat, 15 Oct 2022 17:40:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojot1-0003hO-N2 for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojot1-0004vF-FA for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojot1-0008KS-9B for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 3/7] gnu: Add java-asm-3. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Oct 2022 21:40: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.166586998631940 (code B ref 58553); Sat, 15 Oct 2022 21:40:03 +0000 Received: (at 58553) by debbugs.gnu.org; 15 Oct 2022 21:39:46 +0000 Received: from localhost ([127.0.0.1]:42728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosj-0008It-KH for submit@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:46 -0400 Received: from lepiller.eu ([89.234.186.109]:40376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosg-0008I5-92 for 58553@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:44 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9046b8b1 for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:37 +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=GxVW+jN86Tu7qzIjmf0vqAMCa yjpxLXSYnY/rEGF3DE=; b=SqYToUQ3SURMuXnYVw0tBBK0V0fUBearGvdwjWCSW 4fNqOIepIAaIifyJtnq4CQu3V17irE9bEMP2bE/szmhskGAkN/9B1MSgbqk+4mfQ 28KbyOwjfWE+r2FRBmxxmGGRYDfar+guAah5XWi4ZMetGDMB2KQ/HcZMA6tDupEM Q3aWfgOpNi/n0Iu1wR0EDM9CegRXmLVbinAcCC2L6Z9+n0gpyAhTohwqzWUZw4Dy gsXJp6c4GJm/txWuXl/V6wK2pUqjrz1gmK5jOylk9fGrMI7a/EvyZpVs/hdNRyzX Pla0iRp7R3kX5qI8RqIz7G69LPejaKaUJH0gu5vEOwLDQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id e58a5060 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:36 +0000 (UTC) From: Julien Lepiller Date: Sat, 15 Oct 2022 23:39:21 +0200 Message-Id: <20221015213925.6447-3-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221015213925.6447-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221015213925.6447-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 | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3ab324cce9..a433281ce3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5296,6 +5296,29 @@ (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")))) + (arguments + `(#:build-target "jar" + #:test-target "test" + #:phases + (modify-phases %standard-phases + (replace 'install (install-jars "output/dist")) + (delete 'generate-jar-indices)))) + (native-inputs + `(("java-junit" ,java-junit))))) + (define-public java-asm-8 (package (inherit java-asm) @@ -6778,6 +6801,7 @@ (define-public java-commons-compress (build-system ant-build-system) (arguments `(#:jar-name "commons-compress.jar" + #:source-dir "src/main/java" #:phases (modify-phases %standard-phases (add-after 'unpack 'delete-bad-tests @@ -6798,7 +6822,7 @@ (define-public java-commons-compress #t)) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs - (list java-xz apache-commons-parent-pom-41)) + (list java-asm-3 java-brotli java-xz java-zstd apache-commons-parent-pom-52)) (native-inputs (list java-junit java-mockito-1)) (home-page "https://commons.apache.org/proper/commons-compress/") From patchwork Sat Oct 15 21:39:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43435 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 0A3EF27BBEA; Sat, 15 Oct 2022 22:40:55 +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 6D57D27BBE9 for ; Sat, 15 Oct 2022 22:40:54 +0100 (BST) Received: from localhost ([::1]:35298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojotp-0004FQ-Js for patchwork@mira.cbaines.net; Sat, 15 Oct 2022 17:40:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojot2-0003hW-2x for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojot1-0004vL-R2 for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojot1-0008Ka-Lp for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 4/7] gnu: java-commons-compress: Update to 1.21. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Oct 2022 21:40: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.166586998631947 (code B ref 58553); Sat, 15 Oct 2022 21:40:03 +0000 Received: (at 58553) by debbugs.gnu.org; 15 Oct 2022 21:39:46 +0000 Received: from localhost ([127.0.0.1]:42731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosk-0008J7-Bl for submit@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:46 -0400 Received: from lepiller.eu ([89.234.186.109]:40378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosh-0008IS-8J for 58553@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:44 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id e570b3d7 for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:37 +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=4rP/71zR+HtxwYMyRhwbnOeoQ WULwN5jxL/ySUGsgzI=; b=ePNKLlvZCHEnh4bKLmxqs2njfdQIig6l0Bd+NQ4XN yHykbxoSJPmykjaASH9ijS7rPTy1Z/8qXnh3FzSk5UAIJSvrqHtqgTb4vqHfAqCj pI1rcjpTMILna0vrTG1cRtF+/K/vCXucPTivcxdx5AvsAl80onDURZXBS3uAeWNs bVm9ObdLMhNw2AiavukNuyk/2fzeWvUzl568z1fPVA8GF3lcVWIa9N+AtLyHkQq2 rDua/3OLeY19+1Gy+hGSbcdqiPmA7OimkmUfx5X05A8L4r/2ViIeJaM0GDQj8gdg afZdfeH4xnDKhKVoNV5LfhYWQVnYExyFXRIFn6yjKCCdA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 52c7ab3f (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:36 +0000 (UTC) From: Julien Lepiller Date: Sat, 15 Oct 2022 23:39:22 +0200 Message-Id: <20221015213925.6447-4-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221015213925.6447-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221015213925.6447-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 | 44 ++++++++++++++++++++---------------------- gnu/packages/maven.scm | 3 +-- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a433281ce3..236a910ece 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6790,41 +6790,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-asm-3 java-brotli java-xz java-zstd apache-commons-parent-pom-52)) - (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 @@ -6886,7 +6874,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 @@ -6911,7 +6904,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 Sat Oct 15 21:39:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43434 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 07E6C27BBEA; Sat, 15 Oct 2022 22:40:53 +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 B5B1127BBE9 for ; Sat, 15 Oct 2022 22:40:52 +0100 (BST) Received: from localhost ([::1]:59688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojotn-00049x-Sx for patchwork@mira.cbaines.net; Sat, 15 Oct 2022 17:40:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojot2-0003hd-Fl for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43663) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojot2-0004vU-6o for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojot2-0008Kh-1j for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 5/7] 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: Sat, 15 Oct 2022 21:40: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.166586999331968 (code B ref 58553); Sat, 15 Oct 2022 21:40:04 +0000 Received: (at 58553) by debbugs.gnu.org; 15 Oct 2022 21:39:53 +0000 Received: from localhost ([127.0.0.1]:42733 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosq-0008JW-Ru for submit@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:53 -0400 Received: from lepiller.eu ([89.234.186.109]:40376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosi-0008I5-K3 for 58553@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:45 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ada4ed52 for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:37 +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=ky08JkPSqeguQ53KeO+cHJ+eKUMxvJlQAbjkT0s9A P0oxh5sMyEDzApr3pq6rFgwQv8gEO8D2GxNAcKfvHIxYopN3shHI1PpiS/U01nFQ rON536VFmYpkRnaZo84lFsEOj6OCOr/CnMrmh8CMnMBocnlI1IlYoTyq3pB5ycsh ev9WJHXCO4tksRWnuPDTkof+CtY6mgZVfEw2yhdzq6VF+0wtOCW7Xj3+dS49BueF awPXRN/9aZC1II4jJVeT/vWOgEt6Yc6/yTkRX6OhUog2cWjIKKE9+A/qWTNOL2np 3XLRmNVI0Ut2WpJG1+95crp5w6vFnp5zykmBzzsSOEQ6Q== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 624158fb (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:36 +0000 (UTC) From: Julien Lepiller Date: Sat, 15 Oct 2022 23:39:23 +0200 Message-Id: <20221015213925.6447-5-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221015213925.6447-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221015213925.6447-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 Sat Oct 15 21:39:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43436 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 8DEE027BBEA; Sat, 15 Oct 2022 22:41:01 +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 4D6A327BBE9 for ; Sat, 15 Oct 2022 22:41:01 +0100 (BST) Received: from localhost ([::1]:54936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojotw-0004eE-Gg for patchwork@mira.cbaines.net; Sat, 15 Oct 2022 17:41:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojot2-0003iN-TQ for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojot2-0004vf-KO for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojot2-0008Ko-Em for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 6/7] gnu: java-commons-jcs: Update to 3.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Oct 2022 21:40: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.166586999331976 (code B ref 58553); Sat, 15 Oct 2022 21:40:04 +0000 Received: (at 58553) by debbugs.gnu.org; 15 Oct 2022 21:39:53 +0000 Received: from localhost ([127.0.0.1]:42735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosr-0008JZ-Cp for submit@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:53 -0400 Received: from lepiller.eu ([89.234.186.109]:40378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosi-0008IS-Mx for 58553@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:45 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f04d0455 for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:37 +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=eeS43Zy3gXVbEv8DF3+5FGFa0 mn8dbep4gG/+26TWtE=; b=lH3X/pZpasXpldSuapmNohU8pPJGUR4W2r0NfCEoy afxo8wSphK+UOhovlPpUd2REFYcU6kifKJ263c4Iko7Lw54qKfuNwLasvri9S27U BkeFjWetVnFDPY3bWhf0Q0XKesjuGCGHiO9DmGlpi+tgnXcM7RmwKMezj49rD4bB mRAgrVD62wrPhTcoQdK86BkS7Ul3VfrdiL1jcXQ8jSKQ8Igjt445rdwmv0C+oLJN 5MLrE/EfRe4SCK7sS6rAvpq+tPxCqf+hdGwO3O6lDmiJmJIPH8LGAKFgsOJ3r662 7EJvr5hmzl5VhfrOTLuNwnQao5zpIi7TdJelbC3RRVz8A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 736947df (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:36 +0000 (UTC) From: Julien Lepiller Date: Sat, 15 Oct 2022 23:39:24 +0200 Message-Id: <20221015213925.6447-6-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221015213925.6447-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221015213925.6447-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 236a910ece..96a4937be0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6331,36 +6331,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 Sat Oct 15 21:39:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 43433 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 4A13227BBEA; Sat, 15 Oct 2022 22:40:52 +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 1F2B227BBE9 for ; Sat, 15 Oct 2022 22:40:52 +0100 (BST) Received: from localhost ([::1]:59670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojotn-00048R-8v for patchwork@mira.cbaines.net; Sat, 15 Oct 2022 17:40:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojot3-0003jn-EZ for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ojot3-0004vt-4V for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ojot2-0008Kw-Ur for guix-patches@gnu.org; Sat, 15 Oct 2022 17:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58553] [PATCH 7/7] gnu: josm: Udpate to 18570. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Oct 2022 21:40: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.166586999431982 (code B ref 58553); Sat, 15 Oct 2022 21:40:04 +0000 Received: (at 58553) by debbugs.gnu.org; 15 Oct 2022 21:39:54 +0000 Received: from localhost ([127.0.0.1]:42737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosr-0008Ji-Rw for submit@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:54 -0400 Received: from lepiller.eu ([89.234.186.109]:40376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ojosj-0008I5-E8 for 58553@debbugs.gnu.org; Sat, 15 Oct 2022 17:39:45 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9fbc7fb3 for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:37 +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=eSddIt3vvAT7gGFJc4ZPh4TdxxbR6Ndr6muYLF5l2 30i3swc8tv2hBUN5CB4Zsx4q/so3TbHnkFCIERegP4VGgVU4bqSsY6G7OCDUiR+x j4pio/xpkkTJi+7x310or7q71ThBSDRlVNzSCTr8EBwOlBvNf/NHXu6qDcXLZCuu 0VPuvikxny8Nwtifni612k89JUy7xRmPkdMLOJQNcZ7dGtKLLDMLeow5z+6gSHEa poZMnZUgF84qCG/SiQW+gNScOCZpb+aZGZH56WdtUeuemF7AoOz5lhio7dQ7Wa2m Po5mMoqPlkA2qlMeTKu+IDJZyzPhJjjCqPtJuxOwjgd6A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 2b5bb9c1 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58553@debbugs.gnu.org>; Sat, 15 Oct 2022 21:39:37 +0000 (UTC) From: Julien Lepiller Date: Sat, 15 Oct 2022 23:39:25 +0200 Message-Id: <20221015213925.6447-7-julien@lepiller.eu> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221015213925.6447-1-julien@lepiller.eu> References: <20221015233630.4da3d935@sybil.lepiller.eu> <20221015213925.6447-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