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