unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Julien Lepiller <julien@lepiller.eu>
To: 52723@debbugs.gnu.org
Subject: [bug#52723] [PATCH 12/26] gnu: java-jsr250: Use proper source.
Date: Tue, 21 Dec 2021 23:44:56 +0100	[thread overview]
Message-ID: <5487c235c8e2d2ddcae9b6b0cfa47fcf891d6202.1640126679.git.julien@lepiller.eu> (raw)
In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu>

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 811ce1d4f8..f35ec4f0b1 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6564,14 +6564,14 @@ (define-public java-jsr250
     (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
@@ -6579,11 +6579,9 @@ (define-public java-jsr250
        #: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 c66cfd0b83..4cad05f3e1 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1643,6 +1643,10 @@ (define-public maven-embedder
                (("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
-- 
2.34.0





  parent reply	other threads:[~2021-12-21 22:46 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-21 22:42 [bug#52723] [PATCH] gnu: maven: Update to 3.8.4 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 01/26] gnu: Add apache-parent-pom-23 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 02/26] gnu: Add apache-commons-parent-pom-52 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 03/26] gnu: Add plexus-parent-pom-8 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 04/26] gnu: Add maven-parent-pom-34 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 05/26] gnu: maven-parent-pom: Fix dependency versions Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 06/26] gnu: java-commons-codec: Use latest commons parent Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 07/26] gnu: java-plexus-utils: Default to the newer one Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 08/26] gnu: Add java-plexus-build-api Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 09/26] gnu: java-plexus-cipher: Update to 2.0 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 10/26] gnu: java-plexus-sec-dispatcher: " Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 11/26] gnu: Add java-jvnet-parent-pom-3 Julien Lepiller
2021-12-21 22:44 ` Julien Lepiller [this message]
2021-12-21 22:44 ` [bug#52723] [PATCH 13/26] gnu: java-eclipse-sisu-inject: Update to 0.3.5 Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 14/26] gnu: java-eclipse-sisu-plexus: " Julien Lepiller
2021-12-21 22:44 ` [bug#52723] [PATCH 15/26] gnu: maven-common-artifact-filters: Update to 3.2.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 16/26] gnu: java-plexus-container-default-bootstrap: Update to 2.1.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 17/26] gnu: Add java-sonatype-aether-api-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 18/26] gnu: Add java-sonatype-aether-spi-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 19/26] gnu: Add java-sonatype-aether-test-util-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 20/26] gnu: Add java-sonatype-aether-util-1.13 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 21/26] gnu: maven-dependency-tree: Update to 3.1.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 22/26] guix: maven: Fix java parser Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 23/26] gnu: maven-enforcer-api: Update to 3.0.0 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 24/26] gnu: maven-wagon-provider-api: Update to 3.4.3 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 25/26] gnu: Update maven-artifact-transfer to 0.13.1 Julien Lepiller
2021-12-21 22:45 ` [bug#52723] [PATCH 26/26] gnu: maven: Update to 3.8.4 Julien Lepiller
2022-02-02 22:41 ` [bug#52723] [PATCH] " Björn Höfling
2022-02-05 16:16 ` Björn Höfling
2022-02-05 21:53   ` bug#52723: " Julien Lepiller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5487c235c8e2d2ddcae9b6b0cfa47fcf891d6202.1640126679.git.julien@lepiller.eu \
    --to=julien@lepiller.eu \
    --cc=52723@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).