From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id YAA3J1IpDmdenAAAe85BDQ:P1 (envelope-from ) for ; Tue, 15 Oct 2024 08:35:30 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id YAA3J1IpDmdenAAAe85BDQ (envelope-from ) for ; Tue, 15 Oct 2024 10:35:30 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=KiMx7P5Q; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=dtsfRQ4I; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1728981330; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=r+unI+s24dvmQ1TPqLQGLZFs8t4M0T4Kyp1dkCgJyC0=; b=ZoFjdrhSDSUcSD7IRtUZHzrnfzAnPUGSMEvlpERWGKOHsSrYTsznIIuy+0FuXw5D9JsqMr hUwtUzoYz5ZLV20dbGp4BZ5s+liSf+afw10a8Ln4IFyc+gZ8sBxBkgTISH8MrwfSIyO6bF Y2N9FZuKQKKUEFFnugkTWxcjRLWE8HjOryf9Qzxjaxo1t0MFdtmneEQ2UBhaRjnQtdyjgn BUwTMkIE1FtA9xZeDLkLHvVK/DXE+eHOIzIZjQbTPNhKVCMz7OVxuHWf1PXyX1P/ITxBoq te7TqKnHvDs9OmFpAQGcCdm/yiswO8y4/6OXB5+3k4wrwE+D0DBkdwPkNCePcg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=KiMx7P5Q; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=dtsfRQ4I; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1728981330; a=rsa-sha256; cv=none; b=uoJo4IoJ81/wiarr5oxBhPLQo10uUFzyX/PY6ymNIHKNWKipfRYd6p2OHx8bw2fSF94NbE VS48AWzn0qiE+z9MoHam8ySbA3ohSJoXL9CX2PIX8hPs9SBLAX3gI3SA5rTbCRgRc4Z4LI WWf8XcaCIPaUdo9APkRwCfk7f14A4zFoBrh6kHen2FB1iglmN4KSsBFdgygkdMlU8lRjhf xDcatf9t0eD5kelSNUcrGQN/KzK/Yx28q0f4RNt3YdujvdagM+D1svoByr7s88UqZITB2s KhL8mEFJOa+MqFF85ubYOvEAMohcsQ25JH/aHzYaRg8J244XRBh1MWoq6WTi7A== 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 121878BA45 for ; Tue, 15 Oct 2024 10:35:30 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0cFW-0004A6-7w; Tue, 15 Oct 2024 03:45:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0cFU-00049Z-Vz for bug-guix@gnu.org; Tue, 15 Oct 2024 03:45:45 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t0cFU-0007NT-NE for bug-guix@gnu.org; Tue, 15 Oct 2024 03:45:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=r+unI+s24dvmQ1TPqLQGLZFs8t4M0T4Kyp1dkCgJyC0=; b=KiMx7P5QF7e3iwgC6KYNf2UF0PNBqQx5Apzjv7zf+kPFI1cV7xdTPJ5NBYb6D80tWEc6BFewcGkPew+KpHq8xXb4uzg3CZuhg1NlpEGNm8nwUiheJHp1wvdxjn2LxKPVKgfQ0FYU0EufFgI4Ellwh3Iua6uvHc85T036Dkdq+dPlrb4lvCYk16HqCfJOUGz8BL+dfhkFln6sRJts9rLk+sENnsDS9RrWYXo74G53mqcNlMiFK9JcWotLMWzDXJFsHddQquXTiaxPlFgNBBKd4F3c8IhY5KyQnvThtFp+TQNg7op9HFGE1+LtTXIBboXs4aZFhPOcTg3xM66+MBz8DA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t0cFl-0003KI-Va; Tue, 15 Oct 2024 03:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#73432: [PATCH 1/3] gnu: Add maven-resolver-1.6 Resent-From: Kristiyan Kanchev Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, bug-guix@gnu.org Resent-Date: Tue, 15 Oct 2024 07:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73432 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 73432@debbugs.gnu.org Cc: Kristiyan Kanchev , Julien Lepiller X-Debbugs-Original-Xcc: Julien Lepiller Received: via spool by 73432-submit@debbugs.gnu.org id=B73432.172897831112306 (code B ref 73432); Tue, 15 Oct 2024 07:46:01 +0000 Received: (at 73432) by debbugs.gnu.org; 15 Oct 2024 07:45:11 +0000 Received: from localhost ([127.0.0.1]:53905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0cEx-0003CP-4T for submit@debbugs.gnu.org; Tue, 15 Oct 2024 03:45:11 -0400 Received: from mail-lf1-f43.google.com ([209.85.167.43]:52515) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0cEv-0003CF-GS for 73432@debbugs.gnu.org; Tue, 15 Oct 2024 03:45:10 -0400 Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-539f2b95775so2357427e87.1 for <73432@debbugs.gnu.org>; Tue, 15 Oct 2024 00:44:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728978229; x=1729583029; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r+unI+s24dvmQ1TPqLQGLZFs8t4M0T4Kyp1dkCgJyC0=; b=dtsfRQ4Iep1sj4ru6r3MIoGBtuoVkJZ9s1MF1OCVdpNVugmQq1d7mwcH9+5akJeOfJ wVgfUq6qHvVgmA1mIXtVL+r0iB3ar/92w4IdRiH+QYysxgtF6CXh3Fa73By7Kl+Su/Jo XoVhgUcosm3YAjG8CiWzz7EOhTnp+ENFFb7hndzdfM9FtlU3zQHHZDtRDW7iuAsBVovL 08lnV8qY4Wg8NeZkFCuPmfpX6MSZi8e8tWcm096ZeSNqeG3SFz5zar1w1bbIL763hG9Z waeztqXaF/wFUE8k5ZuGWlTX3Ijag3Jj2fHKmWgf1ynTL/4DRyay91z8MFF1P3ieWUv/ zy/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728978229; x=1729583029; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r+unI+s24dvmQ1TPqLQGLZFs8t4M0T4Kyp1dkCgJyC0=; b=HzC+lYe7Wles7PA/HhtBIDd1cweZwB8Ps1kOi1tbrtAEV9qD3MBkXUcurBHHUmid8w 7rpfkHd61CAdFy4vOyrNpdkN34OVct4nwroC1fBB7uBsBTTZYT3+/Xa/UfANsnD1yCEr pzYYymskc8NOvEjxL5YrGBXJ9PoPb61CjAbW1XwoBWiW/X0CvsnwkU02akbJVcEZKqYL TSfmkh2w1byxGrcphmRDWhoOhi16JEJawksI8yZ3b2KKIR2iKAu3e1XZavl9wXJQlrwh TIgUzAN8cSPpOmIyp6UoRbG9cpDhrksbYV48vyAVUfW7bHrf2ElTAbzyWkbyebSGqROM DdYQ== X-Gm-Message-State: AOJu0YxaQ63xKuUkNfhaAcz0tjJnGaS0p7GzWKx03dDWPIufhDWGLu8Z jRhhkM0C6OZ741nyaqhZRD21sBS2opa9g/MNTH8WQbmi1b/lNFl3UpUDvkd7 X-Google-Smtp-Source: AGHT+IFKghfffykaKzUBOn570zQM+U60Y+SQzq5GFL13eObuv5IOvrRS3wqYgRDW2fCZn0KUvLGMDg== X-Received: by 2002:a05:6512:3083:b0:535:6951:9e1c with SMTP id 2adb3069b0e04-539e54e7122mr6417376e87.15.1728978228902; Tue, 15 Oct 2024 00:43:48 -0700 (PDT) Received: from schCube.localdomain ([87.118.169.164]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9a29719196sm37741966b.33.2024.10.15.00.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 00:43:48 -0700 (PDT) From: Kristiyan Kanchev Date: Tue, 15 Oct 2024 10:43:14 +0300 Message-ID: <6e6837dc8e86e4e3b7bceccd834b1a488233639e.1728910014.git.skrechy@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 4.64 X-Spam-Score: 4.64 X-Migadu-Queue-Id: 121878BA45 X-TUID: thv+CPZSdVfp * gnu/packages/maven.scm (maven-resolver-1.6-parent-pom, maven-resolver-1.6-api, maven-resolver-1.6-spi, maven-resolver-1.6-test-util, maven-resolver-1.6-util, maven-resolver-1.6-connector-basic, maven-resolver-1.6-impl, maven-resolver-1.6-transport-file, maven-resolver-1.6-transport-http): New variables Change-Id: I293fdee8f4124c01c7260f6d10ba6c2ee56fe355 --- gnu/packages/maven.scm | 176 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 67b95a5f7b..564a49fced 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2277,6 +2277,182 @@ (define-public maven can be extended by plugins to utilise a number of other development tools for reporting or the build process."))) +(define maven-resolver-1.6-parent-pom + (package + (inherit maven-resolver-parent-pom) + (version "1.6.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/maven-resolver") + (commit (string-append "maven-resolver-" version)))) + (file-name (git-file-name "maven-resolver" version)) + (sha256 + (base32 + "0hbbbxj14qyq8pccyab96pjqq90jnjmid1pml9kx55c5smfpjn37")))) + (propagated-inputs + (modify-inputs (package-propagated-inputs maven-resolver-parent-pom) + (replace "maven-parent-pom" maven-parent-pom-34))))) + +(define-public maven-resolver-1.6-api + (package + (inherit maven-resolver-api) + (version (package-version maven-resolver-1.6-parent-pom)) + (source (package-source maven-resolver-1.6-parent-pom)) + (propagated-inputs + (modify-inputs (package-propagated-inputs maven-resolver-api) + (replace "maven-resolver-parent-pom" maven-resolver-1.6-parent-pom))))) + +(define-public maven-resolver-1.6-spi + (package + (inherit maven-resolver-spi) + (version (package-version maven-resolver-1.6-parent-pom)) + (source (package-source maven-resolver-1.6-parent-pom)) + (propagated-inputs + (modify-inputs (package-propagated-inputs maven-resolver-spi) + (replace "maven-resolver-api" maven-resolver-1.6-api))))) + +(define-public maven-resolver-1.6-test-util + (package + (inherit maven-resolver-test-util) + (version (package-version maven-resolver-1.6-parent-pom)) + (source (package-source maven-resolver-1.6-parent-pom)) + (inputs + (modify-inputs (package-inputs maven-resolver-test-util) + (replace "maven-resolver-api" maven-resolver-1.6-api) + (replace "maven-resolver-spi" maven-resolver-1.6-spi))))) + +(define-public maven-resolver-1.6-util + (package + (inherit maven-resolver-util) + (version (package-version maven-resolver-1.6-parent-pom)) + (source (package-source maven-resolver-1.6-parent-pom)) + (propagated-inputs + (modify-inputs (package-propagated-inputs maven-resolver-util) + (replace "maven-resolver-api" maven-resolver-1.6-api))) + (native-inputs + (modify-inputs (package-native-inputs maven-resolver-util) + (replace "java-hamcrest-all" java-hamcrest-core) + (replace "maven-resolver-test-util" maven-resolver-1.6-test-util))))) + +(define-public maven-resolver-1.6-connector-basic + (package + (inherit maven-resolver-connector-basic) + (version (package-version maven-resolver-1.6-parent-pom)) + (source (package-source maven-resolver-1.6-parent-pom)) + (propagated-inputs + (modify-inputs (package-propagated-inputs maven-resolver-connector-basic) + (replace "maven-resolver-api" maven-resolver-1.6-api) + (replace "maven-resolver-spi" maven-resolver-1.6-spi) + (replace "maven-resolver-util" maven-resolver-1.6-util))) + (native-inputs + (modify-inputs (package-native-inputs maven-resolver-connector-basic) + (replace "maven-resolver-test-util" maven-resolver-1.6-test-util))))) + +(define-public maven-resolver-1.6-impl + (package + (inherit maven-resolver-impl) + (version (package-version maven-resolver-1.6-parent-pom)) + (source (package-source maven-resolver-1.6-parent-pom)) + (arguments + `(#:jar-name "maven-resolver-impl.jar" + #:source-dir "maven-resolver-impl/src/main/java" + #:test-dir "maven-resolver-impl/src/test" + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-sisu + (lambda _ + (mkdir-p "build/classes/META-INF/sisu") + (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" + (lambda _ + (display + (string-append + ;; Build this list by looking for files containing "@Named" + "org.eclipse.aether.internal.impl.DefaultArtifactResolver\n" + "org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector\n" + "org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider\n" + "org.eclipse.aether.internal.impl.DefaultDeployer\n" + "org.eclipse.aether.internal.impl.DefaultFileProcessor\n" + "org.eclipse.aether.internal.impl.DefaultInstaller\n" + "org.eclipse.aether.internal.impl.DefaultLocalRepositoryProvider\n" + "org.eclipse.aether.internal.impl.DefaultMetadataResolver\n" + "org.eclipse.aether.internal.impl.DefaultOfflineController\n" + "org.eclipse.aether.internal.impl.DefaultRemoteRepositoryManager\n" + "org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider\n" + "org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher\n" + "org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider\n" + "org.eclipse.aether.internal.impl.DefaultRepositorySystem\n" + "org.eclipse.aether.internal.impl.DefaultSyncContextFactory\n" + "org.eclipse.aether.internal.impl.DefaultTransporterProvider\n" + "org.eclipse.aether.internal.impl.DefaultUpdateCheckManager\n" + "org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer\n" + "org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory\n" + "org.eclipse.aether.internal.impl.LoggerFactoryProvider\n" + "org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory\n" + "org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory\n" + "org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory")))) + #t)) + (replace 'install + (install-from-pom "maven-resolver-impl/pom.xml"))))) + (propagated-inputs + (modify-inputs (package-propagated-inputs maven-resolver-impl) + (delete "maven-resolver-named-locks") + (replace "maven-resolver-api" maven-resolver-1.6-api) + (replace "maven-resolver-spi" maven-resolver-1.6-spi) + (replace "maven-resolver-util" maven-resolver-1.6-util) + (replace "maven-resolver-parent-pom" maven-resolver-1.6-parent-pom))) + (native-inputs + (modify-inputs (package-native-inputs maven-resolver-impl) + (delete "java-hamcrest-all") + (delete "java-mockito-1") + (replace "maven-resolver-test-util" maven-resolver-1.6-test-util))))) + +(define-public maven-resolver-1.6-transport-file + (package + (inherit maven-resolver-transport-file) + (version (package-version maven-resolver-1.6-parent-pom)) + (source (package-source maven-resolver-1.6-parent-pom)) + (inputs + (modify-inputs (package-inputs maven-resolver-transport-file) + (delete "maven-wagon-provider-api") + (replace "maven-resolver-api" maven-resolver-1.6-api) + (replace "maven-resolver-spi" maven-resolver-1.6-spi) + (replace "maven-resolver-util" maven-resolver-1.6-util))) + (native-inputs + (modify-inputs (package-native-inputs maven-resolver-transport-file) + (replace "maven-resolver-test-util" maven-resolver-1.6-test-util))))) + +(define-public maven-resolver-1.6-transport-http + (package + (inherit maven-resolver-transport-http) + (version (package-version maven-resolver-1.6-parent-pom)) + (source (package-source maven-resolver-1.6-parent-pom)) + (arguments + `(#:jar-name "maven-resolver-transport-http.jar" + #:source-dir "maven-resolver-transport-http/src/main/java" + #:test-dir "maven-resolver-transport-http/src/test" + #:jdk ,icedtea-8 + ;; Tests all fail because + ;; org.eclipse.aether.transport.http.SslSocketFactory is not available. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-sisu + (lambda _ + (mkdir-p "build/classes/META-INF/sisu") + (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named" + (lambda _ + (display "org.eclipse.aether.transport.http.HttpTransporterFactory\n")))))))) + (inputs + (modify-inputs (package-inputs maven-resolver-transport-http) + (delete "maven-wagon-provider-api") + (replace "maven-resolver-api" maven-resolver-1.6-api) + (replace "maven-resolver-spi" maven-resolver-1.6-spi) + (replace "maven-resolver-util" maven-resolver-1.6-util))) + (native-inputs + (modify-inputs (package-native-inputs maven-resolver-transport-http) + (replace "maven-resolver-test-util" maven-resolver-1.6-test-util))))) + ;; Many plugins require maven 3.0 as a dependency. (define maven-3.0-pom (package -- 2.43.0