From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wL6xBjdZwmHVIwAAgWs5BA (envelope-from ) for ; Tue, 21 Dec 2021 23:46:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 2IpUAjdZwmGgPgAAbx9fmQ (envelope-from ) for ; Tue, 21 Dec 2021 22:46:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BBC8F11A98 for ; Tue, 21 Dec 2021 23:46:14 +0100 (CET) Received: from localhost ([::1]:37380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzntd-00005n-Si for larch@yhetil.org; Tue, 21 Dec 2021 17:46:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzntV-0008Ow-QC for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44520) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzntV-0001eS-GF 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-000818-FJ for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52723] [PATCH 09/26] gnu: java-plexus-cipher: 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.164012674830621 (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]:56024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsy-0007x2-VZ for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:48 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsp-0007uN-PL 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 660a18c9 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:22 +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=dLYbqn9BzFXH3HRSzsXT7X4up HKfYBp/qkdnE0zTeJc=; b=Ni/HZPmqlO9rSwXMSCr5PtyTfukkEnAY39vxlQp+F C+KMrGw0LWI9wNM0yNDBVuTCbuWaCGvrLAyZVc3up/kvm4pp9zWAV2KF+/NLQ1my kSNE01cRHP9v3PH9q9FknIF15tQcT2xeqp24tmG9jDt7Qudw6tEz4zZyBC2PLydR HDGpol+x7OJ+1gpLvCKSTmNiI025+w3FQzDIHiwg3gg+06wYE0jf9FtFP3cHNtb9 UU8pHonRgQo+CjOgIYKWTdnRQWfLlZ6Sg5V3ieHlRNgvrqEQO6q0lkRi+YWra6/G CLmPoXjHO2U1KH4SmnXneEgq46x3wtwn363K1o6dZANBw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 502286ce (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:53 +0100 Message-Id: <890d52c237907568622eb607dd5a7786ba899818.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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640126774; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/eD7Lay+AUW72fnRMsKBzMjvx3B+fzQQJt1+DkHruUM=; b=GJIFzdhLh1wyXrPq67yqd42qqlkdkX5AwVXt0dFI7VKkkOzqh0XxQKpSEuJ1PlK67z6GJr 1mNHbUY/IRjCj+FAUM46aEvmTxrWJ5Rz6MktEAyMF7Gp6G8AbxvnYAT6bOnj8CWnXdpeni wFrd0F715nVAvGxw37EojYlDZu/YDRHC0BQM+/6KAhTzQw5vn8heTIUXm3QXO+U2qwEVon Rr+NsL/toe+qRWgoAABVChZrQ0vF77TPzL1n3Eb+cYRhEAQKHgXUwJR8OtvYr41uU//ahr KkIMbKOOvE/6IxBbl3g8lUQIrUWMcaKKmDo8qnYuDPI4/IcMmqcH2ag7LUJB3A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640126774; a=rsa-sha256; cv=none; b=Xr2bMwmV1XGcBg2nISichT5+B49L95mrKs0b27dmLDf8GiZdEagOzcSbsjY81U0BZLE6/n S6W8HeM07YgwYU+tuMbu2x/Asys+cML2njGcBZT9u2kowc3fjgvd4kCOKylNusJ/4JynlS 8Kp+nPiHhIZSuRdJcpcxA4i/euM5nK1u9abd5DkWM9pMx3kCj7nlZX2/P8HAmhgI7+dO7d nDzFSJXFw48Gufa9y3PoaDJ4FIvih8wN4EvUtS9Z+ZyU4oGjb2BbhnwGN2pSP2KEIlpqZW 2hofwd4dXf04jvp7bOCMNOCjvEObYpmXIwOIHIGVA1DGt8Sty8Z69uIkkbmktQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b="Ni/HZPmq"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b="Ni/HZPmq"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: BBC8F11A98 X-Spam-Score: -0.03 X-Migadu-Scanner: scn0.migadu.com X-TUID: mENf3/BjO0WT * gnu/packages/java.scm (java-plexus-cipher): Update to 2.0. (java-plexus-cipher-1.7): New variable. --- gnu/packages/java.scm | 58 +++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d22cb2600d..fd7dc76fe9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4700,17 +4700,58 @@ (define-public java-plexus-component-metadata (define-public java-plexus-cipher (package (name "java-plexus-cipher") - (version "1.7") + (version "2.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/codehaus-plexus/plexus-cipher") (commit (string-append "plexus-cipher-" version)))) (file-name (git-file-name name version)) + (sha256 + (base32 + "01fipdsm090n8j4207fl8kbxznkgkmkkgyazf53hm1nwn6na5aai")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "plexus-cipher.jar" + #:source-dir "src/main/java" + #:phases + (modify-phases %standard-phases + (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.cipher.DefaultPlexusCipher\n"))) + #t)) + (replace 'install (install-from-pom "pom.xml"))))) + (inputs + `(("java-cdi-api" ,java-cdi-api) + ("java-javax-inject" ,java-javax-inject))) + (propagated-inputs + `(("java-sonatype-spice-parent-pom" ,java-sonatype-spice-parent-pom-15) + ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/sonatype/plexus-cipher") + (synopsis "Encryption/decryption Component") + (description "Plexus-cipher contains a component to deal with encryption +and decryption.") + (license license:asl2.0))) + +(define-public java-plexus-cipher-1.7 + (package + (inherit java-plexus-cipher) + (version "1.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/codehaus-plexus/plexus-cipher") + (commit (string-append "plexus-cipher-" version)))) + (file-name (git-file-name "java-plexus-cipher" version)) (sha256 (base32 "0m638nzlxbmnbcj5cwdpgs326ab584yv0k803zlx37r6iqwvf6b0")))) - (build-system ant-build-system) (arguments `(#:jar-name "plexus-cipher.jar" #:source-dir "src/main/java" @@ -4732,17 +4773,8 @@ (define-public java-plexus-cipher (("provided") "test")) #t)) (replace 'install (install-from-pom "pom.xml"))))) - (inputs - (list java-cdi-api java-javax-inject)) (propagated-inputs - (list java-sonatype-spice-parent-pom-15)) - (native-inputs - (list java-junit)) - (home-page "https://github.com/sonatype/plexus-cipher") - (synopsis "Encryption/decryption Component") - (description "Plexus-cipher contains a component to deal with encryption -and decryption.") - (license license:asl2.0))) + (list java-sonatype-spice-parent-pom-15)))) (define-public java-plexus-java (package @@ -5089,7 +5121,7 @@ (define-public java-plexus-sec-dispatcher #t)) (replace 'install (install-from-pom "pom.xml"))))) (propagated-inputs - (list java-plexus-utils java-plexus-cipher + (list java-plexus-utils java-plexus-cipher-1.7 java-sonatype-spice-parent-pom-12)) (native-inputs `(("java-modello-core" ,java-modello-core) -- 2.34.0