GNU bug report logs -
#31774
[PATCH] Add maven
Previous Next
Reported by: Julien Lepiller <julien <at> lepiller.eu>
Date: Sun, 10 Jun 2018 11:02:02 UTC
Severity: normal
Tags: patch
Done: Julien Lepiller <julien <at> lepiller.eu>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 31774 in the body.
You can then email your comments to 31774 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:02:03 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Julien Lepiller <julien <at> lepiller.eu>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Sun, 10 Jun 2018 11:02:03 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
Finally, the last patch series for maven!
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/web.scm (java-eclipse-jetty-xml): New variable.
---
gnu/packages/web.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d11601120..9b6dbb3cd 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6182,6 +6182,27 @@ container.")))
("server" ,java-eclipse-jetty-server-9.2)
,@(package-inputs java-eclipse-jetty-util-9.2)))))
+(define-public java-eclipse-jetty-xml
+ (package
+ (inherit java-eclipse-jetty-util)
+ (name "java-eclipse-jetty-xml")
+ (arguments
+ `(#:jar-name "eclipse-jetty-xml.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ #:tests? #f; most tests require network
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "jetty-xml")
+ #t)))))
+ (inputs
+ `(("java-eclipse-jetty-util" ,java-eclipse-jetty-util)))
+ (native-inputs
+ `(("java-eclipse-jetty-io" ,java-eclipse-jetty-io)
+ ,@(package-native-inputs java-eclipse-jetty-util)))))
+
(define-public java-jsoup
(package
(name "java-jsoup")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/web.scm (java-eclipse-jetty-security-9.2)[arguments]:
Ignore one failing test.
---
gnu/packages/web.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 9b6dbb3cd..dc20127b0 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6117,6 +6117,10 @@ infrastructure")))
(inherit java-eclipse-jetty-security)
(version (package-version java-eclipse-jetty-util-9.2))
(source (package-source java-eclipse-jetty-util-9.2))
+ (arguments
+ `(#:test-exclude
+ (list "**/ConstraintTest.*")
+ ,@(package-arguments java-eclipse-jetty-security)))
(inputs
`(("util" ,java-eclipse-jetty-util-9.2)
("http" ,java-eclipse-jetty-http-9.2)
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:02 GMT)
Full text and
rfc822 format available.
Message #14 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/web.scm (java-eclipse-jetty-xml-9.2): New variable.
---
gnu/packages/web.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index dc20127b0..9780775d4 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6207,6 +6207,29 @@ container.")))
`(("java-eclipse-jetty-io" ,java-eclipse-jetty-io)
,@(package-native-inputs java-eclipse-jetty-util)))))
+(define-public java-eclipse-jetty-xml-9.2
+ (package
+ (inherit java-eclipse-jetty-xml)
+ (version (package-version java-eclipse-jetty-util-9.2))
+ (source (package-source java-eclipse-jetty-util-9.2))
+ (arguments
+ `(#:jar-name "eclipse-jetty-xml.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ #:tests? #f; most tests require network
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "jetty-xml")
+ #t)))))
+ (inputs
+ `(("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
+ ,@(package-inputs java-eclipse-jetty-util-9.2)))
+ (native-inputs
+ `(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
+ ,@(package-native-inputs java-eclipse-jetty-util-9.2)))))
+
(define-public java-jsoup
(package
(name "java-jsoup")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:03 GMT)
Full text and
rfc822 format available.
Message #17 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/web.scm (java-eclipse-jetty-webapp): New variable.
---
gnu/packages/web.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 9780775d4..174ec28d5 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6230,6 +6230,33 @@ container.")))
`(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
,@(package-native-inputs java-eclipse-jetty-util-9.2)))))
+(define-public java-eclipse-jetty-webapp
+ (package
+ (inherit java-eclipse-jetty-util)
+ (name "java-eclipse-jetty-webapp")
+ (arguments
+ `(#:jar-name "eclipse-jetty-webapp.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ #:test-exclude (list "**/WebAppContextTest.java")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "jetty-webapp")
+ #t)))))
+ (inputs
+ `(("java-eclipse-jetty-util" ,java-eclipse-jetty-util)
+ ("java-eclipse-jetty-http" ,java-eclipse-jetty-http)
+ ("java-eclipse-jetty-server" ,java-eclipse-jetty-server)
+ ("java-eclipse-jetty-servlet" ,java-eclipse-jetty-servlet)
+ ("java-eclipse-jetty-security" ,java-eclipse-jetty-security)
+ ("java-eclipse-jetty-xml" ,java-eclipse-jetty-xml)
+ ("java-tomcat" ,java-tomcat)))
+ (native-inputs
+ `(("java-eclipse-jetty-io" ,java-eclipse-jetty-io)
+ ,@(package-native-inputs java-eclipse-jetty-util)))))
+
(define-public java-jsoup
(package
(name "java-jsoup")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:03 GMT)
Full text and
rfc822 format available.
Message #20 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/web.scm (java-eclipse-jetty-webapp-9.2): New variable.
---
gnu/packages/web.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 174ec28d5..d4be02d4b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6257,6 +6257,35 @@ container.")))
`(("java-eclipse-jetty-io" ,java-eclipse-jetty-io)
,@(package-native-inputs java-eclipse-jetty-util)))))
+(define-public java-eclipse-jetty-webapp-9.2
+ (package
+ (inherit java-eclipse-jetty-webapp)
+ (version (package-version java-eclipse-jetty-util-9.2))
+ (source (package-source java-eclipse-jetty-util-9.2))
+ (arguments
+ `(#:jar-name "eclipse-jetty-webapp.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ #:test-exclude (list "**/WebAppContextTest.java")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "jetty-webapp")
+ #t)))))
+ (inputs
+ `(("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
+ ("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2)
+ ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
+ ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
+ ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
+ ("java-eclipse-jetty-xml9.2" ,java-eclipse-jetty-xml-9.2)
+ ("java-tomcat" ,java-tomcat)
+ ,@(package-inputs java-eclipse-jetty-util-9.2)))
+ (native-inputs
+ `(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
+ ,@(package-native-inputs java-eclipse-jetty-util-9.2)))))
+
(define-public java-jsoup
(package
(name "java-jsoup")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:04 GMT)
Full text and
rfc822 format available.
Message #23 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/java.scm (java-plexus-cli): New variable.
---
gnu/packages/java.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 678cbee18..a51836255 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3262,6 +3262,39 @@ Compiler component.")))
This component decrypts a string passed to it.")
(license license:asl2.0)))
+(define-public java-plexus-cli
+ (package
+ (name "java-plexus-cli")
+ (version "1.7")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sonatype/plexus-cli")
+ (commit "a776afa6bca84e5107bedb69440329cdb24ed645")))
+ (file-name (string-append name "-" version))
+ (sha256
+ (base32
+ "0xjrlay605rypv3zd7y24vlwf0039bil3n2cqw54r1ddpysq46vx"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "plexus-cli.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ #:test-dir "src/test"))
+ (inputs
+ `(("java-commons-cli" ,java-commons-cli)
+ ("java-plexus-container-default" ,java-plexus-container-default)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)))
+ (native-inputs
+ `(("java-plexus-utils" ,java-plexus-utils)
+ ("java-junit" ,java-junit)
+ ("java-guava" ,java-guava)))
+ (home-page "https://codehaus-plexus.github.io/plexus-cli")
+ (synopsis "CLI building library")
+ (description "This package is a library to help creating CLI around
+Plexus components.")
+ (license license:asl2.0)))
+
(define-public java-sisu-build-api
(package
(name "java-sisu-build-api")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:04 GMT)
Full text and
rfc822 format available.
Message #26 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/java.scm (java-qdox): New variable.
---
gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a51836255..a20d122d0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -10186,3 +10186,32 @@ This module can be assimilated to a significantly improved version of log4j.
Moreover, @code{logback-classic} natively implements the slf4j API so that you
can readily switch back and forth between logback and other logging frameworks
such as log4j or @code{java.util.logging} (JUL).")))
+
+(define-public java-qdox
+ (package
+ (name "java-qdox")
+ ; Newer version exists, but this version is required by java-plexus-component-metadata
+ (version "2.0-M2")
+ (source (origin
+ (method url-fetch)
+ ;; 2.0-M4, -M5 at https://github.com/paul-hammant/qdox
+ ;; Older releases at https://github.com/codehaus/qdox/
+ ;; FIXME: The release at maven is pre-generated. The release at
+ ;; github requires jflex.
+ (uri (string-append "http://central.maven.org/maven2/"
+ "com/thoughtworks/qdox/qdox/" version
+ "/qdox-" version "-sources.jar"))
+ (sha256
+ (base32
+ "10xxrcaicq6axszcr2jpygisa4ch4sinyx5q7kqqxv4lknrmxp5x"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "qdox.jar"
+ #:tests? #f)); no tests
+ (home-page "http://qdox.codehaus.org/")
+ (synopsis "Parse definitions from Java source files")
+ (description "QDox is a high speed, small footprint parser for extracting
+class/interface/method definitions from source files complete with JavaDoc
+@code{@@tags}. It is designed to be used by active code generators or
+documentation tools.")
+ (license license:asl2.0)))
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:04 GMT)
Full text and
rfc822 format available.
Message #29 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-plugin-api): New variable.
---
gnu/packages/maven.scm | 47 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 473847c04..d22883ef9 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -562,3 +562,50 @@ so really just plain objects.")))
("java-guava" ,java-guava)
("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
("java-javax-inject" ,java-javax-inject)))))
+
+(define-public maven-plugin-api
+ (package
+ (inherit maven-artifact)
+ (name "maven-plugin-api")
+ (arguments
+ `(#:jar-name "maven-plugin-api.jar"
+ #:source-dir "maven-plugin-api/src/main/java"
+ #:jdk ,icedtea-8
+ #:test-dir "maven-plugin-api/src/test"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'generate-models
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (modello-single-mode file version mode)
+ (invoke "java" "org.codehaus.modello.ModelloCli"
+ file mode "maven-plugin-api/src/main/java" version
+ "false" "true"))
+ (let ((file "maven-plugin-api/src/main/mdo/lifecycle.mdo"))
+ (modello-single-mode file "1.0.0" "java")
+ (modello-single-mode file "1.0.0" "xpp3-reader")
+ (modello-single-mode file "1.0.0" "xpp3-writer"))
+ #t)))))
+ (inputs
+ `(("maven-artifact" ,maven-artifact)
+ ("maven-model" ,maven-model)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
+ ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("guice" ,java-guice)
+ ("java-cglib" ,java-cglib)
+ ("java-asm" ,java-asm)
+ ("sisu-inject" ,java-eclipse-sisu-inject)
+ ("javax-inject" ,java-javax-inject)
+ ("utils" ,java-plexus-utils)))
+ (native-inputs
+ `(("modello" ,java-modello-core)
+ ;; for modello:
+ ("classworlds" ,java-plexus-classworlds)
+ ("guava" ,java-guava)
+ ("xbean" ,java-geronimo-xbean-reflect)
+ ("build-api" ,java-sisu-build-api)
+ ;; modello plugins:
+ ("java" ,java-modello-plugins-java)
+ ("xml" ,java-modello-plugins-xml)
+ ("xpp3" ,java-modello-plugins-xpp3)
+ ;; for tests
+ ("java-junit" ,java-junit)))))
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:05 GMT)
Full text and
rfc822 format available.
Message #32 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-plugin-annotations): New variable.
---
gnu/packages/maven.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 76884301d..937f42353 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -230,6 +230,30 @@ plexus-utils in Maven. It is not a 100% API compatible replacement but a
replacement with improvements.")
(license license:asl2.0)))
+(define-public maven-plugin-annotations
+ (package
+ (name "maven-plugin-annotations")
+ (version "3.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://archive.apache.org/dist/maven/"
+ "plugin-tools/maven-plugin-tools-" version
+ "-source-release.zip"))
+ (sha256 (base32 "1ryqhs62j5pas93brhf5dsnvp99hxbvssf681yj5rk3r9h24hqm2"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "maven-plugin-annotations.jar"
+ #:source-dir "maven-plugin-annotations/src/main/java"
+ #:tests? #f))
+ (inputs
+ `(("maven-artifact" ,maven-artifact)))
+ (native-inputs
+ `(("unzip" ,unzip)))
+ (home-page "https://maven.apache.org/plugin-tools/maven-plugin-annotations/")
+ (synopsis "Java 5 annotations to use in Mojos")
+ (description "This package contains Java 5 annotations for use in Mojos.")
+ (license license:asl2.0)))
+
(define-public maven-artifact
(package
(name "maven-artifact")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:05 GMT)
Full text and
rfc822 format available.
Message #35 received at 31774 <at> debbugs.gnu.org (full text, mbox):
---
gnu/packages/maven.scm | 79 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index d22883ef9..76884301d 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -609,3 +609,82 @@ so really just plain objects.")))
("xpp3" ,java-modello-plugins-xpp3)
;; for tests
("java-junit" ,java-junit)))))
+
+(define maven-core-bootstrap
+ (package
+ (inherit maven-artifact)
+ (name "maven-core")
+ (arguments
+ `(#:jar-name "maven-core.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ ;; Tests need maven-compat, which requires maven-core
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ ;; Required for generating components.xml in maven-core
+ (chdir "maven-core")
+ #t))
+ (add-before 'build 'copy-resources
+ (lambda _
+ (mkdir-p "build/classes/")
+ (copy-recursively "src/main/resources" "build/classes")
+ #t))
+ (add-before 'build 'generate-sisu-named
+ (lambda _
+ (mkdir-p "build/classes/META-INF/sisu")
+ (chmod "../sisu.sh" #o755)
+ (invoke "../sisu.sh" "src/main/java"
+ "build/classes/META-INF/sisu/javax.inject.Named")
+ #t))
+ (add-before 'build 'generate-models
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (modello-single-mode file version mode)
+ (invoke "java" "org.codehaus.modello.ModelloCli"
+ file mode "src/main/java" version
+ "false" "true"))
+ (let ((file "src/main/mdo/toolchains.mdo"))
+ (modello-single-mode file "1.1.0" "java")
+ (modello-single-mode file "1.1.0" "xpp3-reader")
+ (modello-single-mode file "1.1.0" "xpp3-writer"))
+ #t)))))
+ (inputs
+ `(("maven-artifact" ,maven-artifact)
+ ("maven-resolver-provider" ,maven-resolver-provider)
+ ("maven-builder-support" ,maven-builder-support)
+ ("maven-model" ,maven-model)
+ ("maven-model-builder" ,maven-model-builder)
+ ("maven-settings" ,maven-settings)
+ ("maven-settings-builder" ,maven-settings-builder)
+ ("maven-plugin-api" ,maven-plugin-api)
+ ("maven-repository-metadata" ,maven-repository-metadata)
+ ("maven-shared-utils" ,maven-shared-utils)
+ ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-plexus-utils" ,java-plexus-utils)
+ ("java-commons-lang3" ,java-commons-lang3)
+ ("java-guava" ,java-guava)
+ ("java-guice" ,java-guice)
+ ("maven-resolver-api" ,maven-resolver-api)
+ ("maven-resolver-spi" ,maven-resolver-spi)
+ ("maven-resolver-util" ,maven-resolver-util)
+ ("maven-resolver-impl" ,maven-resolver-impl)
+ ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
+ ("java-javax-inject" ,java-javax-inject)
+ ("java-plexus-classworld" ,java-plexus-classworlds)))
+ (native-inputs
+ `(("java-modello-core" ,java-modello-core)
+ ("java-cglib" ,java-cglib)
+ ("java-asm" ,java-asm)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
+ ("java-sisu-build-api" ,java-sisu-build-api)
+ ("java-modello-plugins-java" ,java-modello-plugins-java)
+ ("java-modello-plugins-xml" ,java-modello-plugins-xml)
+ ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)
+ ;; tests
+ ("java-junit" ,java-junit)
+ ("java-mockito-1" ,java-mockito-1)
+ ("java-commons-jxpath" ,java-commons-jxpath)))))
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:06 GMT)
Full text and
rfc822 format available.
Message #38 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (java-plexus-component-metadata): New variable.
---
gnu/packages/maven.scm | 42 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 937f42353..dff5bd3e4 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -24,7 +24,47 @@
#:use-module (guix build-system ant)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
- #:use-module (gnu packages java))
+ #:use-module (gnu packages java)
+ #:use-module (gnu packages xml))
+
+(define-public java-plexus-component-metadata
+ (package
+ (inherit java-plexus-container-default)
+ (name "java-plexus-component-metadata")
+ (arguments
+ `(#:jar-name "plexus-component-metadata.jar"
+ #:source-dir "src/main/java"
+ #:test-dir "src/test"
+ #:jdk ,icedtea-8
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "plexus-component-metadata")
+ #t))
+ (add-before 'build 'copy-resources
+ (lambda _
+ (copy-recursively "src/main/resources"
+ "build/classes/")
+ #t)))))
+ (inputs
+ `(("java-plexus-container-default" ,java-plexus-container-default)
+ ("java-plexu-component-annotations" ,java-plexus-component-annotations)
+ ("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-cli" ,java-plexus-cli)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("maven-plugin-api" ,maven-plugin-api)
+ ("maven-plugin-annotations" ,maven-plugin-annotations)
+ ("maven-core-bootstrap" ,maven-core-bootstrap)
+ ("maven-model" ,maven-model)
+ ("java-commons-cli" ,java-commons-cli)
+ ("java-qdox" ,java-qdox)
+ ("java-jdom2" ,java-jdom2)
+ ("java-asm" ,java-asm)))
+ (native-inputs
+ `(("java-junit" ,java-junit)
+ ("java-guava" ,java-guava)
+ ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)))))
(define-public maven-resolver-api
(package
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:06 GMT)
Full text and
rfc822 format available.
Message #41 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-core): New variable.
---
gnu/packages/maven.scm | 61 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index dff5bd3e4..2fb98295e 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -752,3 +752,64 @@ so really just plain objects.")))
("java-junit" ,java-junit)
("java-mockito-1" ,java-mockito-1)
("java-commons-jxpath" ,java-commons-jxpath)))))
+
+(define-public maven-core
+ (package
+ (inherit maven-core-bootstrap)
+ (arguments
+ (substitute-keyword-arguments (package-arguments maven-core-bootstrap)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-before 'build 'modify-metainf
+ (lambda _
+ (substitute* "build.xml"
+ (("message=\"\"") "message=\"Implementation-Version: 3.5.3\n\""))
+ #t))
+ (add-before 'build 'add-maven-files
+ (lambda _
+ (mkdir-p "build/classes/META-INF/maven/org.apache.maven/maven-core")
+ (copy-file "pom.xml"
+ "build/classes/META-INF/maven/org.apache.maven/maven-core/pom.xml")
+ (with-output-to-file "build/classes/META-INF/maven/org.apache.maven/maven-core/pom.properties"
+ (lambda _
+ (format #t "version=~a~%
+groupId=org.apache.maven~%
+artifactId=maven-core" ,(package-version maven-core-bootstrap))))
+ #t))
+ (add-after 'build 'generate-metadata
+ (lambda _
+ (delete-file "build/classes/META-INF/plexus/components.xml")
+ (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes")
+ "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
+ "--source" "build/classes/META-INF/plexus"
+ "--output" "build/classes/META-INF/plexus/components.t.xml"
+ "--classes" "build/classes"
+ "--descriptors" "build/classes")
+ ;; Now we merge all other components from hand-written xml
+ ;; FIXME: This should be taken care of by plexus-component-metadata directly
+ (invoke "sh" "-c"
+ (string-append
+ "(cat build/classes/META-INF/plexus/components.t.xml |"
+ "sed -e 's|</component-set>||' -e 's|</components>||' ; "
+ "cat src/main/resources/META-INF/plexus/artifact-handlers.xml |"
+ " sed -e 's|<?xml.*||' -e 's|<component-set>||' -e 's|<components>||'"
+ " -e 's|</component-set>||' -e 's|</components>||'; "
+ "cat src/main/resources/META-INF/plexus/components.xml |"
+ " sed -e 's|<?xml.*||' -e 's|<component-set>||' -e 's|<components>||'"
+ " -e 's|</component-set>||' -e 's|</components>||'; "
+ "cat src/main/resources/META-INF/plexus/default-bindings.xml |"
+ " sed -e 's|<?xml.*||' -e 's|<component-set>||' -e 's|<components>||' )>"
+ "build/classes/META-INF/plexus/components.xml"))
+ #t))
+ (add-after 'generate-metadata 'rebuild
+ (lambda _
+ (invoke "ant" "jar")
+ #t))))))
+ (native-inputs
+ `(("java-plexus-component-metadata" ,java-plexus-component-metadata)
+ ("java-commons-cli" ,java-commons-cli)
+ ("java-plexus-cli" ,java-plexus-cli)
+ ("java-jdom2" ,java-jdom2)
+ ("java-qdox" ,java-qdox)
+ ("maven-core-boot" ,maven-core-bootstrap)
+ ,@(package-native-inputs maven-core-bootstrap)))))
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:07 GMT)
Full text and
rfc822 format available.
Message #44 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-embedder): New variable.
---
gnu/packages/maven.scm | 90 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 90 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 2fb98295e..0d03da3dd 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -813,3 +813,93 @@ artifactId=maven-core" ,(package-version maven-core-bootstrap))))
("java-qdox" ,java-qdox)
("maven-core-boot" ,maven-core-bootstrap)
,@(package-native-inputs maven-core-bootstrap)))))
+
+(define-public maven-embedder
+ (package
+ (inherit maven-artifact)
+ (name "maven-embedder")
+ (arguments
+ `(#:jar-name "maven-embedder.jar"
+ #:source-dir "maven-embedder/src/main/java"
+ #:test-dir "maven-embedder/src/test"
+ #:test-exclude (list "**/MavenCliTest.java")
+ #:jdk ,icedtea-8
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'generate-sisu-named
+ (lambda _
+ (mkdir-p "build/classes/META-INF/sisu")
+ (chmod "sisu.sh" #o755)
+ (invoke "./sisu.sh" "maven-embedder/src/main/java"
+ "build/classes/META-INF/sisu/javax.inject.Named")
+ #t))
+ (add-before 'build 'generate-models
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (modello-single-mode file version mode)
+ (invoke "java" "org.codehaus.modello.ModelloCli"
+ file mode "maven-embedder/src/main/java" version
+ "false" "true"))
+ (let ((file "maven-embedder/src/main/mdo/core-extensions.mdo"))
+ (modello-single-mode file "1.0.0" "java")
+ (modello-single-mode file "1.0.0" "xpp3-reader")
+ (modello-single-mode file "1.0.0" "xpp3-writer"))
+ #t))
+ (add-before 'check 'fix-test-paths
+ (lambda _
+ (substitute* "maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java"
+ (("target/test-classes") "build/test-classes"))
+ #t))
+ (add-before 'check 'fix-compilation
+ (lambda _
+ ;; Tests are in the java/ subdir. Other subdirectories contain
+ ;; additional test plugins, with duplicate classes, so we can't
+ ;; compile them. Also, they are meant to be built with maven, to
+ ;; test its build process.
+ (substitute* "build.xml"
+ (("srcdir=\"maven-embedder/src/test\"")
+ "srcdir=\"maven-embedder/src/test/java\""))
+ #t)))))
+ (inputs
+ `(("maven-core" ,maven-core)
+ ("maven-artifact" ,maven-artifact)
+ ("maven-plugin-api" ,maven-plugin-api)
+ ("maven-builder-support" ,maven-builder-support)
+ ("maven-model" ,maven-model)
+ ("maven-model-builder" ,maven-model-builder)
+ ("maven-settings" ,maven-settings)
+ ("maven-settings-builder" ,maven-settings-builder)
+ ("maven-shared-utils" ,maven-shared-utils)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("java-plexus-util" ,java-plexus-utils)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
+ ("java-plexus-cipher" ,java-plexus-cipher)
+ ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher)
+ ("maven-resolevr-util" ,maven-resolver-util)
+ ("maven-resolevr-api" ,maven-resolver-api)
+ ("java-logback-core" ,java-logback-core)
+ ("java-logback-classic" ,java-logback-classic)
+ ("java-commons-cli" ,java-commons-cli)
+ ("java-commons-io" ,java-commons-io)
+ ("java-commons-lang3" ,java-commons-lang3)
+ ("java-guava" ,java-guava)
+ ("java-guice" ,java-guice)
+ ("java-javax-inject" ,java-javax-inject)
+ ("java-slf4j-api" ,java-slf4j-api)
+ ("java-slf4j-simple" ,java-slf4j-simple)))
+ (native-inputs
+ `(("java-modello-core" ,java-modello-core)
+ ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
+ ("java-sisu-build-api" ,java-sisu-build-api)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
+ ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
+ ("java-cglib" ,java-cglib)
+ ("java-asm" ,java-asm)
+ ("java-modello-plugins-java" ,java-modello-plugins-java)
+ ("java-modello-plugins-xml" ,java-modello-plugins-xml)
+ ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)
+ ;; tests
+ ("java-junit" ,java-junit)
+ ("java-objenesis" ,java-objenesis)
+ ("java-mockito-1" ,java-mockito-1)
+ ("java-hamcrest-core" ,java-hamcrest-core)))))
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:07 GMT)
Full text and
rfc822 format available.
Message #47 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-wagon-provider-api): New variable.
---
gnu/packages/maven.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 0d03da3dd..13bc6ff57 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -294,6 +294,32 @@ replacement with improvements.")
(description "This package contains Java 5 annotations for use in Mojos.")
(license license:asl2.0)))
+(define-public maven-wagon-provider-api
+ (package
+ (name "maven-wagon-provider-api")
+ (version "3.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://archive.apache.org/dist/maven/wagon/"
+ "wagon-" version "-source-release.zip"))
+ (sha256 (base32 "1qb0q4m7vmf290xp3fnfdi3pwl3hkskia5g3z2v82q1ch3y2knqv"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "maven-wagon-provider-api.jar"
+ #:source-dir "wagon-provider-api/src/main/java"
+ #:test-dir "wagon-provider-api/src/test"))
+ (inputs
+ `(("java-plexus-utils" ,java-plexus-utils)))
+ (native-inputs
+ `(("unzip" ,unzip)
+ ("java-junit" ,java-junit)
+ ("java-easymock" ,java-easymock)))
+ (home-page "https://maven.apache.org/wagon")
+ (synopsis "Transport abstraction for Maven")
+ (description "Maven Wagon is a transport abstraction that is used in Maven's
+artifact and repository handling code.")
+ (license license:asl2.0)))
+
(define-public maven-artifact
(package
(name "maven-artifact")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:07 GMT)
Full text and
rfc822 format available.
Message #50 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-wagon-provider-test): New variable.
---
gnu/packages/maven.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 13bc6ff57..87a0158c3 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -25,6 +25,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (gnu packages java)
+ #:use-module (gnu packages web)
#:use-module (gnu packages xml))
(define-public java-plexus-component-metadata
@@ -320,6 +321,26 @@ replacement with improvements.")
artifact and repository handling code.")
(license license:asl2.0)))
+(define-public maven-wagon-provider-test
+ (package
+ (inherit maven-wagon-provider-api)
+ (name "maven-wagon-provider-test")
+ (arguments
+ `(#:jar-name "maven-wagon-provider-test.jar"
+ #:source-dir "wagon-provider-test/src/main/java"
+ #:tests? #f; no tests
+ #:jdk ,icedtea-8))
+ (inputs
+ `(("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-container-default" ,java-plexus-container-default)
+ ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
+ ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
+ ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
+ ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
+ ("java-slf4j-api" ,java-slf4j-api)
+ ("java-tomcat" ,java-tomcat)
+ ("maven-wagon-provider-api" ,maven-wagon-provider-api)))))
+
(define-public maven-artifact
(package
(name "maven-artifact")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:08 GMT)
Full text and
rfc822 format available.
Message #53 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-wagon-tck-http): New variable.
---
gnu/packages/maven.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 4d755fe13..6be30e8e3 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -398,6 +398,29 @@ artifact and repository handling code.")
("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
,@(package-native-inputs maven-wagon-provider-api)))))
+(define-public maven-wagon-tck-http
+ (package
+ (inherit maven-wagon-provider-api)
+ (name "maven-wagon-tck-http")
+ (arguments
+ `(#:jar-name "maven-wagon-tck-http.jar"
+ #:source-dir "wagon-tcks/wagon-tck-http/src/main/java"
+ #:tests? #f; no tests
+ #:jdk ,icedtea-8))
+ (inputs
+ `(("java-plexus-util" ,java-plexus-utils)
+ ("maven-wagon-provider-api" ,maven-wagon-provider-api)
+ ("java-tomcat" ,java-tomcat)
+ ("java-slf4j-api" ,java-slf4j-api)
+ ("java-commons-codec" ,java-commons-codec)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
+ ("java-eclipse-jetty-webapp-9.2" ,java-eclipse-jetty-webapp-9.2)
+ ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
+ ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
+ ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)))))
+
(define-public maven-artifact
(package
(name "maven-artifact")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:08 GMT)
Full text and
rfc822 format available.
Message #56 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-wagon-http): New variable.
---
gnu/packages/maven.scm | 79 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index beb51361b..709ae322e 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -477,6 +477,85 @@ artifact and repository handling code.")
("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
,@(package-native-inputs maven-wagon-provider-api)))))
+(define-public maven-wagon-http
+ (package
+ (inherit maven-wagon-provider-api)
+ (name "maven-wagon-http")
+ (arguments
+ `(#:jar-name "maven-wagon-http.jar"
+ #:source-dir "wagon-providers/wagon-http/src/main/java"
+ #:test-dir "wagon-providers/wagon-http/src/test"
+ #:test-exclude (list
+ "**/Abstract*.java"
+ ;; FIXME: javax.net.ssl.SSLHandshakeException:
+ ;; sun.security.validator.ValidatorException:
+ ;; PKIX path building failed:
+ ;; sun.security.provider.certpath.SunCertPathBuilderException:
+ ;; unable to find valid certification path to requested target
+ "**/HttpsWagonPreemptiveTest.java"
+ "**/HttpsWagonTest.java"
+ ;; Injection errors
+ "**/TckTest.java")
+ #:jdk ,icedtea-8
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'copy-resources
+ (lambda _
+ (install-file "wagon-providers/wagon-http/src/main/resources/META-INF/plexus/components.xml"
+ "build/classes/META-INF/plexus")
+ #t))
+ (add-before 'check 'fix-resource-path
+ (lambda _
+ (substitute* '("wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonPreemptiveTest.java"
+ "wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonTest.java")
+ (("src/test") "wagon-providers/wagon-http/src/test"))
+ #t)))))
+ (inputs
+ `(("java-plexus-utils" ,java-plexus-utils)
+ ("java-httpcomponents-client" ,java-httpcomponents-client)
+ ("java-httpcomponents-core" ,java-httpcomponents-core)
+ ("maven-wagon-http-shared" ,maven-wagon-http-shared)
+ ("maven-wagon-tck-http" ,maven-wagon-tck-http)
+ ("maven-wagon-provider-api" ,maven-wagon-provider-api)))
+ (native-inputs
+ `(("maven-wagon-provider-test" ,maven-wagon-provider-test)
+ ("java-plexus-component-metadata" ,java-plexus-component-metadata)
+ ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
+ ("java-plexus-container-default" ,java-plexus-container-default)
+ ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("java-guava" ,java-guava)
+ ("java-guice" ,java-guice)
+ ("java-inject" ,java-javax-inject)
+ ("java-cglib" ,java-cglib)
+ ("java-slf4j-api" ,java-slf4j-api)
+ ("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-cli" ,java-plexus-cli)
+ ("maven-plugin-api" ,maven-plugin-api)
+ ("maven-plugin-annotations" ,maven-plugin-annotations)
+ ("maven-core" ,maven-core)
+ ("maven-model" ,maven-model)
+ ("java-commons-cli" ,java-commons-cli)
+ ("java-qdox" ,java-qdox)
+ ("java-jdom2" ,java-jdom2)
+ ("java-asm" ,java-asm)
+ ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
+ ("java-tomcat" ,java-tomcat)
+ ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
+ ("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
+ ("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2)
+ ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
+ ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
+ ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
+ ("java-hamcrest-core" ,java-hamcrest-core)
+ ("java-commons-logging-minimal" ,java-commons-logging-minimal)
+ ("java-commons-codec" ,java-commons-codec)
+ ("java-commons-io" ,java-commons-io)
+ ("java-jsoup" ,java-jsoup)
+ ("java-slf4j-simple" ,java-slf4j-simple)
+ ,@(package-native-inputs maven-wagon-provider-api)))))
+
(define-public maven-artifact
(package
(name "maven-artifact")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:09 GMT)
Full text and
rfc822 format available.
Message #59 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-resolver-transport-wagon): New variable.
---
gnu/packages/maven.scm | 80 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 709ae322e..5b9d6984f 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -231,6 +231,86 @@ for repositories using URI-based layouts.")))
("java-hamcrest-core" ,java-hamcrest-core)
("maven-resolver-test-util" ,maven-resolver-test-util)))))
+(define-public maven-resolver-transport-wagon
+ (package
+ (inherit maven-resolver-api)
+ (name "maven-resolver-transport-wagon")
+ (arguments
+ `(#:jar-name "maven-resolver-transport-wagon.jar"
+ #:source-dir "maven-resolver-transport-wagon/src/main/java"
+ #:test-dir "maven-resolver-transport-wagon/src/test"
+ #:jdk ,icedtea-8
+ #: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.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
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<component-set>
+ <components>
+ <component>
+ <role>org.eclipse.aether.transport.wagon.WagonConfigurator</role>
+ <role-hint>plexus</role-hint>
+ <implementation>org.eclipse.aether.internal.transport.wagon.PlexusWagonConfigurator</implementation>
+ <description />
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.PlexusContainer</role>
+ <role-hint />
+ <field-name>container</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.eclipse.aether.transport.wagon.WagonProvider</role>
+ <role-hint>plexus</role-hint>
+ <implementation>org.eclipse.aether.internal.transport.wagon.PlexusWagonProvider</implementation>
+ <description />
+ <isolated-realm>false</isolated-realm>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.PlexusContainer</role>
+ <role-hint />
+ <field-name>container</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ </components>
+</component-set>\n"))))
+ #t)))))
+ (inputs
+ `(("maven-resolver-api" ,maven-resolver-api)
+ ("maven-resolver-spi" ,maven-resolver-spi)
+ ("maven-resolver-util" ,maven-resolver-util)
+ ("java-javax-inject" ,java-javax-inject)
+ ("mavne-wagon-provider-api" ,maven-wagon-provider-api)
+ ("java-plexus-component-annotation" ,java-plexus-component-annotations)
+ ("java-plexus-classworld" ,java-plexus-classworlds)
+ ("java-plexus-plexus-util" ,java-plexus-utils)
+ ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)))
+ (native-inputs
+ `(("java-junit" ,java-junit)
+ ("java-hamcrest-core" ,java-hamcrest-core)
+ ("maven-resolver-test-util" ,maven-resolver-test-util)
+ ("java-guava" ,java-guava)
+ ("java-cglib" ,java-cglib)
+ ("java-asm" ,java-asm)
+ ("java-aopalliance" ,java-aopalliance)
+ ("java-guice" ,java-guice)))))
+
(define-public maven-shared-utils
(package
(name "maven-shared-utils")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:04:09 GMT)
Full text and
rfc822 format available.
Message #62 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven): New variable.
---
gnu/packages/maven.scm | 82 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 7f089687c..5f64d8fc3 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1359,3 +1359,85 @@ artifactId=maven-core" ,(package-version maven-core-bootstrap))))
("java-slf4j-api" ,java-slf4j-api)
("java-slf4j-simple" ,java-slf4j-simple)
,@(package-inputs java-slf4j-api)))))
+
+(define-public maven
+ (package
+ (inherit maven-artifact)
+ (name "maven")
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'build
+ (lambda _
+ (substitute* "apache-maven/src/bin/mvn"
+ (("cygwin=false;")
+ (string-append
+ "CLASSPATH=" (getenv "CLASSPATH") "\n"
+ "cygwin=false;"))
+ (("-classpath.*") "-classpath ${CLASSPATH} \\\n"))
+ #t))
+ (delete 'check)
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))
+ (conf (string-append (assoc-ref outputs "out") "/conf/")))
+ (mkdir-p (string-append (assoc-ref outputs "out") "/lib"))
+ (for-each (lambda (file)
+ (install-file (string-append "apache-maven/src/bin/" file)
+ bin)
+ (chmod (string-append bin file) #o755))
+ '("mvn" "mvnDebug" "mvnyjp"))
+ (install-file "apache-maven/src/bin/m2.conf" bin)
+ (copy-recursively "apache-maven/src/conf" conf))
+ #t)))))
+ (inputs
+ `(("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("maven-artifact" ,maven-artifact)
+ ("maven-embedder" ,maven-embedder)
+ ("maven-core" ,maven-core)
+ ("maven-compat" ,maven-compat)
+ ("maven-builder-support" ,maven-builder-support)
+ ("maven-model" ,maven-model)
+ ("maven-model-builder" ,maven-model-builder)
+ ("maven-settings" ,maven-settings)
+ ("maven-settings-builder" ,maven-settings-builder)
+ ("maven-plugin-api" ,maven-plugin-api)
+ ("maven-repository-metadata", maven-repository-metadata)
+ ("maven-shared-utils" ,maven-shared-utils)
+ ("maven-resolver-api" ,maven-resolver-api)
+ ("maven-resolver-spi" ,maven-resolver-spi)
+ ("maven-resolver-util" ,maven-resolver-util)
+ ("maven-resolver-impl" ,maven-resolver-impl)
+ ("maven-resolver-connector-basic" ,maven-resolver-connector-basic)
+ ("maven-resolver-provider" ,maven-resolver-provider)
+ ("maven-resolver-transport-wagon" ,maven-resolver-transport-wagon)
+ ("maven-wagon-provider-api" ,maven-wagon-provider-api)
+ ("maven-wagon-file" ,maven-wagon-file)
+ ("maven-wagon-http" ,maven-wagon-http)
+ ("java-commons-logging-minimal" ,java-commons-logging-minimal)
+ ("java-httpcomponents-client" ,java-httpcomponents-client)
+ ("java-httpcomponents-core" ,java-httpcomponents-core)
+ ("maven-wagon-http-shared" ,maven-wagon-http-shared)
+ ("maven-wagon-tck-http" ,maven-wagon-tck-http)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
+ ("java-guice" ,java-guice)
+ ("java-aopalliance" ,java-aopalliance)
+ ("java-cglib" ,java-cglib)
+ ("java-asm" ,java-asm)
+ ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
+ ("java-javax-inject" ,java-javax-inject)
+ ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-interpolation" ,java-plexus-interpolation)
+ ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher)
+ ("java-plexus-cipher" ,java-plexus-cipher)
+ ("java-guava" ,java-guava)
+ ("java-jansi" ,java-jansi)
+ ("java-jsr250" ,java-jsr250)
+ ("java-cdi-api" ,java-cdi-api)
+ ("java-commons-cli" ,java-commons-cli)
+ ("java-commons-io" ,java-commons-io)
+ ("java-commons-lang3" ,java-commons-lang3)
+ ("java-slf4j-api" ,java-slf4j-api)
+ ;; TODO: replace with maven-slf4j-provider
+ ("java-slf4j-simple" ,java-slf4j-simple)))))
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:13:01 GMT)
Full text and
rfc822 format available.
Message #65 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-wagon-file): New variable.
---
gnu/packages/maven.scm | 57 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 87a0158c3..4d755fe13 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -341,6 +341,63 @@ artifact and repository handling code.")
("java-tomcat" ,java-tomcat)
("maven-wagon-provider-api" ,maven-wagon-provider-api)))))
+(define-public maven-wagon-file
+ (package
+ (inherit maven-wagon-provider-api)
+ (name "maven-wagon-file")
+ (arguments
+ `(#:jar-name "maven-wagon-file.jar"
+ #:source-dir "wagon-providers/wagon-file/src/main/java"
+ #:test-dir "wagon-providers/wagon-file/src/test"
+ #:jdk ,icedtea-8
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'fix-paths
+ (lambda _
+ (substitute* "wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java"
+ (("target") "build"))
+ #t))
+ (add-after 'build 'generate-metadata
+ (lambda _
+ (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes")
+ "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
+ "--source" "wagon-providers/wagon-file/src/main/java"
+ "--output" "build/classes/META-INF/plexus/components.xml"
+ "--classes" "build/classes"
+ "--descriptors" "build/classes/META-INF")
+ #t))
+ (add-after 'generate-metadata 'rebuild
+ (lambda _
+ (invoke "ant" "jar")
+ #t)))))
+ (inputs
+ `(("java-plexus-utils" ,java-plexus-utils)
+ ("maven-wagon-provider-api" ,maven-wagon-provider-api)))
+ (native-inputs
+ `(("maven-wagon-provider-test" ,maven-wagon-provider-test)
+ ("java-plexus-component-metadata" ,java-plexus-component-metadata)
+ ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
+ ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("java-guava" ,java-guava)
+ ("java-guice" ,java-guice)
+ ("java-javax-inject" ,java-javax-inject)
+ ("java-cglib" ,java-cglib)
+ ("java-slf4j-api" ,java-slf4j-api)
+ ("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-cli" ,java-plexus-cli)
+ ("maven-plugin-api" ,maven-plugin-api)
+ ("maven-plugin-annotations" ,maven-plugin-annotations)
+ ("maven-core" ,maven-core)
+ ("maven-model" ,maven-model)
+ ("java-commons-cli" ,java-commons-cli)
+ ("java-qdox" ,java-qdox)
+ ("java-jdom2" ,java-jdom2)
+ ("java-asm" ,java-asm)
+ ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
+ ,@(package-native-inputs maven-wagon-provider-api)))))
+
(define-public maven-artifact
(package
(name "maven-artifact")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:13:02 GMT)
Full text and
rfc822 format available.
Message #68 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-compat): New variable.
---
gnu/packages/maven.scm | 114 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 114 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 5b9d6984f..7f089687c 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1245,3 +1245,117 @@ artifactId=maven-core" ,(package-version maven-core-bootstrap))))
("java-objenesis" ,java-objenesis)
("java-mockito-1" ,java-mockito-1)
("java-hamcrest-core" ,java-hamcrest-core)))))
+
+(define-public maven-compat
+ (package
+ (inherit maven-artifact)
+ (name "maven-compat")
+ (arguments
+ `(#:jar-name "maven-compat.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ #:test-dir "src/test"
+ #:phases
+ (modify-phases %standard-phases
+ ;; Tests assume we're in this directory
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "maven-compat")
+ #t))
+ (add-before 'build 'generate-models
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (modello-single-mode file version mode)
+ (invoke "java" "org.codehaus.modello.ModelloCli"
+ file mode "src/main/java" version
+ "false" "true"))
+ (let ((file "src/main/mdo/profiles.mdo"))
+ (modello-single-mode file "1.0.0" "java")
+ (modello-single-mode file "1.0.0" "xpp3-reader")
+ (modello-single-mode file "1.0.0" "xpp3-writer"))
+ (let ((file "src/main/mdo/paramdoc.mdo"))
+ (modello-single-mode file "1.0.0" "java")
+ (modello-single-mode file "1.0.0" "xpp3-reader")
+ (modello-single-mode file "1.0.0" "xpp3-writer"))
+ #t))
+ (add-after 'build 'generate-metadata
+ (lambda _
+ (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes")
+ "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
+ "--source" "src/main/java"
+ "--output" "build/classes/META-INF/plexus/components.xml"
+ "--classes" "build/classes"
+ "--descriptors" "build/classes/META-INF")
+ #t))
+ (add-before 'check 'build-tests
+ (lambda _
+ (invoke "ant" "compile-tests")
+ #t))
+ (add-after 'build-tests 'generate-test-metadata
+ (lambda _
+ (invoke "java" "-cp" (string-append (getenv "CLASSPATH")
+ ":build/classes"
+ ":build/test-classes")
+ "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
+ "--source" "src/test/java"
+ "--output" "build/test-classes/META-INF/plexus/components.xml"
+ "--classes" "build/test-classes"
+ "--descriptors" "build/test-classes/META-INF")
+ #t))
+ (add-after 'generate-metadata 'rebuild
+ (lambda _
+ (invoke "ant" "jar")
+ #t)))))
+ (inputs
+ `(("maven-artifact" ,maven-artifact)
+ ("maven-repository-metadata" ,maven-repository-metadata)
+ ("maven-builder-support" ,maven-builder-support)
+ ("maven-model" ,maven-model)
+ ("maven-model-builder" ,maven-model-builder)
+ ("maven-settings" ,maven-settings)
+ ("maven-settings-builder" ,maven-settings-builder)
+ ("maven-core" ,maven-core)
+ ("maven-wagon-provider-api" ,maven-wagon-provider-api)
+ ("maven-wagon-file" ,maven-wagon-file)
+ ("maven-resolver-api" ,maven-resolver-api)
+ ("maven-resolver-util" ,maven-resolver-util)
+ ("maven-resolver-spi" ,maven-resolver-spi)
+ ("java-plexus-interpolation" ,java-plexus-interpolation)))
+ (native-inputs
+ `(("java-modello-core" ,java-modello-core)
+ ("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
+ ("java-sisu-build-api" ,java-sisu-build-api)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
+ ("java-exclispe-sisu-inject" ,java-eclipse-sisu-inject)
+ ("java-javax-inject" ,java-javax-inject)
+ ("java-guice" ,java-guice)
+ ("java-guava" ,java-guava)
+ ("java-cglib" ,java-cglib)
+ ("java-asm" ,java-asm)
+ ("java-modello-plugins-java" ,java-modello-plugins-java)
+ ("java-modello-plugins-xml" ,java-modello-plugins-xml)
+ ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)
+ ;; metadata
+ ("java-plexus-component-metadata" ,java-plexus-component-metadata)
+ ("java-commons-cli" ,java-commons-cli)
+ ("java-plexus-cli" ,java-plexus-cli)
+ ("java-jdom2" ,java-jdom2)
+ ("maven-plugin-api" ,maven-plugin-api)
+ ("java-qdox" ,java-qdox)
+ ;; tests
+ ("java-plexus-cipher" ,java-plexus-cipher)
+ ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher)
+ ("java-jsr250", java-jsr250)
+ ("java-cdi-api" ,java-cdi-api)
+ ("java-junit" ,java-junit)
+ ("maven-resolver-impl" ,maven-resolver-impl)
+ ("maven-resolver-connector-basic" ,maven-resolver-connector-basic)
+ ("maven-resolver-transport-wagon" ,maven-resolver-transport-wagon)
+ ("java-commons-lang3" ,java-commons-lang3)
+ ("java-aop" ,java-aopalliance)
+ ("maven-resolver-provider" ,maven-resolver-provider)
+ ("java-slf4j-api" ,java-slf4j-api)
+ ("java-slf4j-simple" ,java-slf4j-simple)
+ ,@(package-inputs java-slf4j-api)))))
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 11:13:02 GMT)
Full text and
rfc822 format available.
Message #71 received at 31774 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/maven.scm (maven-wagon-http-shared): New variable.
---
gnu/packages/maven.scm | 56 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 6be30e8e3..beb51361b 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -421,6 +421,62 @@ artifact and repository handling code.")
("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)))))
+(define-public maven-wagon-http-shared
+ (package
+ (inherit maven-wagon-provider-api)
+ (name "maven-wagon-http-shared")
+ (arguments
+ `(#:jar-name "maven-wagon-http-shared.jar"
+ #:source-dir "wagon-providers/wagon-http-shared/src/main/java"
+ #:test-dir "wagon-providers/wagon-http-shared/src/test"
+ #:jdk ,icedtea-8
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'build 'generate-metadata
+ (lambda _
+ (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes")
+ "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
+ "--source" "wagon-providers/wagon-http-shared/src/main/java"
+ "--output" "build/classes/META-INF/plexus/components.xml"
+ "--classes" "build/classes"
+ "--descriptors" "build/classes/META-INF")
+ #t))
+ (add-after 'generate-metadata 'rebuild
+ (lambda _
+ (invoke "ant" "jar")
+ #t)))))
+ (inputs
+ `(("java-plexus-utils" ,java-plexus-utils)
+ ("java-httpcomponents-client" ,java-httpcomponents-client)
+ ("java-httpcomponents-core" ,java-httpcomponents-core)
+ ("java-commons-io" ,java-commons-io)
+ ("java-jsoup" ,java-jsoup)
+ ("maven-wagon-provider-api" ,maven-wagon-provider-api)))
+ (native-inputs
+ `(("maven-wagon-provider-test" ,maven-wagon-provider-test)
+ ("java-plexus-component-metadata" ,java-plexus-component-metadata)
+ ("java-plexus-component-annotations" ,java-plexus-component-annotations)
+ ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
+ ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("java-guava" ,java-guava)
+ ("java-guice" ,java-guice)
+ ("java-javax-inject" ,java-javax-inject)
+ ("java-cglib" ,java-cglib)
+ ("java-slf4j-api" ,java-slf4j-api)
+ ("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-cli" ,java-plexus-cli)
+ ("maven-plugin-api" ,maven-plugin-api)
+ ("maven-plugin-annotations" ,maven-plugin-annotations)
+ ("maven-core" ,maven-core)
+ ("maven-model" ,maven-model)
+ ("java-commons-cli" ,java-commons-cli)
+ ("java-qdox" ,java-qdox)
+ ("java-jdom2" ,java-jdom2)
+ ("java-asm" ,java-asm)
+ ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
+ ,@(package-native-inputs maven-wagon-provider-api)))))
+
(define-public maven-artifact
(package
(name "maven-artifact")
--
2.17.1
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 13:17:01 GMT)
Full text and
rfc822 format available.
Message #74 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Hi Julien,
the package definition for java-httpcomponents-client is missing.
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:15:02 GMT)
Full text and
rfc822 format available.
Message #77 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
> + (arguments
> + `(#:test-exclude
> + (list "**/ConstraintTest.*")
> + ,@(package-arguments java-eclipse-jetty-security)))
Please add comment stating why.
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:16:01 GMT)
Full text and
rfc822 format available.
Message #80 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:17:01 GMT)
Full text and
rfc822 format available.
Message #83 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
> + #:test-exclude (list "**/WebAppContextTest.java")
Please add comment stating why.
Otherwise LGTM.
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:18:02 GMT)
Full text and
rfc822 format available.
Message #86 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
>+ (synopsis "CLI building library")
"for Plexus" ?
Is "CLI" a common abbreviation for "command-line interface" ? (If not, write it out)
Otherwise LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:20:01 GMT)
Full text and
rfc822 format available.
Message #89 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
> + ;; FIXME: The release at maven is pre-generated. The release at
> + ;; github requires jflex.
That's fine. I'd say "Note" instead of "FIXME" then. There are other packages
where we use a specific server for similar reasons, and it's not bad.
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:21:02 GMT)
Full text and
rfc822 format available.
Message #92 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:21:03 GMT)
Full text and
rfc822 format available.
Message #95 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:22:02 GMT)
Full text and
rfc822 format available.
Message #98 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:23:02 GMT)
Full text and
rfc822 format available.
Message #101 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:24:02 GMT)
Full text and
rfc822 format available.
Message #104 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:24:04 GMT)
Full text and
rfc822 format available.
Message #107 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:25:02 GMT)
Full text and
rfc822 format available.
Message #110 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
> + (substitute* "wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java"
> + (("target") "build"))
Hmm, is this an upstream problem? Maybe mention it to them.
Also, add comment here :)
Otherwise LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:26:01 GMT)
Full text and
rfc822 format available.
Message #113 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:30:02 GMT)
Full text and
rfc822 format available.
Message #116 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
And java-httpcomponents-core is missing, too.
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:33:02 GMT)
Full text and
rfc822 format available.
Message #119 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:34:01 GMT)
Full text and
rfc822 format available.
Message #122 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
> +(define-public maven-wagon-http-shared
> + (package
> + (inherit maven-wagon-provider-api)
[...]
> + ("maven-wagon-provider-api" ,maven-wagon-provider-api)))
That's some serious abuse of inheritance (compared to the by-the-books sense).
But we are doing that all over the place anyway - maybe not that brazenly, though :)
Have to know when to break "the rules", so LGTM! (O_o)
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:36:02 GMT)
Full text and
rfc822 format available.
Message #125 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
> + ("java-eclipse-jetty-xml9.2" ,java-eclipse-jetty-xml-9.2)
Nitpick: Dash ("xml-9.2") on the left side as well.
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 15:40:01 GMT)
Full text and
rfc822 format available.
Message #128 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 16:39:01 GMT)
Full text and
rfc822 format available.
Message #131 received at 31774 <at> debbugs.gnu.org (full text, mbox):
Le Sun, 10 Jun 2018 17:29:48 +0200,
Danny Milosavljevic <dannym <at> scratchpost.org> a écrit :
> And java-httpcomponents-core is missing, too.
Whoops, these are java-httpcomponents-httpcore and
java-httpcompontents-httpclient. I fixed those when I tried to build
maven before send the patches. I must have forgotten to regenerate them.
Thank you for your review on most of these patches!
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 17:08:02 GMT)
Full text and
rfc822 format available.
Message #134 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM!
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 17:17:02 GMT)
Full text and
rfc822 format available.
Message #137 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Hi Julien,
On Sun, 10 Jun 2018 13:03:09 +0200
Julien Lepiller <julien <at> lepiller.eu> wrote:
> + ;; FIXME: This should be taken care of by plexus-component-metadata directly
Is this possible now?
> + (invoke "sh" "-c"
> + (string-append
> + "(cat build/classes/META-INF/plexus/components.t.xml |"
> + "sed -e 's|</component-set>||' -e 's|</components>||' ; "
> + "cat src/main/resources/META-INF/plexus/artifact-handlers.xml |"
> + " sed -e 's|<?xml.*||' -e 's|<component-set>||' -e 's|<components>||'"
> + " -e 's|</component-set>||' -e 's|</components>||'; "
> + "cat src/main/resources/META-INF/plexus/components.xml |"
> + " sed -e 's|<?xml.*||' -e 's|<component-set>||' -e 's|<components>||'"
> + " -e 's|</component-set>||' -e 's|</components>||'; "
> + "cat src/main/resources/META-INF/plexus/default-bindings.xml |"
> + " sed -e 's|<?xml.*||' -e 's|<component-set>||' -e 's|<components>||' )>"
> + "build/classes/META-INF/plexus/components.xml"))
XML isn't really line-based, so using (sxml simple) to merge would be more reliable.
Error reporting would be better, too.
https://www.gnu.org/software/guile/manual/html_node/Reading-and-Writing-XML.html#Reading-and-Writing-XML
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sun, 10 Jun 2018 18:47:02 GMT)
Full text and
rfc822 format available.
Message #140 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Le Sun, 10 Jun 2018 19:16:43 +0200,
Danny Milosavljevic <dannym <at> scratchpost.org> a écrit :
> Hi Julien,
>
> On Sun, 10 Jun 2018 13:03:09 +0200
> Julien Lepiller <julien <at> lepiller.eu> wrote:
>
> > + ;; FIXME: This should be taken care of by
> > plexus-component-metadata directly
>
> Is this possible now?
>
> > + (invoke "sh" "-c"
> > + (string-append
> > + "(cat
> > build/classes/META-INF/plexus/components.t.xml |"
> > + "sed -e 's|</component-set>||' -e
> > 's|</components>||' ; "
> > + "cat
> > src/main/resources/META-INF/plexus/artifact-handlers.xml |"
> > + " sed -e 's|<?xml.*||' -e
> > 's|<component-set>||' -e 's|<components>||'"
> > + " -e 's|</component-set>||' -e
> > 's|</components>||'; "
> > + "cat
> > src/main/resources/META-INF/plexus/components.xml |"
> > + " sed -e 's|<?xml.*||' -e
> > 's|<component-set>||' -e 's|<components>||'"
> > + " -e 's|</component-set>||' -e
> > 's|</components>||'; "
> > + "cat
> > src/main/resources/META-INF/plexus/default-bindings.xml |"
> > + " sed -e 's|<?xml.*||' -e
> > 's|<component-set>||' -e 's|<components>||' )>"
> > +
> > "build/classes/META-INF/plexus/components.xml"))
>
> XML isn't really line-based, so using (sxml simple) to merge would be
> more reliable. Error reporting would be better, too.
>
> https://www.gnu.org/software/guile/manual/html_node/Reading-and-Writing-XML.html#Reading-and-Writing-XML
So I tried to use that, and here is an updated patch. I had troubles
using match (it tried to evaluate the content of the list I wanted to
match with, although that doesn't happen at the REPL), so I used a
sequence of cdr/car instead. Thanks for the hint :)
[0012-gnu-Add-maven-core.patch (text/x-patch, attachment)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Mon, 11 Jun 2018 01:45:02 GMT)
Full text and
rfc822 format available.
Message #143 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Julien Lepiller <julien <at> lepiller.eu> writes:
> * gnu/packages/maven.scm (maven): New variable.
Hello! Amazing work, and great news!
I admit that I didn't read the patches in detail, but I did spot one
thing that should be dealt with eventually: all the packages inheriting
maven-artifact should get their own synopses and descriptions.
I know that's a lot of work, so I'm not sure if it should block this
series. YMMV.
Thank you!
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Mon, 11 Jun 2018 18:44:01 GMT)
Full text and
rfc822 format available.
Message #146 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Hi Julien,
yeah, looks much safer this way IMO.
> So I tried to use that, and here is an updated patch. I had troubles
> using match (it tried to evaluate the content of the list I wanted to
> match with, although that doesn't happen at the REPL), so I used a
> sequence of cdr/car instead. Thanks for the hint :)
Hmm, could you post what you tried?
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Tue, 12 Jun 2018 19:37:02 GMT)
Full text and
rfc822 format available.
Message #149 received at 31774 <at> debbugs.gnu.org (full text, mbox):
Le Mon, 11 Jun 2018 20:43:16 +0200,
Danny Milosavljevic <dannym <at> scratchpost.org> a écrit :
> Hi Julien,
>
> yeah, looks much safer this way IMO.
>
> > So I tried to use that, and here is an updated patch. I had troubles
> > using match (it tried to evaluate the content of the list I wanted
> > to match with, although that doesn't happen at the REPL), so I used
> > a sequence of cdr/car instead. Thanks for the hint :)
>
> Hmm, could you post what you tried?
I tried something like this:
(match sxlm
((list (component-set (components x) ...)) x))
And I got an exception like component-set: unbound variable. On the
REPL, the command works perfectly.
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Thu, 14 Jun 2018 00:14:01 GMT)
Full text and
rfc822 format available.
Message #152 received at 31774 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Hi Julien,
On Tue, 12 Jun 2018 21:36:14 +0200
Julien Lepiller <julien <at> lepiller.eu> wrote:
> I tried something like this:
>
> (match sxlm
> ((list (component-set (components x) ...)) x))
>
> And I got an exception like component-set: unbound variable. On the
> REPL, the command works perfectly.
Yeah, weird sometimes. I've had similar problems in the past.
Now I tried
(match sxml
(('*TOP*
('component-set
('components x ...))) x))
and it seems to work.
[Message part 2 (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Thu, 14 Jun 2018 00:19:02 GMT)
Full text and
rfc822 format available.
Message #155 received at 31774 <at> debbugs.gnu.org (full text, mbox):
From: Julien Lepiller <julien <at> lepiller.eu>
* gnu/packages/maven.scm (maven-core): New variable.
---
gnu/packages/maven.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index dff5bd3e4..ea6be7a7d 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -752,3 +752,73 @@ so really just plain objects.")))
("java-junit" ,java-junit)
("java-mockito-1" ,java-mockito-1)
("java-commons-jxpath" ,java-commons-jxpath)))))
+
+(define-public maven-core
+ (package
+ (inherit maven-core-bootstrap)
+ (arguments
+ (substitute-keyword-arguments (package-arguments maven-core-bootstrap)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-before 'build 'modify-metainf
+ (lambda _
+ (substitute* "build.xml"
+ (("message=\"\"") "message=\"Implementation-Version: 3.5.3\n\""))
+ #t))
+ (add-before 'build 'add-maven-files
+ (lambda _
+ (mkdir-p "build/classes/META-INF/maven/org.apache.maven/maven-core")
+ (copy-file "pom.xml"
+ "build/classes/META-INF/maven/org.apache.maven/maven-core/pom.xml")
+ (with-output-to-file "build/classes/META-INF/maven/org.apache.maven/maven-core/pom.properties"
+ (lambda _
+ (format #t "version=~a~%
+groupId=org.apache.maven~%
+artifactId=maven-core" ,(package-version maven-core-bootstrap))))
+ #t))
+ (add-after 'build 'generate-metadata
+ (lambda _
+ (define (components file)
+ (let ((sxml (with-input-from-file file
+ (lambda _ (xml->sxml (current-input-port) #:trim-whitespace? #t)))))
+ ;; Select the list of <component>s inside the <component-set>
+ ;; and <components>.
+ ((@ (ice-9 match) match) sxml
+ (('*TOP*
+ ('*PI* foo ...)
+ ('component-set
+ ('components x ...))) x))))
+ (use-modules (sxml simple))
+ (delete-file "build/classes/META-INF/plexus/components.xml")
+ (invoke "java" "-cp" (string-append (getenv "CLASSPATH") ":build/classes")
+ "org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
+ "--source" "build/classes/META-INF/plexus"
+ "--output" "build/classes/META-INF/plexus/components.t.xml"
+ "--classes" "build/classes"
+ "--descriptors" "build/classes")
+ ;; Now we merge all other components from hand-written xml
+ (let ((generated-xml (components "build/classes/META-INF/plexus/components.t.xml"))
+ (components-xml (components "src/main/resources/META-INF/plexus/components.xml"))
+ (default-bindings-xml (components "src/main/resources/META-INF/plexus/default-bindings.xml"))
+ (artifact-handlers-xml (components "src/main/resources/META-INF/plexus/artifact-handlers.xml")))
+ (with-output-to-file "build/classes/META-INF/plexus/components.xml"
+ (lambda _
+ (display (sxml->string
+ `(component-set
+ (components
+ ,@(append generated-xml components-xml
+ default-bindings-xml
+ artifact-handlers-xml))))))))
+ #t))
+ (add-after 'generate-metadata 'rebuild
+ (lambda _
+ (invoke "ant" "jar")
+ #t))))))
+ (native-inputs
+ `(("java-plexus-component-metadata" ,java-plexus-component-metadata)
+ ("java-commons-cli" ,java-commons-cli)
+ ("java-plexus-cli" ,java-plexus-cli)
+ ("java-jdom2" ,java-jdom2)
+ ("java-qdox" ,java-qdox)
+ ("maven-core-boot" ,maven-core-bootstrap)
+ ,@(package-native-inputs maven-core-bootstrap)))))
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Thu, 14 Jun 2018 20:08:02 GMT)
Full text and
rfc822 format available.
Message #158 received at 31774 <at> debbugs.gnu.org (full text, mbox):
Hello,
Danny Milosavljevic <dannym <at> scratchpost.org> skribis:
> Now I tried
>
> (match sxml
> (('*TOP*
> ('component-set
> ('components x ...))) x))
>
> and it seems to work.
Also, for SXML, you may sometimes find that ‘sxml-match’ is more
convenient (that’s not always the case though—it has weirdness of its
own. :-)).
https://www.gnu.org/software/guile/manual/html_node/sxml_002dmatch.html
Ludo’.
Reply sent
to
Julien Lepiller <julien <at> lepiller.eu>:
You have taken responsibility.
(Sat, 16 Jun 2018 11:22:01 GMT)
Full text and
rfc822 format available.
Notification sent
to
Julien Lepiller <julien <at> lepiller.eu>:
bug acknowledged by developer.
(Sat, 16 Jun 2018 11:22:01 GMT)
Full text and
rfc822 format available.
Message #163 received at 31774-done <at> debbugs.gnu.org (full text, mbox):
Le Sun, 10 Jun 2018 13:01:04 +0200,
Julien Lepiller <julien <at> lepiller.eu> a écrit :
> Finally, the last patch series for maven!
Pushed as
c099f6a716c035253816344ad24e364d14dc8ba0 -
8c2c105c12e7cc21bc6f27592550bb7132884955
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Sat, 16 Jun 2018 16:18:01 GMT)
Full text and
rfc822 format available.
Message #166 received at 31774 <at> debbugs.gnu.org (full text, mbox):
Julien Lepiller <julien <at> lepiller.eu> skribis:
> Le Sun, 10 Jun 2018 13:01:04 +0200,
> Julien Lepiller <julien <at> lepiller.eu> a écrit :
>
>> Finally, the last patch series for maven!
>
> Pushed as
> c099f6a716c035253816344ad24e364d14dc8ba0 -
> 8c2c105c12e7cc21bc6f27592550bb7132884955
Quite an achievement, congrats on that one!
Ludo’.
Information forwarded
to
guix-patches <at> gnu.org:
bug#31774; Package
guix-patches.
(Fri, 22 Jun 2018 21:22:01 GMT)
Full text and
rfc822 format available.
Message #169 received at 31774-done <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
On Sat, 16 Jun 2018 13:21:45 +0200
Julien Lepiller <julien <at> lepiller.eu> wrote:
> Le Sun, 10 Jun 2018 13:01:04 +0200,
> Julien Lepiller <julien <at> lepiller.eu> a écrit :
>
> > Finally, the last patch series for maven!
>
> Pushed as
> c099f6a716c035253816344ad24e364d14dc8ba0 -
> 8c2c105c12e7cc21bc6f27592550bb7132884955
Cool! Thanks for all the work done!
The next thing would be a maven-build-system and a maven-importer. I
think they also will take some time. Do you already have plans or even
code for that? (Longer discussions should go to devel list)
I found some bugs I will post separately to the bug tracker.
Thanks,
Björn
[Message part 2 (application/pgp-signature, inline)]
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Sat, 21 Jul 2018 11:24:05 GMT)
Full text and
rfc822 format available.
This bug report was last modified 6 years and 333 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.