From patchwork Tue Dec 21 22:45:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35556 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 2F80C27BBE9; Tue, 21 Dec 2021 22:47:13 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 2D90127BBEA for ; Tue, 21 Dec 2021 22:47:12 +0000 (GMT) Received: from localhost ([::1]:40926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mznuZ-0002iH-C3 for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 17:47:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzntb-0000Dm-P1 for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzntb-0001he-F5 for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzntb-00082x-Ds for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52723] [PATCH 26/26] gnu: maven: Update to 3.8.4. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 22:46:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52723 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52723@debbugs.gnu.org Received: via spool by 52723-submit@debbugs.gnu.org id=B52723.164012675430731 (code B ref 52723); Tue, 21 Dec 2021 22:46:11 +0000 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:54 +0000 Received: from localhost ([127.0.0.1]:56058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntJ-0007zW-En for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:54 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznt0-0007us-6F for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:35 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 1f52d1bb for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=miBmgji7IR+0bKFc3d7ePS2Gc qEriElp+0UfWWwzjxE=; b=JvmsbgwKMdDJTu4hqiN2cAdUDq6lrWnot5EqtkmSu P4wXZk/VaYf/bmAWOF+1oXJ104mPqSxNnLQ/hE9OtMl1ovXTKVCH/JLgJCoOvLCN SM0Fj7sTM40Y0fjoonu3iWqv4H4WxYSgzYaHYITn+JJH8qWwHY0TIVHu/LvMJdTG EnbAA93+D1HIUQJDaZAgB1pym8M3RjNntjZCccHu1MJG0xXkHbR5EuZkS4uALpYz HyMD67GXZJYet6dLtUbdTPwMFqAJqwvU+Bzl3+5yviudDxux2lt0V2maEk6kdyTf m0n+Ta+a6QHSo/ZYVO6kC/bq9hTmintRwi4tIWW+tVkng== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 7fe086c5 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:30 +0000 (UTC) From: Julien Lepiller Date: Tue, 21 Dec 2021 23:45:10 +0100 Message-Id: <2ef8bd7dcc29710098a1f1ef75e7ce06230a65a0.1640126679.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu> References: <20211221234231.44299f63@tachikoma.lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven.scm (maven-pom): Update to 3.8.4. (maven-resolver-api): Update to 1.6.3. * gnu/packages/java.scm (java-modello-core): Update to 1.11. --- gnu/packages/java.scm | 4 +- gnu/packages/maven.scm | 94 +++++++++++++++++++++++++++--------------- 2 files changed, 63 insertions(+), 35 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0e6a9601e4..a441a484be 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5434,7 +5434,7 @@ (define-public java-plexus-build-api (define-public java-modello-core (package (name "java-modello-core") - (version "1.9.1") + (version "1.11") (source (origin (method git-fetch) (uri (git-reference @@ -5443,7 +5443,7 @@ (define-public java-modello-core (file-name (git-file-name name version)) (sha256 (base32 - "1di6ni42aqllpdvkpyfcw70352vr2i8wf6hd5nhd9kmqjb5dj5j4")))) + "18885sim7z9j3wy19i9083y9kc8l9xxl2px823a96q4rnqj5z8s2")))) (build-system ant-build-system) (arguments `(#:jar-name "modello-core.jar" diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 7f84966750..8c5eeb4658 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -38,7 +38,7 @@ (define-module (gnu packages maven) (define-public maven-resolver-api (package (name "maven-resolver-api") - (version "1.3.1") + (version "1.6.3") (source (origin (method git-fetch) (uri (git-reference @@ -47,7 +47,7 @@ (define-public maven-resolver-api (file-name (git-file-name name version)) (sha256 (base32 - "1x1gll8nkfl6zgnab78fxxvvhg42b2grxgdh1wp2h4qxsjkxg93d")))) + "0hbbbxj14qyq8pccyab96pjqq90jnjmid1pml9kx55c5smfpjn37")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-resolver-api.jar" @@ -58,7 +58,7 @@ (define-public maven-resolver-api (replace 'install (install-from-pom "maven-resolver-api/pom.xml"))))) (native-inputs - `(("java-asm" ,java-asm) + `(("java-asm-8" ,java-asm-8) ("java-cglib" ,java-cglib) ("java-hamcrest-core" ,java-hamcrest-core) ("java-junit" ,java-junit) @@ -220,6 +220,7 @@ (define-public maven-resolver-impl (list maven-resolver-api maven-resolver-spi maven-resolver-util + java-commons-lang3 java-eclipse-sisu-inject java-javax-inject java-guice @@ -305,7 +306,6 @@ (define-public maven-resolver-transport-wagon maven-resolver-test-util java-guava java-cglib - java-asm java-aopalliance java-guice)) (synopsis "Transport implementation for Maven") @@ -1020,13 +1020,13 @@ (define-public maven-wagon-http (define maven-pom (package (name "maven-pom") - (version "3.6.1") + (version "3.8.4") (source (origin (method url-fetch) (uri (string-append "mirror://apache/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) - (sha256 (base32 "0grw9zp166ci53rd7qkyy2qmwmik37xhiz1z84jpm0msyvzj2n82")) + (sha256 (base32 "16xbhkhhp05gskgbhrf1ia8riivvkhpk822n9xgnad61f9hzp2r9")) (modules '((guix build utils))) (snippet '(begin @@ -1100,7 +1100,7 @@ (define maven-pom (replace 'install (install-pom-file "pom.xml"))))) (propagated-inputs - `(("maven-parent-pom-33" ,maven-parent-pom-33))) + `(("maven-parent-pom-34" ,maven-parent-pom-34))) (home-page "https://maven.apache.org/") (synopsis "Build system") (description "Apache Maven is a software project management and comprehension @@ -1149,8 +1149,9 @@ (define-public maven-model (let ((file "maven-model/src/main/mdo/maven.mdo")) (modello-single-mode file "4.0.0" "java") (modello-single-mode file "4.0.0" "xpp3-reader") + (modello-single-mode file "4.0.0" "xpp3-extended-reader") (modello-single-mode file "4.0.0" "xpp3-writer") - (modello-single-mode file "4.0.0" "xpp3-extended-reader")) + (modello-single-mode file "4.0.0" "xpp3-extended-writer")) #t)) (replace 'install (install-from-pom "maven-model/pom.xml"))))) (propagated-inputs @@ -1224,9 +1225,9 @@ (define-public maven-settings file mode "maven-settings/src/main/java" version "false" "true")) (let ((file "maven-settings/src/main/mdo/settings.mdo")) - (modello-single-mode file "1.1.0" "java") - (modello-single-mode file "1.1.0" "xpp3-reader") - (modello-single-mode file "1.1.0" "xpp3-writer")) + (modello-single-mode file "1.2.0" "java") + (modello-single-mode file "1.2.0" "xpp3-reader") + (modello-single-mode file "1.2.0" "xpp3-writer")) #t)) (replace 'install (install-from-pom "maven-settings/pom.xml"))))) (propagated-inputs @@ -1239,7 +1240,6 @@ (define-public maven-settings java-plexus-component-annotations java-guice java-cglib - java-asm java-eclipse-sisu-inject java-javax-inject java-plexus-classworlds @@ -1266,23 +1266,22 @@ (define-public maven-settings-builder #:test-dir "maven-settings-builder/src/test" #:phases (modify-phases %standard-phases - (add-before 'build 'generate-components.xml + (add-before 'build 'generate-sisu-named (lambda _ - (mkdir-p "build/classes/META-INF/plexus") - (chmod "components.sh" #o755) - (invoke "./components.sh" "maven-settings-builder/src/main/java" - "build/classes/META-INF/plexus/components.xml") - #t)) + (mkdir-p "build/classes/META-INF/sisu") + (chmod "sisu.sh" #o755) + (invoke "./sisu.sh" "maven-settings-builder/src/main/java" + "build/classes/META-INF/sisu/javax.inject.Named"))) (replace 'install (install-from-pom "maven-settings-builder/pom.xml"))))) (propagated-inputs (list java-plexus-utils java-plexus-interpolation - java-plexus-sec-dispatcher-1.4 + java-plexus-sec-dispatcher maven-builder-support maven-settings maven-pom)) (native-inputs - (list java-junit java-plexus-component-annotations)) + (list java-junit java-javax-inject java-plexus-component-annotations)) (description "Apache Maven is a software project management and comprehension tool. This package contains the effective model builder, with profile activation, inheritance, interpolation, @dots{}"))) @@ -1303,13 +1302,12 @@ (define-public maven-model-builder (copy-recursively "maven-model-builder/src/main/resources" "build/classes") #t)) - (add-before 'build 'generate-components.xml + (add-before 'build 'generate-sisu-named (lambda _ - (mkdir-p "build/classes/META-INF/plexus") - (chmod "components.sh" #o755) - (invoke "./components.sh" "maven-model-builder/src/main/java" - "build/classes/META-INF/plexus/components.xml") - #t)) + (mkdir-p "build/classes/META-INF/sisu") + (chmod "sisu.sh" #o755) + (invoke "./sisu.sh" "maven-model-builder/src/main/java" + "build/classes/META-INF/sisu/javax.inject.Named"))) (add-before 'check 'fix-paths (lambda _ (substitute* (find-files "maven-model-builder/src/test/java" ".*.java") @@ -1329,9 +1327,10 @@ (define-public maven-model-builder ("java-guava" ,java-guava) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-plexus-component-annotations" ,java-plexus-component-annotations) + ("java-powermock-reflect" ,java-powermock-reflect) + ("java-objenesis" ,java-objenesis) ("guice" ,java-guice) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("sisu-inject" ,java-eclipse-sisu-inject) ("javax-inject" ,java-javax-inject) ("java-xmlunit" ,java-xmlunit) @@ -1457,7 +1456,6 @@ (define-public maven-plugin-api ("java-plexus-component-annotations" ,java-plexus-component-annotations) ("guice" ,java-guice) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("sisu-inject" ,java-eclipse-sisu-inject) ("javax-inject" ,java-javax-inject) ("utils" ,java-plexus-utils))) @@ -1568,7 +1566,6 @@ (define-public maven-core-bootstrap (native-inputs `(("java-modello-core" ,java-modello-core) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ("java-plexus-build-api" ,java-plexus-build-api) @@ -1723,6 +1720,9 @@ (define-public maven-embedder (("srcdir=\"maven-embedder/src/test\"") "srcdir=\"maven-embedder/src/test/java\"")) #t)) + (add-before 'check 'disable-failing-test + (lambda _ + (delete-file "maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java"))) (add-before 'install 'fix-pom (lambda _ (substitute* "maven-embedder/pom.xml" @@ -1759,13 +1759,13 @@ (define-public maven-embedder ("java-slf4j-simple" ,java-slf4j-simple) ("java-jsr250" ,java-jsr250))) (native-inputs - `(("java-modello-core" ,java-modello-core) + `(("java-asm-8" ,java-asm-8) + ("java-modello-core" ,java-modello-core) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ("java-plexus-build-api" ,java-plexus-build-api) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("java-modello-plugins-java" ,java-modello-plugins-java) ("java-modello-plugins-xml" ,java-modello-plugins-xml) ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3) @@ -1923,6 +1923,9 @@ (define-public maven-compat "--classes" "build/test-classes" "--descriptors" "build/test-classes/META-INF") #t)) + (add-before 'check 'disable-failing-test + (lambda _ + (delete-file "src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java"))) (add-after 'generate-metadata 'rebuild (lambda _ (invoke "ant" "jar") @@ -1970,7 +1973,7 @@ (define-public maven-compat ("java-qdox" ,java-qdox) ;; tests ("java-plexus-cipher" ,java-plexus-cipher) - ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher-1.4) + ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher) ("java-jsr250" ,java-jsr250) ("java-cdi-api" ,java-cdi-api) ("java-junit" ,java-junit) @@ -2088,7 +2091,7 @@ (define-public maven java-guice java-aopalliance java-cglib - java-asm + java-asm-8 java-eclipse-sisu-inject java-javax-inject java-plexus-component-annotations @@ -2225,6 +2228,16 @@ (define-public maven-3.0-settings-builder (inherit maven-settings-builder) (version (package-version maven-3.0-pom)) (source (package-source maven-3.0-pom)) + (arguments + (substitute-keyword-arguments (package-arguments maven-settings-builder) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'generate-components.xml + (lambda _ + (mkdir-p "build/classes/META-INF/plexus") + (chmod "components.sh" #o755) + (invoke "./components.sh" "maven-settings-builder/src/main/java" + "build/classes/META-INF/plexus/components.xml"))))))) (propagated-inputs `(("java-plexus-component-annotations" ,java-plexus-component-annotations) ,@(filter @@ -2235,6 +2248,8 @@ (define-public maven-3.0-settings-builder ("maven-pom" `("maven-pom" ,maven-3.0-pom)) ("maven-settings" `("maven-settings" ,maven-3.0-settings)) ("maven-builder-support" #f) + ("java-plexus-sec-dispatcher" + `("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher-1.4)) (_ input))) (package-propagated-inputs maven-settings-builder))))))) @@ -2243,6 +2258,19 @@ (define-public maven-3.0-model-builder (inherit maven-model-builder) (version (package-version maven-3.0-pom)) (source (package-source maven-3.0-pom)) + (arguments + (substitute-keyword-arguments (package-arguments maven-model-builder) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'generate-components.xml + (lambda _ + (mkdir-p "build/classes/META-INF/plexus") + (chmod "components.sh" #o755) + (invoke "./components.sh" "maven-model-builder/src/main/java" + "build/classes/META-INF/plexus/components.xml"))) + (add-before 'check 'remove-failing-test + (lambda _ + (delete-file "maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java"))))))) (propagated-inputs `(("java-plexus-component-annotations" ,java-plexus-component-annotations) ,@(filter