From patchwork Tue Dec 21 22:44:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35560 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 DE3CA27BBEA; Tue, 21 Dec 2021 22:47:43 +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 4465A27BBE9 for ; Tue, 21 Dec 2021 22:47:43 +0000 (GMT) Received: from localhost ([::1]:42174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mznv4-0003aB-Fz for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 17:47:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzntV-0008O4-Dv for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzntV-0001eH-3k for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzntV-000810-2o for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52723] [PATCH 08/26] gnu: Add java-plexus-build-api. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 22:46:05 +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.164012673330571 (code B ref 52723); Tue, 21 Dec 2021 22:46:05 +0000 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:33 +0000 Received: from localhost ([127.0.0.1]:56019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsx-0007wl-Vi for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:32 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsp-0007us-Di for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:24 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ecd12bf8 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=RhYZNUDcGt8itPX86jOIGTB2e YoXwS3uzBotjookzUs=; b=SElq4jbUgSniype2PV7rqm7gOw3r/Q1evVF2sI0dR JJzCjNv+gkrWewm80MT7Y2YtBznwKj5pCx+MrHe6LuW21PfK86yGWFvlAkiYBA/a sGousH3nPtEAVnouhOLFYKQ9sK8Brva4NkRc4x53UijopQ4N9Ve0+oWhnDerxhGb dLVQmVm9VGPso/z9lvJFoNbkyt0b6v5OVJmjUjcDPUQtOvkfvl/kIOybB28zXqDE KkYVViTUP4y2OM/IrYaSSasOnpJypWJKQEdSX3pdx1gb4+/kmJiSj6zE2tWJGXss wC3rrq65Y4tXlA3iJfA2xXKEOkQwDh0YW4NVP/oSPMYiQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id a5c04cb2 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:21 +0000 (UTC) From: Julien Lepiller Date: Tue, 21 Dec 2021 23:44:52 +0100 Message-Id: <0d1c7707de8b65682be4635ace63c441af0ff56c.1640126679.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu> References: <20211221234231.44299f63@tachikoma.lepiller.eu> MIME-Version: 1.0 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 This is the proper name for java-sisu-build-api. * gnu/packages/java.scm (java-sisu-build-api): Rename to... (java-plexus-build-api): ...this. [source]: Use new source repository. --- gnu/packages/java.scm | 16 ++++++++-------- gnu/packages/maven.scm | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8c65d713f6..d22cb2600d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4335,7 +4335,7 @@ (define-public java-plexus-utils (define-public java-plexus-utils-3.2.1 (package (inherit java-plexus-utils) - ;; sisu-build-api needs this version, later versions don't work + ;; plexus-build-api needs this version, later versions don't work (version "3.2.1") (source (origin (method git-fetch) @@ -5099,7 +5099,7 @@ (define-public java-plexus-sec-dispatcher ("java-plexus-utils" ,java-plexus-utils) ("java-guava" ,java-guava) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) + ("java-plexus-build-api" ,java-plexus-build-api) ;; modello plugins: ("java-modellop-plugins-java" ,java-modello-plugins-java) ("java-modellop-plugins-xml" ,java-modello-plugins-xml) @@ -5143,14 +5143,14 @@ (define-public java-plexus-cli Plexus components.") (license license:asl2.0))) -(define-public java-sisu-build-api +(define-public java-plexus-build-api (package - (name "java-sisu-build-api") + (name "java-plexus-build-api") (version "0.0.7") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/sonatype/sisu-build-api") + (url "https://github.com/codehaus-plexus/plexus-build-api") (commit (string-append "plexus-build-api-" version)))) (file-name (git-file-name name version)) (sha256 @@ -5158,7 +5158,7 @@ (define-public java-sisu-build-api "1d5w6c58gkx30d51v7qwv1xrhc0ly76848gihmgshj19yf6yhca0")))) (build-system ant-build-system) (arguments - `(#:jar-name "sisu-build-api.jar" + `(#:jar-name "plexus-build-api.jar" #:source-dir "src/main/java" #:jdk ,icedtea-8 #:tests? #f; FIXME: how to run the tests? @@ -5194,7 +5194,7 @@ (define-public java-sisu-build-api (install-from-pom "pom.xml"))))) (inputs (list java-plexus-utils-3.2.1 java-plexus-container-default)) - (home-page "https://github.com/sonatype/sisu-build-api/") + (home-page "https://github.com/codehaus-plexus/plexus-build-api/") (synopsis "Base build API for maven") (description "This package contains the base build API for maven and a default implementation of it. This API is about scanning files in a @@ -5238,7 +5238,7 @@ (define-public java-modello-core #t))))) (propagated-inputs (list java-plexus-utils java-plexus-container-default - java-sisu-build-api)) + java-plexus-build-api)) (native-inputs (list java-junit java-plexus-classworlds java-geronimo-xbean-reflect java-guava)) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 38b93f43b7..14cbf49482 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1088,7 +1088,7 @@ (define-public maven-model java-plexus-classworlds java-guava java-geronimo-xbean-reflect - java-sisu-build-api + java-plexus-build-api ;; modello plugins: java-modello-plugins-java java-modello-plugins-xml @@ -1166,7 +1166,7 @@ (define-public maven-settings java-plexus-utils java-guava java-geronimo-xbean-reflect - java-sisu-build-api + java-plexus-build-api ;; modello plugins: java-modello-plugins-java java-modello-plugins-xml @@ -1302,7 +1302,7 @@ (define-public maven-repository-metadata ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-guava" ,java-guava) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) + ("java-plexus-build-api" ,java-plexus-build-api) ;; modello plugins: ("java-modello-plugins-java" ,java-modello-plugins-java) ("java-modello-plugins-xml" ,java-modello-plugins-xml) @@ -1387,7 +1387,7 @@ (define-public maven-plugin-api ("classworlds" ,java-plexus-classworlds) ("guava" ,java-guava) ("xbean" ,java-geronimo-xbean-reflect) - ("build-api" ,java-sisu-build-api) + ("build-api" ,java-plexus-build-api) ;; modello plugins: ("java" ,java-modello-plugins-java) ("xml" ,java-modello-plugins-xml) @@ -1491,7 +1491,7 @@ (define-public maven-core-bootstrap ("java-asm" ,java-asm) ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) + ("java-plexus-build-api" ,java-plexus-build-api) ("java-modello-plugins-java" ,java-modello-plugins-java) ("java-modello-plugins-xml" ,java-modello-plugins-xml) ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3) @@ -1677,7 +1677,7 @@ (define-public maven-embedder (native-inputs `(("java-modello-core" ,java-modello-core) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) + ("java-plexus-build-api" ,java-plexus-build-api) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-cglib" ,java-cglib) @@ -1866,7 +1866,7 @@ (define-public maven-compat ("java-plexus-component-annotations" ,java-plexus-component-annotations) ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("java-sisu-build-api" ,java-sisu-build-api) + ("java-plexus-build-api" ,java-plexus-build-api) ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus) ("java-exclispe-sisu-inject" ,java-eclipse-sisu-inject) ("java-javax-inject" ,java-javax-inject) @@ -2870,7 +2870,7 @@ (define-public maven-filtering `(#:jar-name "maven-filtering.jar" #:source-dir "src/main/java" #:test-dir "src/test" - ;; this test comes from sisu-build-api, not this package + ;; this test comes from plexus-build-api, not this package #:test-exclude (list "**/IncrementalResourceFilteringTest.java" "**/Abstract*.java") #:phases @@ -2890,7 +2890,7 @@ (define-public maven-filtering #t)) (add-before 'check 'decompress-tests (lambda* (#:key inputs #:allow-other-keys) - (let* ((build-api-source (assoc-ref inputs "java-sisu-build-api-origin")) + (let* ((build-api-source (assoc-ref inputs "java-plexus-build-api-origin")) (classes (string-append build-api-source "/src/test/java"))) (copy-recursively classes "src/test/")) #t)) @@ -2909,7 +2909,7 @@ (define-public maven-filtering maven-shared-utils java-plexus-utils-3.2.1 java-plexus-interpolation - java-sisu-build-api + java-plexus-build-api maven-parent-pom-30)) (inputs (list java-jsr305)) @@ -2920,7 +2920,7 @@ (define-public maven-filtering ("java-mockito" ,java-mockito-1) ("java-objenesis" ,java-objenesis) ("java-plexus-component-metadata" ,java-plexus-component-metadata) - ("java-sisu-build-api-origin" ,(package-source java-sisu-build-api)))) + ("java-plexus-build-api-origin" ,(package-source java-plexus-build-api)))) (home-page "https://maven.apache.org/shared/maven-filtering") (synopsis "Shared component for all plugins that needs to filter resources") (description "This component provides an API to filter resources in Maven