TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: Add java-plexus-build-api.

Browse source 
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.
This commit is contained in:
Julien Lepiller 2021-12-20 02:32:20 +01:00
parent 12769573eb
commit ce14731a73
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/java.scm
View file

@ -4012,7 +4012,7 @@ (define-public java-plexus-utils
(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 @@ (define (modello-single-mode file version mode)
("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 @@ (define-public java-plexus-cli
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 @@ (define-public java-sisu-build-api
"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 @@ (define-public java-sisu-build-api
(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 @@ (define-public java-modello-core
#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))

22
gnu/packages/maven.scm
View file

@ -1185,7 +1185,7 @@ (define (modello-single-mode file version mode)
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 @@ (define (modello-single-mode file version mode)
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 @@ (define (modello-single-mode file version mode)
("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 @@ (define (modello-single-mode file version mode)
("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 @@ (define (modello-single-mode file version mode)
("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 @@ (define (modello-single-mode file version mode)
(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 @@ (define (modello-single-mode file version mode)
("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 @@ (define-public maven-filtering
`(#: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 @@ (define-public maven-filtering
#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 @@ (define-public maven-filtering
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 @@ (define-public maven-filtering
("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