From: Julien Lepiller <julien@lepiller.eu>
To: 52723@debbugs.gnu.org
Subject: [bug#52723] [PATCH 15/26] gnu: maven-common-artifact-filters: Update to 3.2.0.
Date: Tue, 21 Dec 2021 23:44:59 +0100 [thread overview]
Message-ID: <185067a5a2a5f2559fe48a00d294468199d0eb15.1640126679.git.julien@lepiller.eu> (raw)
In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu>
* 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 4cad05f3e1..1be266f9a7 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -2585,7 +2585,7 @@ (define-public maven-dependency-tree
(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/"
@@ -2593,7 +2593,7 @@ (define-public maven-common-artifact-filters
"-source-release.zip"))
(sha256
(base32
- "1cl1qk4r0gp62bjzfm7lml9raz1my2kd4yf0ci0lnfsn0h5qivnb"))))
+ "1mr92s4zz6gf028wiskjg8rd1znxzdnmskg42ac55ifg9v1p1884"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "maven-common-artifact-filters.jar"
@@ -2601,14 +2601,12 @@ (define-public maven-common-artifact-filters
#: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
@@ -2618,6 +2616,7 @@ (define-public maven-common-artifact-filters
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
@@ -2630,6 +2629,29 @@ (define-public maven-common-artifact-filters
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")
@@ -2781,7 +2803,7 @@ (define-public maven-artifact-transfer
(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
--
2.34.0
next prev parent reply other threads:[~2021-12-21 22:46 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 ` [bug#52723] [PATCH 10/26] gnu: java-plexus-sec-dispatcher: " Julien Lepiller
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 ` Julien Lepiller [this message]
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=185067a5a2a5f2559fe48a00d294468199d0eb15.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).