[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/26: gnu: maven-common-artifact-filters: Update to 3.2.0.
From: |
guix-commits |
Subject: |
15/26: gnu: maven-common-artifact-filters: Update to 3.2.0. |
Date: |
Sat, 5 Feb 2022 14:18:58 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit a208278229203ecc2a7cc0846822ea1830331535
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Mon Dec 20 03:38:36 2021 +0100
gnu: maven-common-artifact-filters: Update to 3.2.0.
* gnu/packages/maven.scm (maven-common-artifact-filters): Update to
3.2.0.
(maven-common-artifact-filters-3.1.0): New variable.
---
gnu/packages/maven.scm | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 423e859f8b..da1619b03b 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -2682,7 +2682,7 @@ Maven project dependencies.")
(define-public maven-common-artifact-filters
(package
(name "maven-common-artifact-filters")
- (version "3.1.0")
+ (version "3.2.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://apache/maven/shared/"
@@ -2690,7 +2690,7 @@ Maven project dependencies.")
"-source-release.zip"))
(sha256
(base32
- "1cl1qk4r0gp62bjzfm7lml9raz1my2kd4yf0ci0lnfsn0h5qivnb"))))
+ "1mr92s4zz6gf028wiskjg8rd1znxzdnmskg42ac55ifg9v1p1884"))))
(build-system ant-build-system)
(arguments
`(#: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.
#:phases
(modify-phases %standard-phases
- (add-before 'build 'remove-sisu
+ (add-before 'build 'fix-aether
(lambda _
- ;; Replace sisu with an existing dependency, to prevent a failure
- ;; when rewritting dependency versions
(substitute* "pom.xml"
- (("sisu-inject-plexus") "maven-plugin-api")
- (("org.sonatype.sisu") "org.apache.maven"))
- #t))
+ (("eclipse.aether") "sonatype.aether"))
+ (substitute*
"src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java"
+ (("eclipse") "sonatype"))))
(replace 'install
(install-from-pom "pom.xml")))))
(propagated-inputs
@@ -2715,6 +2713,7 @@ Maven project dependencies.")
maven-3.0-plugin-api
maven-shared-utils
maven-parent-pom-33
+ java-eclipse-sisu-plexus
java-sonatype-aether-api
java-sonatype-aether-util))
(inputs
@@ -2727,6 +2726,29 @@ Maven project dependencies.")
Maven project dependencies.")
(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
(package
(name "maven-enforcer-api")
@@ -2878,7 +2900,7 @@ Maven project dependencies.")
(list java-commons-codec
maven-3.0-artifact
maven-3.0-core
- maven-common-artifact-filters
+ maven-common-artifact-filters-3.1.0
java-plexus-component-annotations
java-plexus-utils
java-slf4j-api
- 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 <=
- 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, 2022/02/05
- 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