[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/26: gnu: java-plexus-sec-dispatcher: Update to 2.0.
From: |
guix-commits |
Subject: |
10/26: gnu: java-plexus-sec-dispatcher: Update to 2.0. |
Date: |
Sat, 5 Feb 2022 14:18:57 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit 164185854760245de1d132bb459d46b9023c8980
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Mon Dec 20 01:24:16 2021 +0100
gnu: java-plexus-sec-dispatcher: Update to 2.0.
* 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 64d40b3ce9..8f0aaff3ed 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4733,17 +4733,15 @@ function utilities.")
(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"
@@ -4762,6 +4760,61 @@ function utilities.")
(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")
@@ -4790,37 +4843,10 @@ function utilities.")
</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 e20b902cc3..fbf39357c3 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1294,7 +1294,7 @@ simply plain java objects.")))
(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))
@@ -1983,7 +1983,7 @@ logging support.")))
("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)
@@ -2443,7 +2443,7 @@ reporting or the build process.")))
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
- branch master updated (dda56249ae -> 26c74ed808), guix-commits, 2022/02/05
- 08/26: gnu: Add java-plexus-build-api., guix-commits, 2022/02/05
- 15/26: gnu: maven-common-artifact-filters: Update to 3.2.0., guix-commits, 2022/02/05
- 01/26: gnu: Add apache-parent-pom-23., guix-commits, 2022/02/05
- 13/26: gnu: java-eclipse-sisu-inject: Update to 0.3.5., guix-commits, 2022/02/05
- 12/26: gnu: java-jsr250: Use proper source., guix-commits, 2022/02/05
- 16/26: gnu: java-plexus-container-default-bootstrap: Update to 2.1.0., guix-commits, 2022/02/05
- 03/26: gnu: Add plexus-parent-pom-8., guix-commits, 2022/02/05
- 06/26: gnu: java-commons-codec: Use latest commons parent., guix-commits, 2022/02/05
- 10/26: gnu: java-plexus-sec-dispatcher: Update to 2.0.,
guix-commits <=
- 20/26: gnu: Add java-sonatype-aether-util-1.13., guix-commits, 2022/02/05
- 04/26: gnu: Add maven-parent-pom-34., guix-commits, 2022/02/05
- 05/26: gnu: maven-parent-pom: Fix dependency versions., guix-commits, 2022/02/05
- 23/26: gnu: maven-enforcer-api: Update to 3.0.0., guix-commits, 2022/02/05
- 24/26: gnu: maven-wagon-provider-api: Update to 3.4.3., guix-commits, 2022/02/05
- 02/26: gnu: Add apache-commons-parent-pom-52., guix-commits, 2022/02/05
- 17/26: gnu: Add java-sonatype-aether-api-1.13., guix-commits, 2022/02/05
- 19/26: gnu: Add java-sonatype-aether-test-util-1.13., guix-commits, 2022/02/05
- 21/26: gnu: maven-dependency-tree: Update to 3.1.0., guix-commits, 2022/02/05
- 22/26: guix: maven: Fix java parser., guix-commits, 2022/02/05