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