me/guix
Archived
1
0
Fork 0
Code Activity

gnu: maven-common-artifact-filters: Update to 3.2.0.

Browse source 
* gnu/packages/maven.scm (maven-common-artifact-filters): Update to
3.2.0.
(maven-common-artifact-filters-3.1.0): New variable.
This commit is contained in:
Julien Lepiller 2021-12-20 03:38:36 +01:00
parent 4775d17137
commit a208278229
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gnu/packages/maven.scm
View file

@ -2682,7 +2682,7 @@ Maven project dependencies.")
(define-public maven-common-artifact-filters (define-public maven-common-artifact-filters
(package (package
(name "maven-common-artifact-filters") (name "maven-common-artifact-filters")
(version "3.1.0") (version "3.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://apache/maven/shared/" (uri (string-append "mirror://apache/maven/shared/"
@ -2690,7 +2690,7 @@ Maven project dependencies.")
"-source-release.zip")) "-source-release.zip"))
(sha256 (sha256
(base32 (base32
"1cl1qk4r0gp62bjzfm7lml9raz1my2kd4yf0ci0lnfsn0h5qivnb")))) "1mr92s4zz6gf028wiskjg8rd1znxzdnmskg42ac55ifg9v1p1884"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:jar-name "maven-common-artifact-filters.jar" `(#:jar-name "maven-common-artifact-filters.jar"
@ -2698,14 +2698,12 @@ Maven project dependencies.")
#:tests? #f; require maven-plugin-testing-harness, which requires maven 3.2. #:tests? #f; require maven-plugin-testing-harness, which requires maven 3.2.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'remove-sisu (add-before 'build 'fix-aether
(lambda _ (lambda _
;; Replace sisu with an existing dependency, to prevent a failure
;; when rewritting dependency versions
(substitute* "pom.xml" (substitute* "pom.xml"
(("sisu-inject-plexus") "maven-plugin-api") (("eclipse.aether") "sonatype.aether"))
(("org.sonatype.sisu") "org.apache.maven")) (substitute* "src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java"
#t)) (("eclipse") "sonatype"))))
(replace 'install (replace 'install
(install-from-pom "pom.xml"))))) (install-from-pom "pom.xml")))))
(propagated-inputs (propagated-inputs
@ -2715,6 +2713,7 @@ Maven project dependencies.")
maven-3.0-plugin-api maven-3.0-plugin-api
maven-shared-utils maven-shared-utils
maven-parent-pom-33 maven-parent-pom-33
java-eclipse-sisu-plexus
java-sonatype-aether-api java-sonatype-aether-api
java-sonatype-aether-util)) java-sonatype-aether-util))
(inputs (inputs
@ -2727,6 +2726,29 @@ Maven project dependencies.")
Maven project dependencies.") Maven project dependencies.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public maven-common-artifact-filters-3.1.0
(package
(inherit maven-common-artifact-filters)
(version "3.1.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/maven/shared/"
"maven-common-artifact-filters-" version
"-source-release.zip"))
(sha256
(base32
"1cl1qk4r0gp62bjzfm7lml9raz1my2kd4yf0ci0lnfsn0h5qivnb"))))
(arguments
(substitute-keyword-arguments (package-arguments maven-common-artifact-filters)
((#:phases phases)
`(modify-phases ,phases
(delete 'fix-aether)
(add-before 'build 'remove-sisu
(lambda _
(substitute* "pom.xml"
(("sisu-inject-plexus") "maven-plugin-api")
(("org.sonatype.sisu") "org.apache.maven"))))))))))
(define-public maven-enforcer-api (define-public maven-enforcer-api
(package (package
(name "maven-enforcer-api") (name "maven-enforcer-api")
@ -2878,7 +2900,7 @@ Maven project dependencies.")
(list java-commons-codec (list java-commons-codec
maven-3.0-artifact maven-3.0-artifact
maven-3.0-core maven-3.0-core
maven-common-artifact-filters maven-common-artifact-filters-3.1.0
java-plexus-component-annotations java-plexus-component-annotations
java-plexus-utils java-plexus-utils
java-slf4j-api java-slf4j-api