From patchwork Tue Dec 21 22:44:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35561 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 4086B27BBEA; Tue, 21 Dec 2021 22:47:49 +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 A02BE27BBE9 for ; Tue, 21 Dec 2021 22:47:48 +0000 (GMT) Received: from localhost ([::1]:42384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mznv9-0003j6-Ro for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 17:47:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzntX-0008QD-8V for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzntV-0001ee-UV 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-00081F-Sr for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52723] [PATCH 10/26] gnu: java-plexus-sec-dispatcher: Update to 2.0. 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.164012674830629 (code B ref 52723); Tue, 21 Dec 2021 22:46:05 +0000 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:48 +0000 Received: from localhost ([127.0.0.1]:56030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntE-0007xr-9I for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:48 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsq-0007us-9X 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 f8c67460 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:23 +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=L//lFVB99pErgkMnD2HUlNdLF YUNi4ydRpbtjv1D5Yg=; b=ZSiuQ3W4SxB4BtZh1gSy5f10g1edpeBDSQh8Rgjx4 yk6sOokSuUVXEJVWNC6C/m4xi0bNMoDGyHMo/N521pOcprxU0sZivCQH3nR9Zn84 M/em6mKQP2gcv6tVGfvfVNG9MwB8lir7JSEjD/Us4z5cv+vwdkaRYCbwR17YX/bT bp54hBNyiX1icvP3dqILNpg8XfonVkBPz5cOMePF6i0I6Ec4HVI9AKyGvbEAHMSw 7Fgt1piZfAhrPQpvBkC96rZz9A8wdTYoc0MgPB4ylXrYv8Dapri/PngUcNr0rLfg COsOESpIY1uXcbFZdaIKhpIuz2mGwbGCNBbAmajuxJ0bw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 6facf0f0 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:22 +0000 (UTC) From: Julien Lepiller Date: Tue, 21 Dec 2021 23:44:54 +0100 Message-Id: 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/java.scm (java-plexus-sec-dispatcher): Update to 2.0. (java-plexus-sec-dispatcher-1.4): New variable. --- gnu/packages/java.scm | 96 +++++++++++++++++++++++++++--------------- gnu/packages/maven.scm | 6 +-- 2 files changed, 64 insertions(+), 38 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fd7dc76fe9..811ce1d4f8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5056,17 +5056,15 @@ (define-public java-plexus-digest (define-public java-plexus-sec-dispatcher (package (name "java-plexus-sec-dispatcher") - (version "1.4") ;; Newest release listed at the Maven Central Repository. + (version "2.0") (source (origin - ;; This project doesn't tag releases or publish tarballs, so we take - ;; the "prepare release plexus-sec-dispatcher-1.4" git commit. (method git-fetch) (uri (git-reference - (url "https://github.com/sonatype/plexus-sec-dispatcher/") - (commit "7db8f880486e192a1c5ea9544e01e756c3d49d0f"))) + (url "https://github.com/codehaus-plexus/plexus-sec-dispatcher") + (commit (string-append "plexus-sec-dispatcher-" version)))) (sha256 (base32 - "1ng4yliy4cqpjr4fxxjbpwyk1wkch5f8vblm1kvwf328s4gibszs")) + "0665zcyxkv2knydxgv2dn64zvy1dx9j9af12ds9s64qmzd1rk6pk")) (file-name (git-file-name name version)))) (arguments `(#:jar-name "plexus-sec-dispatcher.jar" @@ -5085,6 +5083,61 @@ (define-public java-plexus-sec-dispatcher (modello-single-mode file "1.0.0" "xpp3-reader") (modello-single-mode file "1.0.0" "xpp3-writer")) #t)) + (add-before 'build 'generate-javax.inject.Named + (lambda _ + (mkdir-p "build/classes/META-INF/sisu") + (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" + (lambda _ + (display + "org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher\n"))) + #t)) + (add-before 'check 'fix-paths + (lambda _ + (copy-recursively "src/test/resources" "target") + #t)) + (replace 'install (install-from-pom "pom.xml"))))) + (propagated-inputs + (list java-plexus-utils java-plexus-cipher plexus-parent-pom-8)) + (native-inputs + (list java-javax-inject + java-modello-core + ;; for modello + java-plexus-container-default + java-plexus-classworlds + java-plexus-utils + java-guava + java-geronimo-xbean-reflect + ;; modello plugins + java-modello-plugins-java + java-modello-plugins-xml + java-modello-plugins-xpp3 + ;; for tests + java-junit)) + (build-system ant-build-system) + (home-page "https://github.com/sonatype/plexus-sec-dispatcher") + (synopsis "Plexus Security Dispatcher Component") + (description "This package is the Plexus Security Dispatcher Component. +This component decrypts a string passed to it.") + (license license:asl2.0))) + +(define-public java-plexus-sec-dispatcher-1.4 + (package + (inherit java-plexus-sec-dispatcher) + (version "1.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-sec-dispatcher") + (commit (string-append "sec-dispatcher-" version)))) + (sha256 + (base32 + "1ng4yliy4cqpjr4fxxjbpwyk1wkch5f8vblm1kvwf328s4gibszs")) + (file-name (git-file-name "java-plexus-sec-dispatcher" version)))) + (arguments + (substitute-keyword-arguments (package-arguments java-plexus-sec-dispatcher) + ((#:phases phases) + `(modify-phases ,phases + (delete 'generate-javax.inject.Named) (add-before 'build 'generate-components.xml (lambda _ (mkdir-p "build/classes/META-INF/plexus") @@ -5113,37 +5166,10 @@ (define-public java-plexus-sec-dispatcher \n \n \n -\n"))) - #t)) - (add-before 'check 'fix-paths - (lambda _ - (copy-recursively "src/test/resources" "target") - #t)) - (replace 'install (install-from-pom "pom.xml"))))) +\n"))))))))) (propagated-inputs (list java-plexus-utils java-plexus-cipher-1.7 - java-sonatype-spice-parent-pom-12)) - (native-inputs - `(("java-modello-core" ,java-modello-core) - ;; for modello: - ("java-plexus-container-default" ,java-plexus-container-default) - ("java-plexus-classworlds" ,java-plexus-classworlds) - ("java-plexus-utils" ,java-plexus-utils) - ("java-guava" ,java-guava) - ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) - ("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) - ("java-modellop-plugins-xpp3" ,java-modello-plugins-xpp3) - ;; for tests - ("java-junit" ,java-junit))) - (build-system ant-build-system) - (home-page "https://github.com/sonatype/plexus-sec-dispatcher") - (synopsis "Plexus Security Dispatcher Component") - (description "This package is the Plexus Security Dispatcher Component. -This component decrypts a string passed to it.") - (license license:asl2.0))) + java-sonatype-spice-parent-pom-12)))) (define-public java-plexus-cli (package diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 14cbf49482..c66cfd0b83 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1197,7 +1197,7 @@ (define-public maven-settings-builder (propagated-inputs (list java-plexus-utils java-plexus-interpolation - java-plexus-sec-dispatcher + java-plexus-sec-dispatcher-1.4 maven-builder-support maven-settings maven-pom)) @@ -1886,7 +1886,7 @@ (define-public maven-compat ("java-qdox" ,java-qdox) ;; tests ("java-plexus-cipher" ,java-plexus-cipher) - ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher) + ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher-1.4) ("java-jsr250" ,java-jsr250) ("java-cdi-api" ,java-cdi-api) ("java-junit" ,java-junit) @@ -2346,7 +2346,7 @@ (define-public maven-3.0-core java-plexus-classworlds java-plexus-component-annotations java-plexus-container-default - java-plexus-sec-dispatcher + java-plexus-sec-dispatcher-1.4 maven-3.0-pom)))) (define-public maven-3.0-compat