Subject: [bug#52723] [PATCH 15/26] gnu: maven-common-artifact-filters: Update to 3.2.0.

From: Julien Lepiller <[email-masked]>
Date: Tue, 21 Dec 2021 23:44:59 +0100

* 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