12/26: gnu: java-jsr250: Use proper source.

[guix-commits]

roptat pushed a commit to branch master
in repository guix.

commit 89bc233f3e0a83d0e9506dadb13e716e435bd40a
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Mon Dec 20 02:53:11 2021 +0100

    gnu: java-jsr250: Use proper 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.
---
 gnu/packages/java.scm  | 16 +++++++---------
 gnu/packages/maven.scm |  4 ++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 8f0aaff3ed..b3165c1990 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6241,14 +6241,14 @@ bottlenecks move away from the database in an 
effectively cached system.")
     (name "java-jsr250")
     (version "1.3")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://repo1.maven.org/maven2/";
-                                  "javax/annotation/javax.annotation-api/"
-                                  version "/javax.annotation-api-"
-                                  version "-sources.jar"))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/javaee/javax.annotation";)
+                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "08clh8n4n9wfglf75qsqfjs6yf79f7x6hqx38cn856pksszv50kz"))))
+                "1g22a9d75g01s9yxgdig0ss7i30j4ysnnp08gn4krn0wly4lpqq0"))))
     (build-system ant-build-system)
     (arguments
      `(#:tests? #f ; no tests included
@@ -6256,11 +6256,9 @@ bottlenecks move away from the database in an 
effectively cached system.")
        #:jar-name "jsr250.jar"
        #:phases
        (modify-phases %standard-phases
-         (add-before 'install 'create-pom
-           (generate-pom.xml "pom.xml" "javax.annotation" "jsr250-api" ,version
-                             #:name "jsr250"))
          (replace 'install
            (install-from-pom "pom.xml")))))
+    (propagated-inputs (list java-jvnet-parent-pom-3))
     (home-page "https://jcp.org/en/jsr/detail?id=250";)
     (synopsis "Security-related annotations")
     (description "This package provides annotations for security.  It provides
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index fbf39357c3..423e859f8b 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1740,6 +1740,10 @@ artifactId=maven-core" ,(package-version 
maven-core-bootstrap))))
                (("srcdir=\"maven-embedder/src/test\"")
                 "srcdir=\"maven-embedder/src/test/java\""))
              #t))
+         (add-before 'install 'fix-pom
+           (lambda _
+             (substitute* "maven-embedder/pom.xml"
+               (("jsr250-api") "javax.annotation-api"))))
          (replace 'install
            (install-from-pom "maven-embedder/pom.xml")))))
     (propagated-inputs