08/26: gnu: Add java-plexus-build-api.

[guix-commits]

roptat pushed a commit to branch master
in repository guix.

commit ce14731a7391d2038f81aad32036497d72eca723
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Mon Dec 20 02:32:20 2021 +0100

    gnu: Add java-plexus-build-api.
    
    This is the proper name for java-sisu-build-api.
    
    * gnu/packages/java.scm (java-sisu-build-api): Rename to...
    (java-plexus-build-api): ...this.
    [source]: Use new source repository.
---
 gnu/packages/java.scm  | 16 ++++++++--------
 gnu/packages/maven.scm | 22 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 8b159c3828..2b169854d8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -4012,7 +4012,7 @@ more.")
 (define-public java-plexus-utils-3.2.1
   (package
     (inherit java-plexus-utils)
-    ;; sisu-build-api needs this version, later versions don't work
+    ;; plexus-build-api needs this version, later versions don't work
     (version "3.2.1")
     (source (origin
               (method git-fetch)
@@ -4776,7 +4776,7 @@ function utilities.")
        ("java-plexus-utils" ,java-plexus-utils)
        ("java-guava" ,java-guava)
        ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
-       ("java-sisu-build-api" ,java-sisu-build-api)
+       ("java-plexus-build-api" ,java-plexus-build-api)
        ;; modello plugins:
        ("java-modellop-plugins-java" ,java-modello-plugins-java)
        ("java-modellop-plugins-xml" ,java-modello-plugins-xml)
@@ -4820,14 +4820,14 @@ This component decrypts a string passed to it.")
 Plexus components.")
     (license license:asl2.0)))
 
-(define-public java-sisu-build-api
+(define-public java-plexus-build-api
   (package
-    (name "java-sisu-build-api")
+    (name "java-plexus-build-api")
     (version "0.0.7")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/sonatype/sisu-build-api";)
+                     (url 
"https://github.com/codehaus-plexus/plexus-build-api";)
                      (commit (string-append "plexus-build-api-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4835,7 +4835,7 @@ Plexus components.")
                 "1d5w6c58gkx30d51v7qwv1xrhc0ly76848gihmgshj19yf6yhca0"))))
     (build-system ant-build-system)
     (arguments
-     `(#:jar-name "sisu-build-api.jar"
+     `(#:jar-name "plexus-build-api.jar"
        #:source-dir "src/main/java"
        #:jdk ,icedtea-8
        #:tests? #f; FIXME: how to run the tests?
@@ -4871,7 +4871,7 @@ which behaves as if all files were just 
created.</description>\n
            (install-from-pom "pom.xml")))))
     (inputs
      (list java-plexus-utils-3.2.1 java-plexus-container-default))
-    (home-page "https://github.com/sonatype/sisu-build-api/";)
+    (home-page "https://github.com/codehaus-plexus/plexus-build-api/";)
     (synopsis "Base build API for maven")
     (description "This package contains the base build API for maven and
 a default implementation of it.  This API is about scanning files in a
@@ -4915,7 +4915,7 @@ project and determining what files need to be rebuilt.")
              #t)))))
     (propagated-inputs
      (list java-plexus-utils java-plexus-container-default
-           java-sisu-build-api))
+           java-plexus-build-api))
     (native-inputs
      (list java-junit java-plexus-classworlds java-geronimo-xbean-reflect
            java-guava))
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 3761f0beda..e20b902cc3 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1185,7 +1185,7 @@ and compares versions:")))
            java-plexus-classworlds
            java-guava
            java-geronimo-xbean-reflect
-           java-sisu-build-api
+           java-plexus-build-api
            ;; modello plugins:
            java-modello-plugins-java
            java-modello-plugins-xml
@@ -1263,7 +1263,7 @@ setting, toolchains)")))
            java-plexus-utils
            java-guava
            java-geronimo-xbean-reflect
-           java-sisu-build-api
+           java-plexus-build-api
            ;; modello plugins:
            java-modello-plugins-java
            java-modello-plugins-xml
@@ -1399,7 +1399,7 @@ inheritance, interpolation, @dots{}")))
        ("java-plexus-classworlds" ,java-plexus-classworlds)
        ("java-guava" ,java-guava)
        ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
