From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wDqXDj1ZwmF2JAAAgWs5BA (envelope-from ) for ; Tue, 21 Dec 2021 23:46:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4IxbCj1ZwmHgSAAAB5/wlQ (envelope-from ) for ; Tue, 21 Dec 2021 22:46:21 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EB9139ABC for ; Tue, 21 Dec 2021 23:46:20 +0100 (CET) Received: from localhost ([::1]:37398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzntk-00007C-0E for larch@yhetil.org; Tue, 21 Dec 2021 17:46:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzntX-0008Rq-Kh for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzntX-0001ew-9w for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzntW-00081M-98 for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52723] [PATCH 12/26] gnu: java-jsr250: Use proper source. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 22:46:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52723 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52723@debbugs.gnu.org Received: via spool by 52723-submit@debbugs.gnu.org id=B52723.164012674930636 (code B ref 52723); Tue, 21 Dec 2021 22:46:06 +0000 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:49 +0000 Received: from localhost ([127.0.0.1]:56032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzntE-0007xy-Nq for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:49 -0500 Received: from lepiller.eu ([89.234.186.109]:52550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsr-0007us-6q for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:28 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id ac5a4a90 for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=bvfjs4TIhosyD2M2c5kG9gSO7 uelB1KbCi6b7n4xqkw=; b=iWtUwmrbT1mhOBAdIm9kI6rOkDR9Yy6+lMeEEAXPS J9a4hXutncANXcRhxcGTEwIEgAaKmJuW+sU3K8gAosYmuGRymzwblyxU1iV9EPY8 OuCThVxS+lTdgFrJpXRi9zA7jNBSQWCH81if5PRV5yuTEVO60CCFUmJeK28sU/9/ 0fKBF2hOND0CYHZJhUgBpebhMzsqYOTvyWU60XXuhksBNUVo6meDY3kEnIK8TCsW T/Yqf8mJcQLpyI3Lx2b9bvmURAufOE5/VE1Ywo1LeRx9DeXzRjUOfj3MJoFWwy58 gpfnFML5NPTrXwowNmLZIT9l9VplC1wylCvvfG0VQe1wA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 486d1b5b (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:23 +0000 (UTC) From: Julien Lepiller Date: Tue, 21 Dec 2021 23:44:56 +0100 Message-Id: <5487c235c8e2d2ddcae9b6b0cfa47fcf891d6202.1640126679.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu> References: <20211221234231.44299f63@tachikoma.lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640126781; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=i3NzCkMc3fsAAwrEv4TbPwz7wl7lbDZA6toq4hzOF48=; b=kliBdW9QCXLW/EBKz2kI+JgKQJgOZrTaS9OlsO7KB+qmM3vj7mHS3MsoRTAnoFekSxSdgc ilmdKAEFETWMsjf+/6ipI5q2OFGK7xMjfW2HyWmQ/Jm/kBAASyeltNJXGaeXPQxuIY/Cip nHwMfjusOj8lkGC2LpQkC6tf6yp37HD9hSacARGii1uMDEuyGBtFLjBk5pQD3x0cb7dw32 zHj+gR2Mzfp+6aDRrkZhhtnlDb4HNpUtXGwJj+LkzJalKnsbsPu6BxKDjYHP2P5X1BxxXx zxNIMaZi9GG07kxigfi7jZ+u3F5cFWWRu7B/1fJXkjehDQH9pw308MgynbO/Uw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640126781; a=rsa-sha256; cv=none; b=eoec7i/MkaQcr9MiRx05nyStFr1SU8FxbK+tikDlQbOLLZ5TYOnLLjFPrIhsco7u5iZXF/ pOObdRG3P6ddRrpLzcgUHiLvXShMw95IlRxuYfkPRAor+N8H4dh5QOIieN+JIE4PiM4ug9 t+/QBdf3C4q4xwbVChMZvvJGoG+XBKI/fTzVf5dz7LWNt3hgLpzNG5SO018UMtk1gUcYpL L6Udc+EDb1aWTIZBnwiLbrSFEawcco0gE9Wq7cfG/1i2fQGdUYdpaJwdb3OOAJSzR1rvI0 s+qTBL2fuAL0APXOkP4yqIdAcsqzdA1b9p1IcibnhXY/Nc+TQkVYbWPpupKb/Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=iWtUwmrb; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=iWtUwmrb; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: EB9139ABC X-Spam-Score: -0.03 X-Migadu-Scanner: scn0.migadu.com X-TUID: AiGPv3yYRbAQ 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