From patchwork Sat Feb 25 20:30:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47339 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4F0A216BBA; Sat, 25 Feb 2023 20:31:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BB5FD1684B for ; Sat, 25 Feb 2023 20:31:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1CF-0005Z1-8H; Sat, 25 Feb 2023 15:31:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1CB-0005Ym-Ar for guix-patches@gnu.org; Sat, 25 Feb 2023 15:31:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1CA-0000uK-TC for guix-patches@gnu.org; Sat, 25 Feb 2023 15:31:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1CA-0004Pa-KL for guix-patches@gnu.org; Sat, 25 Feb 2023 15:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 01/18] gnu: java-objenesis: Update to 3.3. References: <20230225212658.266eb281@sybil.lepiller.eu> In-Reply-To: <20230225212658.266eb281@sybil.lepiller.eu> Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735705816908 (code B ref 61794); Sat, 25 Feb 2023 20:31:02 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:30:58 +0000 Received: from localhost ([127.0.0.1]:41639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C5-0004Oe-DP for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:30:57 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C3-0004OQ-9a for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:30:56 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 4368e102 for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=dkim; bh=vRNuV8NvtfTpouMJZQJvTfQtFzQbAtrVaqlBtmd5iXE=; b=byqc LsUEX0/slBbPs/kB0/KReEdxlCgnYr/ha7WP6mjcf/xHp5QSAhh7VccTJ4x7nU7a 3dBcULATl1FKIa7LDnnFhjUvdUf14sCDKT2hO0zT/y3F7sjWGp9kSVaOZiHupQnj sZUBA1vfHVC56v2pgjO3X7t+8sCbhhSyLWTtiQD+m0JOpy/eH6tEUY8Li0eolT0D qICexGJN4y7bpavdq1Q9skp04xkV1v78z5S93FjnqFbBy5QWQvdj4TuKN9Wney/D Gr8RAajoWE5YMI58CoHWfZX1QWZg85n6MRVwqoGjYBYNg/FyVEPLHu8y/KB9kEOs aN1lZwpZP4s5Qx2Thg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b035c4e1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:53 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:25 +0100 Message-Id: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-objenesis): Update to 3.3. --- gnu/packages/java.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) base-commit: 9a2cf9ef0a9ece9aa0dcb24a31fe0c313d06988f diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 388e9d127f..3ffc6b53dc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4861,7 +4861,7 @@ (define-public java-cglib (define-public java-objenesis (package (name "java-objenesis") - (version "2.5.1") + (version "3.3") (source (origin (method git-fetch) (uri (git-reference @@ -4870,11 +4870,12 @@ (define-public java-objenesis (file-name (git-file-name name version)) (sha256 (base32 - "054yi200wj00x6dp1sxfrwgndwywadsbn8d8ij1j0v45j9g2vdya")))) + "1brlcn536p4s1v1f3vzxhr38lvyhc33wjrbj2x06kdrd8agy90cr")))) (build-system ant-build-system) (arguments - `(#:jar-name "objenesis.jar" - #:source-dir "main/src/" + `(#:tests? #f; require junit-5 + #:jar-name "objenesis.jar" + #:source-dir "main/src/main/java" #:test-dir "main/src/test/")) (native-inputs (list java-junit java-hamcrest-core)) From patchwork Sat Feb 25 20:30:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47340 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B7CB816BA5; Sat, 25 Feb 2023 20:31:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B2B0A1684B for ; Sat, 25 Feb 2023 20:31:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1CG-0005bE-TC; Sat, 25 Feb 2023 15:31:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1CD-0005Z2-7I for guix-patches@gnu.org; Sat, 25 Feb 2023 15:31:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1CB-0000ua-Es for guix-patches@gnu.org; Sat, 25 Feb 2023 15:31:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1CB-0004Pr-AH for guix-patches@gnu.org; Sat, 25 Feb 2023 15:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 02/18] gnu: java-bsh: Update to 2.1.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735706216960 (code B ref 61794); Sat, 25 Feb 2023 20:31:03 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:02 +0000 Received: from localhost ([127.0.0.1]:41646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C9-0004PO-Vc for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:02 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C4-0004OQ-A3 for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:30:56 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 812d2b31 for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:54 +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=6sKc9ifZhzosQn7eeMyGf+mDp tIaIAnecwpidJ/TO1Y=; b=OCu5iHZjkVRtVuXqByhtQe0dqSDvpffu1jKJscPi2 duFxLIQZf9ROuvU9LIaCIO20HWXo9TOWI13ILdBPNZPaWRkquBVj6PJqEI2nZwrK idtCexipk+Cl3v0kU7xkajhg9EyIMEiiJ6kqeAwd4TQ46DkVeSag8AtutfZn0vsp UwWoaVR2Q8O7TprjVytUu9VI23v45bNa4I1nA5zyU2kigwyb5/uj2nvTcGUvr79b 0usiqr0SMSxaMmjVhButo+uyJ26Geu2HFha/EYwo86XigErdwi8udH58/JDxL2za qFnYuNacEWoSxuU1PCrpMUcDIkgvAaaaD/d/YbDRv04ng== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 01428acf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:53 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:26 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-bsh): Update to 2.1.1. --- gnu/packages/java.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3ffc6b53dc..0fb46ce465 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10229,7 +10229,7 @@ (define-public java-jcommander (define-public java-bsh (package (name "java-bsh") - (version "2.0b6") + (version "2.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -10238,7 +10238,7 @@ (define-public java-bsh (file-name (git-file-name name version)) (sha256 (base32 - "0kz3f0xjack6c9syssi4qjw1rbd3q5963sk5pmr143hiibxa9csw")) + "1a6y46yz2ba4mnlfv4bpd5pmzhgxrzk3s10xp05jz377nbp2izwg")) (modules '((guix build utils))) (snippet '(begin @@ -10254,6 +10254,10 @@ (define-public java-bsh #:make-flags (list "-DDATE" "(no date for reproducibility)") #:phases (modify-phases %standard-phases + (add-before 'check 'fix-test + (lambda _ + (substitute* "tests/junitTests/src/bsh/Issue_55_Test.java" + ((" BshScriptEngineFactory") " bsh.engine.BshScriptEngineFactory")))) (replace 'install (install-from-pom "pom.xml"))))) (inputs From patchwork Sat Feb 25 20:30:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47348 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B4E0916BBA; Sat, 25 Feb 2023 20:33:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CDA901684B for ; Sat, 25 Feb 2023 20:33:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DC-0005os-MS; Sat, 25 Feb 2023 15:32:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1D9-0005mX-61 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1D8-00016U-UF for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1D8-0004Ty-R3 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 03/18] gnu: java-cglib: Update to 3.3.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735706517036 (code B ref 61794); Sat, 25 Feb 2023 20:32:02 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:05 +0000 Received: from localhost ([127.0.0.1]:41655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CB-0004Py-Ib for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:05 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C5-0004OQ-4r for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:00 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id b1e84f88 for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:54 +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=zRIVQuPj0/l8ckGiuuCGn9+cT giAMFUQCn/EBbRHYOw=; b=Wo1JeFtmkYSaDWLbrInltujINcShzLPbsmiooJh1h di4db2CyfqjznawEC6fmjCxE8fpX7cY6SgpWOP7JynrOGY82/R/IwXKsgCyYR1Lp 4bDBDxwnG3gqMLtu/TMNsrafhhq6lHwdP8E9HH8tnO/mOwUB3qlnYMxdPU7Cr0up 0TEOoSZf0PuKy7viFqhGH3b0D3uozF5ehu/QXA4dt1pv1HENkZv/sBHjnEv+S+qU U+2RyDWOu0jEix5INJaPtRspTQfXJ8x6uKIVAaDPktPQrwa7Eos9plLe+KhnhOU4 fryGg5pmYAo41h75Br85gLffY+KV/HjoMViqdtgA8i7PA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 29f77e52 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:53 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:27 +0100 Message-Id: <7ed71ea7616290fd7d0309d01b3f0859a062228e.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches cglib now requires asm-8 at runtime, so propagate it and do not use asm-6 in dependents. * gnu/packages/java.scm (java-cglib): Update to 3.3.0. (java-plexus-component-metadata-1.7, java-easymock, java-jmock) (java-jmock-legacy, java-jmock-junit4, java-ops4j-pax-exam-core-spi) (java-guice, java-fest-assert, java-testng, java-lmax-disruptor) (java-powermock-reflect, java-powermock-modules-junit4) (java-kafka-clients, java-jline-2, java-xmlunit, java-eclipse-sisu-plexus) (java-logback-core): Remove `java-asm` from inputs or native-inputs. * gnu/packages/batik.scm (java-xmlgraphics-commons): Remove `java-asm` from inputs or native inputs. * gnu/packages/maven.scm (maven-resolver-transport-file) (maven-resolver-transport-http, maven-model, maven-repository-metadata) (maven-compat): Remove `java-asm` from inputs or native-inputs. --- gnu/packages/batik.scm | 1 - gnu/packages/java.scm | 36 +++++++++++------------------------- gnu/packages/maven.scm | 7 +------ 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 7f159010a5..138869dc90 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -241,7 +241,6 @@ (define-public java-xmlgraphics-commons #t)))))) (native-inputs `(("java-apache-xml-commons-resolver" ,java-apache-xml-commons-resolver) - ("java-asm" ,java-asm) ("java-cglib" ,java-cglib) ("java-hamcrest" ,java-hamcrest-core) ("java-junit" ,java-junit) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0fb46ce465..187a531c27 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3854,7 +3854,7 @@ (define-public java-plexus-component-metadata-1.7 java-commons-cli java-qdox java-jdom2 - java-asm)) + java-asm-8)) (native-inputs (list java-junit java-guava java-geronimo-xbean-reflect)) (synopsis "Inversion-of-control container for Maven") @@ -4826,7 +4826,7 @@ (define-public java-asm-commons-8 (define-public java-cglib (package (name "java-cglib") - (version "3.2.4") + (version "3.3.0") (source (origin (method git-fetch) @@ -4838,7 +4838,7 @@ (define-public java-cglib version))))) (file-name (git-file-name name version)) (sha256 - (base32 "186451jms2zfp47yd8kxd77az2cqal1my2br7klgyp8fpl4qfg8v")))) + (base32 "1lnscamc6bnhh7jgij5garxagp3zn2jp4cbq0rsn4xr3l0cnd014")))) (build-system ant-build-system) (arguments `(;; FIXME: tests fail because junit runs @@ -4850,8 +4850,8 @@ (define-public java-cglib (modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "cglib") #t))))) - (inputs - (list java-asm java-junit)) + (native-inputs (list java-junit)) + (propagated-inputs (list java-asm-8)) (home-page "https://github.com/cglib/cglib/") (synopsis "Java byte code generation library") (description "The byte code generation library CGLIB is a high level API @@ -4939,7 +4939,7 @@ (define-public java-easymock (delete-file "tests2/EasyMockPropertiesTest.java")) #t))))) (inputs - (list java-asm java-cglib java-objenesis)) + (list java-cglib java-objenesis)) (native-inputs (list java-junit java-hamcrest-core)) (home-page "https://easymock.org/") @@ -5000,7 +5000,7 @@ (define-public java-jmock (base32 "12b7l22g3nrjvf2dzcw3z03fpd2chrgp0d8xkvn8w55rwb57pax6")))) (inputs - (list java-hamcrest-all java-asm java-bsh java-junit)) + (list java-hamcrest-all java-bsh java-junit)) (native-inputs `(("cglib" ,java-cglib))) (arguments @@ -5018,7 +5018,6 @@ (define-public java-jmock-junit4 #:test-dir "jmock-junit4/src/test")) (inputs `(("java-hamcrest-all" ,java-hamcrest-all) - ("java-asm" ,java-asm) ("java-bsh" ,java-bsh) ("java-jmock" ,java-jmock) ("java-jumit" ,java-junit))))) @@ -5045,7 +5044,6 @@ (define-public java-jmock-legacy java-objenesis java-cglib java-jmock - java-asm java-bsh java-junit)) (native-inputs @@ -9402,8 +9400,7 @@ (define-public java-ops4j-pax-exam-core-spi ("junit" ,java-junit) ("hamcrest" ,java-hamcrest-core) ("cglib" ,java-cglib) - ("objenesis" ,java-objenesis) - ("asm" ,java-asm))))) + ("objenesis" ,java-objenesis))))) (define-public java-ops4j-pax-exam-core-junit (package @@ -10049,7 +10046,6 @@ (define-public java-guice (install-from-pom "core/pom.xml"))))) (propagated-inputs (list java-aopalliance - java-asm java-cglib java-guava java-javax-inject @@ -10355,8 +10351,7 @@ (define-public java-fest-assert java-hamcrest-core java-mockito-1 java-cglib - java-objenesis - java-asm)) + java-objenesis)) (home-page "https://github.com/alexruiz/fest-assert-2.x") (synopsis "FEST fluent assertions") (description "FEST-Assert provides a fluent interface for assertions.") @@ -10429,7 +10424,6 @@ (define-public java-testng ("java-assertj" ,java-assertj) ("java-mockito" ,java-mockito-1) ("cglib" ,java-cglib) - ("asm" ,java-asm) ("aopalliance" ,java-aopalliance))) (home-page "https://testng.org") (synopsis "Testing framework") @@ -10711,8 +10705,7 @@ (define-public java-lmax-disruptor ("java-hamcrest-all" ,java-hamcrest-all))) (native-inputs `(("cglib" ,java-cglib) - ("objenesis" ,java-objenesis) - ("asm" ,java-asm))) + ("objenesis" ,java-objenesis))) (home-page "https://www.lmax.com/disruptor") (synopsis "High performance inter-thread communication") (description "LMAX Disruptor is a software pattern and software component @@ -10876,7 +10869,6 @@ (define-public java-powermock-reflect (native-inputs `(("junit" ,java-junit) ("cglib" ,java-cglib) - ("asm" ,java-asm) ("hamcrest" ,java-hamcrest-core) ("assertj" ,java-assertj))) (home-page "https://github.com/powermock/powermock") @@ -10973,7 +10965,6 @@ (define-public java-powermock-modules-junit4 `(("easymock" ,java-easymock) ("hamcrest" ,java-hamcrest-core) ("objenesis" ,java-objenesis) - ("asm" ,java-asm) ("junit" ,java-junit))))) (define-public java-powermock-api-easymock @@ -11159,8 +11150,7 @@ (define-public java-kafka-clients (inputs (list java-slf4j-api java-lz4)) (native-inputs - (list java-asm - java-bouncycastle + (list java-bouncycastle java-cglib java-easymock java-hamcrest-all @@ -12032,7 +12022,6 @@ (define-public java-jline-2 java-easymock java-jboss-javassist java-objenesis - java-asm java-hamcrest-core java-cglib java-junit @@ -12163,7 +12152,6 @@ (define-public java-xmlunit ("java-mockito-1" ,java-mockito-1) ("java-hamcrest-all" ,java-hamcrest-all) ("java-objenesis" ,java-objenesis) - ("java-asm" ,java-asm) ("java-cglib" ,java-cglib) ("resources" ,(origin @@ -12851,7 +12839,6 @@ (define-public java-eclipse-sisu-plexus java-guice java-guava java-aopalliance - java-asm java-cglib)) (native-inputs (list java-junit)) @@ -12975,7 +12962,6 @@ (define-public java-logback-core java-hamcrest-core java-mockito-1 java-cglib - java-asm java-objenesis java-joda-time)) (home-page "https://logback.qos.ch") diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index fc3a63c263..f941bf0dd0 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -344,8 +344,7 @@ (define-public maven-resolver-transport-file maven-resolver-util maven-wagon-provider-api)) (native-inputs - (list java-asm - java-aopalliance + (list java-aopalliance java-cglib java-guava java-guice @@ -393,7 +392,6 @@ (define-public maven-resolver-transport-http java-httpcomponents-httpcore)) (native-inputs (list java-aopalliance - java-asm java-cglib java-eclipse-aether-api java-eclipse-jetty-http @@ -1262,7 +1260,6 @@ (define-public maven-model java-plexus-component-annotations java-guice java-cglib - java-asm java-eclipse-sisu-inject java-javax-inject java-plexus-classworlds @@ -1473,7 +1470,6 @@ (define-public maven-repository-metadata ("java-plexus-component-annotations" ,java-plexus-component-annotations) ("java-guice" ,java-guice) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-javax-inject" ,java-javax-inject) ("java-plexus-utils" ,java-plexus-utils) @@ -2103,7 +2099,6 @@ (define-public maven-compat ("java-guice" ,java-guice) ("java-guava" ,java-guava) ("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) From patchwork Sat Feb 25 20:30:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47343 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C396916BBA; Sat, 25 Feb 2023 20:32:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2DB9216BA4 for ; Sat, 25 Feb 2023 20:32:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DB-0005nU-A3; Sat, 25 Feb 2023 15:32:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1D8-0005mL-P3 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1D8-00016O-Gv for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1D8-0004Tr-DZ for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 04/18] gnu: Add java-error-prone-annotations. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735706316989 (code B ref 61794); Sat, 25 Feb 2023 20:32:02 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:03 +0000 Received: from localhost ([127.0.0.1]:41650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CA-0004PV-FM for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:03 -0500 Received: from lepiller.eu ([89.234.186.109]:46240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C7-0004Om-3L for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:30:59 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 126da748 for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:54 +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=L2cYbzm3seLK3LMcmEfKEOBgk YNimqGb78w4oHuHxa0=; b=TzbXSy36BhH4z9e7vXGg4/SHuKTkzLiTaa93as0U3 o/Crk4K8z8VZ3t1oA3GNqvgk7sDlVAZ8i/Gx/jv7svmq59PXRabGDxtC2/Qn13cb LHri2T+hUscUM/3hyKv2/EhXWOuBCm3tS0WZBSMmVcAHqPu7F5T5SIx6qvFC18r/ hq+pShBRUelmpoJ2w/OuU3ZEcGnkc0XvYGDkZpedwly5g5n6yullR35vzl9NAzBn 59qmodGtBJmAK/bFO3iDNlzxXLXs94YmT89R+EHziBpRuLLv8bhPjIf+ut/nRfPP ngP5mj5D+iz+d4HUD8VVJ7fWDePH9b0rsohuw3oehBjmg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 7a19e308 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:54 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:28 +0100 Message-Id: <9a6fa441e3d677daf50ada3bc3fa633df4ec481d.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-error-prone-annotations): New variable. --- gnu/packages/java.scm | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 187a531c27..fbd8b50872 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5857,6 +5857,50 @@ (define-public java-jsr305 It provides packages in the @code{javax.annotations} namespace.") (license license:asl2.0))) +(define-public java-error-prone-annotations + (package + (name "java-error-prone-annotations") + (version "2.18.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/error-prone") + (commit (string-append "v" version)))) + (file-name (git-file-name "java-error-prone" version)) + (sha256 + (base32 + "19sqsz0b308rhadr3ff10azdbqjq37nvrn9c06224dwpxap0931f")))) + (build-system ant-build-system) + (arguments + `(#:tests? #f; no tests + #:jar-name (string-append ,name "-" ,version ".jar") + #:source-dir "annotations/src/main/java" + #:test-dir "annotations/src/altest" + #:phases + (modify-phases %standard-phases + (replace 'install (install-from-pom "annotations/pom.xml"))))) + (propagated-inputs (list java-error-prone-parent-pom java-jsr305)) + (home-page "https://errorprone.info") + (synopsis "Java static analyzer at compile-time") + (description "Error Prone is a static analysis tool for Java that catches +common programming mistakes at compile-time. This package contains annotations +used by programmers to guide the static analysis.") + (license license:asl2.0))) + +(define java-error-prone-parent-pom + (package + (inherit java-error-prone-annotations) + (name "java-error-prone-parent-pom") + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "pom.xml"))))) + (propagated-inputs '()))) + (define-public java-guava (package (name "java-guava") From patchwork Sat Feb 25 20:30:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47342 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2632516BBA; Sat, 25 Feb 2023 20:32:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 62F7216BA4 for ; Sat, 25 Feb 2023 20:32:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DB-0005nh-Js; Sat, 25 Feb 2023 15:32:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1D9-0005mZ-L7 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1D9-00016Z-CY for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1D9-0004U6-8w for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 05/18] gnu: java-guava: Update to 31.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735706717059 (code B ref 61794); Sat, 25 Feb 2023 20:32:03 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:07 +0000 Received: from localhost ([127.0.0.1]:41660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CD-0004Qi-Fl for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:06 -0500 Received: from lepiller.eu ([89.234.186.109]:46240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C8-0004Om-0B for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:00 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 875d57fa for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:54 +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=CKO9lmABUobMJj70XeiWOGHqQ U9sZICQkLJwC60+aEo=; b=ED4xHwuKiBdSA5TSHp5KfsYdzRutFDoDeoOOxVKlp Ksk40Gixc2GrT4zBemCh7l7E1nUlYn3it4OgYGpcIW1oaV20be0wS2k6a1H66GTE Ozt7uIegOEPTTeir/KYtcc1SknMXC+2rwz/dKLa9jqykxOShzwtx4lBw1h29uSzc 0BSDi0uxkD+DD2OU356w0TP8CpaJe7Y/F1L4r5Z1h8y9jNTvt8edaZbfr73rgoHy z3kKCQ0nNzIoBCHgF8sBOAKnbOA+GCRrLTvpEwiS/hdwBtocMnJ4mV365w0NUtKP EwbWpv1Ozzh/ebZJOBhLfwtnEraspF7D6hEiZKJ6/gFMw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b6b319fe (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:54 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:29 +0100 Message-Id: <67cbc476d00ec8fd7385846c88850208a1316a50.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/java-guava-remove-annotation-deps.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/java.scm (java-guava): Update to 31.1. [source]: Use patch. (java-guava-futures-failureaccess): New variable. * gnu/packages/bioinformatics.scm (java-picard, java-picard-2.10.3): Fix for newer guava. * gnu/packages/maven.scm (maven): Add java-guava-futures-failureaccess. --- gnu/local.mk | 1 + gnu/packages/bioinformatics.scm | 8 ++++ gnu/packages/java.scm | 43 +++++++++++++------ gnu/packages/maven.scm | 4 +- .../java-guava-remove-annotation-deps.patch | 37 ++++++++++++++++ 5 files changed, 78 insertions(+), 15 deletions(-) create mode 100644 gnu/packages/patches/java-guava-remove-annotation-deps.patch diff --git a/gnu/local.mk b/gnu/local.mk index 63ec92ebef..019e3de794 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1361,6 +1361,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-commons-lang-fix-dependency.patch \ + %D%/packages/patches/java-guava-remove-annotation-deps.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ %D%/packages/patches/java-openjfx-build-jdk_version.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b5d132749f..a24c89ac6d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5014,6 +5014,10 @@ (define-public java-picard (modify-phases %standard-phases ;; FIXME: this phase fails with "duplicate entry: htsjdk/samtools/AbstractBAMFileIndex$1.class" (delete 'generate-jar-indices) + (add-after 'unpack 'fix-guava + (lambda _ + (substitute* "src/java/picard/cmdline/CommandLineParser.java" + (("CharMatcher.ASCII") "CharMatcher.ascii()")))) (add-after 'unpack 'use-our-htsjdk (lambda* (#:key inputs #:allow-other-keys) (substitute* "build.xml" @@ -5073,6 +5077,10 @@ (define-public java-picard-2.10.3 (delete 'generate-jar-indices) (add-after 'unpack 'remove-useless-build.xml (lambda _ (delete-file "build.xml") #t)) + (add-after 'unpack 'fix-guava + (lambda _ + (substitute* "src/main/java/picard/cmdline/CommandLineParser.java" + (("CharMatcher.ASCII") "CharMatcher.ascii()")))) ;; This is necessary to ensure that htsjdk is found when using ;; picard.jar as an executable. (add-before 'build 'edit-classpath-in-manifest diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fbd8b50872..4d57ba4f79 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5904,8 +5904,7 @@ (define java-error-prone-parent-pom (define-public java-guava (package (name "java-guava") - ;; This is the last release of Guava that can be built with Java 7. - (version "20.0") + (version "31.1") (source (origin (method git-fetch) (uri (git-reference @@ -5914,7 +5913,9 @@ (define-public java-guava (file-name (git-file-name name version)) (sha256 (base32 - "00h5cawdjic1vind3yivzh1f58flvm1yfmhsyqwyvmbvj1vakysp")))) + "0sv1w5cnids9ad3l7qhrh3dh1wdqwc946iinsxryafr25wg5z1lp")) + (patches + (search-patches "java-guava-remove-annotation-deps.patch")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests included @@ -5928,27 +5929,26 @@ (define-public java-guava ;; Remove annotations to avoid extra dependencies: ;; * "j2objc" annotations are used when converting Java to ;; Objective C; - ;; * "errorprone" annotations catch common Java mistakes at - ;; compile time; ;; * "IgnoreJRERequirement" is used for Android. + ;; * "Nullable" is used to catch NPE at build time. (substitute* (find-files "." "\\.java$") (("import com.google.j2objc.*") "") - (("import com.google.errorprone.annotation.*") "") - (("import org.codehaus.mojo.animal_sniffer.*") "") - (("@CanIgnoreReturnValue") "") - (("@LazyInit") "") + (("import org.checkerframework.checker.*") "") + (("@ReflectionSupport.*") "") (("@WeakOuter") "") (("@RetainedWith") "") (("@Weak") "") - (("@ForOverride") "") (("@J2ObjCIncompatible") "") - (("@IgnoreJRERequirement") ""))) - #t)) + (("@IgnoreJRERequirement") "") + (("@Nullable") ""))))) + ;; This is required by guava, but this is just an empty stub + (add-before 'install 'install-listenablefuture-stub + (install-pom-file "futures/listenablefuture9999/pom.xml")) (replace 'install (install-from-pom "guava/pom.xml"))))) (inputs - (list java-jsr305)) + (list java-error-prone-annotations java-jsr305)) (propagated-inputs - (list java-guava-parent-pom)) + (list java-guava-futures-failureaccess java-guava-parent-pom)) (home-page "https://github.com/google/guava") (synopsis "Google core libraries for Java") (description "Guava is a set of core libraries that includes new @@ -5958,6 +5958,21 @@ (define-public java-guava more!") (license license:asl2.0))) +(define-public java-guava-futures-failureaccess + (package + (inherit java-guava) + (name "java-guava-futures-failureaccess") + (arguments + `(#:tests? #f; no tests + #:jar-name "guava-futures-failureaccess.jar" + #:source-dir "futures/failureaccess/src" + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "futures/failureaccess/pom.xml"))))) + (propagated-inputs + `(("java-sonatype-oss-parent-pom" ,java-sonatype-oss-parent-pom-7))))) + (define java-guava-parent-pom (package (inherit java-guava) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index f941bf0dd0..3ab8b6dffc 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2170,7 +2170,8 @@ (define-public maven "java-javax-inject" "java-plexus-component-annotations" "java-plexus-utils" "java-plexus-interpolation" "java-plexus-sec-dispatcher" "java-plexus-cipher" "java-guava" - "java-jansi" "java-jsr250" "java-cdi-api" "java-commons-cli" + "java-guava-futures-failureaccess" "java-jansi" + "java-jsr250" "java-cdi-api" "java-commons-cli" "java-commons-io" "java-commons-lang3" "java-slf4j-api")))) (substitute* "apache-maven/src/bin/mvn" (("cygwin=false;") @@ -2239,6 +2240,7 @@ (define-public maven java-plexus-sec-dispatcher java-plexus-cipher java-guava + java-guava-futures-failureaccess java-jansi java-jsr250 java-cdi-api diff --git a/gnu/packages/patches/java-guava-remove-annotation-deps.patch b/gnu/packages/patches/java-guava-remove-annotation-deps.patch new file mode 100644 index 0000000000..6f038b1ba4 --- /dev/null +++ b/gnu/packages/patches/java-guava-remove-annotation-deps.patch @@ -0,0 +1,37 @@ +From 41d216ca7993991d32a077d0650ccfad8a846942 Mon Sep 17 00:00:00 2001 +From: Julien Lepiller +Date: Sat, 25 Feb 2023 10:02:11 +0100 +Subject: [PATCH] Remove annotation dependencies + +This is used to prevent a failure when guix creates the Maven directory +structure and fails to find these dependencies. +--- + guava/pom.xml | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/guava/pom.xml b/guava/pom.xml +index 81a2005..5237047 100644 +--- a/guava/pom.xml ++++ b/guava/pom.xml +@@ -31,18 +31,6 @@ + com.google.code.findbugs + jsr305 + +- +- org.checkerframework +- checker-qual +- +- +- com.google.errorprone +- error_prone_annotations +- +- +- com.google.j2objc +- j2objc-annotations +- + + + +-- +2.38.1 + From patchwork Sat Feb 25 20:30:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47347 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F2DAB16BBC; Sat, 25 Feb 2023 20:33:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 741E916B4C for ; Sat, 25 Feb 2023 20:33:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DC-0005ps-Ui; Sat, 25 Feb 2023 15:32:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1D9-0005mb-WD for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1D9-00016e-ON for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1D9-0004UD-Kc for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 06/18] gnu: Add apache-parent-pom-29. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735706717066 (code B ref 61794); Sat, 25 Feb 2023 20:32:03 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:07 +0000 Received: from localhost ([127.0.0.1]:41666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CE-0004R6-VF for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:07 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C8-0004OQ-Dd for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:00 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 9edf531a for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=GdFq09R0fcYBsvwXPwZnyZ6Bv ExB/ebWkMXwrhOKvJg=; b=K6+rqMXqpGJZa2gParT5pBZUMDVZGqynEMem6REcB kaK305o6t3s8KYGUuRwz2fOXLTVc2XbIeWvKxSK2v59Xa54DXv87LBAtUq5b83d2 kgYtOfy/N0cOSn+vs2Ty8gGxZtVPvnKVzMrNlRb/+zU16niVhpd4ECSxui5VazCJ 4bXs2H4+NMoPaYA5Y3ZICObcGo2/pgDjNuMvOtKg1z2OGtNqO9xxLUvKm13OZQMs hS/frNAZakJ+hd2mCSTl3AjaWHRr4tr3w3FkdGAPGAA+XRwut4MxGs6EfOWaqFIV kgoW9lraNLqbkcn6gEY0do4ZruowtjfNce2rKmrPGdC2A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 9eab2933 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:54 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:30 +0100 Message-Id: <82033377993505c561ff57dbb7fa5f2f8a595c82.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven-parent-pom.scm (apache-parent-pom-29): 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 660790b019..2e3ed22835 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -92,6 +92,10 @@ (define-public apache-parent-pom-25 (make-apache-parent-pom "25" "1vwx2fpgk7cn2pnlnx26df26vndiwwn5l7ngakj0vwal5pmp6115")) +(define-public apache-parent-pom-29 + (make-apache-parent-pom + "29" "0fj078bgzs0r24x66ph5bbwkkc5s9d1qh57hmlpisg4mdi0l48s9")) + (define* (make-apache-commons-parent-pom version hash parent #:key (tag-prefix "commons-parent-")) (hidden-package From patchwork Sat Feb 25 20:30:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47349 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 635A016BC5; Sat, 25 Feb 2023 20:33:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,TVD_SPACE_RATIO, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CECED1684B for ; Sat, 25 Feb 2023 20:33:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DC-0005oR-I8; Sat, 25 Feb 2023 15:32:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DA-0005mc-DH for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DA-00016k-57 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DA-0004UK-1z for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 07/18] gnu: Add maven-parent-pom-39. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735706817074 (code B ref 61794); Sat, 25 Feb 2023 20:32:04 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:08 +0000 Received: from localhost ([127.0.0.1]:41668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CF-0004RD-C9 for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:07 -0500 Received: from lepiller.eu ([89.234.186.109]:46240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C9-0004Om-2z for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:01 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 00a3850e for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=iLtJ757BKKKe7JypFN2/LlBrs ORct9WxAIJHyhsKt3s=; b=T2cB8tQi13O9tlc7+DxKo8vYDboDcZa/xxp9ujGSm qnn3eXLTNfpB4QhhlK99x7hs7E7/L6UAbdgGNFOLLCf9+4Vf2LudZ81qE73PWuZK xTqm2nRIPzHo+C6eF3HgM7SA7Uq/oNwEtSJbj0lF7XUtVIc/Ztyu40OGDCUB/kcm vQECpVZ706zEU3PNchsPD++NnL9wcZxwUz+AO47nWTvZXTdhuvmzt8FjMov1mubw y+uf+hdCg4XYUhVzhWb/jDBIz2d9zL5rwWP4FYCLuK7w4+X2cKWwfG5xhUGbdDZu DffYQHHOpdC38KKps1y7Orgi6QT9LHojx7/jtsDcbEzTQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id a45c4b85 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:54 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:31 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven-parent-pom.scm (maven-parent-pom-39): New variable. --- gnu/packages/maven-parent-pom.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 2e3ed22835..33d3e73ff6 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -447,6 +447,16 @@ (define* (make-maven-parent-pom version hash parent #:key replacements) tool. This package contains the Maven parent POM.") (license license:asl2.0)))) +(define-public maven-parent-pom-39 + (make-maven-parent-pom + "39" "1123nmm63nrsfy9i35zn12glswc2sy9bsj4fir2z9yh93kraky1y" + apache-parent-pom-29 + #:replacements + (delay + `(("org.codehaus.plexus" + ("plexus-component-annotations" . + ,(package-version java-plexus-component-annotations))))))) + (define-public maven-parent-pom-35 (make-maven-parent-pom "35" "0pg9k7l5pcbghmc89i11g900pbzznvf5sfdfzlqfwpihqb2g8iab" From patchwork Sat Feb 25 20:30:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47350 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B9BE616B4C; Sat, 25 Feb 2023 20:33:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0817B16BBA for ; Sat, 25 Feb 2023 20:33:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DD-0005qJ-A8; Sat, 25 Feb 2023 15:32:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DA-0005n1-Q7 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DA-00016p-HI for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DA-0004UT-DX for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 08/18] gnu: Add apache-parent-pom-27. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735706817081 (code B ref 61794); Sat, 25 Feb 2023 20:32:04 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:08 +0000 Received: from localhost ([127.0.0.1]:41670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CF-0004RL-RT for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:08 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C9-0004OQ-8b for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:01 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ce16656f for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +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=kFtRPnEl829BYwImCO56wBFuK ANYsHF0px1DUK3ifJo=; b=lcACe2z3dmDb0WcIJvshdzBgd7g/20pILS9MlRzYL A6aY4Owmu/ZHlMQ8lLHWdLAVKCn+p0ZyImeQSo5wjM09e6uA/9tOAMBOjYp1qs75 s0mYgIY/uzisFwHsYc2AvpzfKSKRueGOraxF8D/s7Rb4VV1OkjSWmBtjk4KCCfdC fbmB+wWgA+ml5iWGw9BRsctcSkEkq1W2zROJQ9Gwn+/67C0eZ7dlO+ucBwfi16KM EcVsCk5szXJbCaEfJJci15tWr6o6MBP7/43iqTNwkDU0gDDpkYTqb+r8Tenh9rh3 Z649jnKNkhuyYJVFjM/h69KFkJfZiGEdR3+KAqGRCV10g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 987addbf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:55 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:32 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven-parent-pom.scm (apache-parent-pom-27): 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 33d3e73ff6..7fd8f27881 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -92,6 +92,10 @@ (define-public apache-parent-pom-25 (make-apache-parent-pom "25" "1vwx2fpgk7cn2pnlnx26df26vndiwwn5l7ngakj0vwal5pmp6115")) +(define-public apache-parent-pom-27 + (make-apache-parent-pom + "27" "07087qdcwadsg3va5rc9xb7k89im3fm2g297lpmfh1aggn7cpc00")) + (define-public apache-parent-pom-29 (make-apache-parent-pom "29" "0fj078bgzs0r24x66ph5bbwkkc5s9d1qh57hmlpisg4mdi0l48s9")) From patchwork Sat Feb 25 20:30:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47354 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A240C16BBF; Sat, 25 Feb 2023 20:33:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,TVD_SPACE_RATIO, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E73A71684B for ; Sat, 25 Feb 2023 20:33:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DD-0005qD-0U; Sat, 25 Feb 2023 15:32:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DB-0005nH-6Z for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DA-000171-Uh for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DA-0004Ua-QZ for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 09/18] gnu: Add maven-parent-pom-37. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735706817093 (code B ref 61794); Sat, 25 Feb 2023 20:32:04 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:08 +0000 Received: from localhost ([127.0.0.1]:41672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CG-0004RS-94 for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:08 -0500 Received: from lepiller.eu ([89.234.186.109]:46240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C9-0004Om-UG for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:02 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id e47f3b03 for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +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=n0WVMoGk7UhxZH4QrvLxMxIbe /mW3EvfLJmWlX7NsTc=; b=EqoDwCKEO69Xoua0ARnjjFABkUDfgYLbgeqTScSjZ THpFoYRTAw33wbpYdR/T+JQItmPUzS9oxbH9gdTXAdMix9uqb0hBw1ub7LoLFmik Zn2z6AAj0B1ATqsDtBzGeA0ZttePR+Jx431xfOcdgdw7v6jkzCOXe8vyzRdARuba MfHal3w4XIN0brQvFfHlLI/AJW7KZk2WhmD8we+SdUx7NPXLRotFDLnosd081MTT /bZ6g6E1hsNmhFCtMBYoMwhKbr65aZeUMuap6xKv3bSjoOb/rrRR+MBAiCyShhyp 39PdPKeg5XSwakZqbi4XwMnXuq/MRqPg40IDl0D8h/MdA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 00214bbb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:55 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:33 +0100 Message-Id: <3d90af6f45c1e1a23a58000e67871c169e7b9519.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven-parent-pom.scm (maven-parent-pom-37): New variable. --- gnu/packages/maven-parent-pom.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 7fd8f27881..60581f520b 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -461,6 +461,16 @@ (define-public maven-parent-pom-39 ("plexus-component-annotations" . ,(package-version java-plexus-component-annotations))))))) +(define-public maven-parent-pom-37 + (make-maven-parent-pom + "37" "0c8yham28si4zadpv9v2i61gl3in518jls4nsawfhx42b6x3371j" + apache-parent-pom-27 + #:replacements + (delay + `(("org.codehaus.plexus" + ("plexus-component-annotations" . + ,(package-version java-plexus-component-annotations))))))) + (define-public maven-parent-pom-35 (make-maven-parent-pom "35" "0pg9k7l5pcbghmc89i11g900pbzznvf5sfdfzlqfwpihqb2g8iab" From patchwork Sat Feb 25 20:30:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47341 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D7D9916BBC; Sat, 25 Feb 2023 20:32:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4FCC41684B for ; Sat, 25 Feb 2023 20:32:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DC-0005pl-UG; Sat, 25 Feb 2023 15:32:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DB-0005ni-Jx for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DB-000177-Bh for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DB-0004Uh-7i for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 10/18] gnu: maven-resolver-api: Update to 1.9.4. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735709117124 (code B ref 61794); Sat, 25 Feb 2023 20:32:05 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:31 +0000 Received: from localhost ([127.0.0.1]:41674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1Cc-0004S6-PP for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:31 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CA-0004OQ-47 for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:04 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2773c19d for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +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=lQ1D7MZ//G97AGvo3bSxHMvJi 1sAM8VoE0PNO4QLxlY=; b=jcY7qeqeDMnkf9hYOgMOiKYIT5kjdF85oja0fjmbI VE3pv/+UMnLsZQ5VtzYPfwuY9R3URjob5yjiCVJJNzfsftmqZa/2EaOXn9Jqj+f4 D+WAM1bHrHajA/TwBUz3p6El3c5Wdd0MyzAjg+GYJ/5BfkgEugn5cyK+BiO2WAYn G+ogiasB7ANrPTKqCLsYsjyTQwKnicxsFy9+LniKNjQt9VrSjBM4PVtxf2dVegvf a9utwNhDCbPjfwUpNWkU53fHloS7Fh0T3E9oEPoQjSDW9Lo6pxCpyJpOeuzu5uLa w+BPq/UloNGXcEPyQ0fPLOs+Y6DuzrALtdyxveHzjiJ0A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5bf5844c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:55 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:34 +0100 Message-Id: <215f81ad1010c1c68d44193439557158d1b9ca08.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven.scm (maven-resolver-api): Update to 1.9.4. (maven-resolver-util)[native-inputs]: Update test dependencies. (maven-resolver-named-lock): New variable. (maven-resolver-impl, maven-resolver-transport-wagon) (maven-resolver-transport-http): Update sisu. --- gnu/packages/maven.scm | 167 ++++++++++++++++++++++------------------- 1 file changed, 91 insertions(+), 76 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 3ab8b6dffc..f96337a17d 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -40,7 +40,7 @@ (define-module (gnu packages maven) (define-public maven-resolver-api (package (name "maven-resolver-api") - (version "1.6.3") + (version "1.9.4") (source (origin (method git-fetch) (uri (git-reference @@ -49,7 +49,7 @@ (define-public maven-resolver-api (file-name (git-file-name name version)) (sha256 (base32 - "0hbbbxj14qyq8pccyab96pjqq90jnjmid1pml9kx55c5smfpjn37")))) + "0s18vivvapmrk407syrc8ib2qpmp01i3k46h6gqp7961n1p9wzlq")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-resolver-api.jar" @@ -90,7 +90,7 @@ (define maven-resolver-parent-pom #t)) (replace 'install (install-pom-file "pom.xml"))))) - (propagated-inputs '()))) + (propagated-inputs (list maven-parent-pom-37)))) (define-public maven-resolver-spi (package @@ -140,7 +140,7 @@ (define-public maven-resolver-util (propagated-inputs (list maven-resolver-api)) (native-inputs - (list java-junit java-hamcrest-core maven-resolver-test-util)) + (list java-junit java-hamcrest-all maven-resolver-test-util)) (synopsis "Utility classes for the maven repository system") (description "This package contains a collection of utility classes to ease usage of the repository system."))) @@ -174,6 +174,35 @@ (define-public maven-resolver-connector-basic (description "This package contains a repository connector implementation for repositories using URI-based layouts."))) +(define-public maven-resolver-named-locks + (package + (inherit maven-resolver-api) + (name "maven-resolver-named-locks") + (arguments + `(#:jar-name "maven-resolver-named-locks.jar" + #:source-dir "maven-resolver-named-locks/src/main/java" + #:test-dir "maven-resolver-named-locks/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-sisu + (lambda _ + (mkdir-p "build/classes/META-INF/sisu") + (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" + (lambda _ + (display "org.eclipse.aether.named.providers.FileLockNamedLockFactory +org.eclipse.aether.named.providers.LocalReadWriteLockNamedLockFactory +org.eclipse.aether.named.providers.LocalSemaphoreNamedLockFactory +org.eclipse.aether.named.providers.NoopNamedLockFactory\n"))))) + (replace 'install + (install-from-pom "maven-resolver-named-locks/pom.xml"))))) + (propagated-inputs + (list java-slf4j-api)) + (native-inputs + (list java-javax-inject java-junit java-hamcrest-all)) + (synopsis "Maven artifact resolver named locks") + (description "This package contains a synchronization utility implementation +using named locks."))) + (define-public maven-resolver-impl (package (inherit maven-resolver-api) @@ -182,6 +211,7 @@ (define-public maven-resolver-impl `(#:jar-name "maven-resolver-impl.jar" #:source-dir "maven-resolver-impl/src/main/java" #:test-dir "maven-resolver-impl/src/test" + #:tests? #f; require more recent hamcrest #:phases (modify-phases %standard-phases (add-before 'build 'generate-sisu @@ -189,37 +219,60 @@ (define-public maven-resolver-impl (mkdir-p "build/classes/META-INF/sisu") (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" (lambda _ - (display - (string-append - ;; Build this list by looking for files containing "@Named" - "org.eclipse.aether.internal.impl.DefaultArtifactResolver\n" - "org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector\n" - "org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider\n" - "org.eclipse.aether.internal.impl.DefaultDeployer\n" - "org.eclipse.aether.internal.impl.DefaultFileProcessor\n" - "org.eclipse.aether.internal.impl.DefaultInstaller\n" - "org.eclipse.aether.internal.impl.DefaultLocalRepositoryProvider\n" - "org.eclipse.aether.internal.impl.DefaultMetadataResolver\n" - "org.eclipse.aether.internal.impl.DefaultOfflineController\n" - "org.eclipse.aether.internal.impl.DefaultRemoteRepositoryManager\n" - "org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider\n" - "org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher\n" - "org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider\n" - "org.eclipse.aether.internal.impl.DefaultRepositorySystem\n" - "org.eclipse.aether.internal.impl.DefaultSyncContextFactory\n" - "org.eclipse.aether.internal.impl.DefaultTransporterProvider\n" - "org.eclipse.aether.internal.impl.DefaultUpdateCheckManager\n" - "org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer\n" - "org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory\n" - "org.eclipse.aether.internal.impl.LoggerFactoryProvider\n" - "org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory\n" - "org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory\n" - "org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory")))) - #t)) + ;; Build this list by looking for files containing "@Named" + (display "org.eclipse.aether.internal.impl.DefaultArtifactResolver +org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider +org.eclipse.aether.internal.impl.DefaultDeployer +org.eclipse.aether.internal.impl.DefaultFileProcessor +org.eclipse.aether.internal.impl.DefaultInstaller +org.eclipse.aether.internal.impl.DefaultLocalPathComposer +org.eclipse.aether.internal.impl.DefaultLocalPathPrefixComposerFactory +org.eclipse.aether.internal.impl.DefaultLocalRepositoryProvider +org.eclipse.aether.internal.impl.DefaultMetadataResolver +org.eclipse.aether.internal.impl.DefaultOfflineController +org.eclipse.aether.internal.impl.DefaultRemoteRepositoryManager +org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider +org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher +org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider +org.eclipse.aether.internal.impl.DefaultRepositorySystem +org.eclipse.aether.internal.impl.DefaultRepositorySystemLifecycle +org.eclipse.aether.internal.impl.DefaultTrackingFileManager +org.eclipse.aether.internal.impl.DefaultTransporterProvider +org.eclipse.aether.internal.impl.DefaultUpdateCheckManager +org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer +org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory +org.eclipse.aether.internal.impl.LoggerFactoryProvider +org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory +org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory +org.eclipse.aether.internal.impl.checksum.DefaultChecksumAlgorithmFactorySelector +org.eclipse.aether.internal.impl.checksum.Md5ChecksumAlgorithmFactory +org.eclipse.aether.internal.impl.checksum.Sha1ChecksumAlgorithmFactory +org.eclipse.aether.internal.impl.checksum.Sha256ChecksumAlgorithmFactory +org.eclipse.aether.internal.impl.checksum.Sha512ChecksumAlgorithmFactory +org.eclipse.aether.internal.impl.checksum.SparseDirectoryTrustedChecksumsSource +org.eclipse.aether.internal.impl.checksum.SummaryFileTrustedChecksumsSource +org.eclipse.aether.internal.impl.checksum.TrustedToProvidedChecksumsSourceAdapter +org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector +org.eclipse.aether.internal.impl.collect.bf.BfDependencyCollector +org.eclipse.aether.internal.impl.collect.df.DfDependencyCollector +org.eclipse.aether.internal.impl.filter.DefaultRemoteRepositoryFilterManager +org.eclipse.aether.internal.impl.filter.GroupIdRemoteRepositoryFilterSource +org.eclipse.aether.internal.impl.filter.PrefixesRemoteRepositoryFilterSource +org.eclipse.aether.internal.impl.resolution.TrustedChecksumsArtifactResolverPostProcessor +org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory +org.eclipse.aether.internal.impl.synccontext.DefaultSyncContextFactory +org.eclipse.aether.internal.impl.synccontext.legacy.DefaultSyncContextFactory +org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapterFactoryImpl +org.eclipse.aether.internal.impl.synccontext.named.providers.DiscriminatingNameMapperProvider +org.eclipse.aether.internal.impl.synccontext.named.providers.FileGAVNameMapperProvider +org.eclipse.aether.internal.impl.synccontext.named.providers.FileHashingGAVNameMapperProvider +org.eclipse.aether.internal.impl.synccontext.named.providers.GAVNameMapperProvider +org.eclipse.aether.internal.impl.synccontext.named.providers.StaticNameMapperProvider\n"))))) (replace 'install (install-from-pom "maven-resolver-impl/pom.xml"))))) (propagated-inputs (list maven-resolver-api + maven-resolver-named-locks maven-resolver-spi maven-resolver-util java-commons-lang3 @@ -229,7 +282,7 @@ (define-public maven-resolver-impl java-slf4j-api maven-resolver-parent-pom)) (native-inputs - (list java-junit maven-resolver-test-util)))) + (list java-hamcrest-all java-junit java-mockito-1 maven-resolver-test-util)))) (define-public maven-resolver-transport-wagon (package @@ -247,49 +300,9 @@ (define-public maven-resolver-transport-wagon (mkdir-p "build/classes/META-INF/sisu") (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" (lambda _ - (display "org.eclipse.aether.transport.wagon.WagonTransporterFactory\n"))) - #t)) - (add-before 'build 'generate-components.xml - (lambda _ - (mkdir-p "build/classes/META-INF/plexus") - (with-output-to-file "build/classes/META-INF/plexus/components.xml" - (lambda _ - (display - (string-append - " - - - - org.eclipse.aether.transport.wagon.WagonConfigurator - plexus - org.eclipse.aether.internal.transport.wagon.PlexusWagonConfigurator - - false - - - org.codehaus.plexus.PlexusContainer - - container - - - - - org.eclipse.aether.transport.wagon.WagonProvider - plexus - org.eclipse.aether.internal.transport.wagon.PlexusWagonProvider - - false - - - org.codehaus.plexus.PlexusContainer - - container - - - - -\n")))) - #t))))) + (display "org.eclipse.aether.internal.transport.wagon.PlexusWagonConfigurator +org.eclipse.aether.internal.transport.wagon.PlexusWagonProvider +org.eclipse.aether.transport.wagon.WagonTransporterFactory")))))))) (inputs `(("maven-resolver-api" ,maven-resolver-api) ("maven-resolver-spi" ,maven-resolver-spi) @@ -374,7 +387,9 @@ (define-public maven-resolver-transport-http (mkdir-p "build/classes/META-INF/sisu") (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" (lambda _ - (display "org.eclipse.aether.transport.http.HttpTransporterFactory\n")))))))) + (display "org.eclipse.aether.transport.http.HttpTransporterFactory +org.eclipse.aether.transport.http.Nexus2ChecksumExtractor +org.eclipse.aether.transport.http.XChecksumChecksumExtractor\n")))))))) (inputs (list java-eclipse-sisu-inject java-eclipse-sisu-plexus From patchwork Sat Feb 25 20:30:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47351 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9493916BC5; Sat, 25 Feb 2023 20:33:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4967516BBC for ; Sat, 25 Feb 2023 20:33:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DD-0005qQ-G4; Sat, 25 Feb 2023 15:32:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DC-0005pF-PH for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DC-00017T-GW for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DC-0004V3-Cl for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 11/18] gnu: maven: Update to 3.9.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735709317145 (code B ref 61794); Sat, 25 Feb 2023 20:32:06 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:33 +0000 Received: from localhost ([127.0.0.1]:41680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1Ce-0004SO-Do for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:32 -0500 Received: from lepiller.eu ([89.234.186.109]:46240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CA-0004Om-V1 for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:04 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2d465d71 for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +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=jMh6pFQsrS1GWFVADyzUqj8Uv ZXTr/3dY5o5h/I68tM=; b=HVEUfCjtVsSPHft0K0XXJ9udIzk+JlABA+vcivagd x812gT0GlfXlAJQ+9rsP+G74Mrx0YfmXZB+YfiN3AQy7CLHETrDof1Uc7e6zFZTR Z9Jzbmd0d1f1LWOLnkQ6hatLFUmJueCIleLm6MwGoMvXdnERYJl1NakhxwLfq6+K LGghBajPJ+hy+alT4EvHCJmBcMTDWZW9DygPf99a1rB+HuDR/2nPXnh/QB19ZWGQ jwTNKl80TiQ+DVzNfwBclSNOYa5aLNo9ve5ZEYmQP3tCmHzSZhzmnlOebNPHPPgT qfs6AYvXe811W6esI6FnnVDBnf4ujH8iSbxlzIsVARm/A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 6d64fe6b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:35 +0100 Message-Id: <887b57c6d45a00e688ee1e63f97c3e2a904ff191.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven.scm (maven-pom): Update to 3.9.0. --- gnu/packages/maven.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index f96337a17d..67b95a5f7b 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1132,13 +1132,13 @@ (define-public maven-wagon-http (define maven-pom (package (name "maven-pom") - (version "3.8.6") + (version "3.9.0") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) - (sha256 (base32 "0jszmcaxp597a62ajrc478jxix1qmw4pknhiygsbjdy3kccc7gvj")) + (sha256 (base32 "0s8ds2bqkdi2yrcwbd3mkszh6l4hf56j9jz47hkpd7i3zh1hmr4n")) (modules '((guix build utils))) (snippet '(begin @@ -1212,7 +1212,7 @@ (define maven-pom (replace 'install (install-pom-file "pom.xml"))))) (propagated-inputs - (list maven-parent-pom-35)) + (list maven-parent-pom-39)) (home-page "https://maven.apache.org/") (synopsis "Build system") (description "Apache Maven is a software project management and comprehension @@ -1830,6 +1830,7 @@ (define-public maven-embedder #:source-dir "maven-embedder/src/main/java" #:test-dir "maven-embedder/src/test" #:test-exclude (list "**/MavenCliTest.java") + #:tests? #f; require junit 4.13 #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases @@ -1851,9 +1852,9 @@ (define-public maven-embedder file mode "maven-embedder/src/main/java" version "false" "true")) (let ((file "maven-embedder/src/main/mdo/core-extensions.mdo")) - (modello-single-mode file "1.0.0" "java") - (modello-single-mode file "1.0.0" "xpp3-reader") - (modello-single-mode file "1.0.0" "xpp3-writer")) + (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")) #t)) (add-before 'check 'fix-test-paths (lambda _ @@ -2130,6 +2131,8 @@ (define-public maven-compat ("java-jsr250" ,java-jsr250) ("java-cdi-api" ,java-cdi-api) ("java-junit" ,java-junit) + ("java-mockito-1" ,java-mockito-1) + ("java-objenesis" ,java-objenesis) ("maven-resolver-impl" ,maven-resolver-impl) ("maven-resolver-connector-basic" ,maven-resolver-connector-basic) ("maven-resolver-transport-wagon" ,maven-resolver-transport-wagon) @@ -2174,7 +2177,8 @@ (define-public maven "maven-settings" "maven-settings-builder" "maven-plugin-api" "maven-repository-metadata" "maven-shared-utils" "maven-resolver-api" "maven-resolver-spi" "maven-resolver-util" "maven-resolver-impl" - "maven-resolver-connector-basic" "maven-resolver-provider" + "maven-resolver-connector-basic" "maven-resolver-named-locks" + "maven-resolver-provider" "maven-resolver-transport-wagon" "maven-slf4j-provider" "maven-wagon-provider-api" "maven-wagon-file" "maven-wagon-http" "java-commons-logging-minimal" @@ -2229,6 +2233,7 @@ (define-public maven maven-resolver-api maven-resolver-spi maven-resolver-util + maven-resolver-named-locks maven-resolver-impl maven-resolver-connector-basic maven-resolver-provider From patchwork Sat Feb 25 20:30:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47355 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6904016BBA; Sat, 25 Feb 2023 20:33:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7F73416BBC for ; Sat, 25 Feb 2023 20:33:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DD-0005qH-7E; Sat, 25 Feb 2023 15:32:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DC-0005oG-2p for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DB-00017C-RH for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DB-0004Up-Kq for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 12/18] gnu: Add java-asm-9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735709217132 (code B ref 61794); Sat, 25 Feb 2023 20:32:05 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:32 +0000 Received: from localhost ([127.0.0.1]:41676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1Cd-0004S9-Nw for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:32 -0500 Received: from lepiller.eu ([89.234.186.109]:46242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CC-0004Q3-3P for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:04 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a16918a5 for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +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=FYYSYh81WXNnWi/qQP3zgk6Ze ULTn/qBOrI0CqDto6w=; b=n8eeCV1HaDaoBIvJgnXYpu8VK7q1fU30NKZOuRPkz CUw/4aHwmkozb4lEME96mexfT0fMT0RiBcPCxV5DwliYHm32Cg98H9TbI3iXpINc F7JLdhScgRqQsUZnw+TDkjoaILMndXN/nwJX180Qw9nWV0nALBwkjVG1ucX+vQeM pg+4ackhUh0TiEOu2X/kBZS3XDGKZWsW/Bo5W8P4OmI92xWn01HuPCpIKmkjc9BC jolON7e8aJoUhTlr0DBhDgeapBcjHn3H72cKsMLL9JQq3ggV15vuiPlRzFaqzBAm C1qC4ekA9gwNunvaP79Hyx8/CWSk/hzsvz7l7SY2NM3oA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 591e78ba (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:36 +0100 Message-Id: <34f43804db60a09f9e01a9baa6e51f4e061d30ee.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-asm-9): New variable. --- gnu/packages/java.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4d57ba4f79..3e2420129a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4823,6 +4823,30 @@ (define-public java-asm-commons-8 #:tests? #f)) (inputs (list java-asm-8 java-asm-analysis-8 java-asm-tree-8)))) +(define-public java-asm-9 + (package + (inherit java-asm) + (version "9.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.ow2.org/asm/asm") + (commit (string-append + "ASM_" (string-join (string-split version #\.) + "_"))))) + (file-name (git-file-name "java-asm" version)) + (sha256 + (base32 + "0c00m638skr5md1p6y1c2xn11kj5w6sjapyvwp9mh70rw095bwzk")))) + (arguments + `(#:jar-name "asm9.jar" + #:source-dir "asm/src/main/java" + #:test-dir "asm/src/test" + ;; tests depend on junit5 + #:tests? #f)) + (propagated-inputs '()) + (native-inputs '()))) + (define-public java-cglib (package (name "java-cglib") From patchwork Sat Feb 25 20:30:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47356 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1E81A16BBA; Sat, 25 Feb 2023 20:33:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BF2171684B for ; Sat, 25 Feb 2023 20:33:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DD-0005qS-JW; Sat, 25 Feb 2023 15:32:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DC-0005oO-Bu for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DC-00017K-3S for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DC-0004Uw-03 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 13/18] gnu: Add java-asm-tree-9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735709217139 (code B ref 61794); Sat, 25 Feb 2023 20:32:05 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:32 +0000 Received: from localhost ([127.0.0.1]:41678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1Ce-0004SH-3O for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:32 -0500 Received: from lepiller.eu ([89.234.186.109]:46240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CC-0004Om-Eg for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:05 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 1a2462fd for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +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=muKRm1+uGUTP9RMXMl8YGY0PK 3kvFmiNUVStgBmMARM=; b=B6jr2UkohQBLoxfHpICwnyWudfd/bIjh+szo6ni8d Iq3iQTg/aAhRULaO47rK05RELF8zxgjk7PcEG9IRxhi5SxVhDpLa3fdfi9GZKMkh aAgKzq+wVvrvQ9oFtrHzEPovXUUWa3onn+ZpJKz6qdLM91b8+6bRddmviPGgAt+O Mcj4nDyY+Ya+d3MTmCyE1AM01urvrRCr0z49/h8q9bycogWKiRbJakQWZJS9ln1y XfN9CksWQbqGzIiZdy52Yv4pECRxmAjkM5rcGA1bZPaBweBEevUZD1Sqw45A1sgN GemLmPHmyjsQDlCRYnz7y8SVA5OM23tASatCz6+xoQ9dg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 4bee8233 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:37 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-asm-tree-9): New variable. --- gnu/packages/java.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3e2420129a..bc88afc84c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4847,6 +4847,19 @@ (define-public java-asm-9 (propagated-inputs '()) (native-inputs '()))) +(define-public java-asm-tree-9 + (package + (inherit java-asm-9) + (name "java-asm-tree") + (arguments + `(#:jar-name "asm-tree.jar" + #:source-dir "asm-tree/src/main/java" + #:test-dir "asm-tree/src/test" + ;; tests depend on junit5 + #:tests? #f)) + (inputs + (list java-asm-9)))) + (define-public java-cglib (package (name "java-cglib") From patchwork Sat Feb 25 20:30:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47352 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2B2D616BBC; Sat, 25 Feb 2023 20:33:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9316416B4C for ; Sat, 25 Feb 2023 20:33:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DG-0005tu-CR; Sat, 25 Feb 2023 15:32:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DD-0005qI-7d for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DC-00017b-V0 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DC-0004VB-Qy for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 14/18] gnu: Add java-asm-analysis-9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735709317154 (code B ref 61794); Sat, 25 Feb 2023 20:32:06 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:33 +0000 Received: from localhost ([127.0.0.1]:41682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1Ce-0004SZ-Uy for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:33 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CC-0004OQ-H6 for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:05 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 210cd9df for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:57 +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=LC6cntJmf7MYpc83dPKOQPIIq VfbGgYE5JdHqNzCz4A=; b=e11tW+gPAT3kDsEyH8ZQ2CTpd1R+ZNv2VIzkzSoeY +1YHmYGMkLhP91KeDvAzkA9B/MfG5DGLhC24sHAac7+ZSC5a2v9163sKMXdxuqVI 2VpYNpu9nJq/fl6VjBEkzh2nSxwOr+msbuILHXkNE8UJVQrt8NTAU9S8pf6MWXfD V/rIiU4+boV7+pd4IYN69vPW2KvUqndVoZOLql5ngjVn4Yl9zrOrVZyHBq/LkG0V /G0RW91CJMUiJJN1HU0dN7kQ8nk2q0orBztXRTogG71aWLBMT8uRF6slN7/WMzG2 by9untKdv53WhJdOlW63FcIMrFmgWLvQtz1kadiRTg4Ag== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 06a57c51 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:38 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-asm-analysis-9): New variable. --- gnu/packages/java.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index bc88afc84c..d3f64e14fa 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4860,6 +4860,19 @@ (define-public java-asm-tree-9 (inputs (list java-asm-9)))) +(define-public java-asm-analysis-9 + (package + (inherit java-asm-9) + (name "java-asm-analysis") + (arguments + `(#:jar-name "asm-analysis.jar" + #:source-dir "asm-analysis/src/main/java" + #:test-dir "asm-analysis/src/test" + ;; tests depend on junit5 + #:tests? #f)) + (inputs + (list java-asm-9 java-asm-tree-9)))) + (define-public java-cglib (package (name "java-cglib") From patchwork Sat Feb 25 20:30:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47346 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 51C0916BBA; Sat, 25 Feb 2023 20:33:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0FD971684B for ; Sat, 25 Feb 2023 20:32:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DF-0005sV-02; Sat, 25 Feb 2023 15:32:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DD-0005qU-Jh for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DD-00017h-AN for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DD-0004VI-6R for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 15/18] gnu: Add java-asm-util-9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735709317161 (code B ref 61794); Sat, 25 Feb 2023 20:32:07 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:33 +0000 Received: from localhost ([127.0.0.1]:41684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1Cf-0004Sd-7d for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:33 -0500 Received: from lepiller.eu ([89.234.186.109]:46242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CD-0004Q3-9L for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:06 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 8af4ad7d for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:58 +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=x2+RHP2Vn/gZXZmnbjcfOxt76 gREldtbNnGLoUThLog=; b=Cn3u7oR+TU/P6ltGtlSL2DDmqK78mzWf8h+PSRU97 x1wAjUOA8T1BMp7DcQ6HRuG3ir8m7Kzb2K20Qg4H4LTinJuFaU+QdIVPxjNRFjSA BbshUIUfqD3yMtDMAiRh3UkReFSw+fINWVV7PZZckzq+7Pz9KOU8HUBI1OaffMo/ q39kt1OVus7VZmwmcKFMXkxySEhhyvh1nhf/LiKol2icSwmr852WFfQ0l2ZMHarc m9l92FLmJl83HHoP+n6zlDM/auLKiKLAilXFqGYNmeMj5Hlp1MLmfaNk8ZkIudOS st5DGObj6KLGzHoj2KxklJ+TTApRQdgXomWJDYnGUqMTQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 287e662c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:57 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:39 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-asm-util-9): New variable. --- gnu/packages/java.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d3f64e14fa..8131d6f728 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4873,6 +4873,19 @@ (define-public java-asm-analysis-9 (inputs (list java-asm-9 java-asm-tree-9)))) +(define-public java-asm-util-9 + (package + (inherit java-asm-9) + (name "java-asm-util") + (arguments + `(#:jar-name "asm-util8.jar" + #:source-dir "asm-util/src/main/java" + #:test-dir "asm-util/src/test" + ;; tests depend on junit5 + #:tests? #f)) + (inputs + (list java-asm-9 java-asm-analysis-9 java-asm-tree-9)))) + (define-public java-cglib (package (name "java-cglib") From patchwork Sat Feb 25 20:30:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47345 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D1A1616BBC; Sat, 25 Feb 2023 20:32:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1417E1684B for ; Sat, 25 Feb 2023 20:32:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DF-0005tA-FP; Sat, 25 Feb 2023 15:32:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DD-0005qy-Ud for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DD-00017n-Mi for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DD-0004VP-IX for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 16/18] gnu: Add java-asm-commons-9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735709417168 (code B ref 61794); Sat, 25 Feb 2023 20:32:07 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:34 +0000 Received: from localhost ([127.0.0.1]:41686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1Cf-0004Sk-ID for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:33 -0500 Received: from lepiller.eu ([89.234.186.109]:46240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CD-0004Om-Ek for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:06 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id c7a5c15a for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:58 +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=OPos3WHZz0rNUup8qZFdWwKFM kAMUuII6VeyZyNBJCo=; b=Faf2SCSlWCGgMaeYQUZELOUL5MJFqWNh99dIn/rnz OR6UD00MA2VFkLrdXfgjPsiP5V7JQT/NM9IGiNfLj5PatihuuByn4QtvrHUlLQDW F2feZXBOK8oAWDMQChDyG9PBkIXcgTnFcDYxEWlSkww0+qTdrOskIvstEi7eQFG/ F644lM/bdDUD9x2vRL56dTp5qhjfyeZl+UC6PCD6iL4uBf+RkQeth9DIOyv+ZTe7 vOANvZwcrhH3cYkQYd4XBE0Ol8I0XfQ6qp0+AH4pN02idmkny6jXSXNAAJTHzZH4 SjI7zIlQCVvxg7mQyb0qj3wZKO2/AVmoacbg8ekVu0gQA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id a8b4137d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:57 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:40 +0100 Message-Id: <0ca8f19fb7842d0d66bf7c07ed50dfab1e3b05a9.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-asm-commons-9): New variable. --- gnu/packages/java.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8131d6f728..e47462ce04 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4886,6 +4886,18 @@ (define-public java-asm-util-9 (inputs (list java-asm-9 java-asm-analysis-9 java-asm-tree-9)))) +(define-public java-asm-commons-9 + (package + (inherit java-asm-9) + (name "java-asm-commons") + (arguments + (list #:jar-name "asm-commons8.jar" + #:source-dir "asm-commons/src/main/java" + #:test-dir "asm-commons/src/test" + ;; tests depend on junit5 + #:tests? #f)) + (inputs (list java-asm-9 java-asm-analysis-9 java-asm-tree-9)))) + (define-public java-cglib (package (name "java-cglib") From patchwork Sat Feb 25 20:30:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47344 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 94E8C16BBA; Sat, 25 Feb 2023 20:32:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E6B5E1684B for ; Sat, 25 Feb 2023 20:32:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DJ-0005vd-NL; Sat, 25 Feb 2023 15:32:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DE-0005rq-9h for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DE-00017t-1T for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DD-0004VX-U3 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 17/18] gnu: Add java-byte-buddy-dep. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735709417176 (code B ref 61794); Sat, 25 Feb 2023 20:32:07 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:34 +0000 Received: from localhost ([127.0.0.1]:41688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1Cf-0004Sr-TM for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:34 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CD-0004OQ-J6 for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:06 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 8acf55d2 for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:58 +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=oPFKGHSWxEKLPHieLXTl8NhE/ Em+yyv1gsKebfeWYYk=; b=bq2zZXhS/liP/Q4bcvFBx/a0S+7FuMvwVbnxOVHKp eh89WQidq/sRtdyBUFyoXXV4qqq//mBRkFIJ/2t11Qg65C7BDgc0vi4QNpAIEjvb gUubpyssjDCp7vxjZd8AcLsh6pH1OoreUhAb2KKkgaOs26EXQUMCT2HF/ZosYLfQ rBfPZQoMWnsDghgvx033flFtrXtzNbL2t7tMNZUW8Caa8IZ5phNTYmSUjIytoxiV Y3JOJNGN9FHEgdGfDsbBOL6DrYv4lWDKK8KLcloCFPbNVJBelrXZNND7xPVnFhIp HYup4iiewyqxoRqvzOwGvGINYAGIYjsTj2XJp4gjUD5tA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1a006643 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:57 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:41 +0100 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-byte-buddy-dep): New variable. --- gnu/packages/java.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e47462ce04..9940641fe9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10978,6 +10978,48 @@ (define-public java-xerial-core streams, etc.") (license license:asl2.0))) +(define-public java-byte-buddy-dep + (package + (name "java-byte-buddy-dep") + (version "1.14.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/raphw/byte-buddy") + (commit (string-append "byte-buddy-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03jmsnkjb9d3z9brqs8fc512hhs5b5iab3a5wbax9zi03dskgvh2")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "byte-buddy-dep.jar" + #:source-dir "byte-buddy-dep/src/main/java" + #:test-dir "byte-buddy-dep/src/test" + #:tests? #f; would build java files that are incompatible with current jdk + #:phases + (modify-phases %standard-phases + (add-before 'build 'remove-annotations + (lambda _ + (with-directory-excursion "byte-buddy-dep/src/main/java/net/bytebuddy" + (substitute* (find-files "." ".*.java") + (("@EqualsAndHashCode.*") "") + (("import lombok.EqualsAndHashCode;") "") + (("@SuppressFBWarnings.*") "") + (("import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;") "")) + (substitute* '("description/type/TypeDescription.java" + "dynamic/loading/ClassInjector.java") + (("^ *value = .*") "") + (("^ *justification = .*") "")))))))) + (inputs + (list java-asm-9 java-asm-commons-9 java-jsr305 java-native-access)) + (home-page "http://bytebuddy.net/") + (synopsis "Runtime code generation for the Java virtual machine") + (description "Byte Buddy is a code generation and manipulation library for +creating and modifying Java classes during the runtime of a Java application +and without the help of a compiler.") + (license license:asl2.0))) + (define-public java-powermock-reflect (package (name "java-powermock-reflect") From patchwork Sat Feb 25 20:30:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47353 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9FB8616BBA; Sat, 25 Feb 2023 20:33:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CB52D1684B for ; Sat, 25 Feb 2023 20:33:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DI-0005uo-KH; Sat, 25 Feb 2023 15:32:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1DE-0005sD-PF for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DE-000180-FE for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DE-0004Ve-BI for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 18/18] gnu: java-powermock-reflect: Update to 2.0.9. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735709517183 (code B ref 61794); Sat, 25 Feb 2023 20:32:08 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:35 +0000 Received: from localhost ([127.0.0.1]:41690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1Cg-0004Sz-Aa for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:35 -0500 Received: from lepiller.eu ([89.234.186.109]:46242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CE-0004Q3-BR for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:08 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 00f2f45a for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:58 +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=A33WbKhR7qx4VCND0mFbzTHSX Z4DzPSs6ddAH8qgqKA=; b=NqQv9rnjmSytisAh85C9ZLl+woi6ZeMjeZHv8kHlm 7g2amU7juDRgUkg/gJkRwJOyeofnbOeES8p4yOVs7YpGt9d8VoFmUwB2PchqimYt Sus2ltFLKhZJg5c7dkqE18wz18g81J9tQUx8ZaX7hjNPhfTddA2wC1c0eAUQBwGx N9B4bL2u517+pzBTJ57FYzaFNnidbUh+99opSzwLqGMo870MGHnrqr5fmwGy/P8o TzVaTsh9SIqajccxnLTsV0Aq+EiMKu0g9U1EigAtNwMgAI1cMOQJcmUPhNmuTXLh OgsDJTik0iRIsorirVz3oSvg5ZKq3UaIIxclzZTQO3nMQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 357b983b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:57 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:42 +0100 Message-Id: <81c01fdbd4180b159b540fbc48048595615a1b29.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (java-powermock-reflect): Update to 2.0.9. [source]: Use git source. (java-powermock-reflect, java-powermock-core, java-powermock-api-support) (java-powermock-junit4-common, java-powermock-junit4) (java-powermock-api-easymock): Update inputs and use new style. * gnu/packages/patches/java-powermock-fix-java-files.patch: Update patch. --- gnu/packages/java.scm | 72 ++++--- .../java-powermock-fix-java-files.patch | 192 ++++++++++++++---- 2 files changed, 190 insertions(+), 74 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9940641fe9..599cdc0ace 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11023,30 +11023,27 @@ (define-public java-byte-buddy-dep (define-public java-powermock-reflect (package (name "java-powermock-reflect") - (version "1.7.3") + (version "2.0.9") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/powermock/powermock/" - "archive/powermock-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/powermock/powermock") + (commit (string-append "powermock-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0sbgi5vqq7k72wzcdjb20s370vyd4hsbnx71pzb8ishml3gy7fwy")) + "03y8szi9iwxnv431z2mn2ivc1ak30vcvfvkyrwmfq7wq93bj2c5v")) (patches (search-patches "java-powermock-fix-java-files.patch")))) (build-system ant-build-system) (arguments `(#:jar-name "java-powermock-reflect.jar" - #:jdk ,icedtea-8 #:source-dir "powermock-reflect/src/main/java" #:test-dir "powermock-reflect/src/test")) (inputs - (list java-objenesis)) + (list java-asm-9 java-objenesis)) (native-inputs - `(("junit" ,java-junit) - ("cglib" ,java-cglib) - ("hamcrest" ,java-hamcrest-core) - ("assertj" ,java-assertj))) + (list java-assertj java-cglib java-hamcrest-core java-junit)) (home-page "https://github.com/powermock/powermock") (synopsis "Mock library extension framework") (description "PowerMock is a framework that extends other mock libraries @@ -11075,12 +11072,12 @@ (define-public java-powermock-core "build/classes") #t))))) (inputs - `(("reflect" ,java-powermock-reflect) - ("javassist" ,java-jboss-javassist))) + (list java-asm-9 + java-byte-buddy-dep + java-jboss-javassist + java-powermock-reflect)) (native-inputs - `(("junit" ,java-junit) - ("assertj" ,java-assertj) - ("mockito" ,java-mockito-1))))) + (list java-assertj java-mockito-1 java-junit)))) (define-public java-powermock-api-support (package @@ -11093,8 +11090,7 @@ (define-public java-powermock-api-support #:source-dir "powermock-api/powermock-api-support/src/main/java" #:tests? #f)); no tests (inputs - `(("core" ,java-powermock-core) - ("reflect" ,java-powermock-reflect))))) + (list java-powermock-core java-powermock-reflect)))) (define-public java-powermock-modules-junit4-common (package @@ -11107,11 +11103,11 @@ (define-public java-powermock-modules-junit4-common #:source-dir "powermock-modules/powermock-module-junit4-common/src/main/java" #:test-dir "powermock-modules/powermock-module-junit4-common/src/test")) (inputs - `(("core" ,java-powermock-core) - ("easymock" ,java-easymock) - ("reflect" ,java-powermock-reflect) - ("hamcrest" ,java-hamcrest-core) - ("cglib" ,java-cglib))))) + (list java-cglib + java-easymock + java-hamcrest-core + java-powermock-core + java-powermock-reflect)))) (define-public java-powermock-modules-junit4 (package @@ -11120,7 +11116,7 @@ (define-public java-powermock-modules-junit4 (build-system ant-build-system) (arguments `(#:jar-name "java-powermock-modules-junit4.jar" - #:jdk ,icedtea-8 + #:tests? #f; require easymock 4, which introduces a loop with testng #:source-dir "powermock-modules/powermock-module-junit4/src/main/java" #:test-dir "powermock-modules/powermock-module-junit4/src/test" #:phases @@ -11133,15 +11129,15 @@ (define-public java-powermock-modules-junit4 (("4.12") "4.12-SNAPSHOT")) #t))))) (inputs - `(("core" ,java-powermock-core) - ("reflect" ,java-powermock-reflect) - ("common" ,java-powermock-modules-junit4-common) - ("cglib" ,java-cglib))) + (list java-cglib + java-powermock-core + java-powermock-reflect + java-powermock-modules-junit4-common)) (native-inputs - `(("easymock" ,java-easymock) - ("hamcrest" ,java-hamcrest-core) - ("objenesis" ,java-objenesis) - ("junit" ,java-junit))))) + (list java-easymock + java-hamcrest-core + java-junit + java-objenesis)))) (define-public java-powermock-api-easymock (package @@ -11164,11 +11160,11 @@ (define-public java-powermock-api-easymock (("\\(\\(MockClassLoader\\) classLoader\\).*;") ";"))) #t))))) (inputs - `(("core" ,java-powermock-core) - ("easymock" ,java-easymock) - ("reflect" ,java-powermock-reflect) - ("support" ,java-powermock-api-support) - ("cglib" ,java-cglib))))) + (list java-cglib + java-easymock + java-powermock-api-support + java-powermock-core + java-powermock-reflect)))) (define-public java-jboss-jms-api-spec (package diff --git a/gnu/packages/patches/java-powermock-fix-java-files.patch b/gnu/packages/patches/java-powermock-fix-java-files.patch index 6b95818138..ca99749a43 100644 --- a/gnu/packages/patches/java-powermock-fix-java-files.patch +++ b/gnu/packages/patches/java-powermock-fix-java-files.patch @@ -1,17 +1,130 @@ This patch fixes build issues caused by the java compiler not finding the correct types on some statements. -From 1ac84b58b4383fa118d98c35956d722d11cf449e Mon Sep 17 00:00:00 2001 +From 10ce6e0e30bbaf22212abc77f5d644c074df6068 Mon Sep 17 00:00:00 2001 From: Julien Lepiller -Date: Tue, 22 Aug 2017 20:40:27 +0200 +Date: Sat, 25 Feb 2023 18:00:13 +0100 Subject: [PATCH] Fix java files. --- - .../internal/impl/DelegatingPowerMockRunner.java | 13 +++++++--- - .../java/org/powermock/reflect/WhiteBoxTest.java | 30 +++++++++++----------- - .../reflect/internal/proxy/ClassFactory.java | 6 ++--- - 3 files changed, 27 insertions(+), 22 deletions(-) + .../ConditionalStateStackManipulation.java | 6 ++-- + .../org/powermock/core/bytebuddy/Frame.java | 2 +- + .../core/bytebuddy/MaxLocalsExtractor.java | 6 ++-- + .../core/bytebuddy/MockGetawayCall.java | 2 +- + .../core/bytebuddy/PrimitiveBoxing.java | 4 +-- + .../agent/DefinalizingClassTransformer.java | 4 +-- + .../agent/DefinalizingClassVisitor.java | 6 ++-- + .../impl/DelegatingPowerMockRunner.java | 13 +++++--- + .../org/powermock/reflect/WhiteBoxTest.java | 32 +++++++++---------- + .../reflect/internal/proxy/ClassFactory.java | 6 ++-- + 10 files changed, 43 insertions(+), 38 deletions(-) +diff --git a/powermock-core/src/main/java/org/powermock/core/bytebuddy/ConditionalStateStackManipulation.java b/powermock-core/src/main/java/org/powermock/core/bytebuddy/ConditionalStateStackManipulation.java +index fa23a3f..1fa4b94 100644 +--- a/powermock-core/src/main/java/org/powermock/core/bytebuddy/ConditionalStateStackManipulation.java ++++ b/powermock-core/src/main/java/org/powermock/core/bytebuddy/ConditionalStateStackManipulation.java +@@ -20,9 +20,9 @@ package org.powermock.core.bytebuddy; + + import net.bytebuddy.implementation.Implementation.Context; + import net.bytebuddy.implementation.bytecode.StackManipulation; +-import net.bytebuddy.jar.asm.Label; +-import net.bytebuddy.jar.asm.MethodVisitor; +-import net.bytebuddy.jar.asm.Opcodes; ++import org.objectweb.asm.Label; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Opcodes; + + public class ConditionalStateStackManipulation implements StackManipulation { + +diff --git a/powermock-core/src/main/java/org/powermock/core/bytebuddy/Frame.java b/powermock-core/src/main/java/org/powermock/core/bytebuddy/Frame.java +index 8ada262..adfc218 100644 +--- a/powermock-core/src/main/java/org/powermock/core/bytebuddy/Frame.java ++++ b/powermock-core/src/main/java/org/powermock/core/bytebuddy/Frame.java +@@ -24,7 +24,7 @@ import net.bytebuddy.description.method.ParameterDescription.InDefinedShape; + import net.bytebuddy.description.method.ParameterList; + import net.bytebuddy.description.type.TypeDescription.Generic; + import net.bytebuddy.implementation.bytecode.StackSize; +-import net.bytebuddy.jar.asm.Opcodes; ++import org.objectweb.asm.Opcodes; + import net.bytebuddy.utility.CompoundList; + + import java.util.ArrayList; +diff --git a/powermock-core/src/main/java/org/powermock/core/bytebuddy/MaxLocalsExtractor.java b/powermock-core/src/main/java/org/powermock/core/bytebuddy/MaxLocalsExtractor.java +index 6b5cddd..8fe1936 100644 +--- a/powermock-core/src/main/java/org/powermock/core/bytebuddy/MaxLocalsExtractor.java ++++ b/powermock-core/src/main/java/org/powermock/core/bytebuddy/MaxLocalsExtractor.java +@@ -19,9 +19,9 @@ + package org.powermock.core.bytebuddy; + + import net.bytebuddy.description.method.MethodDescription; +-import net.bytebuddy.jar.asm.ClassVisitor; +-import net.bytebuddy.jar.asm.MethodVisitor; +-import net.bytebuddy.jar.asm.Opcodes; ++import org.objectweb.asm.ClassVisitor; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Opcodes; + + public class MaxLocalsExtractor extends ClassVisitor { + +diff --git a/powermock-core/src/main/java/org/powermock/core/bytebuddy/MockGetawayCall.java b/powermock-core/src/main/java/org/powermock/core/bytebuddy/MockGetawayCall.java +index db84196..84942f8 100644 +--- a/powermock-core/src/main/java/org/powermock/core/bytebuddy/MockGetawayCall.java ++++ b/powermock-core/src/main/java/org/powermock/core/bytebuddy/MockGetawayCall.java +@@ -27,7 +27,7 @@ import net.bytebuddy.implementation.bytecode.StackManipulation; + import net.bytebuddy.implementation.bytecode.collection.ArrayFactory; + import net.bytebuddy.implementation.bytecode.constant.ClassConstant; + import net.bytebuddy.implementation.bytecode.member.MethodInvocation; +-import net.bytebuddy.jar.asm.MethodVisitor; ++import org.objectweb.asm.MethodVisitor; + import org.powermock.core.bytebuddy.Variable.VariableAccess; + import org.powermock.reflect.internal.WhiteboxImpl; + +diff --git a/powermock-core/src/main/java/org/powermock/core/bytebuddy/PrimitiveBoxing.java b/powermock-core/src/main/java/org/powermock/core/bytebuddy/PrimitiveBoxing.java +index e200b22..ae1036b 100644 +--- a/powermock-core/src/main/java/org/powermock/core/bytebuddy/PrimitiveBoxing.java ++++ b/powermock-core/src/main/java/org/powermock/core/bytebuddy/PrimitiveBoxing.java +@@ -24,8 +24,8 @@ import net.bytebuddy.description.type.TypeDescription.ForLoadedType; + import net.bytebuddy.implementation.Implementation; + import net.bytebuddy.implementation.bytecode.StackManipulation; + import net.bytebuddy.implementation.bytecode.StackSize; +-import net.bytebuddy.jar.asm.MethodVisitor; +-import net.bytebuddy.jar.asm.Opcodes; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Opcodes; + + public enum PrimitiveBoxing implements StackManipulation{ + +diff --git a/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassTransformer.java b/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassTransformer.java +index e8eef7a..01d0bcb 100644 +--- a/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassTransformer.java ++++ b/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassTransformer.java +@@ -16,8 +16,8 @@ + + package org.powermock.modules.agent; + +-import net.bytebuddy.jar.asm.ClassReader; +-import net.bytebuddy.jar.asm.ClassWriter; ++import org.objectweb.asm.ClassReader; ++import org.objectweb.asm.ClassWriter; + + import java.lang.instrument.ClassFileTransformer; + import java.security.ProtectionDomain; +diff --git a/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassVisitor.java b/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassVisitor.java +index 3bb80c3..9aada60 100644 +--- a/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassVisitor.java ++++ b/powermock-modules/powermock-module-javaagent/src/main/java/org/powermock/modules/agent/DefinalizingClassVisitor.java +@@ -1,8 +1,8 @@ + package org.powermock.modules.agent; + +-import net.bytebuddy.jar.asm.ClassVisitor; +-import net.bytebuddy.jar.asm.MethodVisitor; +-import net.bytebuddy.jar.asm.Opcodes; ++import org.objectweb.asm.ClassVisitor; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Opcodes; + + class DefinalizingClassVisitor extends ClassVisitor { + diff --git a/powermock-modules/powermock-module-junit4/src/main/java/org/powermock/modules/junit4/internal/impl/DelegatingPowerMockRunner.java b/powermock-modules/powermock-module-junit4/src/main/java/org/powermock/modules/junit4/internal/impl/DelegatingPowerMockRunner.java index 301f854..caecbbd 100644 --- a/powermock-modules/powermock-module-junit4/src/main/java/org/powermock/modules/junit4/internal/impl/DelegatingPowerMockRunner.java @@ -39,7 +152,7 @@ index 301f854..caecbbd 100644 if (testClass.isAnnotationPresent(PowerMockRunnerDelegate.class) && JUnitVersion.isGreaterThanOrEqualTo("4.5")) { diff --git a/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java b/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java -index bf1e2e3..0d60487 100644 +index acb3154..8c24fbc 100644 --- a/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java +++ b/powermock-reflect/src/test/java/org/powermock/reflect/WhiteBoxTest.java @@ -248,7 +248,7 @@ public class WhiteBoxTest { @@ -47,126 +160,133 @@ index bf1e2e3..0d60487 100644 @Test public void testMethodWithPrimitiveAndWrappedInt_primtive_wrapped() throws Exception { - assertEquals(17, Whitebox.invokeMethod(new ClassWithPrivateMethods(), "methodWithPrimitiveAndWrappedInt", -+ assertEquals((Integer)17, Whitebox.invokeMethod(new ClassWithPrivateMethods(), "methodWithPrimitiveAndWrappedInt", ++ assertEquals(17, (int) Whitebox.invokeMethod(new ClassWithPrivateMethods(), "methodWithPrimitiveAndWrappedInt", new Class[]{int.class, Integer.class}, 9, Integer.valueOf(8))); } -@@ -257,7 +257,7 @@ public class WhiteBoxTest { +@@ -257,13 +257,13 @@ public class WhiteBoxTest { int expected = 123; Whitebox.setInternalState(ClassWithInternalState.class, "staticState", expected); assertEquals(expected, ClassWithInternalState.getStaticState()); - assertEquals(expected, Whitebox.getInternalState(ClassWithInternalState.class, "staticState")); -+ assertEquals(expected, (int)Whitebox.getInternalState(ClassWithInternalState.class, "staticState")); ++ assertEquals(expected, (int) Whitebox.getInternalState(ClassWithInternalState.class, "staticState")); } @Test -@@ -334,25 +334,25 @@ public class WhiteBoxTest { + public void testStaticFinalPrimitiveState() { + Whitebox.setInternalState(ClassWithInternalState.class, "staticFinalIntState", 123); +- assertEquals(123, Whitebox.getInternalState(ClassWithInternalState.class, "staticFinalIntState")); ++ assertEquals(123, (int) Whitebox.getInternalState(ClassWithInternalState.class, "staticFinalIntState")); + } + + @Test +@@ -330,25 +330,25 @@ public class WhiteBoxTest { @Test public void testInvokeVarArgsMethod_multipleValues() throws Exception { ClassWithPrivateMethods tested = new ClassWithPrivateMethods(); - assertEquals(6, Whitebox.invokeMethod(tested, "varArgsMethod", 1, 2, 3)); -+ assertEquals(6, (int)Whitebox.invokeMethod(tested, "varArgsMethod", 1, 2, 3)); ++ assertEquals(6, (int) Whitebox.invokeMethod(tested, "varArgsMethod", 1, 2, 3)); } @Test public void testInvokeVarArgsMethod_noArguments() throws Exception { ClassWithPrivateMethods tested = new ClassWithPrivateMethods(); - assertEquals(0, Whitebox.invokeMethod(tested, "varArgsMethod")); -+ assertEquals(0, (int)Whitebox.invokeMethod(tested, "varArgsMethod")); ++ assertEquals(0, (int) Whitebox.invokeMethod(tested, "varArgsMethod")); } @Test public void testInvokeVarArgsMethod_oneArgument() throws Exception { ClassWithPrivateMethods tested = new ClassWithPrivateMethods(); - assertEquals(4, Whitebox.invokeMethod(tested, "varArgsMethod", 2)); -+ assertEquals(4, (int)Whitebox.invokeMethod(tested, "varArgsMethod", 2)); ++ assertEquals(4, (int) Whitebox.invokeMethod(tested, "varArgsMethod", 2)); } @Test public void testInvokeVarArgsMethod_invokeVarArgsWithOneArgument() throws Exception { ClassWithPrivateMethods tested = new ClassWithPrivateMethods(); - assertEquals(1, Whitebox.invokeMethod(tested, "varArgsMethod", new Class[]{int[].class}, 1)); -+ assertEquals(1, (int)Whitebox.invokeMethod(tested, "varArgsMethod", new Class[]{int[].class}, 1)); ++ assertEquals(1, (int) Whitebox.invokeMethod(tested, "varArgsMethod", new Class[]{int[].class}, 1)); } @Test -@@ -376,7 +376,7 @@ public class WhiteBoxTest { +@@ -372,7 +372,7 @@ public class WhiteBoxTest { ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() { }; Whitebox.setInternalState(tested, fieldName, value); - assertEquals(value, Whitebox.getInternalState(tested, fieldName)); -+ assertEquals(value, (int)Whitebox.getInternalState(tested, fieldName)); ++ assertEquals(value, (int) Whitebox.getInternalState(tested, fieldName)); } @Test -@@ -387,8 +387,8 @@ public class WhiteBoxTest { +@@ -383,8 +383,8 @@ public class WhiteBoxTest { ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() { }; Whitebox.setInternalState(tested, fieldName, value); - assertEquals(value, Whitebox.getInternalState(tested, fieldName)); - assertEquals(-1, Whitebox.getInternalState(tested, fieldName, ClassWithInternalState.class)); -+ assertEquals(value, (int)Whitebox.getInternalState(tested, fieldName)); -+ assertEquals(-1, (int)Whitebox.getInternalState(tested, fieldName, ClassWithInternalState.class)); ++ assertEquals(value, (int) Whitebox.getInternalState(tested, fieldName)); ++ assertEquals(-1, (int) Whitebox.getInternalState(tested, fieldName, ClassWithInternalState.class)); } @Test(expected = IllegalArgumentException.class) -@@ -398,7 +398,7 @@ public class WhiteBoxTest { +@@ -394,7 +394,7 @@ public class WhiteBoxTest { ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() { }; Whitebox.setInternalState(tested, fieldName, new Object()); - assertEquals(value, Whitebox.getInternalState(tested, fieldName)); -+ assertEquals(value, (int)Whitebox.getInternalState(tested, fieldName)); ++ assertEquals(value, (int) Whitebox.getInternalState(tested, fieldName)); } @Test(expected = IllegalArgumentException.class) -@@ -408,7 +408,7 @@ public class WhiteBoxTest { +@@ -404,7 +404,7 @@ public class WhiteBoxTest { ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState() { }; Whitebox.setInternalState(tested, fieldName, (Object) null); - assertEquals(value, Whitebox.getInternalState(tested, fieldName)); -+ assertEquals(value, (int)Whitebox.getInternalState(tested, fieldName)); ++ assertEquals(value, (int) Whitebox.getInternalState(tested, fieldName)); } @Test -@@ -417,8 +417,8 @@ public class WhiteBoxTest { +@@ -413,8 +413,8 @@ public class WhiteBoxTest { ClassWithChildThatHasInternalState tested = new ClassWithChildThatHasInternalState(); Whitebox.setInternalState(tested, int.class, value); assertEquals(value, (int) Whitebox.getInternalState(tested, int.class)); - assertEquals(value, Whitebox.getInternalState(tested, "anotherInternalState")); - assertEquals(value, Whitebox.getInternalState(tested, "anotherInternalState", -+ assertEquals(value, (int)Whitebox.getInternalState(tested, "anotherInternalState")); -+ assertEquals(value, (int)Whitebox.getInternalState(tested, "anotherInternalState", ++ assertEquals(value, (int) Whitebox.getInternalState(tested, "anotherInternalState")); ++ assertEquals(value, (int) Whitebox.getInternalState(tested, "anotherInternalState", ClassWithChildThatHasInternalState.class)); } -@@ -429,7 +429,7 @@ public class WhiteBoxTest { +@@ -425,7 +425,7 @@ public class WhiteBoxTest { Whitebox.setInternalState(tested, int.class, value, ClassWithInternalState.class); assertEquals(42, (int) Whitebox.getInternalState(tested, int.class)); assertEquals(value, (int) Whitebox.getInternalState(tested, int.class, ClassWithInternalState.class)); - assertEquals(value, Whitebox.getInternalState(tested, "staticState", ClassWithInternalState.class)); -+ assertEquals(value, (int)Whitebox.getInternalState(tested, "staticState", ClassWithInternalState.class)); ++ assertEquals(value, (int) Whitebox.getInternalState(tested, "staticState", ClassWithInternalState.class)); } @Test -@@ -619,7 +619,7 @@ public class WhiteBoxTest { +@@ -621,7 +621,7 @@ public class WhiteBoxTest { @Test public void testInvokeMethodWithBothNormalAndVarArgsParameter() throws Exception { ClassWithPrivateMethods tested = new ClassWithPrivateMethods(); - assertEquals(4, Whitebox.invokeMethod(tested, "varArgsMethod2", 1, 2, 3)); -+ assertEquals(4, (int)Whitebox.invokeMethod(tested, "varArgsMethod2", 1, 2, 3)); ++ assertEquals(4, (int) Whitebox.invokeMethod(tested, "varArgsMethod2", 1, 2, 3)); } @Test diff --git a/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java b/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java -index a5e5fda..14b8bbe 100644 +index 03db992..828bfe0 100644 --- a/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java +++ b/powermock-reflect/src/test/java/org/powermock/reflect/internal/proxy/ClassFactory.java @@ -1,8 +1,8 @@ package org.powermock.reflect.internal.proxy; --import net.sf.cglib.asm.ClassWriter; --import net.sf.cglib.asm.MethodVisitor; --import net.sf.cglib.asm.Opcodes; +-import net.bytebuddy.jar.asm.ClassWriter; +-import net.bytebuddy.jar.asm.MethodVisitor; +-import net.bytebuddy.jar.asm.Opcodes; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; @@ -174,5 +294,5 @@ index a5e5fda..14b8bbe 100644 class ClassFactory implements Opcodes { -- -2.14.1 +2.38.1