ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-03 18:09:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: java-plexus-utils: Default to the newer one.

Browse source 
* gnu/packages/java.scm (java-plexus-utils-3.3.0): Rename to...
(java-plexus-utils): ...this.
(java-plexus-utils-3.2.1): New variable.
This commit is contained in:
Julien Lepiller 2021-12-19 22:25:45 +01:00
parent a348520e2a
commit 12769573eb
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/java.scm
View file

@ -3949,8 +3949,7 @@ (define-public java-junitparams
(define-public java-plexus-utils
(package
(name "java-plexus-utils")
;; sisu-build-api needs this version, later versions don't work
(version "3.2.1")
(version "3.3.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -3959,7 +3958,7 @@ (define-public java-plexus-utils
(file-name (git-file-name name version))
(sha256
(base32
"1w169glixyk94jbczj8jzg897lsab46jihiaa3dhw0p06g35va8b"))))
"0d0fq21rzjy0j55kcp8w9k1rbq9rwr0r7cc8239p9jbz54vihp0g"))))
(build-system ant-build-system)
;; FIXME: The default build.xml does not include a target to install
;; javadoc files.
@ -4010,10 +4009,11 @@ (define-public java-plexus-utils
more.")
(license license:asl2.0)))
(define-public java-plexus-utils-3.3.0
(define-public java-plexus-utils-3.2.1
(package
(inherit java-plexus-utils)
(version "3.3.0")
;; sisu-build-api needs this version, later versions don't work
(version "3.2.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -4022,7 +4022,7 @@ (define-public java-plexus-utils-3.3.0
(file-name (git-file-name "java-plexus-utils" version))
(sha256
(base32
"0d0fq21rzjy0j55kcp8w9k1rbq9rwr0r7cc8239p9jbz54vihp0g"))))))
"1w169glixyk94jbczj8jzg897lsab46jihiaa3dhw0p06g35va8b"))))))
(define-public java-plexus-interpolation
(package
@ -4185,7 +4185,7 @@ (define-public java-plexus-io
#t))
(replace 'install (install-from-pom "pom.xml")))))
(propagated-inputs
(list java-plexus-utils-3.3.0 java-commons-io plexus-parent-pom-5.1))
(list java-plexus-utils java-commons-io plexus-parent-pom-5.1))
(inputs
(list java-jsr305))
(native-inputs
@ -4241,7 +4241,7 @@ (define-public java-plexus-archiver
#t))
(replace 'install (install-from-pom "pom.xml")))))
(propagated-inputs
(list java-plexus-utils-3.3.0 java-plexus-io java-iq80-snappy
(list java-plexus-utils java-plexus-io java-iq80-snappy
java-commons-compress plexus-parent-pom-6.1))
(inputs
`(("java-jsr305" ,java-jsr305)
@ -4870,7 +4870,7 @@ (define-public java-sisu-build-api
(replace 'install
(install-from-pom "pom.xml")))))
(inputs
(list java-plexus-utils java-plexus-container-default))
(list java-plexus-utils-3.2.1 java-plexus-container-default))
(home-page "https://github.com/sonatype/sisu-build-api/")
(synopsis "Base build API for maven")
(description "This package contains the base build API for maven and

2
gnu/packages/maven.scm
View file

@ -3004,7 +3004,7 @@ (define-public maven-filtering
(propagated-inputs
(list maven-3.0-core
maven-shared-utils
java-plexus-utils
java-plexus-utils-3.2.1
java-plexus-interpolation
java-sisu-build-api
maven-parent-pom-30))