me/guix
Archived
1
0
Fork 0
Code Activity

gnu: java-jsr250: Use proper source.

Browse source 
Sources from maven.org are autogenerated, not actual sources.

* gnu/packages/java.scm (java-jsr250)[source]: Use git repository.
* gnu/packages/maven.scm (maven-embedder): Fix pom to use it.
This commit is contained in:
Julien Lepiller 2021-12-20 02:53:11 +01:00
parent 137a7af178
commit 89bc233f3e
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/java.scm
View file

@ -6241,14 +6241,14 @@ bottlenecks move away from the database in an effectively cached system.")
(name "java-jsr250") (name "java-jsr250")
(version "1.3") (version "1.3")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://repo1.maven.org/maven2/" (uri (git-reference
"javax/annotation/javax.annotation-api/" (url "https://github.com/javaee/javax.annotation")
version "/javax.annotation-api-" (commit version)))
version "-sources.jar")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"08clh8n4n9wfglf75qsqfjs6yf79f7x6hqx38cn856pksszv50kz")))) "1g22a9d75g01s9yxgdig0ss7i30j4ysnnp08gn4krn0wly4lpqq0"))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:tests? #f ; no tests included `(#:tests? #f ; no tests included
@ -6256,11 +6256,9 @@ bottlenecks move away from the database in an effectively cached system.")
#:jar-name "jsr250.jar" #:jar-name "jsr250.jar"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'install 'create-pom
(generate-pom.xml "pom.xml" "javax.annotation" "jsr250-api" ,version
#:name "jsr250"))
(replace 'install (replace 'install
(install-from-pom "pom.xml"))))) (install-from-pom "pom.xml")))))
(propagated-inputs (list java-jvnet-parent-pom-3))
(home-page "https://jcp.org/en/jsr/detail?id=250") (home-page "https://jcp.org/en/jsr/detail?id=250")
(synopsis "Security-related annotations") (synopsis "Security-related annotations")
(description "This package provides annotations for security. It provides (description "This package provides annotations for security. It provides

4
gnu/packages/maven.scm
View file

@ -1740,6 +1740,10 @@ artifactId=maven-core" ,(package-version maven-core-bootstrap))))
(("srcdir=\"maven-embedder/src/test\"") (("srcdir=\"maven-embedder/src/test\"")
"srcdir=\"maven-embedder/src/test/java\"")) "srcdir=\"maven-embedder/src/test/java\""))
#t)) #t))
(add-before 'install 'fix-pom
(lambda _
(substitute* "maven-embedder/pom.xml"
(("jsr250-api") "javax.annotation-api"))))
(replace 'install (replace 'install
(install-from-pom "maven-embedder/pom.xml"))))) (install-from-pom "maven-embedder/pom.xml")))))
(propagated-inputs (propagated-inputs