From 3422e10ededa47ed7e71cc4fd55aab4cf65ea905 Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sun, 25 Feb 2018 11:45:17 +0100
Subject: gnu: Update java-testng to 6.14.3.
* gnu/packages/java.scm (java-testng): Update to 6.14.3.
---
gnu/packages/java.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 47220fc75..94c806b99 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6959,7 +6959,7 @@ those in Perl and JavaScript.")
(define-public java-testng
(package
(name "java-testng")
- (version "6.14.2")
+ (version "6.14.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -6968,7 +6968,7 @@ those in Perl and JavaScript.")
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0ngj88dpbqqdx9084cmiasmn9q3v5dgx45qbvxpip47nxc5x14xy"))))
+ "0y6vq30i5g276kw0v2bhbvci22ijg7ax49ap2611yqlhbs4d6dqv"))))
(build-system ant-build-system)
(arguments
`(#:jdk ,icedtea-8; java.util.function
--
cgit v1.3
From 3214afabff01f7aae1d4790059a6f40763023711 Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 21:53:53 +0100
Subject: gnu: Add java-plexus-component-annotations.
* gnu/packages/java.scm (java-plexus-component-annotations): New
variable.
---
gnu/packages/java.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 94c806b99..5f8f7fdb5 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2660,6 +2660,20 @@ archives (jar).")
`(("archiver" ,java-plexus-archiver)
("hamcrest" ,java-hamcrest-core)))))
+(define-public java-plexus-component-annotations
+ (package
+ (inherit java-plexus-container-default)
+ (name "java-plexus-component-annotations")
+ (arguments
+ `(#:jar-name "plexus-component-annotations.jar"
+ #:source-dir "plexus-component-annotations/src/main/java"
+ #:tests? #f)); no tests
+ (inputs '())
+ (native-inputs '())
+ (synopsis "Plexus descriptors generator")
+ (description "This package is a Maven plugin to generate Plexus descriptors
+from source tags and class annotations.")))
+
(define-public java-asm
(package
(name "java-asm")
--
cgit v1.3
From a7ad92ade94d456f991062aedede9fd1ecd64b07 Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Wed, 14 Feb 2018 22:11:34 +0100
Subject: gnu: Make java-plexus-container-default-bootstrap private.
* gnu/packages/java.scm (java-plexus-container-default-bootstrap): Make
private.
---
gnu/packages/java.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 5f8f7fdb5..7312d4703 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2483,7 +2483,7 @@ mechanism of Java. It is especially useful for dynamic loading of application
components.")
(license license:asl2.0)))
-(define-public java-plexus-container-default-bootstrap
+(define java-plexus-container-default-bootstrap
(package
(name "java-plexus-container-default-bootstrap")
(version "1.7.1")
--
cgit v1.3
From 4f77ba17c663881c0657c838fbcb2a98e9137aa5 Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 22:02:24 +0100
Subject: gnu: Add java-plexus-cipher.
* gnu/packages/java.scm (java-plexus-cipher): New variable.
---
gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7312d4703..57370db76 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2674,6 +2674,42 @@ archives (jar).")
(description "This package is a Maven plugin to generate Plexus descriptors
from source tags and class annotations.")))
+(define-public java-plexus-cipher
+ (package
+ (name "java-plexus-cipher")
+ (version "1.7")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/codehaus-plexus/plexus-cipher"
+ "/archive/plexus-cipher-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1j3r8xzlxlk340snkjp6lk2ilkxlkn8qavsfiq01f43xmvv8ymk3"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "plexus-cipher.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ #:tests? #f; FIXME: requires sisu-inject-bean
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'copy-resources
+ (lambda _
+ (copy-recursively "src/main/resources" "build/classes")
+ (mkdir-p "build/classes/META-INF/sisu")
+ (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named"
+ (lambda _
+ (display "org.sonatype.plexus.components.cipher.DefaultPlexusCipher\n")))
+ #t)))))
+ (inputs
+ `(("java-cdi-api" ,java-cdi-api)
+ ("java-javax-inject" ,java-javax-inject)))
+ (home-page "https://github.com/sonatype/plexus-cipher")
+ (synopsis "Encryption/decryption Component")
+ (description "Plexus-cipher contains a component to deal with encryption
+and decryption.")
+ (license license:asl2.0)))
+
(define-public java-asm
(package
(name "java-asm")
--
cgit v1.3
From 239126d48b960013cc368a3f3636e760e0adb8fd Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 23:00:09 +0100
Subject: gnu: Add java-plexus-compiler-api.
* gnu/packages/java.scm (java-plexus-compiler-api): New variable.
---
gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 57370db76..45904ff84 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2710,6 +2710,35 @@ from source tags and class annotations.")))
and decryption.")
(license license:asl2.0)))
+(define-public java-plexus-compiler-api
+ (package
+ (name "java-plexus-compiler-api")
+ (version "2.8.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/codehaus-plexus/plexus-compiler"
+ "/archive/plexus-compiler-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0g3x26pymcdnfnwv2a1i57pd5s26f5zqfi1rdy98z1bn01klx25k"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "plexus-compiler-api.jar"
+ #:source-dir "plexus-compiler-api/src/main/java"
+ #:jdk ,icedtea-8
+ #:test-dir "plexus-compiler-api/src/test"))
+ (inputs
+ `(("java-plexus-container-default" ,java-plexus-container-default)
+ ("java-plexus-util" ,java-plexus-utils)))
+ (native-inputs
+ `(("java-junit" ,java-junit)))
+ (home-page "https://github.com/codehaus-plexus/plexus-compiler")
+ (synopsis "Plexus Compilers component's API to manipulate compilers")
+ (description "This package contains the API used by components to manipulate
+compilers.")
+ (license (list license:asl2.0
+ license:expat))))
+
(define-public java-asm
(package
(name "java-asm")
--
cgit v1.3
From f8a519fa3f8af3e3be842d84be49897d0bd9fd06 Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 23:09:20 +0100
Subject: gnu: Add java-plexus-compiler-javac.
gnu/packages/java.scm (java-plexus-compiler-javac): New variable.
---
gnu/packages/java.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 45904ff84..dc8523369 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2739,6 +2739,26 @@ compilers.")
(license (list license:asl2.0
license:expat))))
+(define-public java-plexus-compiler-javac
+ (package
+ (inherit java-plexus-compiler-api)
+ (name "java-plexus-compiler-javac")
+ (arguments
+ `(#:jar-name "plexus-compiler-javac.jar"
+ #:source-dir "plexus-compilers/plexus-compiler-javac/src/main/java"
+ #:jdk ,icedtea-8
+ #:tests? #f; depends on compiler-test -> maven-core -> ... -> this package.
+ #:test-dir "plexus-compilers/plexus-compiler-javac/src/test"))
+ (inputs
+ `(("java-plexus-compiler-api" ,java-plexus-compiler-api)
+ ("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-container-default" ,java-plexus-container-default)))
+ (native-inputs
+ `(("java-junit" ,java-junit)))
+ (synopsis "Javac Compiler support for Plexus Compiler component")
+ (description "This package contains the Javac Compiler support for Plexus
+Compiler component.")))
+
(define-public java-asm
(package
(name "java-asm")
--
cgit v1.3
From 8f524749bc26601d4dc781978104718adb7addc8 Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 22:42:43 +0100
Subject: gnu: Add java-sisu-build-api.
* gnu/packages/java.scm (java-sisu-build-api): New variable.
---
gnu/packages/java.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index dc8523369..bbc39831e 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2759,6 +2759,61 @@ compilers.")
(description "This package contains the Javac Compiler support for Plexus
Compiler component.")))
+(define-public java-sisu-build-api
+ (package
+ (name "java-sisu-build-api")
+ (version "0.0.7")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/sonatype/sisu-build-api/"
+ "archive/plexus-build-api-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1c3rrpma3x634xp2rm2p5iskfhzdyc7qfbhjzr70agrl1jwghgy2"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "sisu-build-api.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ #:tests? #f; FIXME: how to run the tests?
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'copy-resources
+ (lambda _
+ (copy-recursively "src/main/resources" "build/classes")
+ (substitute* (find-files "build/classes")
+ (("\\$\\{project.version\\}") ,version))
+ #t))
+ (add-before 'build 'generate-plexus-compontent
+ (lambda _
+ (mkdir-p "build/classes/META-INF/plexus")
+ ;; This file is required for plexus to inject this package.
+ ;; FIXME: how is it generated?
+ (with-output-to-file "build/classes/META-INF/plexus/components.xml"
+ (lambda _
+ (display
+ "\n
+ \n
+ \n
+ org.sonatype.plexus.build.incremental.BuildContext\n
+ default\n
+ org.sonatype.plexus.build.incremental.DefaultBuildContext\n
+ Filesystem based non-incremental build context implementation\n
+which behaves as if all files were just created.\n
+ \n
+ \n
+\n")))
+ #t)))))
+ (inputs
+ `(("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-container-default" ,java-plexus-container-default)))
+ (home-page "https://github.com/sonatype/sisu-build-api/")
+ (synopsis "Base build API for maven")
+ (description "This package contains the base build API for maven and
+a default implementation of it. This API is about scanning files in a
+project and determining what files need to be rebuilt.")
+ (license license:asl2.0)))
+
(define-public java-asm
(package
(name "java-asm")
--
cgit v1.3
From b26c8b618457943075eaf5d33592af0eabf53cc8 Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 22:51:17 +0100
Subject: gnu: Add java-modello-core.
* gnu/packages/java.scm (java-modello-core): New variable.
---
gnu/packages/java.scm | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index bbc39831e..d7a1299a7 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2814,6 +2814,69 @@ a default implementation of it. This API is about scanning files in a
project and determining what files need to be rebuilt.")
(license license:asl2.0)))
+(define-public java-modello-core
+ (package
+ (name "java-modello-core")
+ (version "1.9.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/codehaus-plexus/modello"
+ "/archive/modello-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0l2pvns8pmlrmjm3iknp7gpg3654y1m8qhy55b19sdwdchdcyxfh"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "modello-core.jar"
+ #:source-dir "modello-core/src/main/java"
+ #:test-dir "modello-core/src/test"
+ #:main-class "org.codehaus.modello.ModelloCli"
+ #:jdk ,icedtea-8
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'copy-resources
+ (lambda _
+ (mkdir-p "build/classes/META-INF/plexus")
+ (copy-file "modello-core/src/main/resources/META-INF/plexus/components.xml"
+ "build/classes/META-INF/plexus/components.xml")
+ #t))
+ (add-before 'check 'fix-tests
+ (lambda _
+ (with-directory-excursion "modello-core/src/test/java/org/codehaus"
+ (substitute* '("modello/core/DefaultModelloCoreTest.java"
+ "modello/core/io/ModelReaderTest.java")
+ (("src/test") "modello-core/src/test")))
+ #t)))))
+ (inputs
+ `(("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-container-default" ,java-plexus-container-default)
+ ("java-sisu-build-api" ,java-sisu-build-api)))
+ (native-inputs
+ `(("java-junit" ,java-junit)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
+ ("java-guava" ,java-guava)))
+ (home-page "http://codehaus-plexus.github.io/modello/")
+ (synopsis "Framework for code generation from a simple model")
+ (description "Modello is a framework for code generation from a simple model.
+
+Modello generates code from a simple model format: based on a plugin
+architecture, various types of code and descriptors can be generated from the
+single model, including Java POJOs, XML/JSON/YAML marshallers/unmarshallers,
+XSD and documentation.")
+ (license (list
+ license:expat
+ ;; Although this package uses only files licensed under expat,
+ ;; other parts of the source are licensed under different
+ ;; licenses. We include them to be inherited by other packages.
+ license:asl2.0
+ ;; Some files in modello-plugin-java are licensed under a
+ ;; 5-clause BSD license.
+ (license:non-copyleft
+ (string-append "file:///modello-plugins/modello-plugin-java/"
+ "src/main/java/org/codehaus/modello/plugin/"
+ "java/javasource/JNaming.java"))))))
+
(define-public java-asm
(package
(name "java-asm")
--
cgit v1.3
From fc620befd4d4236db8f446dba2e0f3abcd4c0cfb Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 22:52:22 +0100
Subject: gnu: Add java-modello-plugins-java.
* gnu/packages/java.scm (java-modello-plugins-java): New variable.
---
gnu/packages/java.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d7a1299a7..05cf91999 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2877,6 +2877,30 @@ XSD and documentation.")
"src/main/java/org/codehaus/modello/plugin/"
"java/javasource/JNaming.java"))))))
+(define-public java-modello-plugins-java
+ (package
+ (inherit java-modello-core)
+ (name "java-modello-plugins-java")
+ (arguments
+ `(#:jar-name "modello-plugins-java.jar"
+ #:source-dir "modello-plugins/modello-plugin-java/src/main/java"
+ #:test-dir "modello-plugins/modello-plugin-java/src/test"
+ #:jdk ,icedtea-8
+ #:tests? #f; requires maven-model, which depends on this package
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'copy-resources
+ (lambda _
+ (mkdir-p "build/classes")
+ (copy-recursively "modello-plugins/modello-plugin-java/src/main/resources"
+ "build/classes")
+ #t)))))
+ (inputs
+ `(("java-modello-core" ,java-modello-core)
+ ,@(package-inputs java-modello-core)))
+ (synopsis "Modello Java Plugin")
+ (description "Modello Java Plugin generates Java objects for the model.")))
+
(define-public java-asm
(package
(name "java-asm")
--
cgit v1.3
From a0ce95ba8f6beb79fe77fe4f199dbe49e243bbbc Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 22:53:12 +0100
Subject: gnu: Add java-modello-plugins-xml.
* gnu/packages/java.scm (java-modello-plugins-xml): New variable.
---
gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 05cf91999..6d77967de 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2901,6 +2901,38 @@ XSD and documentation.")
(synopsis "Modello Java Plugin")
(description "Modello Java Plugin generates Java objects for the model.")))
+(define-public java-modello-plugins-xml
+ (package
+ (inherit java-modello-core)
+ (name "java-modello-plugins-xml")
+ (arguments
+ `(#:jar-name "modello-plugins-xml.jar"
+ #:source-dir "modello-plugins/modello-plugin-xml/src/main/java"
+ #:test-dir "modello-plugins/modello-plugin-xml/src/test"
+ #:jdk ,icedtea-8
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'copy-resources
+ (lambda _
+ (mkdir-p "build/classes")
+ (copy-recursively
+ "modello-plugins/modello-plugin-xml/src/main/resources"
+ "build/classes")
+ #t))
+ (add-before 'check 'fix-paths
+ (lambda _
+ (with-directory-excursion "modello-plugins/modello-plugin-xml/src/test"
+ (substitute*
+ "java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java"
+ (("src/test") "modello-plugins/modello-plugin-xml/src/test"))))))))
+ (inputs
+ `(("java-modello-core" ,java-modello-core)
+ ("java-modello-plugins-java" ,java-modello-plugins-java)
+ ,@(package-inputs java-modello-core)))
+ (synopsis "Modello XML Plugin")
+ (description "Modello XML Plugin contains shared code for every plugins
+working on XML representation of the model.")))
+
(define-public java-asm
(package
(name "java-asm")
--
cgit v1.3
From e470856017a705d4ba1881363717579e62f28671 Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 23:23:38 +0100
Subject: gnu: Add java-modello-test.
gnu/packages/java.scm (java-modello-test): New variable.
---
gnu/packages/java.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 6d77967de..f8bb5e58f 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2933,6 +2933,25 @@ XSD and documentation.")
(description "Modello XML Plugin contains shared code for every plugins
working on XML representation of the model.")))
+(define-public java-modello-test
+ (package
+ (inherit java-modello-core)
+ (name "java-modello-test")
+ (arguments
+ `(#:jar-name "modello-test.jar"
+ #:source-dir "modello-test/src/main/java"
+ #:tests? #f; no tests
+ #:jdk ,icedtea-8))
+ (inputs
+ `(("java-plexus-utils" ,java-plexus-utils)
+ ("java-plexus-compiler-api" ,java-plexus-compiler-api)
+ ("java-plexus-compiler-javac" ,java-plexus-compiler-javac)
+ ("java-plexus-container-default" ,java-plexus-container-default)))
+ (synopsis "Modello test package")
+ (description "The modello test package contains the basis to create
+Modello generator unit-tests, including sample models and xml files to test
+every feature for every plugin.")))
+
(define-public java-asm
(package
(name "java-asm")
--
cgit v1.3
From 36607d3bfe1f0d26773ffaefd22b4968c6237999 Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 23:30:59 +0100
Subject: gnu: Add java-modello-plugins-xpp3.
gnu/packages/java.scm (java-modello-plugins-xpp3): New variable.
---
gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index f8bb5e58f..93b343f62 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2952,6 +2952,38 @@ working on XML representation of the model.")))
Modello generator unit-tests, including sample models and xml files to test
every feature for every plugin.")))
+(define-public java-modello-plugins-xpp3
+ (package
+ (inherit java-modello-core)
+ (name "java-modello-plugins-xpp3")
+ (arguments
+ `(#:jar-name "modello-plugins-xpp3.jar"
+ #:source-dir "modello-plugins/modello-plugin-xpp3/src/main/java"
+ #:test-dir "modello-plugins/modello-plugin-xpp3/src/test"
+ ;; One of the test dependencies is maven-model which depends on this package.
+ #:tests? #f
+ #:jdk ,icedtea-8
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'copy-resources
+ (lambda _
+ (mkdir-p "build/classes")
+ (copy-recursively "modello-plugins/modello-plugin-xpp3/src/main/resources"
+ "build/classes")
+ #t)))))
+ (inputs
+ `(("java-modello-core" ,java-modello-core)
+ ("java-modello-plugins-java" ,java-modello-plugins-java)
+ ("java-modello-plugins-xml" ,java-modello-plugins-xml)
+ ,@(package-inputs java-modello-core)))
+ (native-inputs
+ `(("java-xmlunit" ,java-xmlunit)
+ ("java-modello-test" ,java-modello-test)
+ ,@(package-native-inputs java-modello-core)))
+ (synopsis "Modello XPP3 Plugin")
+ (description "The modello XPP3 plugin generates XML readers and writers based
+on the XPP3 API (XML Pull Parser).")))
+
(define-public java-asm
(package
(name "java-asm")
--
cgit v1.3
From 0aa85081d6319b582d53e9113be41cbe1a59f2a8 Mon Sep 17 00:00:00 2001
From: Julien Lepiller
Date: Sat, 10 Feb 2018 23:46:31 +0100
Subject: gnu: Add java-plexus-sec-dispatcher.
* gnu/packages/java.scm (java-plexus-sec-dispatcher): New variable.
---
gnu/packages/java.scm | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 88 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 93b343f62..2b7a76fda 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2759,6 +2759,94 @@ compilers.")
(description "This package contains the Javac Compiler support for Plexus
Compiler component.")))
+(define-public java-plexus-sec-dispatcher
+ (package
+ (name "java-plexus-sec-dispatcher")
+ (version "1.4") ;; Newest release listed at the Maven Central Repository.
+ (source (origin
+ ;; This project doesn't tag releases or publish tarballs, so we take
+ ;; the "prepare release plexus-sec-dispatcher-1.4" git commit.
+ (method url-fetch)
+ (uri (string-append "https://github.com/sonatype/plexus-sec-dispatcher/"
+ "archive/7db8f88048.tar.gz"))
+ (sha256
+ (base32
+ "1smfrk4n7xbrsxpxcp2j4i0j8q86j73w0w6xg7qz83dp6dagdjgp"))
+ (file-name (string-append name "-" version ".tar.gz"))))
+ (arguments
+ `(#:jar-name "plexus-sec-dispatcher.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'generate-models
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (modello-single-mode file version mode)
+ (zero? (system* "java"
+ "org.codehaus.modello.ModelloCli"
+ file mode "src/main/java" version
+ "false" "true")))
+ (let ((file "src/main/mdo/settings-security.mdo"))
+ (and
+ (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")))))
+ (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
+ "\n
+ \n
+ \n
+ org.sonatype.plexus.components.sec.dispatcher.SecDispatcher\n
+ default\n
+ org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher\n
+ \n
+ \n
+ \n
+ org.sonatype.plexus.components.cipher.PlexusCipher\n
+ _cipher\n
+ \n
+ \n
+ org.sonatype.plexus.components.sec.dispatcher.PasswordDecryptor\n
+ _decryptors\n
+ \n
+ \n
+ \n
+ <_configuration-file>~/.settings-security.xml\n
+ \n
+ \n
+ \n
+\n")))))
+ (add-before 'check 'fix-paths
+ (lambda _
+ (copy-recursively "src/test/resources" "target"))))))
+ (inputs
+ `(("java-plexus-cipher" ,java-plexus-cipher)))
+ (native-inputs
+ `(("java-modello-core" ,java-modello-core)
+ ;; for modello:
+ ("java-plexus-container-default" ,java-plexus-container-default)
+ ("java-plexus-classworlds" ,java-plexus-classworlds)
+ ("java-plexus-utils" ,java-plexus-utils)
+ ("java-guava" ,java-guava)
+ ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
+ ("java-sisu-build-api" ,java-sisu-build-api)
+ ;; modello plugins:
+ ("java-modellop-plugins-java" ,java-modello-plugins-java)
+ ("java-modellop-plugins-xml" ,java-modello-plugins-xml)
+ ("java-modellop-plugins-xpp3" ,java-modello-plugins-xpp3)
+ ;; for tests
+ ("java-junit" ,java-junit)))
+ (build-system ant-build-system)
+ (home-page "https://github.com/sonatype/plexus-sec-dispatcher")
+ (synopsis "Plexus Security Dispatcher Component")
+ (description "This package is the Plexus Security Dispatcher Component.
+This component decrypts a string passed to it.")
+ (license license:asl2.0)))
+
(define-public java-sisu-build-api
(package
(name "java-sisu-build-api")
--
cgit v1.3
From c1cb8576453db450493726ab44f34910dfa10ed7 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Wed, 28 Feb 2018 22:12:52 +0100
Subject: gnu: Add java-ecj-3.
* gnu/packages/java.scm (java-ecj-3): New variable.
---
gnu/packages/java.scm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 2b7a76fda..4ea6f4d8c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2018,6 +2018,41 @@ debugging, etc.")
(delete-file-recursively "lib") #t))
(replace 'install (install-jars "bin/lib")))))))
+;; This is the last 3.x release of ECJ
+(define-public java-ecj-3
+ (package
+ (name "java-ecj")
+ (version "3.8.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://archive.eclipse.org/eclipse/"
+ "downloads/drops/R-" version
+ "-201301310800/ecjsrc-" version ".jar"))
+ (sha256
+ (base32
+ "01mdj14jw11g1jfnki4fi8229p0c6zzckd38zqy2w4m3cjcvsx04"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:tests? #f ; none included
+ #:jdk ,icedtea-7 ; doesn't build with JDK8+
+ #:make-flags (list "-f" "src/build.xml")
+ #:build-target "build"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-manifest
+ (lambda _
+ ;; Record the main class to make ecj executable.
+ (with-atomic-file-replacement "src/META-INF/MANIFEST.MF"
+ (lambda (in out)
+ (display "Manifest-Version: 1.0
+Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n"
+ out)))))
+ (replace 'install (install-jars ".")))))
+ (home-page "https://eclipse.org")
+ (synopsis "Eclipse Java development tools core batch compiler")
+ (description "This package provides the Eclipse Java core batch compiler.")
+ (license license:epl1.0)))
+
(define-public java-classpathx-servletapi
(package
(name "java-classpathx-servletapi")
--
cgit v1.3
From f201b18ed7d7f8ab640f2e571aad765cf3c572dd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Wed, 28 Feb 2018 22:13:12 +0100
Subject: gnu: Add java-ecj-3.5.
* gnu/packages/java.scm (java-ecj-3.5): New variable.
---
gnu/packages/java.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 4ea6f4d8c..7a90bfba0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2053,6 +2053,37 @@ Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n"
(description "This package provides the Eclipse Java core batch compiler.")
(license license:epl1.0)))
+;; This is needed for java-cisd-args4j
+(define-public java-ecj-3.5
+ (package (inherit java-ecj-3)
+ (version "3.5.1")
+ (source (origin
+ (method url-fetch/zipbomb)
+ (uri (string-append "http://archive.eclipse.org/eclipse/"
+ "downloads/drops/R-" version
+ "-200909170800/ecjsrc-" version ".zip"))
+ (sha256
+ (base32
+ "1vnl2mavisc567bip736xzsvvbjif5279wc4a7pbdik5wlir8qr7"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:tests? #f ; none included
+ #:jdk ,icedtea-7 ; doesn't build with JDK8+
+ #:build-target "build"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-manifest
+ (lambda _
+ ;; Record the main class to make ecj executable.
+ (with-atomic-file-replacement "META-INF/MANIFEST.MF"
+ (lambda (in out)
+ (dump-port in out)
+ (display "Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n"
+ out)))))
+ (replace 'install (install-jars ".")))))
+ (native-inputs
+ `(("unzip" ,unzip)))))
+
(define-public java-classpathx-servletapi
(package
(name "java-classpathx-servletapi")
--
cgit v1.3
From 602f54f436d41634adaa56e4ff645a6bad202daf Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:36:58 +0100
Subject: gnu: java-jnacl: Use invoke.
* gnu/packages/java.scm (java-jnacl)[arguments]: Use "invoke".
---
gnu/packages/java.scm | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7a90bfba0..bc2fb32eb 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7538,18 +7538,18 @@ to use.")
#t))
(replace 'check
(lambda _
- (system* "ant" "compile-tests")
- (and
- (zero? (system* "java" "-cp" (string-append (getenv "CLASSPATH")
- ":build/classes"
- ":build/test-classes")
- "org.testng.TestNG" "-testclass"
- "build/test-classes/com/neilalexander/jnacl/NaclSecretBoxTest.class"))
- (zero? (system* "java" "-cp" (string-append (getenv "CLASSPATH")
- ":build/classes"
- ":build/test-classes")
- "org.testng.TestNG" "-testclass"
- "build/test-classes/com/neilalexander/jnacl/NaClTest.class"))))))))
+ (invoke "ant" "compile-tests")
+ (invoke "java" "-cp" (string-append (getenv "CLASSPATH")
+ ":build/classes"
+ ":build/test-classes")
+ "org.testng.TestNG" "-testclass"
+ "build/test-classes/com/neilalexander/jnacl/NaclSecretBoxTest.class")
+ (invoke "java" "-cp" (string-append (getenv "CLASSPATH")
+ ":build/classes"
+ ":build/test-classes")
+ "org.testng.TestNG" "-testclass"
+ "build/test-classes/com/neilalexander/jnacl/NaClTest.class")
+ #t)))))
(native-inputs
`(("java-testng" ,java-testng)
("java-fest-util" ,java-fest-util)
--
cgit v1.3
From e15864281615d3bc72d772b9bea704accd9262c3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:39:38 +0100
Subject: gnu: java-jnacl: Correct license.
* gnu/packages/java.scm (java-jnacl)[license]: Change to BSD-2.
---
gnu/packages/java.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index bc2fb32eb..e7715b4b3 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7558,7 +7558,7 @@ to use.")
(synopsis "Java implementation of NaCl")
(description "Pure Java implementation of the NaCl: Networking and
Cryptography library.")
- (license license:mpl2.0)))
+ (license license:bsd-2)))
(define-public java-mvel2
(package
--
cgit v1.3
From 8333c206a90977c5080313b1cb85b0513bd8e12d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:40:02 +0100
Subject: gnu: java-jnacl: Simplify build phase.
* gnu/packages/java.scm (java-jnacl)[arguments]: Simplify "fix-tests" phase.
---
gnu/packages/java.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e7715b4b3..a197da819 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7531,9 +7531,8 @@ to use.")
(modify-phases %standard-phases
(add-before 'build 'fix-tests
(lambda _
- (substitute* "src/test/java/com/neilalexander/jnacl/NaClTest.java"
- (("assertions.Assertions") "assertions.api.Assertions"))
- (substitute* "src/test/java/com/neilalexander/jnacl/NaclSecretBoxTest.java"
+ (substitute* '("src/test/java/com/neilalexander/jnacl/NaClTest.java"
+ "src/test/java/com/neilalexander/jnacl/NaclSecretBoxTest.java")
(("assertions.Assertions") "assertions.api.Assertions"))
#t))
(replace 'check
--
cgit v1.3
From 3e87923a67bb1352651ee0877633934fa0457f72 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:43:05 +0100
Subject: gnu: java-jnacl: Update to 0.1.0-2.094e819.
* gnu/packages/java.scm (java-jnacl): Update to 0.1.0-2.094e819.
---
gnu/packages/java.scm | 94 ++++++++++++++++++++++++++-------------------------
1 file changed, 48 insertions(+), 46 deletions(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a197da819..c527e6898 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7511,53 +7511,55 @@ to use.")
(license license:asl2.0)))
(define-public java-jnacl
- (package
- (name "java-jnacl")
- (version "0.1.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/neilalexander/jnacl")
- (commit "40c322e0a42637ab17cdf941138eeaf2494055f8")))
- (sha256
- (base32
- "1pspnmp44q61a2q4bpslpxw86rfn8s5l0xgvyrikqgdvg7ypx597"))))
- (build-system ant-build-system)
- (arguments
- `(#:jar-name "java-jnacl.jar"
- #:source-dir "src/main/java"
- #:jdk ,icedtea-8
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'fix-tests
- (lambda _
- (substitute* '("src/test/java/com/neilalexander/jnacl/NaClTest.java"
- "src/test/java/com/neilalexander/jnacl/NaclSecretBoxTest.java")
- (("assertions.Assertions") "assertions.api.Assertions"))
- #t))
- (replace 'check
- (lambda _
- (invoke "ant" "compile-tests")
- (invoke "java" "-cp" (string-append (getenv "CLASSPATH")
- ":build/classes"
- ":build/test-classes")
- "org.testng.TestNG" "-testclass"
- "build/test-classes/com/neilalexander/jnacl/NaclSecretBoxTest.class")
- (invoke "java" "-cp" (string-append (getenv "CLASSPATH")
- ":build/classes"
- ":build/test-classes")
- "org.testng.TestNG" "-testclass"
- "build/test-classes/com/neilalexander/jnacl/NaClTest.class")
- #t)))))
- (native-inputs
- `(("java-testng" ,java-testng)
- ("java-fest-util" ,java-fest-util)
- ("java-fest-assert" ,java-fest-assert)))
- (home-page "https://github.com/neilalexander/jnacl")
- (synopsis "Java implementation of NaCl")
- (description "Pure Java implementation of the NaCl: Networking and
+ (let ((commit "094e819afdd63ea81a499b3bcb42a271006bebd9")
+ (revision "2"))
+ (package
+ (name "java-jnacl")
+ (version (string-append "0.1.0-" revision "." (string-take commit 7)))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/neilalexander/jnacl.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "1d6g6xhn83byv5943n7935wwjsk0ibk0qdvqgr699qqgqqmwisbb"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:jar-name "java-jnacl.jar"
+ #:source-dir "src/main/java"
+ #:jdk ,icedtea-8
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'fix-tests
+ (lambda _
+ (substitute* '("src/test/java/com/neilalexander/jnacl/NaClTest.java"
+ "src/test/java/com/neilalexander/jnacl/NaclSecretBoxTest.java")
+ (("assertions.Assertions") "assertions.api.Assertions"))
+ #t))
+ (replace 'check
+ (lambda _
+ (invoke "ant" "compile-tests")
+ (invoke "java" "-cp" (string-append (getenv "CLASSPATH")
+ ":build/classes"
+ ":build/test-classes")
+ "org.testng.TestNG" "-testclass"
+ "build/test-classes/com/neilalexander/jnacl/NaclSecretBoxTest.class")
+ (invoke "java" "-cp" (string-append (getenv "CLASSPATH")
+ ":build/classes"
+ ":build/test-classes")
+ "org.testng.TestNG" "-testclass"
+ "build/test-classes/com/neilalexander/jnacl/NaClTest.class")
+ #t)))))
+ (native-inputs
+ `(("java-testng" ,java-testng)
+ ("java-fest-util" ,java-fest-util)
+ ("java-fest-assert" ,java-fest-assert)))
+ (home-page "https://github.com/neilalexander/jnacl")
+ (synopsis "Java implementation of NaCl")
+ (description "Pure Java implementation of the NaCl: Networking and
Cryptography library.")
- (license license:bsd-2)))
+ (license license:bsd-2))))
(define-public java-mvel2
(package
--
cgit v1.3
From 8c7d32e07c39df8a0d95c142eb46ecf0f8b65e57 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:43:56 +0100
Subject: gnu: java-jnacl: Do not prefix jar with "java-".
* gnu/packages/java.scm (java-jnacl)[arguments]: Rename jar to "jnacl.jar".
---
gnu/packages/java.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c527e6898..6350b57a8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7526,7 +7526,7 @@ to use.")
"1d6g6xhn83byv5943n7935wwjsk0ibk0qdvqgr699qqgqqmwisbb"))))
(build-system ant-build-system)
(arguments
- `(#:jar-name "java-jnacl.jar"
+ `(#:jar-name "jnacl.jar"
#:source-dir "src/main/java"
#:jdk ,icedtea-8
#:phases
--
cgit v1.3
From 080d0b605aa7cb0dc433d98b24a0bfeea63a2798 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:45:53 +0100
Subject: gnu: java-commons-jexl-2: Use invoke.
* gnu/packages/java.scm (java-commons-jexl-2)[arguments]: Use invoke.
---
gnu/packages/java.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 6350b57a8..830ecaf2f 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7654,8 +7654,9 @@ configuration and string construction.")
(add-before 'build 'run-javacc
(lambda _
(with-directory-excursion "src/main/java/org/apache/commons/jexl2/parser/"
- (and (zero? (system* "java" "jjtree" "Parser.jjt"))
- (zero? (system* "java" "javacc" "Parser.jj")))))))))
+ (invoke "java" "jjtree" "Parser.jjt")
+ (invoke "java" "javacc" "Parser.jj"))
+ #t)))))
(inputs
`(("java-commons-logging-minimal" ,java-commons-logging-minimal)))
(native-inputs
--
cgit v1.3
From 6338ea9a88cb651a9796bdb2a62786d61acd5ad1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:48:49 +0100
Subject: gnu: java-hawtjni: Simplify build phases.
* gnu/packages/java.scm (java-hawtjni)[arguments]: Use "invoke" instead of
"system*"; use "install-file" instead of "mkdir-p" and "copy-file".
---
gnu/packages/java.scm | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 830ecaf2f..579ab9b41 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -8384,26 +8384,23 @@ including pre-existing objects that you do not have source-code of.")
(modify-phases %standard-phases
(add-before 'build 'build-native
(lambda* (#:key inputs #:allow-other-keys)
- (with-directory-excursion "hawtjni-generator/src/main/resources/"
- (and
- (system* "gcc" "-c" "hawtjni.c" "-o" "hawtjni.o"
- "-fPIC" "-O2"
- (string-append "-I" (assoc-ref inputs "jdk") "/include/linux"))
- (system* "gcc" "-c" "hawtjni-callback.c" "-o" "hawtjni-callback.o"
- "-fPIC" "-O2"
- (string-append "-I" (assoc-ref inputs "jdk") "/include/linux"))
- (system* "gcc" "-o" "libhawtjni.so" "-shared"
- "hawtjni.o" "hawtjni-callback.o")))))
+ (let ((include (string-append "-I" (assoc-ref inputs "jdk") "/include/linux")))
+ (with-directory-excursion "hawtjni-generator/src/main/resources/"
+ (invoke "gcc" "-c" "hawtjni.c" "-o" "hawtjni.o"
+ "-fPIC" "-O2" include)
+ (invoke "gcc" "-c" "hawtjni-callback.c" "-o" "hawtjni-callback.o"
+ "-fPIC" "-O2" include)
+ (invoke "gcc" "-o" "libhawtjni.so" "-shared"
+ "hawtjni.o" "hawtjni-callback.o")))
+ #t))
(add-after 'install 'install-native
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))
(inc (string-append out "/include")))
- (mkdir-p lib)
- (mkdir-p inc)
(with-directory-excursion "hawtjni-generator/src/main/resources/"
- (copy-file "libhawtjni.so" (string-append lib "/libhawtjni.so"))
- (copy-file "hawtjni.h" (string-append inc "/hawtjni.h"))))
+ (install-file "libhawtjni.so" lib)
+ (install-file "hawtjni.h" inc)))
#t)))))
(inputs
`(("java-commons-cli" ,java-commons-cli)
--
cgit v1.3
From 3d6925ef51995cf4aab1c128cfcb6c322c0c5467 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:52:00 +0100
Subject: gnu: java-jansi-native: Fix description.
* gnu/packages/java.scm (java-jansi-native)[description]: Replace placeholder
text with an actual description.
---
gnu/packages/java.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 579ab9b41..1c8435830 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -8465,8 +8465,9 @@ that is part of the SWT Tools project.")
`(("java-hawtjni" ,java-hawtjni)))
(home-page "https://fusesource.github.io/jansi/")
(synopsis "Native library for jansi")
- (description "Java-jansi-native contains the native library for the jansi
-frobnication library/framework.")
+ (description "This package provides the native library for jansi, a small
+Java library that allows you to use ANSI escape sequences to format your
+console output.")
(license license:asl2.0)))
(define-public java-jansi
--
cgit v1.3
From e85c1bf6cd72887eb20680ac8ebf578b5831e6f6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:53:15 +0100
Subject: gnu: java-jansi-native: Simplify.
* gnu/packages/java.scm (java-jansi-native)[arguments]: Use "invoke"; remove
useless "mkdir-p".
---
gnu/packages/java.scm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 1c8435830..3c208ffe6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -8437,14 +8437,14 @@ that is part of the SWT Tools project.")
(with-directory-excursion "src/main/native-package/src"
(substitute* "jansi_ttyname.c"
(("#include \"jansi_.*") ""))
- (and
- (system* "gcc" "-c" "jansi_ttyname.c" "-o" "jansi_ttyname.o"
- (string-append "-I" (assoc-ref inputs "java-hawtjni")
- "/include")
- (string-append "-I" (assoc-ref inputs "jdk")
- "/include/linux")
- "-fPIC" "-O2")
- (system* "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o")))))
+ (invoke "gcc" "-c" "jansi_ttyname.c" "-o" "jansi_ttyname.o"
+ (string-append "-I" (assoc-ref inputs "java-hawtjni")
+ "/include")
+ (string-append "-I" (assoc-ref inputs "jdk")
+ "/include/linux")
+ "-fPIC" "-O2")
+ (invoke "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o")
+ #t)))
(add-before 'build 'install-native
(lambda _
(let ((dir (string-append "build/classes/META-INF/native/"
@@ -8457,7 +8457,6 @@ that is part of the SWT Tools project.")
#t))
(add-after 'install 'install-native
(lambda* (#:key outputs #:allow-other-keys)
- (mkdir-p (string-append (assoc-ref outputs "out") "/include"))
(install-file "src/main/native-package/src/jansi.h"
(string-append (assoc-ref outputs "out") "/include"))
#t)))))
--
cgit v1.3
From 13f38d31a4cf3d3dcc7935c21b3288c65f143f00 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:56:02 +0100
Subject: gnu: antlr3-3.1: Use invoke.
* gnu/packages/java.scm (antlr3-3.1)[arguments]: Use invoke.
---
gnu/packages/java.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 3c208ffe6..b3a0c8936 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -5709,12 +5709,13 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;"))
(for-each (lambda (file)
(display file)
(newline)
- (system* "antlr" "-o" dir (string-append dir file)))
+ (invoke "antlr" "-o" dir (string-append dir file)))
'("antlr.g" "antlr.print.g" "assign.types.g"
"buildnfa.g" "define.g")))
(format #t "codegen.g\n")
- (system* "antlr" "-o" "src/org/antlr/codegen"
- "src/org/antlr/codegen/codegen.g")))
+ (invoke "antlr" "-o" "src/org/antlr/codegen"
+ "src/org/antlr/codegen/codegen.g")
+ #t))
(add-before 'build 'fix-build-xml
(lambda _
(substitute* "build.xml"
--
cgit v1.3
From ec32bc9860fc54b8a4f874f7c67465172b2e1ec2 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 20:56:32 +0100
Subject: gnu: antlr3-3.1: Remove version from package name.
* gnu/packages/java.scm (antlr3-3.1)[name]: Remove.
[arguments]: Adjust accordingly.
---
gnu/packages/java.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b3a0c8936..9e9c10125 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -5666,7 +5666,6 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;"))
(define antlr3-3.1
(package
(inherit antlr3)
- (name "antlr3-3.1")
(version "3.1")
(source (origin
(method url-fetch)
@@ -5677,7 +5676,7 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;"))
(base32
"0sfimc9cpbgrihz4giyygc8afgpma2c93yqpwb951giriri6x66z"))))
(arguments
- `(#:jar-name (string-append ,name "-" ,version ".jar")
+ `(#:jar-name (string-append "antlr3-" ,version ".jar")
#:source-dir "src:runtime/Java/src"
#:tests? #f
#:phases
--
cgit v1.3
From 1b6bc5167519d5c87b87fd4d7e367fbbe54c9b2e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 21:00:24 +0100
Subject: gnu: java-lz4: Use invoke.
* gnu/packages/java.scm (java-lz4)[arguments]: Use invoke.
---
gnu/packages/java.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 9e9c10125..8cc3b7201 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7696,7 +7696,8 @@ by technical operatives or consultants working with enterprise platforms.")
(add-before 'configure 'generate-source
(lambda _
(with-directory-excursion "src/build/source_templates"
- (zero? (system* "mvel2" "../gen_sources.mvel" "../../java"))))))))
+ (invoke "mvel2" "../gen_sources.mvel" "../../java"))
+ #t)))))
(native-inputs
`(("mvel" ,java-mvel2)))
(home-page "https://jpountz.github.io/lz4-java")
--
cgit v1.3
From 9be4b9fa582090a74395e18883e9d97c1b1119e2 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 21:02:03 +0100
Subject: gnu: java-bouncycastle-bcprov: Use invoke.
* gnu/packages/java.scm (java-bouncycastle-bcprov)[arguments]: Use invoke.
---
gnu/packages/java.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 8cc3b7201..113c75603 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7727,7 +7727,8 @@ algorithms and xxHash hashing algorithm.")
(lambda _
(mkdir-p "src")
(with-directory-excursion "src"
- (zero? (system* "unzip" "../src.zip"))))))))
+ (invoke "unzip" "../src.zip"))
+ #t)))))
(native-inputs
`(("unzip" ,unzip)
("junit" ,java-junit)))
--
cgit v1.3
From 201084ac1ff9cace8350ff820f1b30b1720540fe Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus
Date: Tue, 27 Feb 2018 21:03:37 +0100
Subject: gnu: java-bouncycastle-bcpkix: Use invoke.
* gnu/packages/java.scm (java-bouncycastle-bcpkix)[arguments]: Use invoke.
---
gnu/packages/java.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 113c75603..0f8c04e8b 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7759,7 +7759,8 @@ for the Java programming language.")
(lambda _
(mkdir-p "src")
(with-directory-excursion "src"
- (zero? (system* "unzip" "../src.zip"))))))))
+ (invoke "unzip" "../src.zip"))
+ #t)))))
(native-inputs
`(("unzip" ,unzip)
("junit" ,java-junit)))
--
cgit v1.3