From patchwork Tue Dec 21 22:44:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35550 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 1BCBE27BBE9; Tue, 21 Dec 2021 22:46:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 9602F27BBEA for ; Tue, 21 Dec 2021 22:46:42 +0000 (GMT) Received: from localhost ([::1]:39466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mznu5-0001iS-NW for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 17:46:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzntV-0008NJ-0h for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzntU-0001e6-NK for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzntU-00080q-MQ for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52723] [PATCH 07/26] gnu: java-plexus-utils: Default to the newer one. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 22:46:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52723 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52723@debbugs.gnu.org Received: via spool by 52723-submit@debbugs.gnu.org id=B52723.164012673230554 (code B ref 52723); Tue, 21 Dec 2021 22:46:04 +0000 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:32 +0000 Received: from localhost ([127.0.0.1]:56016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsx-0007wT-3a for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:31 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznso-0007uN-V2 for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:23 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 07a01d98 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:20 +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=el6jDD4JBR4EQINNBeayT899+ LtydH8MM4F1TLkZg7I=; b=GkVhmMUrOcmVgucPeWfXo1CkHEAD9kunVObHmPVGo D0xyjccesa9dSzg3GxI5PTVgfNDc2S3s6nJRqo3AWBaFdKTZEACL+3rxtnRcQ8Og GDqOb0F5sUfODZn2+lxRjSFSpBKtOYNfTgB+vY+ZN8Fky5qDdLGl3tOlkBp55lnP cGpbgjZ51oIC1vK2y0cRaA5nrjLtyIf9bOI6N1QWzqr8WJpmUqo5QYfZMnqGe2eZ 2APgaWkaXlbx6lZQa0l+Hcc8/eiS5t9L983pi7Egzjyp982wh7QK9oDFqcb/PM9R faDXOHsimwI9+b8NxfNq/phPyqbB7C7WCR4CJUp026dpQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 2d4c3f97 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:20 +0000 (UTC) From: Julien Lepiller Date: Tue, 21 Dec 2021 23:44:51 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu> References: <20211221234231.44299f63@tachikoma.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-plexus-utils-3.3.0): Rename to... (java-plexus-utils): ...this. (java-plexus-utils-3.2.1): New variable. --- gnu/packages/java.scm | 18 +++++++++--------- gnu/packages/maven.scm | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7c57924231..8c65d713f6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4272,8 +4272,7 @@ (define-public java-junitparams (define-public java-plexus-utils (package (name "java-plexus-utils") - ;; sisu-build-api needs this version, later versions don't work - (version "3.2.1") + (version "3.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -4282,7 +4281,7 @@ (define-public java-plexus-utils (file-name (git-file-name name version)) (sha256 (base32 - "1w169glixyk94jbczj8jzg897lsab46jihiaa3dhw0p06g35va8b")))) + "0d0fq21rzjy0j55kcp8w9k1rbq9rwr0r7cc8239p9jbz54vihp0g")))) (build-system ant-build-system) ;; FIXME: The default build.xml does not include a target to install ;; javadoc files. @@ -4333,10 +4332,11 @@ (define-public java-plexus-utils more.") (license license:asl2.0))) -(define-public java-plexus-utils-3.3.0 +(define-public java-plexus-utils-3.2.1 (package (inherit java-plexus-utils) - (version "3.3.0") + ;; sisu-build-api needs this version, later versions don't work + (version "3.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -4345,7 +4345,7 @@ (define-public java-plexus-utils-3.3.0 (file-name (git-file-name "java-plexus-utils" version)) (sha256 (base32 - "0d0fq21rzjy0j55kcp8w9k1rbq9rwr0r7cc8239p9jbz54vihp0g")))))) + "1w169glixyk94jbczj8jzg897lsab46jihiaa3dhw0p06g35va8b")))))) (define-public java-plexus-interpolation (package @@ -4508,7 +4508,7 @@ (define-public java-plexus-io #t)) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs - (list java-plexus-utils-3.3.0 java-commons-io plexus-parent-pom-5.1)) + (list java-plexus-utils java-commons-io plexus-parent-pom-5.1)) (inputs (list java-jsr305)) (native-inputs @@ -4564,7 +4564,7 @@ (define-public java-plexus-archiver #t)) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs - (list java-plexus-utils-3.3.0 java-plexus-io java-iq80-snappy + (list java-plexus-utils java-plexus-io java-iq80-snappy java-commons-compress plexus-parent-pom-6.1)) (inputs `(("java-jsr305" ,java-jsr305) @@ -5193,7 +5193,7 @@ (define-public java-sisu-build-api (replace 'install (install-from-pom "pom.xml"))))) (inputs - (list java-plexus-utils java-plexus-container-default)) + (list java-plexus-utils-3.2.1 java-plexus-container-default)) (home-page "https://github.com/sonatype/sisu-build-api/") (synopsis "Base build API for maven") (description "This package contains the base build API for maven and diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 479746639a..38b93f43b7 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2907,7 +2907,7 @@ (define-public maven-filtering (propagated-inputs (list maven-3.0-core maven-shared-utils - java-plexus-utils + java-plexus-utils-3.2.1 java-plexus-interpolation java-sisu-build-api maven-parent-pom-30))