-       ("java-sisu-build-api" ,java-sisu-build-api)
+       ("java-plexus-build-api" ,java-plexus-build-api)
        ;; modello plugins:
        ("java-modello-plugins-java" ,java-modello-plugins-java)
        ("java-modello-plugins-xml" ,java-modello-plugins-xml)
@@ -1484,7 +1484,7 @@ so really just plain objects.")))
        ("classworlds" ,java-plexus-classworlds)
        ("guava" ,java-guava)
        ("xbean" ,java-geronimo-xbean-reflect)
-       ("build-api" ,java-sisu-build-api)
+       ("build-api" ,java-plexus-build-api)
        ;; modello plugins:
        ("java" ,java-modello-plugins-java)
        ("xml" ,java-modello-plugins-xml)
@@ -1588,7 +1588,7 @@ generally generated from plugin sources using 
maven-plugin-plugin.")))
          ("java-asm" ,java-asm)
          ("java-plexus-classworlds" ,java-plexus-classworlds)
          ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
-         ("java-sisu-build-api" ,java-sisu-build-api)
+         ("java-plexus-build-api" ,java-plexus-build-api)
          ("java-modello-plugins-java" ,java-modello-plugins-java)
          ("java-modello-plugins-xml" ,java-modello-plugins-xml)
          ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)
@@ -1774,7 +1774,7 @@ artifactId=maven-core" ,(package-version 
maven-core-bootstrap))))
     (native-inputs
      `(("java-modello-core" ,java-modello-core)
        ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
-       ("java-sisu-build-api" ,java-sisu-build-api)
+       ("java-plexus-build-api" ,java-plexus-build-api)
        ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
        ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
        ("java-cglib" ,java-cglib)
@@ -1963,7 +1963,7 @@ logging support.")))
        ("java-plexus-component-annotations" ,java-plexus-component-annotations)
        ("java-plexus-classworlds" ,java-plexus-classworlds)
        ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
-       ("java-sisu-build-api" ,java-sisu-build-api)
+       ("java-plexus-build-api" ,java-plexus-build-api)
        ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
        ("java-exclispe-sisu-inject" ,java-eclipse-sisu-inject)
        ("java-javax-inject" ,java-javax-inject)
@@ -2967,7 +2967,7 @@ build are stored.  By default, it is located within the 
user's home directory
      `(#:jar-name "maven-filtering.jar"
        #:source-dir "src/main/java"
        #:test-dir "src/test"
-       ;; this test comes from sisu-build-api, not this package
+       ;; this test comes from plexus-build-api, not this package
        #:test-exclude (list "**/IncrementalResourceFilteringTest.java"
                             "**/Abstract*.java")
        #:phases
@@ -2987,7 +2987,7 @@ build are stored.  By default, it is located within the 
user's home directory
              #t))
          (add-before 'check 'decompress-tests
            (lambda* (#:key inputs #:allow-other-keys)
-             (let* ((build-api-source (assoc-ref inputs 
"java-sisu-build-api-origin"))
+             (let* ((build-api-source (assoc-ref inputs 
"java-plexus-build-api-origin"))
                     (classes (string-append build-api-source 
"/src/test/java")))
                (copy-recursively classes "src/test/"))
              #t))
@@ -3006,7 +3006,7 @@ build are stored.  By default, it is located within the 
user's home directory
            maven-shared-utils
            java-plexus-utils-3.2.1
            java-plexus-interpolation
-           java-sisu-build-api
+           java-plexus-build-api
            maven-parent-pom-30))
     (inputs
      (list java-jsr305))
@@ -3017,7 +3017,7 @@ build are stored.  By default, it is located within the 
user's home directory
        ("java-mockito" ,java-mockito-1)
        ("java-objenesis" ,java-objenesis)
        ("java-plexus-component-metadata" ,java-plexus-component-metadata)
-       ("java-sisu-build-api-origin" ,(package-source java-sisu-build-api))))
+       ("java-plexus-build-api-origin" ,(package-source 
java-plexus-build-api))))
     (home-page "https://maven.apache.org/shared/maven-filtering";)
     (synopsis "Shared component for all plugins that needs to filter 
resources")
     (description "This component provides an API to filter resources in Maven