From: Julien Lepiller <julien@lepiller.eu>
To: 52723@debbugs.gnu.org
Subject: [bug#52723] [PATCH 10/26] gnu: java-plexus-sec-dispatcher: Update to 2.0.
Date: Tue, 21 Dec 2021 23:44:54 +0100 [thread overview]
Message-ID: <d2db70fe4457a4f561c40e4b6866cacb58c9dbc8.1640126679.git.julien@lepiller.eu> (raw)
In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu>
* 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
</configuration>\n
</component>\n
</components>\n
-</component-set>\n")))
- #t))
- (add-before 'check 'fix-paths
- (lambda _
- (copy-recursively "src/test/resources" "target")
- #t))
- (replace 'install (install-from-pom "pom.xml")))))
+</component-set>\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
--
2.34.0
next prev parent reply other threads:[~2021-12-21 22:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 22:42 [bug#52723] [PATCH] gnu: maven: Update to 3.8.4 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 01/26] gnu: Add apache-parent-pom-23 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 02/26] gnu: Add apache-commons-parent-pom-52 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 03/26] gnu: Add plexus-parent-pom-8 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 04/26] gnu: Add maven-parent-pom-34 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 05/26] gnu: maven-parent-pom: Fix dependency versions Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 06/26] gnu: java-commons-codec: Use latest commons parent Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 07/26] gnu: java-plexus-utils: Default to the newer one Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 08/26] gnu: Add java-plexus-build-api Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 09/26] gnu: java-plexus-cipher: Update to 2.0 Julien Lepiller
2021-12-21 22:44 ` Julien Lepiller [this message]
2021-12-21 22:44 ` [bug#52723] [PATCH 11/26] gnu: Add java-jvnet-parent-pom-3 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 12/26] gnu: java-jsr250: Use proper source Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 13/26] gnu: java-eclipse-sisu-inject: Update to 0.3.5 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 14/26] gnu: java-eclipse-sisu-plexus: " Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 15/26] gnu: maven-common-artifact-filters: Update to 3.2.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 16/26] gnu: java-plexus-container-default-bootstrap: Update to 2.1.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 17/26] gnu: Add java-sonatype-aether-api-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 18/26] gnu: Add java-sonatype-aether-spi-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 19/26] gnu: Add java-sonatype-aether-test-util-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 20/26] gnu: Add java-sonatype-aether-util-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 21/26] gnu: maven-dependency-tree: Update to 3.1.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 22/26] guix: maven: Fix java parser Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 23/26] gnu: maven-enforcer-api: Update to 3.0.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 24/26] gnu: maven-wagon-provider-api: Update to 3.4.3 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 25/26] gnu: Update maven-artifact-transfer to 0.13.1 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 26/26] gnu: maven: Update to 3.8.4 Julien Lepiller
2022-02-02 22:41 ` [bug#52723] [PATCH] " Björn Höfling
2022-02-05 16:16 ` Björn Höfling
2022-02-05 21:53 ` bug#52723: " Julien Lepiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d2db70fe4457a4f561c40e4b6866cacb58c9dbc8.1640126679.git.julien@lepiller.eu \
--to=julien@lepiller.eu \
--cc=52723@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).