diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-10-05 19:15:39 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-10-05 19:15:39 +0200 |
commit | cf6db76d2af2f287f12928df160447ab4165b3e5 (patch) | |
tree | 49a1309c0e04c00090ab106f7ae3495a6da328c1 /gnu/packages/java.scm | |
parent | e65b2181e8b436278e3dd0b405602a400fbd0a75 (diff) | |
parent | a6798218bea0d6b2df598042d1ced29f74bb4250 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r-- | gnu/packages/java.scm | 128 |
1 files changed, 128 insertions, 0 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d2f4c9d05b..96da495c29 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4288,6 +4288,85 @@ setter and getter method.") file filters and endian classes.") (license license:asl2.0))) +(define-public java-commons-exec-1.1 + (package + (name "java-commons-exec") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/exec/source/" + "commons-exec-" version "-src.tar.gz")) + (sha256 + (base32 + "025dk8xgj10lxwwwqp0hng2rn7fr4vcirxzydqzx9k4dim667alk")))) + (build-system ant-build-system) + (arguments + `(#:test-target "test" + #:make-flags + (list (string-append "-Dmaven.junit.jar=" + (assoc-ref %build-inputs "java-junit") + "/share/java/junit.jar")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'delete-network-tests + (lambda _ + (delete-file "src/test/java/org/apache/commons/exec/DefaultExecutorTest.java") + (substitute* "src/test/java/org/apache/commons/exec/TestRunner.java" + (("suite\\.addTestSuite\\(DefaultExecutorTest\\.class\\);") "")) + #t)) + ;; The "build" phase automatically tests. + (delete 'check) + (replace 'install (install-jars "target"))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/proper/commons-exec/") + (synopsis "Common program execution related classes") + (description "Commons-Exec simplifies executing external processes.") + (license license:asl2.0))) + +(define-public java-commons-exec + (package + (inherit java-commons-exec-1.1) + (version "1.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/exec/source/" + "commons-exec-" version "-src.tar.gz")) + (sha256 + (base32 + "17yb4h6f8l49c5iyyvda4z2nmw0bxrx857nrwmsr7mmpb7x441yv")))) + (arguments + `(#:test-target "test" + #:make-flags + (list (string-append "-Dmaven.junit.jar=" + (assoc-ref %build-inputs "java-junit") + "/share/java/junit.jar") + "-Dmaven.compiler.source=1.7" + "-Dmaven.compiler.target=1.7") + #:phases + (modify-phases %standard-phases + (add-before 'build 'delete-network-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; This test hangs indefinitely. + (delete-file "src/test/java/org/apache/commons/exec/issues/Exec60Test.java") + (substitute* "src/test/java/org/apache/commons/exec/issues/Exec41Test.java" + (("ping -c 10 127.0.0.1") "sleep 10")) + (substitute* "src/test/java/org/apache/commons/exec/issues/Exec49Test.java" + (("/bin/ls") "ls")) + (call-with-output-file "src/test/scripts/ping.sh" + (lambda (port) + (format port "#!~a/bin/sh\nsleep $1\n" + (assoc-ref inputs "bash")))) + #t)) + ;; The "build" phase automatically tests. + (delete 'check) + (replace 'install (install-jars "target"))))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))))) + (define-public java-commons-lang (package (name "java-commons-lang") @@ -7585,6 +7664,55 @@ configuration.") (description "This package is the jaxb annotations module for jackson.") (license license:asl2.0))); found on wiki.fasterxml.com/JacksonLicensing +(define-public java-fasterxml-jackson-modules-base-mrbean + (package + (name "java-fasterxml-jackson-modules-base-mrbean") + (version "2.9.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/FasterXML/" + "jackson-modules-base/archive/" + "jackson-modules-base-" version ".tar.gz")) + (sha256 + (base32 + "1wws95xi8sppp6b0k2vvjdjyynl20r1a4dwrhai08lzlria6blp5")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jackson-modules-base-mrbean.jar" + #:source-dir "mrbean/src/main/java" + #:test-dir "mrbean/src/test" + #:test-exclude + ;; Base class for tests + (list "**/BaseTest.java") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'generate-PackageVersion.java + (lambda _ + (let* ((out (string-append "mrbean/src/main/java/com/fasterxml/" + "jackson/module/mrbean/PackageVersion.java")) + (in (string-append out ".in"))) + (copy-file in out) + (substitute* out + (("@package@") "com.fasterxml.jackson.module.mrbean") + (("@projectversion@") ,version) + (("@projectgroupid@") "com.fasterxml.jackson.module.mrbean") + (("@projectartifactid@") "jackson-module-mrbean"))) + #t))))) + (inputs + `(("java-asm" ,java-asm) + ("java-fasterxml-jackson-annotations" + ,java-fasterxml-jackson-annotations) + ("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core) + ("java-fasterxml-jackson-databind" ,java-fasterxml-jackson-databind))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/FasterXML/jackson-modules-base") + (synopsis "POJO type materialization for Java") + (description "This package implements POJO type materialization. +Databinders can construct implementation classes for Java interfaces as part +of deserialization.") + (license license:asl2.0))) + (define-public java-snakeyaml (package (name "java-snakeyaml") |