Received: (at 56054) by debbugs.gnu.org; 4 Aug 2022 09:11:59 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 04 05:11:59 2022 Received: from localhost ([127.0.0.1]:51190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1oJWta-0002Sh-MW for submit <at> debbugs.gnu.org; Thu, 04 Aug 2022 05:11:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1oJWtZ-0002SV-4O for 56054 <at> debbugs.gnu.org; Thu, 04 Aug 2022 05:11:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36946) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1oJWtT-0003FT-Tg; Thu, 04 Aug 2022 05:11:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=LjuxC7enGm9xXXJN1Sv0Vb3PVwhaA2Z55T49XNdjNBw=; b=Do7YyoZHSm9j7eZ3GTt8 va1ZLfdauKYmceI9gBPyPE7HL1Gvz9mQy531mOXf/dF1bk/YLkvT1zhmwKJorGMDgF6OpvF4yXc1S G6/LcLgc6V9FUXI7GI+YCJDh9zrhCMvoYaI5k7IdmxcmaHFcgiO5c1kGcjGEs87RQ5/Yjcgafrz1t WU41tVbHjYOhSQ7uyIlzER6R5yY+IimyMDIrd87KmzRnC4dhK+YPeVFxWAol/0CkrAufYzPVjjRuf tdaL0juz2wpZLYc4cfEgBY8IXnC2I1VRp6Q2bjt6PWddbvg7Anbd0ZdO4cP6UucvqwBlnNPgZZGvm woKqykdqR3LwAg==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=35156 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1oJWtT-0001O4-Cl; Thu, 04 Aug 2022 05:11:51 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Julien Lepiller <julien@HIDDEN> Subject: Re: bug#56054: [PATCH] gnu: Add maven-shared-invoker References: <87a6aavx17.fsf@HIDDEN> <20220618215647.4e25fd30@HIDDEN> Date: Thu, 04 Aug 2022 11:11:49 +0200 In-Reply-To: <20220618215647.4e25fd30@HIDDEN> (Julien Lepiller's message of "Sat, 18 Jun 2022 21:56:51 +0200") Message-ID: <87y1w4nzje.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56054 Cc: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>, 56054 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hey Artyom, Did you have a chance to look at Julien=E2=80=99s comments below? Thanks, Ludo=E2=80=99. Julien Lepiller <julien@HIDDEN> skribis: > Thanks for the patch! It's mostly good, but I have some comments below > :) > > Le Sat, 18 Jun 2022 17:58:12 +0300, > "Artyom V. Poptsov" <poptsov.artyom@HIDDEN> a =C3=A9crit : > >> +(define-public maven-shared-invoker >> + (package >> + (name "maven-shared-invoker") >> + (version "3.2.0") >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "mirror://apache/maven/shared/" >> + "maven-invoker-" version >> "-source-release.zip")) >> + (sha256 >> + (base32 >> + >> "0yhgxvwpmyfhqaksdfmj9c4ml4pj60gnin8bq1a92ximf1dyyjyc")) >> + (patches >> + (search-patches >> + "maven-shared-invoker-exception-handler-fix.patch" >> + "maven-shared-invoker-rename-test-classes.patch")))) >> + (build-system ant-build-system) >> + (arguments >> + `(#:jar-name "maven-shared-invoker.jar" >> + #:source-dir "src/main/java" >> + #:tests? #f)) ; Tests require Maven >> itself > > How so? Tests are usually just junit tests and it's easy to run them. > How are they so different from the usual tests? > > If it really requires maven, have you tried building it with the > maven-build-system? There's a way to remove plugins from the pom file, > so maven doesn't complain. The pom file doesn't look too complex, so I > think it could work. > >> + (propagated-inputs >> + (list maven-parent-pom-35)) > > Yes you should propagate the parent, but that's only because maven > needs it when it reads this package's pom file. So, please keep it and > install this package from its pom file, like the others :) > >> + (native-inputs >> + (list unzip >> + maven-surefire-plugin >> + java-javax-inject >> + java-junit)) > > I'm surprised here you need maven-surefire-plugin. What is it used for > exactly? From my understanding it can't be called outside of maven, and > we don't use maven to install this package. > > The pom file lists java-javax-inject as a normal dependency, so it > should be propagated instead. The pom file also lists > maven-shared-utils. Is it needed? If so please add it to the propagated > inputs, otherwise fix the pom file (with a patch to upstream I=C2=A0guess= ). > >> + (home-page >> "https://maven.apache.org/shared/maven-invoker/index.html") >> + (synopsis "Invoke Maven programmatically") > >> Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" >> <poptsov.artyom@HIDDEN> +Date: Tue, 14 Jun 2022 23:53:13 +0300 >> +Subject: [PATCH 1/2] MavenCommandLineBuilder: Fix exception handling >> + >> +* >> src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.ja= va >> + (setGoals): Catch 'Exception' instead of 'CommandLineException' as >> + 'CommandLineException' is never thrown in the "try" block. >> +--- >> + .../apache/maven/shared/invoker/MavenCommandLineBuilder.java | 2 >> +- >> + 1 file changed, 1 insertion(+), 1 deletion(-) >> + >> +diff --git > > This looks like a simple patch, but I don't understand why it's needed. > Is this a fix from upstream? Did you create it? For what reason? > >> @@ -0,0 +1,126 @@ +From 4bce3183b25c44ab406c2f4d8541a0a520b15a3d Mon >> Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" >> <poptsov.artyom@HIDDEN> +Date: Wed, 15 Jun 2022 07:09:29 +0300 >> +Subject: [PATCH 2/2] test: Rename some classes to avoid name >> conflicts + >> +* > > I'm lost. What's happening in this patch? Why do you need it > (especially since you couldn't run the tests anyway)? Is this a problem > with upstream, or some issue you encountered because of what Guix is > doing?
guix-patches@HIDDEN
:bug#56054
; Package guix-patches
.
Full text available.Received: (at 56054) by debbugs.gnu.org; 18 Jun 2022 19:56:59 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jun 18 15:56:58 2022 Received: from localhost ([127.0.0.1]:50060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1o2eZ0-0001sb-KC for submit <at> debbugs.gnu.org; Sat, 18 Jun 2022 15:56:58 -0400 Received: from lepiller.eu ([89.234.186.109]:40896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <julien@HIDDEN>) id 1o2eYx-0001sP-9j for 56054 <at> debbugs.gnu.org; Sat, 18 Jun 2022 15:56:57 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f7bd797c; Sat, 18 Jun 2022 19:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=wgsmT4NLQJFr G23LXgyDO9TdjAuWVy94g9Ldaaj1iBM=; b=lYPwdoVSnM2ZRwf2oKafpkb/QfCf 78GfmOuWvutuTnrLShSB8dZmXFu8hmlMAVu+G50GN8pEiBn6fVe5eh1MnIRvwNVG Kip6Txl6esdu7Ccu/8vjlSF2ftXShQEby/npv6+EYZt7/ySNtR/kaMtdN0q4tskU 7nLXQdqOgIVQ7X2EbveuifMUDkE/PJ4e/JSwX9j+UC65sp0/u2pQemv5z0ZdnE1J aJCiVNYy/L9RfI3HTs5PnUv1RwgCJTVjAUZ0fhoGzDc0XujYqqUDKq9QuKPJ90f9 J3hoDQhWPnNexpPE2sP/5y0GDfgavYiq79CvNfGEqbspzHCaRRz7n92NQg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1921c05a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Sat, 18 Jun 2022 19:56:53 +0000 (UTC) Date: Sat, 18 Jun 2022 21:56:51 +0200 From: Julien Lepiller <julien@HIDDEN> To: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN> Subject: Re: [bug#56054] [PATCH] gnu: Add maven-shared-invoker Message-ID: <20220618215647.4e25fd30@HIDDEN> In-Reply-To: <87a6aavx17.fsf@HIDDEN> References: <87a6aavx17.fsf@HIDDEN> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 56054 Cc: 56054 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Thanks for the patch! It's mostly good, but I have some comments below :) Le Sat, 18 Jun 2022 17:58:12 +0300, "Artyom V. Poptsov" <poptsov.artyom@HIDDEN> a =C3=A9crit : > +(define-public maven-shared-invoker > + (package > + (name "maven-shared-invoker") > + (version "3.2.0") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://apache/maven/shared/" > + "maven-invoker-" version > "-source-release.zip")) > + (sha256 > + (base32 > + > "0yhgxvwpmyfhqaksdfmj9c4ml4pj60gnin8bq1a92ximf1dyyjyc")) > + (patches > + (search-patches > + "maven-shared-invoker-exception-handler-fix.patch" > + "maven-shared-invoker-rename-test-classes.patch")))) > + (build-system ant-build-system) > + (arguments > + `(#:jar-name "maven-shared-invoker.jar" > + #:source-dir "src/main/java" > + #:tests? #f)) ; Tests require Maven > itself How so? Tests are usually just junit tests and it's easy to run them. How are they so different from the usual tests? If it really requires maven, have you tried building it with the maven-build-system? There's a way to remove plugins from the pom file, so maven doesn't complain. The pom file doesn't look too complex, so I think it could work. > + (propagated-inputs > + (list maven-parent-pom-35)) Yes you should propagate the parent, but that's only because maven needs it when it reads this package's pom file. So, please keep it and install this package from its pom file, like the others :) > + (native-inputs > + (list unzip > + maven-surefire-plugin > + java-javax-inject > + java-junit)) I'm surprised here you need maven-surefire-plugin. What is it used for exactly? From my understanding it can't be called outside of maven, and we don't use maven to install this package. The pom file lists java-javax-inject as a normal dependency, so it should be propagated instead. The pom file also lists maven-shared-utils. Is it needed? If so please add it to the propagated inputs, otherwise fix the pom file (with a patch to upstream I=C2=A0guess). > + (home-page > "https://maven.apache.org/shared/maven-invoker/index.html") > + (synopsis "Invoke Maven programmatically") > Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" > <poptsov.artyom@HIDDEN> +Date: Tue, 14 Jun 2022 23:53:13 +0300 > +Subject: [PATCH 1/2] MavenCommandLineBuilder: Fix exception handling > + > +* > src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java > + (setGoals): Catch 'Exception' instead of 'CommandLineException' as > + 'CommandLineException' is never thrown in the "try" block. > +--- > + .../apache/maven/shared/invoker/MavenCommandLineBuilder.java | 2 > +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git This looks like a simple patch, but I don't understand why it's needed. Is this a fix from upstream? Did you create it? For what reason? > @@ -0,0 +1,126 @@ +From 4bce3183b25c44ab406c2f4d8541a0a520b15a3d Mon > Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" > <poptsov.artyom@HIDDEN> +Date: Wed, 15 Jun 2022 07:09:29 +0300 > +Subject: [PATCH 2/2] test: Rename some classes to avoid name > conflicts + > +* I'm lost. What's happening in this patch? Why do you need it (especially since you couldn't run the tests anyway)? Is this a problem with upstream, or some issue you encountered because of what Guix is doing?
guix-patches@HIDDEN
:bug#56054
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 18 Jun 2022 14:58:32 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jun 18 10:58:32 2022 Received: from localhost ([127.0.0.1]:49834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1o2ZuB-0002yy-9q for submit <at> debbugs.gnu.org; Sat, 18 Jun 2022 10:58:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:60806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <poptsov.artyom@HIDDEN>) id 1o2Zu2-0002yi-3J for submit <at> debbugs.gnu.org; Sat, 18 Jun 2022 10:58:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <poptsov.artyom@HIDDEN>) id 1o2Zu1-00025d-RK for guix-patches@HIDDEN; Sat, 18 Jun 2022 10:58:21 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]:42884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <poptsov.artyom@HIDDEN>) id 1o2Ztz-0005Fe-5X for guix-patches@HIDDEN; Sat, 18 Jun 2022 10:58:21 -0400 Received: by mail-lf1-x12e.google.com with SMTP id h36so10935634lfv.9 for <guix-patches@HIDDEN>; Sat, 18 Jun 2022 07:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:user-agent:mime-version; bh=cJHPv6aEuU2GLPznT82Lpo+QSnAvuNTIqZUjuoGw9dc=; b=TKaaB4PShMO0yRtEHL6VpgcbjYLMlMjhnI9qGqOy08EWtf1hOz/ISHUqLy7vhe2BuB fDFoV800TPQFt9BE5/EMt9QIwA2tTvmYkZ23sKws8ZGvbJ/et7zD/zXMSvPFVvmzpS0P VnLc4l0hpEfRe67Cl9XNJ2qeYyUrv+WQgAYR9yqLri2/aPJr+JFEOX3tWj8lbhGerox8 BFCmiMNkWu6mjbAUHu2jXPBmM7z8vOjsD5HrE1+p8V0Tt1gr80TXcE8Cv38oQLEPe+42 CxEsYrIQ18LPTXc/X2f9+zDgszA1ktNLe9kKS8e8GHQ8Hk4wBojSsKlEnGdKnd+gk0WR pYpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=cJHPv6aEuU2GLPznT82Lpo+QSnAvuNTIqZUjuoGw9dc=; b=EnCk0DR4lhaxh2vh/GAtJeJFdR1otyAXqAB5ykhzS3fcKP7OYW6Eu1/L/t2hl5AGeV x3N6OcYl48KNjZHMoDWwMUoGw59K69OrJCKUWZwr6sIAlrf0XpMY+VZEp+C2yptCWVYq /LMAtTBHiYt2jkTZWf5CBH588y10CTBmNDNgjhc9ZArEXhz0eCnyBHXhYLHRKzYR+mAF a4HdVAXEjo9Frf/IbmpVYRbQVWj5ndTwGAsXB9vMEvjofW1lo48E+nhHYF87kVgLXC67 u5QrgIzXEX3DUvkufPIGl25NnumV8EaVfy+d/i3z2Ha6BgKtde1/9ILjHfzv+SHJKURW ymcg== X-Gm-Message-State: AJIora+X0Xne39zU4CPPDFEF13E6HeoGtNIign3EwY+DegCXi2Ody+uu A6bW4pNmInOIs2iQba2S8ro0Kb9Nask= X-Google-Smtp-Source: AGRyM1tcnfUkeC240fupChZcQb2/bqyy+gN1O02Y81/TOl7pw4PqPnysiqlC2al7Cueug/jN/gS9uQ== X-Received: by 2002:a05:6512:32c1:b0:479:351b:f2e2 with SMTP id f1-20020a05651232c100b00479351bf2e2mr8409604lfg.194.1655564296816; Sat, 18 Jun 2022 07:58:16 -0700 (PDT) Received: from elephant ([5.164.222.47]) by smtp.gmail.com with ESMTPSA id z1-20020a2e8e81000000b002556a17e193sm358353ljk.38.2022.06.18.07.58.15 for <guix-patches@HIDDEN> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 07:58:16 -0700 (PDT) From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH] gnu: Add maven-shared-invoker Date: Sat, 18 Jun 2022 17:58:12 +0300 Message-ID: <87a6aavx17.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a00:1450:4864:20::12e; envelope-from=poptsov.artyom@HIDDEN; helo=mail-lf1-x12e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello, this patch adds Apache Maven Invoker[1] under the name 'maven-shared-invoker'. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-Add-maven-shared-invoker.patch Content-Transfer-Encoding: quoted-printable From=20bc84964c765656cd53bc85345b30d780157818dc Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN> Date: Sat, 18 Jun 2022 17:05:36 +0300 Subject: [PATCH] gnu: Add maven-shared-invoker * gnu/packages/maven.scm (maven-shared-invoker): New variable. * gnu/packages/patches/maven-shared-invoker-exception-handler-fix.patch, gnu/packages/patches/maven-shared-invoker-rename-test-classes.patch: Add = to the repository. * gnu/local.mk (dist_patch_DATA): Add new Maven shared invoker patches. =2D-- gnu/local.mk | 2 + gnu/packages/maven.scm | 37 +++++ ...shared-invoker-exception-handler-fix.patch | 28 ++++ ...n-shared-invoker-rename-test-classes.patch | 126 ++++++++++++++++++ 4 files changed, 193 insertions(+) create mode 100644 gnu/packages/patches/maven-shared-invoker-exception-han= dler-fix.patch create mode 100644 gnu/packages/patches/maven-shared-invoker-rename-test-c= lasses.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0176585485..6d7aafb848 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1479,6 +1479,8 @@ dist_patch_DATA =3D \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ %D%/packages/patches/maven-generate-component-xml.patch \ %D%/packages/patches/maven-generate-javax-inject-named.patch \ + %D%/packages/patches/maven-shared-invoker-exception-handler-fix.patch \ + %D%/packages/patches/maven-shared-invoker-rename-test-classes.patch \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 817fee1c71..57f469ed5d 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -765,6 +765,43 @@ plexus-utils in Maven. It is not a 100% API compatibl= e replacement but a replacement with improvements.") (license license:asl2.0))) =20 +(define-public maven-shared-invoker + (package + (name "maven-shared-invoker") + (version "3.2.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/shared/" + "maven-invoker-" version "-source-releas= e.zip")) + (sha256 + (base32 + "0yhgxvwpmyfhqaksdfmj9c4ml4pj60gnin8bq1a92ximf1dyyjyc")) + (patches + (search-patches + "maven-shared-invoker-exception-handler-fix.patch" + "maven-shared-invoker-rename-test-classes.patch")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-shared-invoker.jar" + #:source-dir "src/main/java" + #:tests? #f)) ; Tests require Maven itself + (propagated-inputs + (list maven-parent-pom-35)) + (native-inputs + (list unzip + maven-surefire-plugin + java-javax-inject + java-junit)) + (home-page "https://maven.apache.org/shared/maven-invoker/index.html") + (synopsis "Invoke Maven programmatically") + (description "The API of this module is concerned with firing a Maven +build in a new JVM. It accomplishes its task by building up a conventional +Maven command line from options given in the current request, along with t= hose +global options specified in the invoker itself. Once it has the command l= ine, +the invoker will execute it, and capture the resulting exit code or any +exception thrown to signal a failure to execute.") + (license license:asl2.0))) + (define-public maven-plugin-annotations (package (name "maven-plugin-annotations") diff --git a/gnu/packages/patches/maven-shared-invoker-exception-handler-fi= x.patch b/gnu/packages/patches/maven-shared-invoker-exception-handler-fix.p= atch new file mode 100644 index 0000000000..eb572f7c26 =2D-- /dev/null +++ b/gnu/packages/patches/maven-shared-invoker-exception-handler-fix.patch @@ -0,0 +1,28 @@ +From 30e9cde32c1e2513ca1f656fa5043c05935f2645 Mon Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN> +Date: Tue, 14 Jun 2022 23:53:13 +0300 +Subject: [PATCH 1/2] MavenCommandLineBuilder: Fix exception handling + +* src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.ja= va + (setGoals): Catch 'Exception' instead of 'CommandLineException' as + 'CommandLineException' is never thrown in the "try" block. +--- + .../apache/maven/shared/invoker/MavenCommandLineBuilder.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLin= eBuilder.java b/src/main/java/org/apache/maven/shared/invoker/MavenCommandL= ineBuilder.java +index 7c7e985..eaf8333 100644 +--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilde= r.java ++++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilde= r.java +@@ -257,7 +257,7 @@ public class MavenCommandLineBuilder + { + cli.createArg().setLine( StringUtils.join( goals.iterator= (), " " ) ); + } +- catch ( CommandLineException e ) ++ catch ( Exception e ) + { + throw new CommandLineConfigurationException( "Problem to = set goals: " + e.getMessage(), e ); + } +--=20 +2.25.1 + diff --git a/gnu/packages/patches/maven-shared-invoker-rename-test-classes.= patch b/gnu/packages/patches/maven-shared-invoker-rename-test-classes.patch new file mode 100644 index 0000000000..7ffb6fed9b =2D-- /dev/null +++ b/gnu/packages/patches/maven-shared-invoker-rename-test-classes.patch @@ -0,0 +1,126 @@ +From 4bce3183b25c44ab406c2f4d8541a0a520b15a3d Mon Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN> +Date: Wed, 15 Jun 2022 07:09:29 +0300 +Subject: [PATCH 2/2] test: Rename some classes to avoid name conflicts + +* src/test/resources/test-build-should-timeout/src/main/java/org/apache/ma= ven/shared/invoker/App.java: + Rename to + "src/test/resources/test-build-should-timeout/src/main/java/org/apache/m= aven/shared/invoker/AppTimeout.java" +* src/test/resources/test-build-should-timeout/src/test/java/org/apache/ma= ven/shared/invoker/AppTest.java + Rename to + "src/test/resources/test-build-should-timeout/src/test/java/org/apache/m= aven/shared/invoker/AppTimeoutTest.java" +* src/test/resources/test-build-should-succeed/src/test/java/org/apache/ma= ven/shared/invoker/AppTest.java: + Rename to + "src/test/resources/test-build-should-succeed/src/test/java/org/apache/m= aven/shared/invoker/AppShouldSucceedTest.java" +* src/test/resources/test-build-should-succeed/src/main/java/org/apache/ma= ven/shared/invoker/App.java: + Rename to + "src/test/resources/test-build-should-timeout/src/main/java/org/apache/m= aven/shared/invoker/AppTimeout.java". +--- + ...AppTest.java =3D> AppShouldSucceedTest.java} | 4 +-- + .../org/apache/maven/shared/invoker/App.java | 32 ------------------- + .../maven/shared/invoker/AppTimeout.java} | 2 +- + .../{AppTest.java =3D> AppTimeoutTest.java} | 2 +- + 4 files changed, 4 insertions(+), 36 deletions(-) + rename src/test/resources/test-build-should-succeed/src/test/java/org/apa= che/maven/shared/invoker/{AppTest.java =3D> AppShouldSucceedTest.java} (94%) + delete mode 100644 src/test/resources/test-build-should-timeout/src/main/= java/org/apache/maven/shared/invoker/App.java + rename src/test/resources/{test-build-should-succeed/src/main/java/org/ap= ache/maven/shared/invoker/App.java =3D> test-build-should-timeout/src/main/= java/org/apache/maven/shared/invoker/AppTimeout.java} (97%) + rename src/test/resources/test-build-should-timeout/src/test/java/org/apa= che/maven/shared/invoker/{AppTest.java =3D> AppTimeoutTest.java} (97%) + +diff --git a/src/test/resources/test-build-should-succeed/src/test/java/or= g/apache/maven/shared/invoker/AppTest.java b/src/test/resources/test-build-= should-succeed/src/test/java/org/apache/maven/shared/invoker/AppShouldSucce= edTest.java +similarity index 94% +rename from src/test/resources/test-build-should-succeed/src/test/java/org= /apache/maven/shared/invoker/AppTest.java +rename to src/test/resources/test-build-should-succeed/src/test/java/org/a= pache/maven/shared/invoker/AppShouldSucceedTest.java +index 785d70c..9b5bb0a 100644 +--- a/src/test/resources/test-build-should-succeed/src/test/java/org/apach= e/maven/shared/invoker/AppTest.java ++++ b/src/test/resources/test-build-should-succeed/src/test/java/org/apach= e/maven/shared/invoker/AppShouldSucceedTest.java +@@ -26,7 +26,7 @@ import junit.framework.TestSuite; + /** + * Unit test for simple App. + */ +-public class AppTest=20 ++public class AppShouldSucceedTest + extends TestCase + { + /** +@@ -34,7 +34,7 @@ public class AppTest + * + * @param testName name of the test case + */ +- public AppTest( String testName ) ++ public AppShouldSucceedTest( String testName ) + { + super( testName ); + } +diff --git a/src/test/resources/test-build-should-timeout/src/main/java/or= g/apache/maven/shared/invoker/App.java b/src/test/resources/test-build-shou= ld-timeout/src/main/java/org/apache/maven/shared/invoker/App.java +deleted file mode 100644 +index 753a51c..0000000 +--- a/src/test/resources/test-build-should-timeout/src/main/java/org/apach= e/maven/shared/invoker/App.java ++++ /dev/null +@@ -1,32 +0,0 @@ +-package org.apache.maven.shared.invoker; +- +-/* +- * Licensed to the Apache Software Foundation (ASF) under one +- * or more contributor license agreements. See the NOTICE file +- * distributed with this work for additional information +- * regarding copyright ownership. The ASF licenses this file +- * to you under the Apache License, Version 2.0 (the +- * "License"); you may not use this file except in compliance +- * with the License. You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, +- * software distributed under the License is distributed on an +- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +- * KIND, either express or implied. See the License for the +- * specific language governing permissions and limitations +- * under the License. +- */ +- +-/** +- * Hello world! +- * +- */ +-public class App=20 +-{ +- public static void main( String[] args ) +- { +- System.out.println( "Hello World!" ); +- } +-} +diff --git a/src/test/resources/test-build-should-succeed/src/main/java/or= g/apache/maven/shared/invoker/App.java b/src/test/resources/test-build-shou= ld-timeout/src/main/java/org/apache/maven/shared/invoker/AppTimeout.java +similarity index 97% +rename from src/test/resources/test-build-should-succeed/src/main/java/org= /apache/maven/shared/invoker/App.java +rename to src/test/resources/test-build-should-timeout/src/main/java/org/a= pache/maven/shared/invoker/AppTimeout.java +index 753a51c..d94b104 100644 +--- a/src/test/resources/test-build-should-succeed/src/main/java/org/apach= e/maven/shared/invoker/App.java ++++ b/src/test/resources/test-build-should-timeout/src/main/java/org/apach= e/maven/shared/invoker/AppTimeout.java +@@ -23,7 +23,7 @@ package org.apache.maven.shared.invoker; + * Hello world! + * + */ +-public class App=20 ++public class AppTimeout + { + public static void main( String[] args ) + { +diff --git a/src/test/resources/test-build-should-timeout/src/test/java/or= g/apache/maven/shared/invoker/AppTest.java b/src/test/resources/test-build-= should-timeout/src/test/java/org/apache/maven/shared/invoker/AppTimeoutTest= .java +similarity index 97% +rename from src/test/resources/test-build-should-timeout/src/test/java/org= /apache/maven/shared/invoker/AppTest.java +rename to src/test/resources/test-build-should-timeout/src/test/java/org/a= pache/maven/shared/invoker/AppTimeoutTest.java +index 27808ea..2bdeda4 100644 +--- a/src/test/resources/test-build-should-timeout/src/test/java/org/apach= e/maven/shared/invoker/AppTest.java ++++ b/src/test/resources/test-build-should-timeout/src/test/java/org/apach= e/maven/shared/invoker/AppTimeoutTest.java +@@ -24,7 +24,7 @@ import org.junit.Test; + /** + * Unit test for simple App. + */ +-public class AppTest ++public class AppTimeoutTest + { +=20 + /** +--=20 +2.25.1 + =2D-=20 2.25.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D Artyom References: 1. https://maven.apache.org/shared/maven-invoker/index.html =2D-=20 Artyom "avp" Poptsov <poptsov.artyom@HIDDEN> Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmKt6AQACgkQ6cWi2QiY oC9cEgf/UpCxSPeoPv+/adw8fiFQmMk27zVPpAGeMN3MIIhF0jhSDZ8umkzd35uC +jIXr7j3yc4uySmN2GORBCcVY8+HzO0XBsohQze9o649MNerDp5J5lsCt/wBSFNQ N2xZR9BL2qoJGXoo8R/HEX1QCllBVa1J3lTMMtgAV0AUK4iuvQOyRxFcHPB3IDsc q3DTgCZlaR2nM2T/kkZkeEQrzb29D/ALYS5az+Roej/+teEU5BFKZXvWNhr0pfL5 g+LzHxE4Q5FRM8/8v4+uQ1SbnwEfY/27tjk9W6dg60ktOLJGV0lfzFwPww7cjBFk oK00u/zhd0B/52Oy0FLK2ui3E0rkMA== =nzEV -----END PGP SIGNATURE----- --==-=-=--
"Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#56054
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.