From patchwork Sat Feb 25 20:30:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47341 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D7D9916BBC; Sat, 25 Feb 2023 20:32:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4FCC41684B for ; Sat, 25 Feb 2023 20:32:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DC-0005pl-UG; Sat, 25 Feb 2023 15:32:06 -0500 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 1pW1DB-0005ni-Jx for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1DB-000177-Bh for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1DB-0004Uh-7i for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 10/18] gnu: maven-resolver-api: Update to 1.9.4. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735709117124 (code B ref 61794); Sat, 25 Feb 2023 20:32:05 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:31 +0000 Received: from localhost ([127.0.0.1]:41674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1Cc-0004S6-PP for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:31 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CA-0004OQ-47 for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:04 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2773c19d for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:56 +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=lQ1D7MZ//G97AGvo3bSxHMvJi 1sAM8VoE0PNO4QLxlY=; b=jcY7qeqeDMnkf9hYOgMOiKYIT5kjdF85oja0fjmbI VE3pv/+UMnLsZQ5VtzYPfwuY9R3URjob5yjiCVJJNzfsftmqZa/2EaOXn9Jqj+f4 D+WAM1bHrHajA/TwBUz3p6El3c5Wdd0MyzAjg+GYJ/5BfkgEugn5cyK+BiO2WAYn G+ogiasB7ANrPTKqCLsYsjyTQwKnicxsFy9+LniKNjQt9VrSjBM4PVtxf2dVegvf a9utwNhDCbPjfwUpNWkU53fHloS7Fh0T3E9oEPoQjSDW9Lo6pxCpyJpOeuzu5uLa w+BPq/UloNGXcEPyQ0fPLOs+Y6DuzrALtdyxveHzjiJ0A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5bf5844c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:55 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:34 +0100 Message-Id: <215f81ad1010c1c68d44193439557158d1b9ca08.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven.scm (maven-resolver-api): Update to 1.9.4. (maven-resolver-util)[native-inputs]: Update test dependencies. (maven-resolver-named-lock): New variable. (maven-resolver-impl, maven-resolver-transport-wagon) (maven-resolver-transport-http): Update sisu. --- gnu/packages/maven.scm | 167 ++++++++++++++++++++++------------------- 1 file changed, 91 insertions(+), 76 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 3ab8b6dffc..f96337a17d 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -40,7 +40,7 @@ (define-module (gnu packages maven) (define-public maven-resolver-api (package (name "maven-resolver-api") - (version "1.6.3") + (version "1.9.4") (source (origin (method git-fetch) (uri (git-reference @@ -49,7 +49,7 @@ (define-public maven-resolver-api (file-name (git-file-name name version)) (sha256 (base32 - "0hbbbxj14qyq8pccyab96pjqq90jnjmid1pml9kx55c5smfpjn37")))) + "0s18vivvapmrk407syrc8ib2qpmp01i3k46h6gqp7961n1p9wzlq")))) (build-system ant-build-system) (arguments `(#:jar-name "maven-resolver-api.jar" @@ -90,7 +90,7 @@ (define maven-resolver-parent-pom #t)) (replace 'install (install-pom-file "pom.xml"))))) - (propagated-inputs '()))) + (propagated-inputs (list maven-parent-pom-37)))) (define-public maven-resolver-spi (package @@ -140,7 +140,7 @@ (define-public maven-resolver-util (propagated-inputs (list maven-resolver-api)) (native-inputs - (list java-junit java-hamcrest-core maven-resolver-test-util)) + (list java-junit java-hamcrest-all maven-resolver-test-util)) (synopsis "Utility classes for the maven repository system") (description "This package contains a collection of utility classes to ease usage of the repository system."))) @@ -174,6 +174,35 @@ (define-public maven-resolver-connector-basic (description "This package contains a repository connector implementation for repositories using URI-based layouts."))) +(define-public maven-resolver-named-locks + (package + (inherit maven-resolver-api) + (name "maven-resolver-named-locks") + (arguments + `(#:jar-name "maven-resolver-named-locks.jar" + #:source-dir "maven-resolver-named-locks/src/main/java" + #:test-dir "maven-resolver-named-locks/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 "org.eclipse.aether.named.providers.FileLockNamedLockFactory +org.eclipse.aether.named.providers.LocalReadWriteLockNamedLockFactory +org.eclipse.aether.named.providers.LocalSemaphoreNamedLockFactory +org.eclipse.aether.named.providers.NoopNamedLockFactory\n"))))) + (replace 'install + (install-from-pom "maven-resolver-named-locks/pom.xml"))))) + (propagated-inputs + (list java-slf4j-api)) + (native-inputs + (list java-javax-inject java-junit java-hamcrest-all)) + (synopsis "Maven artifact resolver named locks") + (description "This package contains a synchronization utility implementation +using named locks."))) + (define-public maven-resolver-impl (package (inherit maven-resolver-api) @@ -182,6 +211,7 @@ (define-public maven-resolver-impl `(#:jar-name "maven-resolver-impl.jar" #:source-dir "maven-resolver-impl/src/main/java" #:test-dir "maven-resolver-impl/src/test" + #:tests? #f; require more recent hamcrest #:phases (modify-phases %standard-phases (add-before 'build 'generate-sisu @@ -189,37 +219,60 @@ (define-public maven-resolver-impl (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)) + ;; Build this list by looking for files containing "@Named" + (display "org.eclipse.aether.internal.impl.DefaultArtifactResolver +org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider +org.eclipse.aether.internal.impl.DefaultDeployer +org.eclipse.aether.internal.impl.DefaultFileProcessor +org.eclipse.aether.internal.impl.DefaultInstaller +org.eclipse.aether.internal.impl.DefaultLocalPathComposer +org.eclipse.aether.internal.impl.DefaultLocalPathPrefixComposerFactory +org.eclipse.aether.internal.impl.DefaultLocalRepositoryProvider +org.eclipse.aether.internal.impl.DefaultMetadataResolver +org.eclipse.aether.internal.impl.DefaultOfflineController +org.eclipse.aether.internal.impl.DefaultRemoteRepositoryManager +org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider +org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher +org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider +org.eclipse.aether.internal.impl.DefaultRepositorySystem +org.eclipse.aether.internal.impl.DefaultRepositorySystemLifecycle +org.eclipse.aether.internal.impl.DefaultTrackingFileManager +org.eclipse.aether.internal.impl.DefaultTransporterProvider +org.eclipse.aether.internal.impl.DefaultUpdateCheckManager +org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer +org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory +org.eclipse.aether.internal.impl.LoggerFactoryProvider +org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory +org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory +org.eclipse.aether.internal.impl.checksum.DefaultChecksumAlgorithmFactorySelector +org.eclipse.aether.internal.impl.checksum.Md5ChecksumAlgorithmFactory +org.eclipse.aether.internal.impl.checksum.Sha1ChecksumAlgorithmFactory +org.eclipse.aether.internal.impl.checksum.Sha256ChecksumAlgorithmFactory +org.eclipse.aether.internal.impl.checksum.Sha512ChecksumAlgorithmFactory +org.eclipse.aether.internal.impl.checksum.SparseDirectoryTrustedChecksumsSource +org.eclipse.aether.internal.impl.checksum.SummaryFileTrustedChecksumsSource +org.eclipse.aether.internal.impl.checksum.TrustedToProvidedChecksumsSourceAdapter +org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector +org.eclipse.aether.internal.impl.collect.bf.BfDependencyCollector +org.eclipse.aether.internal.impl.collect.df.DfDependencyCollector +org.eclipse.aether.internal.impl.filter.DefaultRemoteRepositoryFilterManager +org.eclipse.aether.internal.impl.filter.GroupIdRemoteRepositoryFilterSource +org.eclipse.aether.internal.impl.filter.PrefixesRemoteRepositoryFilterSource +org.eclipse.aether.internal.impl.resolution.TrustedChecksumsArtifactResolverPostProcessor +org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory +org.eclipse.aether.internal.impl.synccontext.DefaultSyncContextFactory +org.eclipse.aether.internal.impl.synccontext.legacy.DefaultSyncContextFactory +org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapterFactoryImpl +org.eclipse.aether.internal.impl.synccontext.named.providers.DiscriminatingNameMapperProvider +org.eclipse.aether.internal.impl.synccontext.named.providers.FileGAVNameMapperProvider +org.eclipse.aether.internal.impl.synccontext.named.providers.FileHashingGAVNameMapperProvider +org.eclipse.aether.internal.impl.synccontext.named.providers.GAVNameMapperProvider +org.eclipse.aether.internal.impl.synccontext.named.providers.StaticNameMapperProvider\n"))))) (replace 'install (install-from-pom "maven-resolver-impl/pom.xml"))))) (propagated-inputs (list maven-resolver-api + maven-resolver-named-locks maven-resolver-spi maven-resolver-util java-commons-lang3 @@ -229,7 +282,7 @@ (define-public maven-resolver-impl java-slf4j-api maven-resolver-parent-pom)) (native-inputs - (list java-junit maven-resolver-test-util)))) + (list java-hamcrest-all java-junit java-mockito-1 maven-resolver-test-util)))) (define-public maven-resolver-transport-wagon (package @@ -247,49 +300,9 @@ (define-public maven-resolver-transport-wagon (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.wagon.WagonTransporterFactory\n"))) - #t)) - (add-before 'build 'generate-components.xml - (lambda _ - (mkdir-p "build/classes/META-INF/plexus") - (with-output-to-file "build/classes/META-INF/plexus/components.xml" - (lambda _ - (display - (string-append - " - - - - org.eclipse.aether.transport.wagon.WagonConfigurator - plexus - org.eclipse.aether.internal.transport.wagon.PlexusWagonConfigurator - - false - - - org.codehaus.plexus.PlexusContainer - - container - - - - - org.eclipse.aether.transport.wagon.WagonProvider - plexus - org.eclipse.aether.internal.transport.wagon.PlexusWagonProvider - - false - - - org.codehaus.plexus.PlexusContainer - - container - - - - -\n")))) - #t))))) + (display "org.eclipse.aether.internal.transport.wagon.PlexusWagonConfigurator +org.eclipse.aether.internal.transport.wagon.PlexusWagonProvider +org.eclipse.aether.transport.wagon.WagonTransporterFactory")))))))) (inputs `(("maven-resolver-api" ,maven-resolver-api) ("maven-resolver-spi" ,maven-resolver-spi) @@ -374,7 +387,9 @@ (define-public maven-resolver-transport-http (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")))))))) + (display "org.eclipse.aether.transport.http.HttpTransporterFactory +org.eclipse.aether.transport.http.Nexus2ChecksumExtractor +org.eclipse.aether.transport.http.XChecksumChecksumExtractor\n")))))))) (inputs (list java-eclipse-sisu-inject java-eclipse-sisu-plexus