From unknown Sat Jun 14 18:02:42 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#52723 <52723@debbugs.gnu.org> To: bug#52723 <52723@debbugs.gnu.org> Subject: Status: [PATCH] gnu: maven: Update to 3.8.4. Reply-To: bug#52723 <52723@debbugs.gnu.org> Date: Sun, 15 Jun 2025 01:02:42 +0000 retitle 52723 [PATCH] gnu: maven: Update to 3.8.4. reassign 52723 guix-patches submitter 52723 Julien Lepiller severity 52723 normal tag 52723 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:42:58 2021 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 22:42:58 +0000 Received: from localhost ([127.0.0.1]:55976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznqU-0007pT-5P for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:42:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:36144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznqR-0007pK-FY for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:42:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mznqR-0006RK-8T for guix-patches@gnu.org; Tue, 21 Dec 2021 17:42:55 -0500 Received: from [2a00:5884:8208::1] (port=41728 helo=lepiller.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mznqJ-00017V-Hp for guix-patches@gnu.org; Tue, 21 Dec 2021 17:42:54 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 16c7c396 for ; Tue, 21 Dec 2021 22:42:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type :content-transfer-encoding; s=dkim; bh=aMP3FaugMG/djrDf5p3jB1dx1 DrjiwTp3/6/5Uq79Rk=; b=GlJk+zGh7K4IxBXzrzWIm/hXRLxCIkokQDAlRbvyk GqpIEFDwkQhq1WA4nU2PM1QPjjqihbM0siatZ+ZRgkxVt+IY9NdpNhpklpE1s1UY 1vyr/s+TeX2+okvzZCpdNbfZ4tBI6VlX6pGqb8s9ywOSksHVpOyPa4oqOpfzKlCs 4w6iJ6og7s6DOT9l7YooLwHir3yGv/DfsCkkaJFj4VTHcTxxwTz/IigC9lunf97P jpkBettaiNxDwgs7InB1c4UNOQ+L+N7ftXCfR8Zt0t2gOoZRH7XxSCwkNUAU73Ru canYvVV9w9fq3wNn1wv8MeeHZiMFqKhMuOWIVKS+T9ptg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 38d2e3bc (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Tue, 21 Dec 2021 22:42:42 +0000 (UTC) Date: Tue, 21 Dec 2021 23:42:31 +0100 From: Julien Lepiller To: guix-patches@gnu.org Subject: [PATCH] gnu: maven: Update to 3.8.4. Message-ID: <20211221234231.44299f63@tachikoma.lepiller.eu> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.24; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5884:8208::1 (failed) Received-SPF: pass client-ip=2a00:5884:8208::1; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi guix! This series updates maven to the latest version. I was able to find an update order for most of the changes, but the last patch still has to update three packages at the same time, and changes inherited packages to fix them. From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:21 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:21 +0000 Received: from localhost ([127.0.0.1]:55988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsm-0007ua-SJ for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:21 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsl-0007uN-E6 for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:19 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 714962db for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:17 +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=xQ1TowG5EPd+0b8bQQQ0yB7w7 0Sg3mpmR1+tf0nVOlc=; b=gbo0/837hsF2dU3G9z6hKYF/OWfNWBidFPr3Z42Ll 3W8bLnHhM9e9y1jnZhH4jxPfmasKjY5ZLQ1NgdsRgnHGgey3OuHuRCnqkFrP/AKf pKYrBYkddZ2qwlCXe8HWPtXY2G/BOMJ8DCvRAnUrDTsFJdMmnv2uyHFi98LwZLGB BYfz2iPOGk35wzIX8gMjkSuz5VDrk3fagvkqbnQNt5HvXiEzls3guKM4nntFb7CM DyhpIOtY/GnmxE+8Ob6z8PIBSZZQgZTxd0MG0uraBFEH7MHDvMXMJtioyWL7ww3x 1eCW6a7wVz9AdMB4XxspbEXrIlFmcvjfpuTxvSMFhVIVQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b31aa7df (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:17 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 01/26] gnu: Add apache-parent-pom-23. Date: Tue, 21 Dec 2021 23:44:45 +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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven-parent-pom.scm (apache-parent-pom-23): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index a47fbfa8c1..9919a66105 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -84,6 +84,10 @@ (define-public apache-parent-pom-21 (make-apache-parent-pom "21" "0clcbrq1b2b8sbvlqddyw2dg5niq25dhdma9sk4b0i30hqaipx96")) +(define-public apache-parent-pom-23 + (make-apache-parent-pom + "23" "05c8i741f0m4311q264zvq0lc6srsyz2x95ga4d7qfd89swkzg9d")) + (define (make-apache-commons-parent-pom version hash parent) (hidden-package (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:28 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:28 +0000 Received: from localhost ([127.0.0.1]:55999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsr-0007vP-2F for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:28 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsm-0007uN-8D for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:20 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 09b2ff2e for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:18 +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=8N76cFd6ufqtXLF28gZR20Poe YYgi7zrDMy09w6YOCc=; b=Ro7xUd9/G+boZ5OHr6CbRJuxtIVzeYWe0PZj3f3yt lrdqDd/8YfC6+CiMU5InZJfShaB1c6bug0BKyE3FRZpnBleW/O7fWLwX7wbIL2SL yC/mrg5dqFTUJIK7AApqsW8lq58q/gehT8a2dNqqL79pLb0eCvstw2BlY4V7cdPi O3GiWk2rpAht3hv5Rpq0Q+zRACuhPANdYsBApfsvYOU+57xJKhy6Vc75kvBj4Som tiXM8svqbZvVDnnONOvLtmovpBRLvmlJCbgxt8biLqfeISwucfFP4vlQHmCLmmnX gV87fHnlq3hdgU7JIGsv0Bk9zDdZ4zruQbiXD+DrOnowg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1e42ae8a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:17 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 02/26] gnu: Add apache-commons-parent-pom-52. Date: Tue, 21 Dec 2021 23:44:46 +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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven-parent-pom.scm (apache-commons-parent-pom-52): New variable. (make-apache-commons-parent-pom): Add optional tag-prefix input. --- gnu/packages/maven-parent-pom.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 9919a66105..8a70791353 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -88,7 +88,8 @@ (define-public apache-parent-pom-23 (make-apache-parent-pom "23" "05c8i741f0m4311q264zvq0lc6srsyz2x95ga4d7qfd89swkzg9d")) -(define (make-apache-commons-parent-pom version hash parent) +(define* (make-apache-commons-parent-pom version hash parent + #:key (tag-prefix "commons-parent-")) (hidden-package (package (name "apache-commons-parent-pom") @@ -97,7 +98,7 @@ (define (make-apache-commons-parent-pom version hash parent) (method git-fetch) (uri (git-reference (url "https://github.com/apache/commons-parent") - (commit (string-append "commons-parent-" version)))) + (commit (string-append tag-prefix version)))) (file-name (git-file-name name version)) (sha256 (base32 hash)))) (build-system ant-build-system) @@ -138,6 +139,12 @@ (define-public apache-commons-parent-pom-50 "50" "0ki8px35dan51ashblpw6rdl27c2fq62slazhslhq3lr4fwlpvxs" apache-parent-pom-21)) +(define-public apache-commons-parent-pom-52 + (make-apache-commons-parent-pom + "52" "0fb6id9cs9944fjlirjc07bf234bwi96i642px09m9nrfj338n5d" + apache-parent-pom-23 + #:tag-prefix "rel/commons-parent-")) + (define-public java-weld-parent-pom (hidden-package (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:29 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:29 +0000 Received: from localhost ([127.0.0.1]:56002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsu-0007vV-9l for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:28 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsm-0007uN-Uv for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:21 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id b3bebc45 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:18 +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=ECe8KXWBq2qmOhyw+VOArU9+r 71TGQFUHtnbgGj0ajA=; b=LhOlv0rNy+dd9SY/u2h+JUsBUOcpdqIdwWjbNWqJt HpWmIsf3bW62TdGlPDSBAUy1aR+Tpo41vjO17LPlEI47UjQAq/uK9z9RGS7Roj7/ WEm98jcpJT81vH+ekiFqSVU6KPM/E3KVDe2SaJX6DIHN4opjlNC/vSW0z3d3dmsI MYlElDxJ+GiEbRpfblYFtzZ4Lw3PDRtPBXhbs2YvbaaZNfhdTK+VnaX2lq+W3YnI WxPVI75sFMTTA8LgIaqzUV/3fgGqseLfnzPyOEAIUliDzY+Xf+qRGn6FiPi10WfN z8XvdX81C6wJmnM8qLG6N6KqD3rusBKGrR4BWYuuJOYEQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 39ca888e (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:18 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 03/26] gnu: Add plexus-parent-pom-8. Date: Tue, 21 Dec 2021 23:44:47 +0100 Message-Id: <304fc9132367335d748e199defe1b79d764d6c74.1640126678.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven-parent-pom.scm (plexus-parent-pom-8): New variable. --- gnu/packages/maven-parent-pom.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 8a70791353..302a30f338 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -391,6 +391,10 @@ (define-public plexus-parent-pom-6.1 (make-plexus-parent-pom "6.1" "1pisca0fxpgbhf4xdgw5mn86622pg3mc5b8760kf9mk2awazshlj")) +(define-public plexus-parent-pom-8 + (make-plexus-parent-pom + "8" "0ybwdzawa58qg9ag39rxyin24lk9sjcaih6n2yfldfzsbkq6gnww")) + (define (make-maven-parent-pom version hash parent) (hidden-package (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:29 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:29 +0000 Received: from localhost ([127.0.0.1]:56004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsv-0007vl-0j for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:29 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsn-0007uN-IZ for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:21 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 3a49ce8c for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:19 +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=Wmljg0DtQiqgR193OQNGSbT/1 mhAnD570Wt3LuqwK54=; b=OZRSXA/CQ9Q2LGRKYJaktcVme9JiPdsWXEg4fOx61 lzQonKgYl8T2Adk4/5iqHDwcMiK+3jWIqyBYzlBl0Nl+woETdip3ug1Z9MTpLTgR 2VQtTjlrrH4VKlg5KTypzHOrGWzW2g15m+3vx1RQcBpBVyrW/bNSqlza9+H27Vfc LO7Qz8UHkpDzQlt2HImikAR3MEy4Zpx4g4+999HTwNWRJDKfgDLtJWnPQDuRO9gh U4l83VZVKcZ/j5VtvwJCIcOuLAB/xHyw6Mjo4m1RAUWpB5OruvDl1qT5WC4c3jrF VJeNbYH4YzKOidhom6Z1tMe9SXvtmDYnC5jxUdgp3f1gQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id f8f431fe (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:18 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 04/26] gnu: Add maven-parent-pom-34. Date: Tue, 21 Dec 2021 23:44:48 +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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven-parent-pom.scm (maven-parent-pom-34): New variable. --- gnu/packages/maven-parent-pom.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 302a30f338..19f1bc5007 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -428,6 +428,11 @@ (define (make-maven-parent-pom version hash parent) tool. This package contains the Maven parent POM.") (license license:asl2.0)))) +(define-public maven-parent-pom-34 + (make-maven-parent-pom + "34" "1vkmrfwva76k6maf1ljbja5ga4kzav4xc73ymbaf42xaiaknglbc" + apache-parent-pom-23)) + (define-public maven-parent-pom-33 (make-maven-parent-pom "33" "1b0z2gsvpccgcssys9jbdfwlwq8b5imdwr508f87ssdbfs29lh65" -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:30 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:30 +0000 Received: from localhost ([127.0.0.1]:56007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsv-0007vs-BB for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:30 -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-6i for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:22 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2359e178 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:19 +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=1cZAmQwJqg2LVCuk41LO2/XtG nrQiQ2wOMod7Vh6S74=; b=d3AppTSYVqItQXlPtATs87pZP8mHIOV481Lp5tXZH A6DHEbELtZS/d16wfl5pBOQbRcyBKuquIV67w/I32jFu2pSL30XN1W/UsoIXTtPA 8mBMKJnl1yc3LOMLkI6gHF8DNhGuI/QMKNm7O3YmlFWuo1WlzHFBWeGvfyCR/ssU mU9MZfRRvAlLgb6ixGtbidvt8Z8PJr21jbu3xAbQkBgwf0xrU9uyKo1/2+8KVCNh 2MAAnjvuJCM6soTZLiEV1ORSfHhL34M1MvFky1Y1+ufSjo0UHc3H1zyk/v9g8NSU mntYQbWykDa/oLwKmmjzRNIwvwj+d+4FqBVxjHej2DY3w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 10f0a017 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:19 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 05/26] gnu: maven-parent-pom: Fix dependency versions. Date: Tue, 21 Dec 2021 23:44:49 +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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven-parent-pom.scm (make-maven-parent-pom): Add a replacement option. (maven-parent-pom-34, maven-parent-pom-33, maven-parent-pom-31, maven-parent-pom-22, maven-parent-pom-15): Replace java-plexus-component-annotations version. --- gnu/packages/maven-parent-pom.scm | 44 ++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 19f1bc5007..6d11c84f44 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -395,7 +395,7 @@ (define-public plexus-parent-pom-8 (make-plexus-parent-pom "8" "0ybwdzawa58qg9ag39rxyin24lk9sjcaih6n2yfldfzsbkq6gnww")) -(define (make-maven-parent-pom version hash parent) +(define* (make-maven-parent-pom version hash parent #:key replacements) (hidden-package (package (name "maven-parent-pom") @@ -418,6 +418,12 @@ (define (make-maven-parent-pom version hash parent) (install-pom-file "maven-plugins/pom.xml")) (add-after 'install 'install-shared (install-pom-file "maven-shared-components/pom.xml")) + ,@(if replacements + `((add-before 'install 'fix-pom + (lambda _ + (use-modules (guix build maven pom)) + (fix-pom-dependencies "pom.xml" '() #:local-packages (quote ,(force replacements)))))) + '()) (replace 'install (install-pom-file "pom.xml"))))) (propagated-inputs @@ -431,17 +437,32 @@ (define (make-maven-parent-pom version hash parent) (define-public maven-parent-pom-34 (make-maven-parent-pom "34" "1vkmrfwva76k6maf1ljbja5ga4kzav4xc73ymbaf42xaiaknglbc" - apache-parent-pom-23)) + apache-parent-pom-23 + #:replacements + (delay + `(("org.codehaus.plexus" + ("plexus-component-annotations" . + ,(package-version java-plexus-component-annotations))))))) (define-public maven-parent-pom-33 (make-maven-parent-pom "33" "1b0z2gsvpccgcssys9jbdfwlwq8b5imdwr508f87ssdbfs29lh65" - apache-parent-pom-21)) + apache-parent-pom-21 + #:replacements + (delay + `(("org.codehaus.plexus" + ("plexus-component-annotations" . + ,(package-version java-plexus-component-annotations))))))) (define-public maven-parent-pom-31 (make-maven-parent-pom "31" "0skxv669v9ffwbmrmybnn9awkf1g3ylk88bz0hv6g11zpj1a8454" - apache-parent-pom-19)) + apache-parent-pom-19 + #:replacements + (delay + `(("org.codehaus.plexus" + ("plexus-component-annotations" . + ,(package-version java-plexus-component-annotations))))))) (define-public maven-parent-pom-30 (make-maven-parent-pom @@ -477,7 +498,12 @@ (define-public maven-parent-pom-15 (define-public maven-parent-pom-22 (let ((base (make-maven-parent-pom "22" "1kgqbyx7ckashy47n9rgyg4asyrvp933hdiknvnad7msq5d4c2jg" - apache-parent-pom-11))) + apache-parent-pom-11 + #:replacements + (delay + `(("org.codehaus.plexus" + ("plexus-component-annotations" . + ,(package-version java-plexus-container-default)))))))) (package (inherit base) (arguments @@ -485,13 +511,7 @@ (define-public maven-parent-pom-22 ((#:phases phases) `(modify-phases ,phases (delete 'install-plugins) - (delete 'install-shared) - (add-before 'install 'fix-versions - (lambda _ - (substitute* "pom.xml" - (("1.5.5") - ,(package-version java-plexus-component-annotations))) - #t))))))))) + (delete 'install-shared)))))))) (define-public maven-plugins-pom-23 (hidden-package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:31 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:31 +0000 Received: from localhost ([127.0.0.1]:56012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsw-0007wE-AI for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:31 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznso-0007us-Pu 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 d20f6492 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=46LLR4I10dPXf6Sq68xD5tcAP ++2vT6m2pgCq1Ob+hI=; b=F/wOAAYSdfINEr77qseqXVWyxknoyxe7xIFkhmpdf CxnbwFESY5W0+cky9EWyHYTrovhRIXHWuwXrgzLWDzKI0oXRgCxWSXrSzY/KIw8F LgbtU4oYj0bdR7pOWxoC9VGX9cGqF60i9N+WM4GYIL86cCsl43Lxev9ESz+I31Iv 4Iho4HmYblChJ7KVTBs2xia8Wt5DQqd1WAPmT7X/1RIjlK2s0o7u0aeV/sutMPeZ pGl14u+zG5xGChVD6JRGmd8oh76AwQPdkFKa7yMhzk0A3qCA+PqbXYWbP15j7neb fq+v/+17PxhH8lsnOzOG3rBE0SM4SPHd92B9oxOW6+1UA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id d66eff84 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:19 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 06/26] gnu: java-commons-codec: Use latest commons parent. Date: Tue, 21 Dec 2021 23:44:50 +0100 Message-Id: <77bf72c953edb03afaba512d91d9e7710bf23823.1640126678.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-commons-codec)[propagated-inputs]: Fix commons parent version. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6332b58b98..7c57924231 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7991,7 +7991,7 @@ (define-public java-commons-codec (native-inputs (list java-commons-lang3 java-junit)) (propagated-inputs - (list apache-commons-parent-pom-50)) + (list apache-commons-parent-pom-52)) (home-page "https://commons.apache.org/codec/") (synopsis "Common encoders and decoders such as Base64, Hex, Phonetic and URLs") (description "The codec package contains simple encoder and decoders for -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:32 2021 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 To: 52723@debbugs.gnu.org Subject: [PATCH 07/26] gnu: java-plexus-utils: Default to the newer one. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:33 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:33 +0000 Received: from localhost ([127.0.0.1]:56019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsx-0007wl-Vi for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:32 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsp-0007us-Di for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:24 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ecd12bf8 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:21 +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=RhYZNUDcGt8itPX86jOIGTB2e YoXwS3uzBotjookzUs=; b=SElq4jbUgSniype2PV7rqm7gOw3r/Q1evVF2sI0dR JJzCjNv+gkrWewm80MT7Y2YtBznwKj5pCx+MrHe6LuW21PfK86yGWFvlAkiYBA/a sGousH3nPtEAVnouhOLFYKQ9sK8Brva4NkRc4x53UijopQ4N9Ve0+oWhnDerxhGb dLVQmVm9VGPso/z9lvJFoNbkyt0b6v5OVJmjUjcDPUQtOvkfvl/kIOybB28zXqDE KkYVViTUP4y2OM/IrYaSSasOnpJypWJKQEdSX3pdx1gb4+/kmJiSj6zE2tWJGXss wC3rrq65Y4tXlA3iJfA2xXKEOkQwDh0YW4NVP/oSPMYiQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id a5c04cb2 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:21 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 08/26] gnu: Add java-plexus-build-api. Date: Tue, 21 Dec 2021 23:44:52 +0100 Message-Id: <0d1c7707de8b65682be4635ace63c441af0ff56c.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is the proper name for java-sisu-build-api. * gnu/packages/java.scm (java-sisu-build-api): Rename to... (java-plexus-build-api): ...this. [source]: Use new source repository. --- gnu/packages/java.scm | 16 ++++++++-------- gnu/packages/maven.scm | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8c65d713f6..d22cb2600d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4335,7 +4335,7 @@ (define-public java-plexus-utils (define-public java-plexus-utils-3.2.1 (package (inherit java-plexus-utils) - ;; sisu-build-api needs this version, later versions don't work + ;; plexus-build-api needs this version, later versions don't work (version "3.2.1") (source (origin (method git-fetch) @@ -5099,7 +5099,7 @@ (define-public java-plexus-sec-dispatcher ("java-plexus-utils" ,java-plexus-utils) ("java-guava" ,java-guava) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) + ("java-plexus-build-api" ,java-plexus-build-api) ;; modello plugins: ("java-modellop-plugins-java" ,java-modello-plugins-java) ("java-modellop-plugins-xml" ,java-modello-plugins-xml) @@ -5143,14 +5143,14 @@ (define-public java-plexus-cli Plexus components.") (license license:asl2.0))) -(define-public java-sisu-build-api +(define-public java-plexus-build-api (package - (name "java-sisu-build-api") + (name "java-plexus-build-api") (version "0.0.7") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sonatype/sisu-build-api") + (url "https://github.com/codehaus-plexus/plexus-build-api") (commit (string-append "plexus-build-api-" version)))) (file-name (git-file-name name version)) (sha256 @@ -5158,7 +5158,7 @@ (define-public java-sisu-build-api "1d5w6c58gkx30d51v7qwv1xrhc0ly76848gihmgshj19yf6yhca0")))) (build-system ant-build-system) (arguments - `(#:jar-name "sisu-build-api.jar" + `(#:jar-name "plexus-build-api.jar" #:source-dir "src/main/java" #:jdk ,icedtea-8 #:tests? #f; FIXME: how to run the tests? @@ -5194,7 +5194,7 @@ (define-public java-sisu-build-api (install-from-pom "pom.xml"))))) (inputs (list java-plexus-utils-3.2.1 java-plexus-container-default)) - (home-page "https://github.com/sonatype/sisu-build-api/") + (home-page "https://github.com/codehaus-plexus/plexus-build-api/") (synopsis "Base build API for maven") (description "This package contains the base build API for maven and a default implementation of it. This API is about scanning files in a @@ -5238,7 +5238,7 @@ (define-public java-modello-core #t))))) (propagated-inputs (list java-plexus-utils java-plexus-container-default - java-sisu-build-api)) + java-plexus-build-api)) (native-inputs (list java-junit java-plexus-classworlds java-geronimo-xbean-reflect java-guava)) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 38b93f43b7..14cbf49482 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1088,7 +1088,7 @@ (define-public maven-model java-plexus-classworlds java-guava java-geronimo-xbean-reflect - java-sisu-build-api + java-plexus-build-api ;; modello plugins: java-modello-plugins-java java-modello-plugins-xml @@ -1166,7 +1166,7 @@ (define-public maven-settings java-plexus-utils java-guava java-geronimo-xbean-reflect - java-sisu-build-api + java-plexus-build-api ;; modello plugins: java-modello-plugins-java java-modello-plugins-xml @@ -1302,7 +1302,7 @@ (define-public maven-repository-metadata ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-guava" ,java-guava) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) + ("java-plexus-build-api" ,java-plexus-build-api) ;; modello plugins: ("java-modello-plugins-java" ,java-modello-plugins-java) ("java-modello-plugins-xml" ,java-modello-plugins-xml) @@ -1387,7 +1387,7 @@ (define-public maven-plugin-api ("classworlds" ,java-plexus-classworlds) ("guava" ,java-guava) ("xbean" ,java-geronimo-xbean-reflect) - ("build-api" ,java-sisu-build-api) + ("build-api" ,java-plexus-build-api) ;; modello plugins: ("java" ,java-modello-plugins-java) ("xml" ,java-modello-plugins-xml) @@ -1491,7 +1491,7 @@ (define-public maven-core-bootstrap ("java-asm" ,java-asm) ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) + ("java-plexus-build-api" ,java-plexus-build-api) ("java-modello-plugins-java" ,java-modello-plugins-java) ("java-modello-plugins-xml" ,java-modello-plugins-xml) ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3) @@ -1677,7 +1677,7 @@ (define-public maven-embedder (native-inputs `(("java-modello-core" ,java-modello-core) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) + ("java-plexus-build-api" ,java-plexus-build-api) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-cglib" ,java-cglib) @@ -1866,7 +1866,7 @@ (define-public maven-compat ("java-plexus-component-annotations" ,java-plexus-component-annotations) ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) + ("java-plexus-build-api" ,java-plexus-build-api) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-exclispe-sisu-inject" ,java-eclipse-sisu-inject) ("java-javax-inject" ,java-javax-inject) @@ -2870,7 +2870,7 @@ (define-public maven-filtering `(#:jar-name "maven-filtering.jar" #:source-dir "src/main/java" #:test-dir "src/test" - ;; this test comes from sisu-build-api, not this package + ;; this test comes from plexus-build-api, not this package #:test-exclude (list "**/IncrementalResourceFilteringTest.java" "**/Abstract*.java") #:phases @@ -2890,7 +2890,7 @@ (define-public maven-filtering #t)) (add-before 'check 'decompress-tests (lambda* (#:key inputs #:allow-other-keys) - (let* ((build-api-source (assoc-ref inputs "java-sisu-build-api-origin")) + (let* ((build-api-source (assoc-ref inputs "java-plexus-build-api-origin")) (classes (string-append build-api-source "/src/test/java"))) (copy-recursively classes "src/test/")) #t)) @@ -2909,7 +2909,7 @@ (define-public maven-filtering maven-shared-utils java-plexus-utils-3.2.1 java-plexus-interpolation - java-sisu-build-api + java-plexus-build-api maven-parent-pom-30)) (inputs (list java-jsr305)) @@ -2920,7 +2920,7 @@ (define-public maven-filtering ("java-mockito" ,java-mockito-1) ("java-objenesis" ,java-objenesis) ("java-plexus-component-metadata" ,java-plexus-component-metadata) - ("java-sisu-build-api-origin" ,(package-source java-sisu-build-api)))) + ("java-plexus-build-api-origin" ,(package-source java-plexus-build-api)))) (home-page "https://maven.apache.org/shared/maven-filtering") (synopsis "Shared component for all plugins that needs to filter resources") (description "This component provides an API to filter resources in Maven -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:48 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:48 +0000 Received: from localhost ([127.0.0.1]:56024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsy-0007x2-VZ for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:48 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsp-0007uN-PL for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:24 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 660a18c9 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:22 +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=dLYbqn9BzFXH3HRSzsXT7X4up HKfYBp/qkdnE0zTeJc=; b=Ni/HZPmqlO9rSwXMSCr5PtyTfukkEnAY39vxlQp+F C+KMrGw0LWI9wNM0yNDBVuTCbuWaCGvrLAyZVc3up/kvm4pp9zWAV2KF+/NLQ1my kSNE01cRHP9v3PH9q9FknIF15tQcT2xeqp24tmG9jDt7Qudw6tEz4zZyBC2PLydR HDGpol+x7OJ+1gpLvCKSTmNiI025+w3FQzDIHiwg3gg+06wYE0jf9FtFP3cHNtb9 UU8pHonRgQo+CjOgIYKWTdnRQWfLlZ6Sg5V3ieHlRNgvrqEQO6q0lkRi+YWra6/G CLmPoXjHO2U1KH4SmnXneEgq46x3wtwn363K1o6dZANBw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 502286ce (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:21 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 09/26] gnu: java-plexus-cipher: Update to 2.0. Date: Tue, 21 Dec 2021 23:44:53 +0100 Message-Id: <890d52c237907568622eb607dd5a7786ba899818.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-plexus-cipher): Update to 2.0. (java-plexus-cipher-1.7): New variable. --- gnu/packages/java.scm | 58 +++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d22cb2600d..fd7dc76fe9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4700,17 +4700,58 @@ (define-public java-plexus-component-metadata (define-public java-plexus-cipher (package (name "java-plexus-cipher") - (version "1.7") + (version "2.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/codehaus-plexus/plexus-cipher") (commit (string-append "plexus-cipher-" version)))) (file-name (git-file-name name version)) + (sha256 + (base32 + "01fipdsm090n8j4207fl8kbxznkgkmkkgyazf53hm1nwn6na5aai")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "plexus-cipher.jar" + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-javax.inject.Named + (lambda _ + (mkdir-p "build/classes/META-INF/sisu") + (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" + (lambda _ + (display + "org.sonatype.plexus.components.cipher.DefaultPlexusCipher\n"))) + #t)) + (replace 'install (install-from-pom "pom.xml"))))) + (inputs + `(("java-cdi-api" ,java-cdi-api) + ("java-javax-inject" ,java-javax-inject))) + (propagated-inputs + `(("java-sonatype-spice-parent-pom" ,java-sonatype-spice-parent-pom-15) + ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/sonatype/plexus-cipher") + (synopsis "Encryption/decryption Component") + (description "Plexus-cipher contains a component to deal with encryption +and decryption.") + (license license:asl2.0))) + +(define-public java-plexus-cipher-1.7 + (package + (inherit java-plexus-cipher) + (version "1.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-cipher") + (commit (string-append "plexus-cipher-" version)))) + (file-name (git-file-name "java-plexus-cipher" version)) (sha256 (base32 "0m638nzlxbmnbcj5cwdpgs326ab584yv0k803zlx37r6iqwvf6b0")))) - (build-system ant-build-system) (arguments `(#:jar-name "plexus-cipher.jar" #:source-dir "src/main/java" @@ -4732,17 +4773,8 @@ (define-public java-plexus-cipher (("provided") "test")) #t)) (replace 'install (install-from-pom "pom.xml"))))) - (inputs - (list java-cdi-api java-javax-inject)) (propagated-inputs - (list java-sonatype-spice-parent-pom-15)) - (native-inputs - (list java-junit)) - (home-page "https://github.com/sonatype/plexus-cipher") - (synopsis "Encryption/decryption Component") - (description "Plexus-cipher contains a component to deal with encryption -and decryption.") - (license license:asl2.0))) + (list java-sonatype-spice-parent-pom-15)))) (define-public java-plexus-java (package @@ -5089,7 +5121,7 @@ (define-public java-plexus-sec-dispatcher #t)) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs - (list java-plexus-utils java-plexus-cipher + (list java-plexus-utils java-plexus-cipher-1.7 java-sonatype-spice-parent-pom-12)) (native-inputs `(("java-modello-core" ,java-modello-core) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:48 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:48 +0000 Received: from localhost ([127.0.0.1]:56030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntE-0007xr-9I for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:48 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsq-0007us-9X for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:24 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f8c67460 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:23 +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=L//lFVB99pErgkMnD2HUlNdLF YUNi4ydRpbtjv1D5Yg=; b=ZSiuQ3W4SxB4BtZh1gSy5f10g1edpeBDSQh8Rgjx4 yk6sOokSuUVXEJVWNC6C/m4xi0bNMoDGyHMo/N521pOcprxU0sZivCQH3nR9Zn84 M/em6mKQP2gcv6tVGfvfVNG9MwB8lir7JSEjD/Us4z5cv+vwdkaRYCbwR17YX/bT bp54hBNyiX1icvP3dqILNpg8XfonVkBPz5cOMePF6i0I6Ec4HVI9AKyGvbEAHMSw 7Fgt1piZfAhrPQpvBkC96rZz9A8wdTYoc0MgPB4ylXrYv8Dapri/PngUcNr0rLfg COsOESpIY1uXcbFZdaIKhpIuz2mGwbGCNBbAmajuxJ0bw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 6facf0f0 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:22 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 10/26] gnu: java-plexus-sec-dispatcher: Update to 2.0. Date: Tue, 21 Dec 2021 23:44:54 +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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-plexus-sec-dispatcher): Update to 2.0. (java-plexus-sec-dispatcher-1.4): New variable. --- gnu/packages/java.scm | 96 +++++++++++++++++++++++++++--------------- gnu/packages/maven.scm | 6 +-- 2 files changed, 64 insertions(+), 38 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fd7dc76fe9..811ce1d4f8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5056,17 +5056,15 @@ (define-public java-plexus-digest (define-public java-plexus-sec-dispatcher (package (name "java-plexus-sec-dispatcher") - (version "1.4") ;; Newest release listed at the Maven Central Repository. + (version "2.0") (source (origin - ;; This project doesn't tag releases or publish tarballs, so we take - ;; the "prepare release plexus-sec-dispatcher-1.4" git commit. (method git-fetch) (uri (git-reference - (url "https://github.com/sonatype/plexus-sec-dispatcher/") - (commit "7db8f880486e192a1c5ea9544e01e756c3d49d0f"))) + (url "https://github.com/codehaus-plexus/plexus-sec-dispatcher") + (commit (string-append "plexus-sec-dispatcher-" version)))) (sha256 (base32 - "1ng4yliy4cqpjr4fxxjbpwyk1wkch5f8vblm1kvwf328s4gibszs")) + "0665zcyxkv2knydxgv2dn64zvy1dx9j9af12ds9s64qmzd1rk6pk")) (file-name (git-file-name name version)))) (arguments `(#:jar-name "plexus-sec-dispatcher.jar" @@ -5085,6 +5083,61 @@ (define-public java-plexus-sec-dispatcher (modello-single-mode file "1.0.0" "xpp3-reader") (modello-single-mode file "1.0.0" "xpp3-writer")) #t)) + (add-before 'build 'generate-javax.inject.Named + (lambda _ + (mkdir-p "build/classes/META-INF/sisu") + (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" + (lambda _ + (display + "org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher\n"))) + #t)) + (add-before 'check 'fix-paths + (lambda _ + (copy-recursively "src/test/resources" "target") + #t)) + (replace 'install (install-from-pom "pom.xml"))))) + (propagated-inputs + (list java-plexus-utils java-plexus-cipher plexus-parent-pom-8)) + (native-inputs + (list java-javax-inject + java-modello-core + ;; for modello + java-plexus-container-default + java-plexus-classworlds + java-plexus-utils + java-guava + java-geronimo-xbean-reflect + ;; modello plugins + java-modello-plugins-java + java-modello-plugins-xml + java-modello-plugins-xpp3 + ;; for tests + java-junit)) + (build-system ant-build-system) + (home-page "https://github.com/sonatype/plexus-sec-dispatcher") + (synopsis "Plexus Security Dispatcher Component") + (description "This package is the Plexus Security Dispatcher Component. +This component decrypts a string passed to it.") + (license license:asl2.0))) + +(define-public java-plexus-sec-dispatcher-1.4 + (package + (inherit java-plexus-sec-dispatcher) + (version "1.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-sec-dispatcher") + (commit (string-append "sec-dispatcher-" version)))) + (sha256 + (base32 + "1ng4yliy4cqpjr4fxxjbpwyk1wkch5f8vblm1kvwf328s4gibszs")) + (file-name (git-file-name "java-plexus-sec-dispatcher" version)))) + (arguments + (substitute-keyword-arguments (package-arguments java-plexus-sec-dispatcher) + ((#:phases phases) + `(modify-phases ,phases + (delete 'generate-javax.inject.Named) (add-before 'build 'generate-components.xml (lambda _ (mkdir-p "build/classes/META-INF/plexus") @@ -5113,37 +5166,10 @@ (define-public java-plexus-sec-dispatcher \n \n \n -\n"))) - #t)) - (add-before 'check 'fix-paths - (lambda _ - (copy-recursively "src/test/resources" "target") - #t)) - (replace 'install (install-from-pom "pom.xml"))))) +\n"))))))))) (propagated-inputs (list java-plexus-utils java-plexus-cipher-1.7 - java-sonatype-spice-parent-pom-12)) - (native-inputs - `(("java-modello-core" ,java-modello-core) - ;; for modello: - ("java-plexus-container-default" ,java-plexus-container-default) - ("java-plexus-classworlds" ,java-plexus-classworlds) - ("java-plexus-utils" ,java-plexus-utils) - ("java-guava" ,java-guava) - ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-plexus-build-api" ,java-plexus-build-api) - ;; modello plugins: - ("java-modellop-plugins-java" ,java-modello-plugins-java) - ("java-modellop-plugins-xml" ,java-modello-plugins-xml) - ("java-modellop-plugins-xpp3" ,java-modello-plugins-xpp3) - ;; for tests - ("java-junit" ,java-junit))) - (build-system ant-build-system) - (home-page "https://github.com/sonatype/plexus-sec-dispatcher") - (synopsis "Plexus Security Dispatcher Component") - (description "This package is the Plexus Security Dispatcher Component. -This component decrypts a string passed to it.") - (license license:asl2.0))) + java-sonatype-spice-parent-pom-12)))) (define-public java-plexus-cli (package diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 14cbf49482..c66cfd0b83 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1197,7 +1197,7 @@ (define-public maven-settings-builder (propagated-inputs (list java-plexus-utils java-plexus-interpolation - java-plexus-sec-dispatcher + java-plexus-sec-dispatcher-1.4 maven-builder-support maven-settings maven-pom)) @@ -1886,7 +1886,7 @@ (define-public maven-compat ("java-qdox" ,java-qdox) ;; tests ("java-plexus-cipher" ,java-plexus-cipher) - ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher) + ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher-1.4) ("java-jsr250" ,java-jsr250) ("java-cdi-api" ,java-cdi-api) ("java-junit" ,java-junit) @@ -2346,7 +2346,7 @@ (define-public maven-3.0-core java-plexus-classworlds java-plexus-component-annotations java-plexus-container-default - java-plexus-sec-dispatcher + java-plexus-sec-dispatcher-1.4 maven-3.0-pom)))) (define-public maven-3.0-compat -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:49 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:49 +0000 Received: from localhost ([127.0.0.1]:56032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntE-0007xy-Nq for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:49 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsr-0007us-6q for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:28 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ac5a4a90 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:24 +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=bvfjs4TIhosyD2M2c5kG9gSO7 uelB1KbCi6b7n4xqkw=; b=iWtUwmrbT1mhOBAdIm9kI6rOkDR9Yy6+lMeEEAXPS J9a4hXutncANXcRhxcGTEwIEgAaKmJuW+sU3K8gAosYmuGRymzwblyxU1iV9EPY8 OuCThVxS+lTdgFrJpXRi9zA7jNBSQWCH81if5PRV5yuTEVO60CCFUmJeK28sU/9/ 0fKBF2hOND0CYHZJhUgBpebhMzsqYOTvyWU60XXuhksBNUVo6meDY3kEnIK8TCsW T/Yqf8mJcQLpyI3Lx2b9bvmURAufOE5/VE1Ywo1LeRx9DeXzRjUOfj3MJoFWwy58 gpfnFML5NPTrXwowNmLZIT9l9VplC1wylCvvfG0VQe1wA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 486d1b5b (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:23 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 12/26] gnu: java-jsr250: Use proper source. Date: Tue, 21 Dec 2021 23:44:56 +0100 Message-Id: <5487c235c8e2d2ddcae9b6b0cfa47fcf891d6202.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Sources from maven.org are autogenerated, not actual sources. * gnu/packages/java.scm (java-jsr250)[source]: Use git repository. * gnu/packages/maven.scm (maven-embedder): Fix pom to use it. --- gnu/packages/java.scm | 16 +++++++--------- gnu/packages/maven.scm | 4 ++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 811ce1d4f8..f35ec4f0b1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6564,14 +6564,14 @@ (define-public java-jsr250 (name "java-jsr250") (version "1.3") (source (origin - (method url-fetch) - (uri (string-append "https://repo1.maven.org/maven2/" - "javax/annotation/javax.annotation-api/" - version "/javax.annotation-api-" - version "-sources.jar")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/javaee/javax.annotation") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "08clh8n4n9wfglf75qsqfjs6yf79f7x6hqx38cn856pksszv50kz")))) + "1g22a9d75g01s9yxgdig0ss7i30j4ysnnp08gn4krn0wly4lpqq0")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests included @@ -6579,11 +6579,9 @@ (define-public java-jsr250 #:jar-name "jsr250.jar" #:phases (modify-phases %standard-phases - (add-before 'install 'create-pom - (generate-pom.xml "pom.xml" "javax.annotation" "jsr250-api" ,version - #:name "jsr250")) (replace 'install (install-from-pom "pom.xml"))))) + (propagated-inputs (list java-jvnet-parent-pom-3)) (home-page "https://jcp.org/en/jsr/detail?id=250") (synopsis "Security-related annotations") (description "This package provides annotations for security. It provides diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index c66cfd0b83..4cad05f3e1 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1643,6 +1643,10 @@ (define-public maven-embedder (("srcdir=\"maven-embedder/src/test\"") "srcdir=\"maven-embedder/src/test/java\"")) #t)) + (add-before 'install 'fix-pom + (lambda _ + (substitute* "maven-embedder/pom.xml" + (("jsr250-api") "javax.annotation-api")))) (replace 'install (install-from-pom "maven-embedder/pom.xml"))))) (propagated-inputs -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:49 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:49 +0000 Received: from localhost ([127.0.0.1]:56034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntF-0007y5-4b for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:49 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsq-0007uN-He for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:29 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 65e40ed2 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:23 +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=4cVy5eSuB7bUp0g2A5D25LW/v yXw64IhYUkJ9VfIxqk=; b=I1YLSu1XSkr2xOshhcl+mmay57bWhCgweuAwDuVQw ATecgGfaC68KgfZCkL06r7ezPwbJm/Z65wHyP5p36ZNIUyPXTM5tQk39Xv7CK5OS H6Lkr1wmjoGQfbbwI1GaQpbTpJwRJR7hJbuKhN/uG4o4mVxsdw9caannbSXY9hEV AhbPnXs5WMH1o7YovR++odRELs3fTvRe1V8x93Kellf5vpmRz6qZ8LOmErl140uz ZebWrCTaUcNuECxxriiQw7Q8Lavhad/Mpkwv6/KbRrfdrzWZFd9GRcozrvVU1DDI ByCnVxSycOoujIlCwOE6KzirY3b/9sjik24KT11H5YFnA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id e12efdce (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:22 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 11/26] gnu: Add java-jvnet-parent-pom-3. Date: Tue, 21 Dec 2021 23:44:55 +0100 Message-Id: <823d58f854b7cf0b44590429706cdc65269e21ad.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-jvnet-parent-pom-3): New variable. --- gnu/packages/maven-parent-pom.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 6d11c84f44..e2ebf83572 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -586,3 +586,32 @@ (define-public maven-components-parent-pom-21 (sha256 (base32 "0cqa072fz55j5xyvixqv8vbd7jsbhb1cd14bzjvm0hbv2wpd9npf")))))) + +(define-public java-jvnet-parent-pom-3 + (hidden-package + (package + (name "java-jvnet-parent-pom-3") + (version "3") + (source (origin + (method url-fetch) + (uri (string-append "https://repo1.maven.org/maven2/net/java/" + "jvnet-parent/" version "/jvnet-parent-" + version ".pom")) + (sha256 + (base32 + "0nj7958drckwf634cw9gmwgmdi302bya7bas16bbzp9rzag7ix9h")))) + (build-system ant-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'unpack) + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file #$(package-source this-package)))))) + (home-page "https://mvnrepository.com/artifact/net.java/jvnet-parent") + (synopsis "java.net parent pom") + (description "This package contains the java.net parent pom file.") + (license license:asl2.0)))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:49 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:49 +0000 Received: from localhost ([127.0.0.1]:56036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntF-0007yC-GP for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:49 -0500 Received: from lepiller.eu ([89.234.186.109]:52554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsv-0007ve-32 for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:29 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 7bd438c6 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:24 +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=H2/MqiMc71tVkb9yHkoigOH1F qrmjUWttKzDPjE298Y=; b=g80162pzAJMdVIffA95zp8S/SFuMDNABDilxJvn6N Ic6IeKbvkEAUJYq3Uo1+zzBrfbJqPgjtyd1T9XI33x8vFqG/8kWTMFFbifFiRTzH GDjrRVIkiCjktw6Nz7Ze93+OjG9AE+abGDvXbhW2Dqj9cUboK3auhOCzipnCtETw UubISSqujjSsJSuQdSeXchy5/FkboYVlPOkjtRBiQ5Da6b7d2HauEYzDdlT8Z2Ya UeZwd4aY3L/4IXZ/bEr/yjaXicCXIl7+MZJZiUydTK6CBiwL9igfGRh6cYyEJKKx qq6Dbkl8kB7Z7+WQ7MkF6Kzzh8QL2PKSUiDHeevzmP9Tg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 07b996c9 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:23 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 13/26] gnu: java-eclipse-sisu-inject: Update to 0.3.5. Date: Tue, 21 Dec 2021 23:44:57 +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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-eclipse-sisu-inject): Update to 0.3.5. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f35ec4f0b1..2671b7ab50 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13355,7 +13355,7 @@ (define-public java-apache-ivy (define-public java-eclipse-sisu-inject (package (name "java-eclipse-sisu-inject") - (version "0.3.4") + (version "0.3.5") (source (origin (method git-fetch) (uri (git-reference @@ -13364,7 +13364,7 @@ (define-public java-eclipse-sisu-inject (file-name (git-file-name name version)) (sha256 (base32 - "16044sizdb0rjbhlfbmcnpds5y7by7dyn9b0c11606aikqi8k3x6")))) + "1yh434b8pi8cwmpk825fbvbnkkk2cwd4gxxjaygg8i9j0q3l9zp3")))) (build-system ant-build-system) (arguments `(#:jar-name "eclipse-sisu-inject.jar" -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:50 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:50 +0000 Received: from localhost ([127.0.0.1]:56038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntF-0007yK-Qc for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:50 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsv-0007us-4l for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:30 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 849ee886 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:24 +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=mkJ8TDmTEa9G0yM2/+9r0tkfM /sf4vxQKbKYA9wuhg8=; b=hHxetJrTQzBmG+96CcBvXUHXMnxXyW0jYtEjImZbj /PLQ2wg9IKuEbTvMv5hc9V8yLq3pUEoj4YeibfBYYmIztq7BddTrODcV0Dsp4FhL B3PnpUGAIM4tsCTAJtc9WWtnRnyFiOO2KXxK8vZYdQnUDEEiqUnhwrVtzBTyKo25 J4D9GjE8xb9YHrBbnusPWbcWdgLQ3nOf0rT8Z8oGKrf1xmU4+689lQap8LnT+n2m ObvbS9IkH3a4V+Mw2gntpmnkg4HFzeLeHiAlJaWS06f7F8ogDRmYbBR8OGktAt2X dz/k6vjZH3Un1hBdeN/KrzUCinbZR9o4Q9PLYarNHX/5g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id db0e7279 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:24 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 14/26] gnu: java-eclipse-sisu-plexus: Update to 0.3.5. Date: Tue, 21 Dec 2021 23:44:58 +0100 Message-Id: <32186e8169670f56805ea13b13b57bb363b2db3d.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-eclipse-sisu-plexus): Update to 0.3.5. --- gnu/packages/java.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2671b7ab50..af36d9e10f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13415,7 +13415,7 @@ (define java-sisu-inject-parent-pom (define-public java-eclipse-sisu-plexus (package (name "java-eclipse-sisu-plexus") - (version "0.3.4") + (version "0.3.5") (source (origin (method git-fetch) (uri (git-reference @@ -13424,7 +13424,7 @@ (define-public java-eclipse-sisu-plexus (file-name (git-file-name name version)) (sha256 (base32 - "17mjlajnsqnk07cc58h1qpxrif85yb2m2y0pyba48yjjgikk8r9f")) + "0lm5h0dmh41ffcwd32qnk3a87d360am36yq7168ikkyqa8jxkx28")) (modules '((guix build utils))) (snippet '(begin @@ -13477,7 +13477,8 @@ (define-public java-eclipse-sisu-plexus (replace 'install (install-from-pom "org.eclipse.sisu.plexus/pom.xml"))))) (propagated-inputs - (list java-plexus-classworlds + (list java-jsr250 + java-plexus-classworlds java-plexus-utils java-plexus-component-annotations java-cdi-api -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:50 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:50 +0000 Received: from localhost ([127.0.0.1]:56040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntG-0007yR-3l for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:50 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsv-0007uN-K9 for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:30 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 085565e5 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:25 +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=Pc8mNgZ1K51YyCwls0X42iOG/ plkbG6FMcib50f/ZGk=; b=Y6ZC3DGd2tELlRm8XL5lWA4tgTguRTmNe+yx/cWaW Rz7EaKVP/pOSkq0LabTrhmQ+boPIa/M2/yPyghWL9YdKy4KsgebbX6G0ET3eN8A6 2t7nS1sfKHUBaDl7OBCjVXAlcdhKFoGtdReEO33lMqZ6p+7czQhFBF5ZViIsS08Q iWwfTOu4iZ6xVO5YtH9uvCgjwIo14fYPfaxqPA5x0MI7ntdjcFITqzmWdyzOi3Xz B27osSheTwNY60cLIYaUzdbdaqpvZ4iXDlxGRSXfkp9DvPIFdGs7Gn8v8dgQsjGh kqHqXUw94V49Kz1Ilqf0lgZNUje86D4v825NP+m5dqHxw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1f10fa7f (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:24 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 15/26] gnu: maven-common-artifact-filters: Update to 3.2.0. Date: Tue, 21 Dec 2021 23:44:59 +0100 Message-Id: <185067a5a2a5f2559fe48a00d294468199d0eb15.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven.scm (maven-common-artifact-filters): Update to 3.2.0. (maven-common-artifact-filters-3.1.0): New variable. --- gnu/packages/maven.scm | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 4cad05f3e1..1be266f9a7 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2585,7 +2585,7 @@ (define-public maven-dependency-tree (define-public maven-common-artifact-filters (package (name "maven-common-artifact-filters") - (version "3.1.0") + (version "3.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/shared/" @@ -2593,7 +2593,7 @@ (define-public maven-common-artifact-filters "-source-release.zip")) (sha256 (base32 - "1cl1qk4r0gp62bjzfm7lml9raz1my2kd4yf0ci0lnfsn0h5qivnb")))) + "1mr92s4zz6gf028wiskjg8rd1znxzdnmskg42ac55ifg9v1p1884")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-common-artifact-filters.jar" @@ -2601,14 +2601,12 @@ (define-public maven-common-artifact-filters #:tests? #f; require maven-plugin-testing-harness, which requires maven 3.2. #:phases (modify-phases %standard-phases - (add-before 'build 'remove-sisu + (add-before 'build 'fix-aether (lambda _ - ;; Replace sisu with an existing dependency, to prevent a failure - ;; when rewritting dependency versions (substitute* "pom.xml" - (("sisu-inject-plexus") "maven-plugin-api") - (("org.sonatype.sisu") "org.apache.maven")) - #t)) + (("eclipse.aether") "sonatype.aether")) + (substitute* "src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java" + (("eclipse") "sonatype")))) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs @@ -2618,6 +2616,7 @@ (define-public maven-common-artifact-filters maven-3.0-plugin-api maven-shared-utils maven-parent-pom-33 + java-eclipse-sisu-plexus java-sonatype-aether-api java-sonatype-aether-util)) (inputs @@ -2630,6 +2629,29 @@ (define-public maven-common-artifact-filters Maven project dependencies.") (license license:asl2.0))) +(define-public maven-common-artifact-filters-3.1.0 + (package + (inherit maven-common-artifact-filters) + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/shared/" + "maven-common-artifact-filters-" version + "-source-release.zip")) + (sha256 + (base32 + "1cl1qk4r0gp62bjzfm7lml9raz1my2kd4yf0ci0lnfsn0h5qivnb")))) + (arguments + (substitute-keyword-arguments (package-arguments maven-common-artifact-filters) + ((#:phases phases) + `(modify-phases ,phases + (delete 'fix-aether) + (add-before 'build 'remove-sisu + (lambda _ + (substitute* "pom.xml" + (("sisu-inject-plexus") "maven-plugin-api") + (("org.sonatype.sisu") "org.apache.maven")))))))))) + (define-public maven-enforcer-api (package (name "maven-enforcer-api") @@ -2781,7 +2803,7 @@ (define-public maven-artifact-transfer (list java-commons-codec maven-3.0-artifact maven-3.0-core - maven-common-artifact-filters + maven-common-artifact-filters-3.1.0 java-plexus-component-annotations java-plexus-utils java-slf4j-api -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:50 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:50 +0000 Received: from localhost ([127.0.0.1]:56042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntG-0007yY-Fb for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:50 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsw-0007us-Ev for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:31 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f4a88fc3 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:26 +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=WDWV31sXzdZnjzVK/fsk9i8yD cS1fmDVDwa/gsHq42E=; b=NRA53ahLfOoZ1wT3BlIh2Cyss5E4vL2RP8AdouMHH 431cX9Vbn/OI4kNscZx9UEuBqRNihnVlBZ3Cv6B5YrpaUPKfN0pOrIPqdXEkuywo ZqusVGs5Xe7Qka6GXgxkyE1ohB3G+VrO5iv9lx+l4KmAqDy8FcmuSg/rcBcoEHLs KHi/oYcmI78D2LCJ6RhVsf3Gqgk8QHhQlVFZOpQ00zPrjjkYKjc9AMFa0wiZ/LGA 5UDeUnG4HCiGbkT1T/zYCfAPwehDYyAbi9BJrkm02XKD9NFUCBhhbMvOkUVvL25/ pgtvPH2wVOitUKmgkvVOBx+2GbCKuY777o9VExabbR95Q== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1d7c4263 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:25 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 17/26] gnu: Add java-sonatype-aether-api-1.13. Date: Tue, 21 Dec 2021 23:45:01 +0100 Message-Id: <7fee3672d2b4beec434f26d52eff5f70591c1f6e.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven.scm (java-sonatype-aether-api-1.13): New variable. --- gnu/packages/maven.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index e62db6cb85..d8e00e6c61 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -437,6 +437,37 @@ (define-public java-sonatype-aether-impl (list java-junit java-plexus-component-metadata java-sonatype-aether-test-util)))) +;; This slightly newer version is also required by some plugins +(define-public java-sonatype-aether-api-1.13 + (package + (name "java-sonatype-aether-api") + (version "1.13.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sonatype/sonatype-aether") + (commit (string-append "aether-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yl34dqhm6ykb7h63gkssyrdxv3dsa3n5b8d8cvy8rh4qsm6p2yb")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "aether-api.jar" + #:source-dir "aether-api/src/main/java" + #:test-dir "aether-api/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'install 'install-parent (install-pom-file "pom.xml")) + (replace 'install (install-from-pom "aether-api/pom.xml"))))) + (propagated-inputs + `(("java-sonatype-forge-parent-pom" ,java-sonatype-forge-parent-pom-10))) + (native-inputs `(("java-junit" ,java-junit))) + (home-page "https://github.com/sonatype/sonatype-aether") + (synopsis "Maven repository system API") + (description "This package contains the API for the maven repository system.") + (license license:asl2.0))) + ;; Again, this old version is required by some maven plugins (define-public java-eclipse-aether-api (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:51 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:51 +0000 Received: from localhost ([127.0.0.1]:56044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntG-0007yf-Ps for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:51 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsw-0007uN-QD for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:31 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 3a304486 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:26 +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=y230jFrwGhm1seoGGzhJqJsJU luR1VoY7b9CFTbLEtc=; b=Xzu7MB814GaVEl2Tk5LC78k+8m26KP9eZDq0iKeKM yEGstQ8Le9Xtip/TIzlENYZ7JfkJma4xwN38AuQDWaupkcp4isf+mYTtqYGV+y5w dBiRZFuPEa2HxZqogGQd3QSz9W+fo9Tdt6N0rEUu8weAVGdTi3HDT7JrNwC+kfMV 2go5YF6JROPdfZ4zCQIQi9o+4KemYeNAkS3jdLl0PUlY4A0YlUOYoAQf68I4Wkso jBhbAKGi3va3j7Mmubq+2QWseSSaVdfqOqvn0q2CC0arZd8JsbdNCVkXyHNXH6WV UecvyqkYUc6enSpqsYR7zCa8CtCzLgVrhPp0XaLCgAffQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id bf50265a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:26 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 18/26] gnu: Add java-sonatype-aether-spi-1.13. Date: Tue, 21 Dec 2021 23:45:02 +0100 Message-Id: <870a595f6a27abc8b8829e84e3d302e18d4d050a.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven.scm (java-sonatype-aether-spi-1.13): New variable. --- gnu/packages/maven.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index d8e00e6c61..39270566fe 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -468,6 +468,23 @@ (define-public java-sonatype-aether-api-1.13 (description "This package contains the API for the maven repository system.") (license license:asl2.0))) +(define-public java-sonatype-aether-spi-1.13 + (package + (inherit java-sonatype-aether-api-1.13) + (name "java-sonatype-aether-spi") + (arguments + `(#:jar-name "aether-spi.jar" + #:source-dir "aether-spi/src/main/java" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "aether-spi/pom.xml"))))) + (propagated-inputs + `(("java-sonatype-aether-api" ,java-sonatype-aether-api-1.13))) + (synopsis "Maven repository system SPI") + (description "This package contains the service provider interface (SPI) +for repository system implementations and repository connectors."))) + ;; Again, this old version is required by some maven plugins (define-public java-eclipse-aether-api (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:51 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:51 +0000 Received: from localhost ([127.0.0.1]:56046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntH-0007yo-2P for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:51 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsx-0007us-GQ for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:32 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f56a266e for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:27 +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=th9sRJ7itJpU0JXa2jCiNhMwn lT5u5S/JHLy4cMvG+4=; b=jvj0UhdQ+xupKZs3IN5wS6rr9jyvg75KbV6mcUexK iarefCLOoLDYtZ8I7TpPJ8lCoKIeAc0OkxEa/lFwOFWi+jXRdOoxle2YQ8S9UD27 gyuhNvrrmzdQZXInOiVylSHB5QugcwxQcdcUu3LbiXaB8TvAd5+4sd8tosIHqgpg SajGka4eoLcGtqj1+6h6BGO4dPKnpdCoR0/CgIiobBL5ybP9Lx4p3KWytlvPwz6e EE0vzosOh8QvT5sKFDF5OTM8mqg2BabtbRhUi24SFytc+AhDMUXGYy1Y2Wornj+h 5TvcQrFFCz6AqBTUPjB5Dl3Ml2SSzfzYxlJoObEitbDhw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 70dc2bb9 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:26 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 19/26] gnu: Add java-sonatype-aether-test-util-1.13. Date: Tue, 21 Dec 2021 23:45:03 +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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven.scm (java-sonatype-aether-test-util-1.13): New variable. --- gnu/packages/maven.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 39270566fe..b73111a5ec 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -485,6 +485,21 @@ (define-public java-sonatype-aether-spi-1.13 (description "This package contains the service provider interface (SPI) for repository system implementations and repository connectors."))) +(define-public java-sonatype-aether-test-util-1.13 + (package + (inherit java-sonatype-aether-api-1.13) + (name "java-sonatype-aether-test-util") + (arguments + `(#:jar-name "java-sonatype-aether-test-util.jar" + #:source-dir "aether-test-util/src/main/java" + #:test-dir "aether-test-util/src/test")) + (inputs + `(("java-sonatype-aether-api" ,java-sonatype-aether-api-1.13) + ("java-sonatype-aether-spi" ,java-sonatype-aether-spi-1.13))) + (synopsis "Utility classes for testing the maven repository system") + (description "This package contains a collection of utility classes to +ease testing of the repository system."))) + ;; Again, this old version is required by some maven plugins (define-public java-eclipse-aether-api (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:52 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:52 +0000 Received: from localhost ([127.0.0.1]:56048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntH-0007yv-Bh for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:52 -0500 Received: from lepiller.eu ([89.234.186.109]:52554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsw-0007ve-02 for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:32 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 01fde9fc for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:25 +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=KI7AMiKeNEutb6vgOM7X5TgmO zzD5aeHliY5YVOeEPI=; b=aTGaYrslWh0C64BgkFu65TqPqEQhV+NgKb49BRMt/ zAtlGmxo1ttUG+A7UZNRpNBMNP44U3425rwjHXG4bT8IgcmSa6kKh5IGmKudxBbr iaGEUzTyzs0EKnhM/J4n7Hn0uwGYtih5m+XxrjC4QUAdIvInuv1sIICfio8RI3g9 ewtc2D2Kmiz8vqKIdehMqF4M9A3Z/FZYqLHH7znFAQcVUDR8wxDtvgL5b9kjZSqL nOVx1W2RWW1o7VZLoNQyCGXYpt44c2H3vb+21QlsAdxCx9Uqz8slv+P4PWBdsEpz c6S9xnT5cl+kmGAaMwLYHSi0gK1Vo8JGPwpFvu2zo6n7Q== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1e5cd5c4 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:25 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 16/26] gnu: java-plexus-container-default-bootstrap: Update to 2.1.0. Date: Tue, 21 Dec 2021 23:45:00 +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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/java.scm (java-plexus-container-default-bootstrap): Update to 2.1.0. (java-plexus-container-default-1.7, java-plexus-containers-parent-pom-1.7) (java-plexus-component-annotations-1.7, java-plexus-component-metadata-1.7): New variables. --- gnu/packages/java.scm | 188 +++++++++++++++++++++++++++++++++++++++-- gnu/packages/maven.scm | 22 ++--- 2 files changed, 191 insertions(+), 19 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index af36d9e10f..463cf51bcb 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4417,7 +4417,7 @@ (define-public java-plexus-classworlds (define java-plexus-container-default-bootstrap (package (name "java-plexus-container-default-bootstrap") - (version "1.7.1") + (version "2.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -4426,7 +4426,7 @@ (define java-plexus-container-default-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "1316hrp5vqfv0aw7miq2fp0wwy833h66h502h29vnh5sxj27x228")))) + "0r9yq67c1hvi1pz5wmx6x6hk5fmavp8a7yal3j5hkaad757firn1")))) (build-system ant-build-system) (arguments `(#:jar-name "container-default.jar" @@ -4673,7 +4673,82 @@ (define-public java-plexus-component-metadata (lambda _ (copy-recursively "src/main/resources" "build/classes/") - #t))))) + #t)) + (add-before 'build 'reinstate-cli + ;; The CLI was removed in 2.1.0, but we still need it to build some + ;; maven dependencies, and some parts of maven itself. We can't use + ;; the maven plugin for that yet. + (lambda _ + (with-output-to-file "src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java" + (lambda _ + ;; Copied from a previous version of this package. + (display "package org.codehaus.plexus.metadata; + +import java.io.File; +import java.util.Arrays; +import java.util.Collections; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +import org.codehaus.plexus.PlexusContainer; +import org.codehaus.plexus.tools.cli.AbstractCli; + +public class PlexusMetadataGeneratorCli + extends AbstractCli +{ + public static final char SOURCE_DIRECTORY = 's'; + public static final char SOURCE_ENCODING = 'e'; + public static final char CLASSES_DIRECTORY = 'c'; + public static final char OUTPUT_FILE = 'o'; + public static final char DESCRIPTORS_DIRECTORY = 'm'; + + public static void main( String[] args ) + throws Exception + { + new PlexusMetadataGeneratorCli().execute( args ); + } + + @Override + public String getPomPropertiesPath() + { + return \"META-INF/maven/org.codehaus.plexus/plexus-metadata-generator/pom.properties\"; + } + + @Override + @SuppressWarnings(\"static-access\") + public Options buildCliOptions( Options options ) + { + options.addOption( OptionBuilder.withLongOpt( \"source\" ).hasArg().withDescription( \"Source directory.\" ).create( SOURCE_DIRECTORY ) ); + options.addOption( OptionBuilder.withLongOpt( \"encoding\" ).hasArg().withDescription( \"Source file encoding.\" ).create( SOURCE_ENCODING ) ); + options.addOption( OptionBuilder.withLongOpt( \"classes\" ).hasArg().withDescription( \"Classes directory.\" ).create( CLASSES_DIRECTORY ) ); + options.addOption( OptionBuilder.withLongOpt( \"output\" ).hasArg().withDescription( \"Output directory.\" ).create( OUTPUT_FILE ) ); + options.addOption( OptionBuilder.withLongOpt( \"descriptors\" ).hasArg().withDescription( \"Descriptors directory.\" ).create( DESCRIPTORS_DIRECTORY ) ); + return options; + } + + public void invokePlexusComponent( CommandLine cli, PlexusContainer plexus ) + throws Exception + { + MetadataGenerator metadataGenerator = plexus.lookup( MetadataGenerator.class ); + + MetadataGenerationRequest request = new MetadataGenerationRequest(); + request.classesDirectory = new File( cli.getOptionValue( CLASSES_DIRECTORY ) ); + request.classpath = Collections.emptyList(); + request.sourceDirectories = Arrays.asList( new String[]{ new File( cli.getOptionValue( SOURCE_DIRECTORY ) ).getAbsolutePath() } ); + request.sourceEncoding = cli.getOptionValue( SOURCE_ENCODING ); + request.useContextClassLoader = true; + request.outputFile = new File( cli.getOptionValue( OUTPUT_FILE ) ); + request.componentDescriptorDirectory = new File( cli.getOptionValue( DESCRIPTORS_DIRECTORY ) ); + + metadataGenerator.generateDescriptor( request ); + } +}"))))) + (add-before 'check 'fix-test-location + (lambda _ + (substitute* '("src/test/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriterTest.java" + "src/test/java/org/codehaus/plexus/metadata/merge/ComponentsXmlMergerTest.java") + (("target") "build"))))))) (propagated-inputs `(("java-plexus-container-default" ,java-plexus-container-default) ("java-plexu-component-annotations" ,java-plexus-component-annotations) @@ -4687,7 +4762,104 @@ (define-public java-plexus-component-metadata ("java-commons-cli" ,java-commons-cli) ("java-qdox" ,java-qdox) ("java-jdom2" ,java-jdom2) - ("java-asm" ,java-asm))) + ("java-asm-8" ,java-asm-8))) + (native-inputs + (list java-junit java-guava java-geronimo-xbean-reflect)) + (synopsis "Inversion-of-control container for Maven") + (description "The Plexus project provides a full software stack for creating +and executing software projects. Based on the Plexus container, the +applications can utilise component-oriented programming to build modular, +reusable components that can easily be assembled and reused. This package +provides the Maven plugin generating the component metadata."))) + +(define-public java-plexus-container-default-1.7 + (package + (inherit java-plexus-container-default) + (version "1.7.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-containers") + (commit (string-append "plexus-containers-" version)))) + (file-name (git-file-name "java-plexus-container-default" version)) + (sha256 + (base32 + "1316hrp5vqfv0aw7miq2fp0wwy833h66h502h29vnh5sxj27x228")))))) + +(define java-plexus-containers-parent-pom-1.7 + (package + (inherit java-plexus-container-default-1.7) + (name "java-plexus-containers-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs + `(("plexus-parent-pom" ,plexus-parent-pom-4.0))))) + +(define-public java-plexus-component-annotations-1.7 + (package + (inherit java-plexus-container-default-1.7) + (name "java-plexus-component-annotations") + (arguments + `(#:jar-name "plexus-component-annotations.jar" + #:source-dir "plexus-component-annotations/src/main/java" + #:tests? #f; no tests + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "plexus-component-annotations/pom.xml"))))) + (propagated-inputs + `(("java-plexus-containers-parent-pom-1.7" ,java-plexus-containers-parent-pom-1.7))) + (inputs '()) + (native-inputs '()) + (synopsis "Plexus descriptors generator") + (description "This package is a Maven plugin to generate Plexus descriptors +from source tags and class annotations."))) + +(define-public java-plexus-component-metadata-1.7 + (package + (inherit java-plexus-container-default-1.7) + (name "java-plexus-component-metadata") + (arguments + `(#:jar-name "plexus-component-metadata.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + (chdir "plexus-component-metadata") + #t)) + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" + "build/classes/") + #t)) + (add-before 'check 'fix-test-location + (lambda _ + (substitute* '("src/test/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriterTest.java" + "src/test/java/org/codehaus/plexus/metadata/merge/ComponentsXmlMergerTest.java") + (("target") "build"))))))) + (propagated-inputs + (list java-plexus-container-default-1.7 + java-plexus-component-annotations-1.7 + java-plexus-utils + java-plexus-cli + java-plexus-cli + java-plexus-classworlds + maven-plugin-api + maven-plugin-annotations + maven-core-bootstrap + maven-model + java-commons-cli + java-qdox + java-jdom2 + java-asm)) (native-inputs (list java-junit java-guava java-geronimo-xbean-reflect)) (synopsis "Inversion-of-control container for Maven") @@ -4820,9 +4992,9 @@ (define-public java-plexus-java (list java-asm java-qdox-2-M9 java-javax-inject plexus-parent-pom-4.0)) (inputs - (list java-plexus-component-annotations)) + (list java-plexus-component-annotations-1.7)) (native-inputs - (list java-plexus-component-metadata java-junit)) + (list java-plexus-component-metadata-1.7 java-junit)) (home-page "https://codehaus-plexus.github.io/plexus-languages/plexus-java") (synopsis "Shared language features for Java") (description "This package contains shared language features of the Java @@ -4939,9 +5111,9 @@ (define-public java-plexus-compiler-manager (install-from-pom "plexus-compiler-manager/pom.xml"))))) (propagated-inputs (list java-plexus-compiler-api java-plexus-compiler-pom - java-plexus-container-default)) + java-plexus-container-default-1.7)) (native-inputs - (list unzip java-plexus-component-metadata)) + (list unzip java-plexus-component-metadata-1.7)) (synopsis "Compiler management for Plexus Compiler component") (description "Plexus Compiler is a Plexus component to use different compilers through a uniform API. This component chooses the compiler diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 1be266f9a7..e62db6cb85 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -293,7 +293,7 @@ (define-public maven-resolver-transport-wagon ("maven-resolver-util" ,maven-resolver-util) ("java-javax-inject" ,java-javax-inject) ("mavne-wagon-provider-api" ,maven-wagon-provider-api) - ("java-plexus-component-annotation" ,java-plexus-component-annotations) + ("java-plexus-component-annotation" ,java-plexus-component-annotations-1.7) ("java-plexus-classworld" ,java-plexus-classworlds) ("java-plexus-plexus-util" ,java-plexus-utils) ("java-slf4j-api" ,java-slf4j-api) @@ -735,8 +735,8 @@ (define-public maven-wagon-file (list java-plexus-utils maven-wagon-provider-api)) (native-inputs `(("maven-wagon-provider-test" ,maven-wagon-provider-test) - ("java-plexus-component-metadata" ,java-plexus-component-metadata) - ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-component-metadata" ,java-plexus-component-metadata-1.7) + ("java-plexus-component-annotations" ,java-plexus-component-annotations-1.7) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-plexus-classworlds" ,java-plexus-classworlds) @@ -823,8 +823,8 @@ (define-public maven-wagon-http-shared maven-wagon-provider-api)) (native-inputs `(("maven-wagon-provider-test" ,maven-wagon-provider-test) - ("java-plexus-component-metadata" ,java-plexus-component-metadata) - ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-component-metadata" ,java-plexus-component-metadata-1.7) + ("java-plexus-component-annotations" ,java-plexus-component-annotations-1.7) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-plexus-classworlds" ,java-plexus-classworlds) @@ -895,8 +895,8 @@ (define-public maven-wagon-http maven-wagon-provider-api)) (native-inputs `(("maven-wagon-provider-test" ,maven-wagon-provider-test) - ("java-plexus-component-metadata" ,java-plexus-component-metadata) - ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-component-metadata" ,java-plexus-component-metadata-1.7) + ("java-plexus-component-annotations" ,java-plexus-component-annotations-1.7) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-plexus-container-default" ,java-plexus-container-default) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) @@ -1472,7 +1472,7 @@ (define-public maven-core-bootstrap ("maven-plugin-api" ,maven-plugin-api) ("maven-repository-metadata" ,maven-repository-metadata) ("maven-shared-utils" ,maven-shared-utils) - ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-component-annotations" ,java-plexus-component-annotations-1.7) ("java-plexus-utils" ,java-plexus-utils) ("java-commons-lang3" ,java-commons-lang3) ("java-guava" ,java-guava) @@ -1590,7 +1590,7 @@ (define-public maven-core (invoke "ant" "jar") #t)))))) (native-inputs - `(("java-plexus-component-metadata" ,java-plexus-component-metadata) + `(("java-plexus-component-metadata" ,java-plexus-component-metadata-1.7) ("java-commons-cli" ,java-commons-cli) ("java-plexus-cli" ,java-plexus-cli) ("java-jdom2" ,java-jdom2) @@ -1867,7 +1867,7 @@ (define-public maven-compat (native-inputs `(("java-modello-core" ,java-modello-core) ("java-plexus-utils" ,java-plexus-utils) - ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-plexus-component-annotations" ,java-plexus-component-annotations-1.7) ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ("java-plexus-build-api" ,java-plexus-build-api) @@ -1882,7 +1882,7 @@ (define-public maven-compat ("java-modello-plugins-xml" ,java-modello-plugins-xml) ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3) ;; metadata - ("java-plexus-component-metadata" ,java-plexus-component-metadata) + ("java-plexus-component-metadata" ,java-plexus-component-metadata-1.7) ("java-commons-cli" ,java-commons-cli) ("java-plexus-cli" ,java-plexus-cli) ("java-jdom2" ,java-jdom2) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:52 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:52 +0000 Received: from localhost ([127.0.0.1]:56050 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntI-0007z3-7Z for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:52 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsy-0007us-Gw for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:33 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id caa225a8 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:28 +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=KXVkXzopIZKt6ZbmGmwxkIBqy mxhrEyNfiutmAdMwpE=; b=MkOQ+p8mdW2MfoxVcBR0WFPVNUwpZ36O78md7eloh JvvuelOmsJ3hrYPN4DUhte3Xv428aokFQ/GUMXVZVKx6+kt87ZED1wrAfr0MpooT Y/HzYX/yzhWxs2PcYLEZLTHoLz/6zx88bf7UKsKBho35cG2qz/iK3kuCC8+gXoo3 N1MKfpZbeQct9GfjwybOJSf3sbuN1OEe/kopyjn0KItpF6ycdyRnNr7xfGeTF+71 zhtD0QeZM7cU2XW/TC5k/QaGm6+IUlKuhiw15XYFTX5K3OrnCcgBe8NOhM9yMTTV O/yoQuAhoqyKOiGd6XEqXfZYYBNWsZzpdEDSvvGUY09lg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5bd4ae7b (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:27 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 21/26] gnu: maven-dependency-tree: Update to 3.1.0. Date: Tue, 21 Dec 2021 23:45:05 +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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven.scm (maven-dependency-tree): Update to 3.1.0. --- gnu/packages/maven.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index f85835f73c..3e17e79752 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2634,7 +2634,7 @@ (define-public maven-archiver (define-public maven-dependency-tree (package (name "maven-dependency-tree") - (version "3.0.1") + (version "3.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/shared/" @@ -2642,20 +2642,21 @@ (define-public maven-dependency-tree "-source-release.zip")) (sha256 (base32 - "0mxfslxvcmjs13jl30zhcg672j970dzn6ihh79w9ajh6sfqmlds2")))) + "1vhcd3lmbyy8q61c37sqgbllqj4ypkxm344l6pb05mkchlyk5dy5")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-dependency-tree.jar" #:source-dir "src/main/java" + #:tests? #f; no tests #:phases (modify-phases %standard-phases (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs (list maven-3.0-core java-plexus-component-annotations - maven-parent-pom-30)) + maven-parent-pom-34)) (inputs - (list java-sonatype-aether-api java-sonatype-aether-util + (list java-sonatype-aether-api-1.13 java-sonatype-aether-util-1.13 java-eclipse-aether-api java-eclipse-aether-util)) (native-inputs (list unzip java-junit)) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:52 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:52 +0000 Received: from localhost ([127.0.0.1]:56052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntI-0007zA-HC for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:52 -0500 Received: from lepiller.eu ([89.234.186.109]:52554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsy-0007ve-KB for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:33 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f7edf91c for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:28 +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=oPQZM/DwMlMoCI4wokBLQwPiW t9rvf0O/ys1FhzDX9w=; b=ai58sSzielMJ9zEpUVUa4LbAcCXdpdFSXF/4YavHb Oy6WnCKwK1W+yZMBLINUo3MmTTbeBadYKwNnfbvSPz59PsTU0hA8aH/+jHRzkXcC s5HaWcnQD+xkzhsRMgGdcUnKFdl0tsOGZlXhNaP5SUBn9Tg/MuIY/poGnMIZ03Ea alSHp1FIq33+OHPMPoyMrDO6zCXvkoDDAtNgwgrJvJLHda44cPUfWffx5LOfHWBJ 1xnHq5lsixoyRlERyGXDCFd46oyiZw+xBjLbYLZCd4dks0azb6acNBVdpHxA06kW IjiX8e5OxUdjT9GbZacr0GVFfmCtTbgQrhet8Advp9V9w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 498e78db (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:28 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 22/26] guix: maven: Fix java parser. Date: Tue, 21 Dec 2021 23:45:06 +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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/build/maven/java.scm (comment, comment-chr): Support more comment styles. --- guix/build/maven/java.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/guix/build/maven/java.scm b/guix/build/maven/java.scm index daa4c88045..f8c8e5745d 100644 --- a/guix/build/maven/java.scm +++ b/guix/build/maven/java.scm @@ -31,11 +31,14 @@ (define-peg-pattern import-pat all (and (ignore "import") (* WS) (? (and (ignore "static") (* WS))) package-name (* WS) (ignore ";"))) -(define-peg-pattern comment all (and (? (and annotation-pat (* WS))) (ignore "/*") - comment-part)) +(define-peg-pattern comment all (or + (and (? (and annotation-pat (* WS))) (ignore "/*") + comment-part) + (and (ignore "//") (* (or "\t" (range #\ #\xffff))) + (or (ignore "\n") (ignore "\r")) (* WS)))) (define-peg-pattern comment-part body (or (ignore (and (* "*") "/")) (and (* "*") (+ comment-chr) comment-part))) -(define-peg-pattern comment-chr body (or "\t" "\n" (range #\ #\)) (range #\+ #\xffff))) +(define-peg-pattern comment-chr body (or "\t" "\n" "\r" (range #\ #\)) (range #\+ #\xffff))) (define-peg-pattern inline-comment none (and (ignore "//") (* inline-comment-chr) (ignore "\n"))) (define-peg-pattern inline-comment-chr body (range #\ #\xffff)) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:53 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:53 +0000 Received: from localhost ([127.0.0.1]:56054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntI-0007zH-RC for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:53 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsz-0007us-Ds for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:33 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 6868cd0e for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:30 +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=7OcZN4cIVcaOLdNfJiZgMU8Av X1Nl5vfVR1NdoBobW0=; b=DYLP4O851H09pU9JQFDNg/htAK3TYKC75C7kDdEtt aAZz8rpFmesZpoERhF1gmgujr4Ltzf5+jI4WjuymSGB5sHzn++fTLb4teSDWZ/+S fU4SVfwr/z4zj47fJxsC3K/vMRrA6uS33IyPhGWgeXG25BBZm2YtX/JP510ZnDLq MTYNd/Ge5pNHtRCtmy+YlK/SgkxrBUc0yLwno6hLEzUtzo45UkVvIhDb821Ylica xLh3xmrogSj4f6VyLXj/j6zz/MN8NgyshXxFBIPoZQe/A55l61kz/swQ5J984hex gJhNDlKM2EPA+ibKjc7N5f9/pKZ5KKE1oonlTxT7NlAdg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id d48d204c (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:29 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 24/26] gnu: maven-wagon-provider-api: Update to 3.4.3. Date: Tue, 21 Dec 2021 23:45:08 +0100 Message-Id: <6fa3845c3f261e776db320f94a01fc2e66f6d2fd.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven.scm (maven-wagon-provider-api): Update to 3.4.3. --- gnu/packages/maven.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index d0424a3d08..f0d387f175 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -713,14 +713,14 @@ (define maven-plugin-tools-parent-pom (define-public maven-wagon-provider-api (package (name "maven-wagon-provider-api") - (version "3.3.4") + (version "3.4.3") (source (origin (method url-fetch) (uri (string-append "https://archive.apache.org/dist/maven/wagon/" "wagon-" version "-source-release.zip")) (sha256 (base32 - "1iq9bilgfklzbxwwhzi3f19mkbaaf9dh9f83h3yz5gbmvypask9a")))) + "1rnviw0yr4g5902fb8pkd1gyvci4bz7hndjvhkqmnkj7ay0y6mf0")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-wagon-provider-api.jar" @@ -837,7 +837,6 @@ (define-public maven-wagon-file ("java-commons-cli" ,java-commons-cli) ("java-qdox" ,java-qdox) ("java-jdom2" ,java-jdom2) - ("java-asm" ,java-asm) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ,@(package-native-inputs maven-wagon-provider-api))) (synopsis "Wagon provider that gets and puts artifacts using the file system") @@ -925,7 +924,6 @@ (define-public maven-wagon-http-shared ("java-commons-cli" ,java-commons-cli) ("java-qdox" ,java-qdox) ("java-jdom2" ,java-jdom2) - ("java-asm" ,java-asm) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ,@(package-native-inputs maven-wagon-provider-api))) (synopsis "Shared Library for wagon providers supporting HTTP.") @@ -998,7 +996,6 @@ (define-public maven-wagon-http ("java-commons-cli" ,java-commons-cli) ("java-qdox" ,java-qdox) ("java-jdom2" ,java-jdom2) - ("java-asm" ,java-asm) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ("java-javaee-servletapi" ,java-javaee-servletapi) ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:53 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:53 +0000 Received: from localhost ([127.0.0.1]:56056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntJ-0007zO-53 for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:53 -0500 Received: from lepiller.eu ([89.234.186.109]:52554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsz-0007ve-HA for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:33 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 39bd204c for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:30 +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=Q+tLDlEmfzsvSF09/Iraht7iN MiOsM86SrAH1l/NzEM=; b=OyJqbCkx8uV1sI97Uhww5IKke0ZQzl4N7MY3c5A9V 1AkbkeX8c4sj4nER4zqH98JpaiMW2JtlF2Yf1ac0DROCFZsa+XE/r7OBzrbcDign 5oTyPIkxHcCFWWNEMnr6Yg7LhQJrrkorvBpRFAwQSfXmgxKE4fyZUusJz4g+Hk93 QSp9QElx0IreU0oeClSuZXlIAQyK1kqWxmzvFRFrjFjBNT6CU9dATQi+VEKeBbeM c7DoaHE6M/8zt+Hl78Uay8zXhmKwlPQM/TSGJvaAloeIsUTtGusCwOdQV1l0qpec 4d8jz99HSZZ/dg2GUo4uQ4fl2HEUTR0Ou6Z18P7T3vR4w== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 003e301c (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:29 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 25/26] gnu: Update maven-artifact-transfer to 0.13.1. Date: Tue, 21 Dec 2021 23:45:09 +0100 Message-Id: <695b9587c32ae6f7fad060e12b00e36fe90b76fd.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven.scm (maven-artifact-transfer): Update to 0.13.1. --- gnu/packages/maven.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index f0d387f175..7f84966750 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2848,7 +2848,7 @@ (define-public maven-enforcer-plugin (define-public maven-artifact-transfer (package (name "maven-artifact-transfer") - (version "0.12.0") + (version "0.13.1") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/shared/" @@ -2856,7 +2856,7 @@ (define-public maven-artifact-transfer "-source-release.zip")) (sha256 (base32 - "0mkdjr3wnvaxqaq68sy7h4mqlq3xgwwp5s2anj5vbxfy4bsc1ivj")))) + "0xl7lkksljacrhmvwf924zb6h0h5zw9494jaz9cz4hll0lrhlpz6")))) (build-system ant-build-system) (arguments `(#:tests? #f; require mockito 2 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 17:45:54 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:54 +0000 Received: from localhost ([127.0.0.1]:56058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntJ-0007zW-En for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:54 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznt0-0007us-6F for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:35 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 1f52d1bb for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:31 +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=miBmgji7IR+0bKFc3d7ePS2Gc qEriElp+0UfWWwzjxE=; b=JvmsbgwKMdDJTu4hqiN2cAdUDq6lrWnot5EqtkmSu P4wXZk/VaYf/bmAWOF+1oXJ104mPqSxNnLQ/hE9OtMl1ovXTKVCH/JLgJCoOvLCN SM0Fj7sTM40Y0fjoonu3iWqv4H4WxYSgzYaHYITn+JJH8qWwHY0TIVHu/LvMJdTG EnbAA93+D1HIUQJDaZAgB1pym8M3RjNntjZCccHu1MJG0xXkHbR5EuZkS4uALpYz HyMD67GXZJYet6dLtUbdTPwMFqAJqwvU+Bzl3+5yviudDxux2lt0V2maEk6kdyTf m0n+Ta+a6QHSo/ZYVO6kC/bq9hTmintRwi4tIWW+tVkng== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 7fe086c5 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:30 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 26/26] gnu: maven: Update to 3.8.4. Date: Tue, 21 Dec 2021 23:45:10 +0100 Message-Id: <2ef8bd7dcc29710098a1f1ef75e7ce06230a65a0.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven.scm (maven-pom): Update to 3.8.4. (maven-resolver-api): Update to 1.6.3. * gnu/packages/java.scm (java-modello-core): Update to 1.11. --- gnu/packages/java.scm | 4 +- gnu/packages/maven.scm | 94 +++++++++++++++++++++++++++--------------- 2 files changed, 63 insertions(+), 35 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0e6a9601e4..a441a484be 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5434,7 +5434,7 @@ (define-public java-plexus-build-api (define-public java-modello-core (package (name "java-modello-core") - (version "1.9.1") + (version "1.11") (source (origin (method git-fetch) (uri (git-reference @@ -5443,7 +5443,7 @@ (define-public java-modello-core (file-name (git-file-name name version)) (sha256 (base32 - "1di6ni42aqllpdvkpyfcw70352vr2i8wf6hd5nhd9kmqjb5dj5j4")))) + "18885sim7z9j3wy19i9083y9kc8l9xxl2px823a96q4rnqj5z8s2")))) (build-system ant-build-system) (arguments `(#:jar-name "modello-core.jar" diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 7f84966750..8c5eeb4658 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -38,7 +38,7 @@ (define-module (gnu packages maven) (define-public maven-resolver-api (package (name "maven-resolver-api") - (version "1.3.1") + (version "1.6.3") (source (origin (method git-fetch) (uri (git-reference @@ -47,7 +47,7 @@ (define-public maven-resolver-api (file-name (git-file-name name version)) (sha256 (base32 - "1x1gll8nkfl6zgnab78fxxvvhg42b2grxgdh1wp2h4qxsjkxg93d")))) + "0hbbbxj14qyq8pccyab96pjqq90jnjmid1pml9kx55c5smfpjn37")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-resolver-api.jar" @@ -58,7 +58,7 @@ (define-public maven-resolver-api (replace 'install (install-from-pom "maven-resolver-api/pom.xml"))))) (native-inputs - `(("java-asm" ,java-asm) + `(("java-asm-8" ,java-asm-8) ("java-cglib" ,java-cglib) ("java-hamcrest-core" ,java-hamcrest-core) ("java-junit" ,java-junit) @@ -220,6 +220,7 @@ (define-public maven-resolver-impl (list maven-resolver-api maven-resolver-spi maven-resolver-util + java-commons-lang3 java-eclipse-sisu-inject java-javax-inject java-guice @@ -305,7 +306,6 @@ (define-public maven-resolver-transport-wagon maven-resolver-test-util java-guava java-cglib - java-asm java-aopalliance java-guice)) (synopsis "Transport implementation for Maven") @@ -1020,13 +1020,13 @@ (define-public maven-wagon-http (define maven-pom (package (name "maven-pom") - (version "3.6.1") + (version "3.8.4") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) - (sha256 (base32 "0grw9zp166ci53rd7qkyy2qmwmik37xhiz1z84jpm0msyvzj2n82")) + (sha256 (base32 "16xbhkhhp05gskgbhrf1ia8riivvkhpk822n9xgnad61f9hzp2r9")) (modules '((guix build utils))) (snippet '(begin @@ -1100,7 +1100,7 @@ (define maven-pom (replace 'install (install-pom-file "pom.xml"))))) (propagated-inputs - `(("maven-parent-pom-33" ,maven-parent-pom-33))) + `(("maven-parent-pom-34" ,maven-parent-pom-34))) (home-page "https://maven.apache.org/") (synopsis "Build system") (description "Apache Maven is a software project management and comprehension @@ -1149,8 +1149,9 @@ (define-public maven-model (let ((file "maven-model/src/main/mdo/maven.mdo")) (modello-single-mode file "4.0.0" "java") (modello-single-mode file "4.0.0" "xpp3-reader") + (modello-single-mode file "4.0.0" "xpp3-extended-reader") (modello-single-mode file "4.0.0" "xpp3-writer") - (modello-single-mode file "4.0.0" "xpp3-extended-reader")) + (modello-single-mode file "4.0.0" "xpp3-extended-writer")) #t)) (replace 'install (install-from-pom "maven-model/pom.xml"))))) (propagated-inputs @@ -1224,9 +1225,9 @@ (define-public maven-settings file mode "maven-settings/src/main/java" version "false" "true")) (let ((file "maven-settings/src/main/mdo/settings.mdo")) - (modello-single-mode file "1.1.0" "java") - (modello-single-mode file "1.1.0" "xpp3-reader") - (modello-single-mode file "1.1.0" "xpp3-writer")) + (modello-single-mode file "1.2.0" "java") + (modello-single-mode file "1.2.0" "xpp3-reader") + (modello-single-mode file "1.2.0" "xpp3-writer")) #t)) (replace 'install (install-from-pom "maven-settings/pom.xml"))))) (propagated-inputs @@ -1239,7 +1240,6 @@ (define-public maven-settings java-plexus-component-annotations java-guice java-cglib - java-asm java-eclipse-sisu-inject java-javax-inject java-plexus-classworlds @@ -1266,23 +1266,22 @@ (define-public maven-settings-builder #:test-dir "maven-settings-builder/src/test" #:phases (modify-phases %standard-phases - (add-before 'build 'generate-components.xml + (add-before 'build 'generate-sisu-named (lambda _ - (mkdir-p "build/classes/META-INF/plexus") - (chmod "components.sh" #o755) - (invoke "./components.sh" "maven-settings-builder/src/main/java" - "build/classes/META-INF/plexus/components.xml") - #t)) + (mkdir-p "build/classes/META-INF/sisu") + (chmod "sisu.sh" #o755) + (invoke "./sisu.sh" "maven-settings-builder/src/main/java" + "build/classes/META-INF/sisu/javax.inject.Named"))) (replace 'install (install-from-pom "maven-settings-builder/pom.xml"))))) (propagated-inputs (list java-plexus-utils java-plexus-interpolation - java-plexus-sec-dispatcher-1.4 + java-plexus-sec-dispatcher maven-builder-support maven-settings maven-pom)) (native-inputs - (list java-junit java-plexus-component-annotations)) + (list java-junit java-javax-inject java-plexus-component-annotations)) (description "Apache Maven is a software project management and comprehension tool. This package contains the effective model builder, with profile activation, inheritance, interpolation, @dots{}"))) @@ -1303,13 +1302,12 @@ (define-public maven-model-builder (copy-recursively "maven-model-builder/src/main/resources" "build/classes") #t)) - (add-before 'build 'generate-components.xml + (add-before 'build 'generate-sisu-named (lambda _ - (mkdir-p "build/classes/META-INF/plexus") - (chmod "components.sh" #o755) - (invoke "./components.sh" "maven-model-builder/src/main/java" - "build/classes/META-INF/plexus/components.xml") - #t)) + (mkdir-p "build/classes/META-INF/sisu") + (chmod "sisu.sh" #o755) + (invoke "./sisu.sh" "maven-model-builder/src/main/java" + "build/classes/META-INF/sisu/javax.inject.Named"))) (add-before 'check 'fix-paths (lambda _ (substitute* (find-files "maven-model-builder/src/test/java" ".*.java") @@ -1329,9 +1327,10 @@ (define-public maven-model-builder ("java-guava" ,java-guava) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-powermock-reflect" ,java-powermock-reflect) + ("java-objenesis" ,java-objenesis) ("guice" ,java-guice) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("sisu-inject" ,java-eclipse-sisu-inject) ("javax-inject" ,java-javax-inject) ("java-xmlunit" ,java-xmlunit) @@ -1457,7 +1456,6 @@ (define-public maven-plugin-api ("java-plexus-component-annotations" ,java-plexus-component-annotations) ("guice" ,java-guice) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("sisu-inject" ,java-eclipse-sisu-inject) ("javax-inject" ,java-javax-inject) ("utils" ,java-plexus-utils))) @@ -1568,7 +1566,6 @@ (define-public maven-core-bootstrap (native-inputs `(("java-modello-core" ,java-modello-core) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ("java-plexus-build-api" ,java-plexus-build-api) @@ -1723,6 +1720,9 @@ (define-public maven-embedder (("srcdir=\"maven-embedder/src/test\"") "srcdir=\"maven-embedder/src/test/java\"")) #t)) + (add-before 'check 'disable-failing-test + (lambda _ + (delete-file "maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java"))) (add-before 'install 'fix-pom (lambda _ (substitute* "maven-embedder/pom.xml" @@ -1759,13 +1759,13 @@ (define-public maven-embedder ("java-slf4j-simple" ,java-slf4j-simple) ("java-jsr250" ,java-jsr250))) (native-inputs - `(("java-modello-core" ,java-modello-core) + `(("java-asm-8" ,java-asm-8) + ("java-modello-core" ,java-modello-core) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ("java-plexus-build-api" ,java-plexus-build-api) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("java-modello-plugins-java" ,java-modello-plugins-java) ("java-modello-plugins-xml" ,java-modello-plugins-xml) ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3) @@ -1923,6 +1923,9 @@ (define-public maven-compat "--classes" "build/test-classes" "--descriptors" "build/test-classes/META-INF") #t)) + (add-before 'check 'disable-failing-test + (lambda _ + (delete-file "src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java"))) (add-after 'generate-metadata 'rebuild (lambda _ (invoke "ant" "jar") @@ -1970,7 +1973,7 @@ (define-public maven-compat ("java-qdox" ,java-qdox) ;; tests ("java-plexus-cipher" ,java-plexus-cipher) - ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher-1.4) + ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher) ("java-jsr250" ,java-jsr250) ("java-cdi-api" ,java-cdi-api) ("java-junit" ,java-junit) @@ -2088,7 +2091,7 @@ (define-public maven java-guice java-aopalliance java-cglib - java-asm + java-asm-8 java-eclipse-sisu-inject java-javax-inject java-plexus-component-annotations @@ -2225,6 +2228,16 @@ (define-public maven-3.0-settings-builder (inherit maven-settings-builder) (version (package-version maven-3.0-pom)) (source (package-source maven-3.0-pom)) + (arguments + (substitute-keyword-arguments (package-arguments maven-settings-builder) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'generate-components.xml + (lambda _ + (mkdir-p "build/classes/META-INF/plexus") + (chmod "components.sh" #o755) + (invoke "./components.sh" "maven-settings-builder/src/main/java" + "build/classes/META-INF/plexus/components.xml"))))))) (propagated-inputs `(("java-plexus-component-annotations" ,java-plexus-component-annotations) ,@(filter @@ -2235,6 +2248,8 @@ (define-public maven-3.0-settings-builder ("maven-pom" `("maven-pom" ,maven-3.0-pom)) ("maven-settings" `("maven-settings" ,maven-3.0-settings)) ("maven-builder-support" #f) + ("java-plexus-sec-dispatcher" + `("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher-1.4)) (_ input))) (package-propagated-inputs maven-settings-builder))))))) @@ -2243,6 +2258,19 @@ (define-public maven-3.0-model-builder (inherit maven-model-builder) (version (package-version maven-3.0-pom)) (source (package-source maven-3.0-pom)) + (arguments + (substitute-keyword-arguments (package-arguments maven-model-builder) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'generate-components.xml + (lambda _ + (mkdir-p "build/classes/META-INF/plexus") + (chmod "components.sh" #o755) + (invoke "./components.sh" "maven-model-builder/src/main/java" + "build/classes/META-INF/plexus/components.xml"))) + (add-before 'check 'remove-failing-test + (lambda _ + (delete-file "maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java"))))))) (propagated-inputs `(("java-plexus-component-annotations" ,java-plexus-component-annotations) ,@(filter -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 18:06:51 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 23:06:51 +0000 Received: from localhost ([127.0.0.1]:56098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzoDV-00007w-Ir for submit@debbugs.gnu.org; Tue, 21 Dec 2021 18:06:51 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsx-0007uN-Qp for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:32 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id d8138515 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:27 +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=r+6Y8EMqBa+/zl7nkmO2WatN9 ymAFQYOiZaybWTFZ8M=; b=AxJM0JI5rvPmvUo7Kyt++ekGhwxZuLleLUi7GNAuT VZ2XAchCoN4k5bozayTKJcJOv9XJKbisiaGqJ4hTujww8Qbia7tob0nYAld9K8Fy Z5Qg7oInhhxvJ1vspk/VmNB5v6yVEO4ujJxJl3wO8XNcDMguNH9Gx2R4sGRBs1rd PTnp6ZZYy6S+8Sjp/VYSF1qwBo27y9j9xLjXZZ/qLWnk4oDYcfhZEkeVyxOyj6wh ZugUqVhfz9fpLg4OYfdXO8iuvA4EisVLJz3RLI88mXms8xyfvHlbn5nol/IzNqLB c1PUaAHJQanhS1u7/XkPvi6T60evkXhMr7HTPhl8V2nwA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 42428aee (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:27 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 20/26] gnu: Add java-sonatype-aether-util-1.13. Date: Tue, 21 Dec 2021 23:45:04 +0100 Message-Id: <351c11ef448860d05348f95095101e649c33f709.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven.scm (java-sonatype-aether-util-1.13): New variable. --- gnu/packages/maven.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index b73111a5ec..f85835f73c 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -500,6 +500,26 @@ (define-public java-sonatype-aether-test-util-1.13 (description "This package contains a collection of utility classes to ease testing of the repository system."))) +(define-public java-sonatype-aether-util-1.13 + (package + (inherit java-sonatype-aether-api-1.13) + (name "java-sonatype-aether-util") + (arguments + `(#:jar-name "aether-util.jar" + #:source-dir "aether-util/src/main/java" + #:test-dir "aether-util/src/test" + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "aether-util/pom.xml"))))) + (propagated-inputs + `(("java-sonatype-aether-api" ,java-sonatype-aether-api-1.13))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-sonatype-aether-test-util" ,java-sonatype-aether-test-util-1.13))) + (synopsis "Utility classes for the maven repository system") + (description "This package contains a collection of utility classes to +ease usage of the repository system."))) + ;; Again, this old version is required by some maven plugins (define-public java-eclipse-aether-api (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 21 18:06:54 2021 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 23:06:54 +0000 Received: from localhost ([127.0.0.1]:56100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzoDb-000085-JC for submit@debbugs.gnu.org; Tue, 21 Dec 2021 18:06:54 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsy-0007uN-SJ for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:47 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 8755bda1 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:30 +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=9rDvKSVLHy63BmDbjbV13kkvI pbDeHf6joCqBc3LAfs=; b=H/FWG1WgCG+sYJeQSiCNkqPQX2QHgCNijMKN+dXU9 BpbT3RHx517gk0lsnKnJpwcOzE7gmVPhrNcUvSDOzlX22U6wD+KPNtwInz6n5C38 2Zw+ASMOVKCyuqfzliI1Phvi8JYI0zkMky+dGAhjJgTzjen0MO5KFZY8iPVup1Do rH6jvu34fdKUK8B+XhI9KOeu9bjGPMCLGZIR+F6tgShIphMxaFywnYZNLQntsSX9 OWRWGgeoy5onstvVwUqx8okeu07wFC4VDCCK+OASWILTl9q9OITkGdvyIeFqRCQ4 K+y0c0BDOi4hegL2KbVINfcJYnea/GJQ5In1vaDuuHQ2g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id bac0ed44 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:28 +0000 (UTC) From: Julien Lepiller To: 52723@debbugs.gnu.org Subject: [PATCH 23/26] gnu: maven-enforcer-api: Update to 3.0.0. Date: Tue, 21 Dec 2021 23:45:07 +0100 Message-Id: <463a5bb87e0f1d80d3ad6836458ab7b9e22c65e0.1640126679.git.julien@lepiller.eu> 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maven.scm (maven-enforcer-api): Update to 3.0.0. * gnu/packages/java.scm (java-bsh): Do not patch pom file anymore. --- gnu/packages/java.scm | 5 ----- gnu/packages/maven.scm | 19 +++++++++---------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 463cf51bcb..0e6a9601e4 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11068,11 +11068,6 @@ (define-public java-bsh #:make-flags (list "-DDATE" "(no date for reproducibility)") #:phases (modify-phases %standard-phases - (add-before 'install 'fix-pom - (lambda _ - (substitute* "pom.xml" - (("org.apache-extras.beanshell") "org.beanshell")) - #t)) (replace 'install (install-from-pom "pom.xml"))))) (inputs diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 3e17e79752..d0424a3d08 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2739,16 +2739,14 @@ (define-public maven-common-artifact-filters-3.1.0 (define-public maven-enforcer-api (package (name "maven-enforcer-api") - (version "3.0.0-M3") + (version "3.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/enforcer/" "enforcer-" version "-source-release.zip")) (sha256 (base32 - "014cwj0dqa69nnlzcin8pk9wsjmmg71vsbcpb16cibcjpm6h9wjg")) - (patches - (search-patches "maven-enforcer-api-fix-old-dependencies.patch")))) + "1479yp58jv788xc1jc2sbdxpajlbvwlk60639vd2h4s8r6x7naqh")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-enforcer-api.jar" @@ -2782,12 +2780,13 @@ (define maven-enforcer-parent-pom (add-before 'install 'fix-pom-versions (lambda _ (substitute* "pom.xml" - (("3.8.1") ,(package-version java-commons-lang3)) - (("1.4.1") ,(package-version maven-resolver-util)) - (("1.12") ,(package-version java-commons-codec)) - (("2.2") - ,(string-append "" (package-version maven-dependency-tree) - ""))))) + ((".*") + ,(string-append "" (package-version maven) + "")) + (("2.11.0") ,(package-version java-commons-io)) + (("3.12.0") ,(package-version java-commons-lang3)) + (("1.6.1") ,(package-version maven-resolver-util)) + (("1.15") ,(package-version java-commons-codec))))) (replace 'install (install-pom-file "pom.xml"))))) (propagated-inputs -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 02 17:41:36 2022 Received: (at 52723) by debbugs.gnu.org; 2 Feb 2022 22:41:36 +0000 Received: from localhost ([127.0.0.1]:53877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFOJk-0004WX-4x for submit@debbugs.gnu.org; Wed, 02 Feb 2022 17:41:36 -0500 Received: from m4s11.vlinux.de ([83.151.27.109]:53416 helo=bjoernhoefling.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFOJi-0004WN-8c for 52723@debbugs.gnu.org; Wed, 02 Feb 2022 17:41:35 -0500 Received: from alma-ubu.fritz.box (p57b523a1.dip0.t-ipconnect.de [87.181.35.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id B27373F9B0; Wed, 2 Feb 2022 23:41:32 +0100 (CET) Date: Wed, 2 Feb 2022 23:41:27 +0100 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: Julien Lepiller Subject: Re: [bug#52723] [PATCH] gnu: maven: Update to 3.8.4. Message-ID: <20220202234127.245b5b51@alma-ubu.fritz.box> In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu> References: <20211221234231.44299f63@tachikoma.lepiller.eu> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/f=GE3WrIonk6=i9bLsste/0"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 52723 Cc: 52723@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/f=GE3WrIonk6=i9bLsste/0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi Julien, On Tue, 21 Dec 2021 23:42:31 +0100 Julien Lepiller wrote: > Hi guix! >=20 > This series updates maven to the latest version. I was able to find an > update order for most of the changes, but the last patch still has to > update three packages at the same time, and changes inherited packages > to fix them. This is an impressive patch, thanks. It's still compiling on my side, so I haven't tested the Maven executable yet, but from looking with the naked eye at the patches, it looks good to me, with the following remarks: Of cause, inputs should be written now in the "new" format, as lists instead of maps. While linting, I found two possible updates: java-plexus-utils@3.3.0: can be upgraded to 3.4.1 java-jsr250@1.3: can be upgraded to 1.3.2 I haven't tested if these minor upgrades would break anything of would be possible without any hassle. The linter had also some warnings about clashes: maven-artifact-transfer@0.13.1: propagated inputs apache-commons-parent-pom= @52 and apache-commons-parent-pom@39 collide java-plexus-sec-dispatcher@2.0: propagated inputs plexus-parent-pom@5.1 and= plexus-parent-pom@8 collide maven-enforcer-api@3.0.0: propagated inputs plexus-parent-pom@5.1 and plexu= s-parent-pom@4.0 collide maven-wagon-provider-api@3.4.3: propagated inputs /gnu/store/lfqsagcsir9gyw= p60b1k3lcp6vgyzkaw-maven-wagon-provider-api-3.4.3 and /gnu/store/blhmwm974q= 97hxxkak9419sm6kscs1yv-maven-wagon-provider-api-3.4.3 collide I'm not yet sure where they come from, probably somewhere in the dependency tree? I will report back when maven is finished compiled. Thanks, Bj=C3=B6rn --Sig_/f=GE3WrIonk6=i9bLsste/0 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EAREKAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCYfsIlwAKCRC/KGy2WT5f /W0eAJ4nRJWzTuACGtBLjgn269zXaC1algCgpxPRRVqgODclvUH2XLnSxtJCytY= =Pacj -----END PGP SIGNATURE----- --Sig_/f=GE3WrIonk6=i9bLsste/0-- From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 05 11:16:15 2022 Received: (at 52723) by debbugs.gnu.org; 5 Feb 2022 16:16:15 +0000 Received: from localhost ([127.0.0.1]:35478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGNjT-0000Ve-2t for submit@debbugs.gnu.org; Sat, 05 Feb 2022 11:16:15 -0500 Received: from m4s11.vlinux.de ([83.151.27.109]:53662 helo=bjoernhoefling.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGNjR-0000VW-KS for 52723@debbugs.gnu.org; Sat, 05 Feb 2022 11:16:14 -0500 Received: from alma-ubu.fritz.box (p508ac48c.dip0.t-ipconnect.de [80.138.196.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 0925B3F9B0; Sat, 5 Feb 2022 17:16:12 +0100 (CET) Date: Sat, 5 Feb 2022 17:16:00 +0100 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= To: Julien Lepiller Subject: Re: [bug#52723] [PATCH] gnu: maven: Update to 3.8.4. Message-ID: <20220205171600.4a198f22@alma-ubu.fritz.box> In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu> References: <20211221234231.44299f63@tachikoma.lepiller.eu> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/wXfiEGubb3x7hmVCcM0lYlJ"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 52723 Cc: 52723@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/wXfiEGubb3x7hmVCcM0lYlJ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Tue, 21 Dec 2021 23:42:31 +0100 Julien Lepiller wrote: > Hi guix! >=20 > This series updates maven to the latest version. I was able to find an > update order for most of the changes, but the last patch still has to > update three packages at the same time, and changes inherited packages > to fix them. Hi Julien, I finished my reviews, maven compiles, runs and also the package java-jmh, which uses the maven-build-system builds with the new Maven version. Bj=C3=B6rn --Sig_/wXfiEGubb3x7hmVCcM0lYlJ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EAREKAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCYf6iwAAKCRC/KGy2WT5f /cXsAKCLitkwMX3DDLwDUOnFBqNtXXfvjgCgs8gFpj8h8X2OiqkeeadrqdfoGP0= =qrK+ -----END PGP SIGNATURE----- --Sig_/wXfiEGubb3x7hmVCcM0lYlJ-- From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 05 16:53:57 2022 Received: (at 52723-done) by debbugs.gnu.org; 5 Feb 2022 21:53:57 +0000 Received: from localhost ([127.0.0.1]:35732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGT0H-0000Q6-0Z for submit@debbugs.gnu.org; Sat, 05 Feb 2022 16:53:57 -0500 Received: from lepiller.eu ([89.234.186.109]:45514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGT0E-0000Pw-I5 for 52723-done@debbugs.gnu.org; Sat, 05 Feb 2022 16:53:55 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 734324de; Sat, 5 Feb 2022 21:53:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=s+kXyBSOVdzj 0FRk5KYMEvHieTuYE9U/F6DHw2J9dpU=; b=L85vRtDqGpOkGoauQcF8lb7AhbV4 tPUbGqZtY8mHLU81I5W0DLDS5w9MYDqeCwOwkxSMdC5RlINi0qQ16Ar8lhv8rEvs OSMhfppu6CKx6Tgmqp2xV57bZAwHhyprqvPZHP1+DbSQfRV5qoutiMb755JVgOxr AAa9+/nCH/5eWMQXg8qCmNc672JYS7LG9HZI3ZTtsWOhrw1olLoWjRvQg4lQh/4g Js5jlhvoHFuKxgVwB8z7P5hOdhBQ5mAnU3xJFkCGyp56qAm0pY85NYjHt1Nf2SRo vIobAIok2I3lirGAJPLfCgZEXPzRmLHVvBLVXv0Gq1yhUxYgKstZkLpSHA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ebcbbf75 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Sat, 5 Feb 2022 21:53:51 +0000 (UTC) Date: Sat, 5 Feb 2022 22:53:45 +0100 From: Julien Lepiller To: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= Subject: Re: [bug#52723] [PATCH] gnu: maven: Update to 3.8.4. Message-ID: <20220205225345.1b038352@tachikoma.lepiller.eu> In-Reply-To: <20220205171600.4a198f22@alma-ubu.fritz.box> References: <20211221234231.44299f63@tachikoma.lepiller.eu> <20220205171600.4a198f22@alma-ubu.fritz.box> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52723-done Cc: 52723-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Sat, 5 Feb 2022 17:16:00 +0100, Bj=C3=B6rn H=C3=B6fling a =C3=A9crit : > On Tue, 21 Dec 2021 23:42:31 +0100 > Julien Lepiller wrote: >=20 > > Hi guix! > >=20 > > This series updates maven to the latest version. I was able to find > > an update order for most of the changes, but the last patch still > > has to update three packages at the same time, and changes > > inherited packages to fix them. =20 >=20 > Hi Julien, >=20 > I finished my reviews, maven compiles, runs and also the package > java-jmh, which uses the maven-build-system builds with the new Maven > version. >=20 > Bj=C3=B6rn Thanks, pushed to master. From unknown Sat Jun 14 18:02:42 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 06 Mar 2022 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator