From: Kristiyan Kanchev <skrechy@gmail.com>
To: 73432@debbugs.gnu.org
Cc: Kristiyan Kanchev <skrechy@gmail.com>,
Julien Lepiller <julien@lepiller.eu>
Subject: bug#73432: [PATCH 1/3] gnu: Add maven-resolver-1.6
Date: Tue, 15 Oct 2024 10:43:14 +0300 [thread overview]
Message-ID: <6e6837dc8e86e4e3b7bceccd834b1a488233639e.1728910014.git.skrechy@gmail.com> (raw)
In-Reply-To: <cover.1728910014.git.skrechy@gmail.com>
* 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
next prev parent reply other threads:[~2024-10-15 8:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-23 2:21 bug#73432: clojure package is broken Andreas Bauer
2024-09-26 13:50 ` Kristiyan Kanchev
2024-10-03 14:00 ` Ludovic Courtès
2024-10-03 14:41 ` Roman Scherer
2024-10-03 14:48 ` Roman Scherer
2024-10-04 8:33 ` Kristiyan Kanchev
2024-10-04 10:51 ` Roman Scherer
2024-10-06 12:57 ` Rostislav Svoboda
2024-10-09 12:15 ` Kristiyan Kanchev
2024-10-09 12:18 ` Roman Scherer
2024-10-15 7:35 ` bug#73432: [PATCH 0/3] Fix clojure-tools-deps: wrong resolution of deps Kristiyan Kanchev
2024-10-15 7:43 ` Kristiyan Kanchev [this message]
2024-10-15 7:43 ` bug#73432: [PATCH 2/3] gnu: Add maven-3.8-core Kristiyan Kanchev
2024-10-15 7:43 ` bug#73432: [PATCH 3/3] gnu: clojure-tools-deps: Fix wrong resolution of clojure deps Kristiyan Kanchev
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6e6837dc8e86e4e3b7bceccd834b1a488233639e.1728910014.git.skrechy@gmail.com \
--to=skrechy@gmail.com \
--cc=73432@debbugs.gnu.org \
--cc=julien@lepiller.eu \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.