[bug#52723] [PATCH 07/26] gnu: java-plexus-utils: Default to the newer one.

[Julien Lepiller]

* gnu/packages/java.scm (java-plexus-utils-3.3.0): Rename to...
(java-plexus-utils): ...this.
(java-plexus-utils-3.2.1): New variable.
---
 gnu/packages/java.scm  | 18 +++++++++---------
 gnu/packages/maven.scm |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7c57924231..8c65d713f6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4272,8 +4272,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
@@ -4282,7 +4281,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.
@@ -4333,10 +4332,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
@@ -4345,7 +4345,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
@@ -4508,7 +4508,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
@@ -4564,7 +4564,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)
@@ -5193,7 +5193,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
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 479746639a..38b93f43b7 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -2907,7 +2907,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))
-- 
2.34.0