From patchwork Mon Jun 13 07:26:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 39931 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 8782F27BBEA; Mon, 13 Jun 2022 08:27: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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 ED6E727BBE9 for ; Mon, 13 Jun 2022 08:27:13 +0100 (BST) Received: from localhost ([::1]:56560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0eTh-0005nE-2t for patchwork@mira.cbaines.net; Mon, 13 Jun 2022 03:27:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0eTW-0005kJ-5t for guix-patches@gnu.org; Mon, 13 Jun 2022 03:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0eTV-0007TX-RD for guix-patches@gnu.org; Mon, 13 Jun 2022 03:27:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o0eTV-0000O4-LN for guix-patches@gnu.org; Mon, 13 Jun 2022 03:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55931] [PATCH] gnu: java-commons-lang3: Update to 3.12.0 Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Jun 2022 07:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55931 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Julien Lepiller Cc: 55931@debbugs.gnu.org Received: via spool by 55931-submit@debbugs.gnu.org id=B55931.16551052101469 (code B ref 55931); Mon, 13 Jun 2022 07:27:01 +0000 Received: (at 55931) by debbugs.gnu.org; 13 Jun 2022 07:26:50 +0000 Received: from localhost ([127.0.0.1]:57146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0eTF-0000NW-0a for submit@debbugs.gnu.org; Mon, 13 Jun 2022 03:26:50 -0400 Received: from mail-lj1-f177.google.com ([209.85.208.177]:33522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0eTA-0000NG-0z for 55931@debbugs.gnu.org; Mon, 13 Jun 2022 03:26:43 -0400 Received: by mail-lj1-f177.google.com with SMTP id y15so5259552ljc.0 for <55931@debbugs.gnu.org>; Mon, 13 Jun 2022 00:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=BoHe3cPETqDEZ7gbryHJAq2AhOwaWgnG0JXiC3sr/6k=; b=DOZoDfmbYKpvrcML6z4VpPy87dnNb5SvKb1QFxGb/aHiCKfUBX/XvhqQ5NK/Pu0VD8 uaASu61Wz03Vq43+3A9JJg1jTjPibv3Brj2S4xP+LjWsP5mAHMPcfWb2a9+2EBNuTpQW BVSPrC90FJDBCNfDs91O1z/B65XUpk91P8RymWiGy/qr3woPuEwOMOPy2qK2rW5HHvnK QL09I+B0pHF8iGRjhDF2TwIViIfs9RZsaOYDnVefjq5syOiZVykdzQ+mnJZKtxy6akMl JwFY5Pel+H+o1GISPY2wrO6oSjoRyZ1XtZvTwR+mzfiQ0sywsMQoXse3YXjWTu4Ccjto 5wfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=BoHe3cPETqDEZ7gbryHJAq2AhOwaWgnG0JXiC3sr/6k=; b=sUR+5hJDk+PG9UG1MGZo9JEAa9JFtsHEEmWHu0wbEzDZys+vrxAqK4pmzMcEWeWG/X PFSNv+fi2dMonTPWujAukstj4Ry1U2Q72lcUyd0mkOtR21ge7jtqpdDU1Wdlx2Nybjlr 9W7DqrQEpaR683MS3WIPv3BIGRZppsR4Up2xezzVuYaPWYgJVrAfm8JHjhjglLa+koQv jf6dXzBXE+R5IyJlNL7LMCI9EZLwglrP2/e6K7rRJLUnnQy2zM/srYa3m2XjePflR5dC xPeuvK3hs4hccMAtfIC9Huclws7eH3SoYDtP2HS0xnjkJnJIFOMDsKTAjd9khrKu4cTt UE8w== X-Gm-Message-State: AOAM5336nINLsthEYNjsCAMMjnhE7qAHFlksASWHsl+CdR8ogEGlvj4Q iF0hIlq9UjKKHkosLCOkmtdYBXUv7yE= X-Google-Smtp-Source: ABdhPJy1ZFFn0Wi5t3bzagVPhWieXRk7/yq4c6d+hYvPsBY7BbKGQHN1FVGQFlIRd7jrkMU7oCM8aw== X-Received: by 2002:a05:651c:4c9:b0:255:aeac:91e0 with SMTP id e9-20020a05651c04c900b00255aeac91e0mr15821026lji.449.1655105193432; Mon, 13 Jun 2022 00:26:33 -0700 (PDT) Received: from elephant ([5.164.222.47]) by smtp.gmail.com with ESMTPSA id x3-20020a2e8803000000b0024f3d1dae91sm907753ljh.25.2022.06.13.00.26.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 00:26:32 -0700 (PDT) From: "Artyom V. Poptsov" References: <878rq1y8jw.fsf@gmail.com> <20220612225018.4a167392@sybil.lepiller.eu> Date: Mon, 13 Jun 2022 10:26:19 +0300 In-Reply-To: <20220612225018.4a167392@sybil.lepiller.eu> (Julien Lepiller's message of "Sun, 12 Jun 2022 22:50:29 +0200") Message-ID: <87mtehvxb8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) 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 Hello Julien, I've added a patch that removes 'junit-bom' from 'pom.xml' and tried to build 'java-jmh' as you did; it seems that everything now builds without errors. Please find the updated patch attached. - Artyom From 39c8cc2a9e057e606cb21dea2584794f8f1d2bec Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 12 Jun 2022 22:34:28 +0300 Subject: [PATCH] gnu: java-commons-lang3: Update to 3.12.0 * gnu/packages/java.scm (java-commons-lang3): Update to 3.12.0. * gnu/packages/patches/java-commons-lang-fix-dependency.patch: Add to the repository. --- gnu/packages/java.scm | 7 ++-- .../java-commons-lang-fix-dependency.patch | 35 +++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/java-commons-lang-fix-dependency.patch diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fcac0c2367..d2fbf840a0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2021 Mike Gerwitz ;;; Copyright © 2021 Pierre Langlois ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2022 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -6206,14 +6207,16 @@ included: (define-public java-commons-lang3 (package (name "java-commons-lang3") - (version "3.9") + (version "3.12.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/commons/lang/source/" "commons-lang3-" version "-src.tar.gz")) (sha256 - (base32 "0s4ffbvsyl16c90l45ximsg4dwd8hmz7wsza3p308fw43h6mwhb6")))) + (base32 "09dcv1pkdx3hpf06py8p9511f1wkin6jpacdll0c8vxpbi3yfwzv")) + (patches + (search-patches "java-commons-lang-fix-dependency.patch")))) (build-system ant-build-system) (arguments `(#:jar-name "commons-lang3.jar" diff --git a/gnu/packages/patches/java-commons-lang-fix-dependency.patch b/gnu/packages/patches/java-commons-lang-fix-dependency.patch new file mode 100644 index 0000000000..50e0e94c6b --- /dev/null +++ b/gnu/packages/patches/java-commons-lang-fix-dependency.patch @@ -0,0 +1,35 @@ +From 5c15b04ff9d05235460ea58f303fcf3502a943f2 Mon Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" +Date: Mon, 13 Jun 2022 09:25:42 +0300 +Subject: [PATCH] pom.xml: Remove dependency on 'junit-bom' + +--- + pom.xml | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 167a85a47..6cd9be57b 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -513,18 +513,6 @@ + + + +- +- +- +- org.junit +- junit-bom +- 5.7.1 +- pom +- import +- +- +- +- + + + +-- +2.25.1 + -- 2.25.1