Merge branch 'master' into staging

1 files changed, 82 insertions, 13 deletions

diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm
index a47fbfa8c1..e2ebf83572 100644
--- a/gnu/packages/maven-parent-pom.scm
+++ b/gnu/packages/maven-parent-pom.scm
@@ -84,7 +84,12 @@
   (make-apache-parent-pom
     "21" "0clcbrq1b2b8sbvlqddyw2dg5niq25dhdma9sk4b0i30hqaipx96"))
 
-(define (make-apache-commons-parent-pom version hash parent)
+(define-public apache-parent-pom-23
+  (make-apache-parent-pom
+    "23" "05c8i741f0m4311q264zvq0lc6srsyz2x95ga4d7qfd89swkzg9d"))
+
+(define* (make-apache-commons-parent-pom version hash parent
+                                         #:key (tag-prefix "commons-parent-"))
   (hidden-package
     (package
       (name "apache-commons-parent-pom")
@@ -93,7 +98,7 @@
                 (method git-fetch)
                 (uri (git-reference
                        (url "https://github.com/apache/commons-parent")
-                       (commit (string-append "commons-parent-" version))))
+                       (commit (string-append tag-prefix version))))
                 (file-name (git-file-name name version))
                 (sha256 (base32 hash))))
       (build-system ant-build-system)
@@ -134,6 +139,12 @@
     "50" "0ki8px35dan51ashblpw6rdl27c2fq62slazhslhq3lr4fwlpvxs"
     apache-parent-pom-21))
 
+(define-public apache-commons-parent-pom-52
+  (make-apache-commons-parent-pom
+    "52" "0fb6id9cs9944fjlirjc07bf234bwi96i642px09m9nrfj338n5d"
+    apache-parent-pom-23
+    #:tag-prefix "rel/commons-parent-"))
+
 (define-public java-weld-parent-pom
   (hidden-package
     (package
@@ -380,7 +391,11 @@ other projects as their parent pom.")
   (make-plexus-parent-pom
     "6.1" "1pisca0fxpgbhf4xdgw5mn86622pg3mc5b8760kf9mk2awazshlj"))
 
-(define (make-maven-parent-pom version hash parent)
+(define-public plexus-parent-pom-8
+  (make-plexus-parent-pom
+    "8" "0ybwdzawa58qg9ag39rxyin24lk9sjcaih6n2yfldfzsbkq6gnww"))
+
+(define* (make-maven-parent-pom version hash parent #:key replacements)
   (hidden-package
     (package
       (name "maven-parent-pom")
@@ -403,6 +418,12 @@ other projects as their parent pom.")
              (install-pom-file "maven-plugins/pom.xml"))
            (add-after 'install 'install-shared
              (install-pom-file "maven-shared-components/pom.xml"))
+           ,@(if replacements
+                 `((add-before 'install 'fix-pom
+                    (lambda _
+                      (use-modules (guix build maven pom))
+                      (fix-pom-dependencies "pom.xml" '() #:local-packages (quote ,(force replacements))))))
+                 '())
            (replace 'install
              (install-pom-file "pom.xml")))))
       (propagated-inputs
@@ -413,15 +434,35 @@ other projects as their parent pom.")
 tool.  This package contains the Maven parent POM.")
       (license license:asl2.0))))
 
+(define-public maven-parent-pom-34
+  (make-maven-parent-pom
+    "34" "1vkmrfwva76k6maf1ljbja5ga4kzav4xc73ymbaf42xaiaknglbc"
+    apache-parent-pom-23
+    #:replacements
+    (delay
+      `(("org.codehaus.plexus"
+         ("plexus-component-annotations" .
+          ,(package-version java-plexus-component-annotations)))))))
+
 (define-public maven-parent-pom-33
   (make-maven-parent-pom
     "33" "1b0z2gsvpccgcssys9jbdfwlwq8b5imdwr508f87ssdbfs29lh65"
-    apache-parent-pom-21))
+    apache-parent-pom-21
+    #:replacements
+    (delay
+      `(("org.codehaus.plexus"
+         ("plexus-component-annotations" .
+          ,(package-version java-plexus-component-annotations)))))))
 
 (define-public maven-parent-pom-31
   (make-maven-parent-pom
     "31" "0skxv669v9ffwbmrmybnn9awkf1g3ylk88bz0hv6g11zpj1a8454"
-    apache-parent-pom-19))
+    apache-parent-pom-19
+    #:replacements
+    (delay
+      `(("org.codehaus.plexus"
+         ("plexus-component-annotations" .
+          ,(package-version java-plexus-component-annotations)))))))
 
 (define-public maven-parent-pom-30
   (make-maven-parent-pom
@@ -457,7 +498,12 @@ tool.  This package contains the Maven parent POM.")
 (define-public maven-parent-pom-22
   (let ((base (make-maven-parent-pom
                 "22" "1kgqbyx7ckashy47n9rgyg4asyrvp933hdiknvnad7msq5d4c2jg"
-                apache-parent-pom-11)))
+                apache-parent-pom-11
+                #:replacements
+                (delay
+                  `(("org.codehaus.plexus"
+                     ("plexus-component-annotations" .
+                      ,(package-version java-plexus-container-default))))))))
     (package
       (inherit base)
       (arguments
@@ -465,13 +511,7 @@ tool.  This package contains the Maven parent POM.")
          ((#:phases phases)
           `(modify-phases ,phases
              (delete 'install-plugins)
-             (delete 'install-shared)
-             (add-before 'install 'fix-versions
-               (lambda _
-                 (substitute* "pom.xml"
-                   (("1.5.5")
-                    ,(package-version java-plexus-component-annotations)))
-                 #t)))))))))
+             (delete 'install-shared))))))))
 
 (define-public maven-plugins-pom-23
   (hidden-package
@@ -546,3 +586,32 @@ components.")
               (sha256
                (base32
                 "0cqa072fz55j5xyvixqv8vbd7jsbhb1cd14bzjvm0hbv2wpd9npf"))))))
+
+(define-public java-jvnet-parent-pom-3
+  (hidden-package
+    (package
+      (name "java-jvnet-parent-pom-3")
+      (version "3")
+      (source (origin
+                (method url-fetch)
+                (uri (string-append "https://repo1.maven.org/maven2/net/java/"
+                                    "jvnet-parent/" version "/jvnet-parent-"
+                                    version ".pom"))
+                (sha256
+                 (base32
+                  "0nj7958drckwf634cw9gmwgmdi302bya7bas16bbzp9rzag7ix9h"))))
+      (build-system ant-build-system)
+      (arguments
+       (list
+         #:tests? #f
+         #:phases
+         #~(modify-phases %standard-phases
+             (delete 'unpack)
+             (delete 'configure)
+             (delete 'build)
+             (replace 'install
+               (install-pom-file #$(package-source this-package))))))
+      (home-page "https://mvnrepository.com/artifact/net.java/jvnet-parent")
+      (synopsis "java.net parent pom")
+      (description "This package contains the java.net parent pom file.")
+      (license license:asl2.0))))