update gradle, add dependencies and fix gradle-launcher

Julien LepillerSat Jun 16 22:03:05+0200 2018

4f1428d

update gradle, add dependencies and fix gradle-launcher

gradle-match-files-without-version-number.patch unknown status 1

1+
From df92ed786feeff0f54681d2f559ea25c9bbcef49 Mon Sep 17 00:00:00 2001
2+
From: Julien Lepiller <julien@lepiller.eu>
3+
Date: Thu, 14 Dec 2017 19:26:57 +0100
4+
Subject: [PATCH] Also match files without version number.
5+
6+
Guix usually build java libraries without embedding their version number
7+
in the file name.  This patch allows gradle to match these files too.
8+
---
9+
 .../org/gradle/api/internal/classpath/DefaultModuleRegistry.java | 9 ++++++---
10+
 1 file changed, 6 insertions(+), 3 deletions(-)
11+
12+
diff --git a/subprojects/core/src/main/java/org/gradle/api/internal/classpath/DefaultModuleRegistry.java b/subprojects/core/src/main/java/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
13+
index bcd55e3..b0ffd2b 100644
14+
--- a/subprojects/core/src/main/java/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
15+
+++ b/subprojects/core/src/main/java/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
16+
@@ -227,18 +227,21 @@ public class DefaultModuleRegistry implements ModuleRegistry {
17+
     }
18+
 
19+
     private File findJar(String name) {
20+
-        Pattern pattern = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar");
21+
+        Pattern pattern = Pattern.compile(Pattern.quote(name) + "\\.jar");
22+
+        Pattern pattern2 = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar");
23+
         if (gradleInstallation != null) {
24+
             for (File libDir : gradleInstallation.getLibDirs()) {
25+
                 for (File file : libDir.listFiles()) {
26+
-                    if (pattern.matcher(file.getName()).matches()) {
27+
+                    if (pattern.matcher(file.getName()).matches() ||
28+
+                                pattern2.matcher(file.getName()).matches()) {
29+
                         return file;
30+
                     }
31+
                 }
32+
             }
33+
         }
34+
         for (File file : classpath) {
35+
-            if (pattern.matcher(file.getName()).matches()) {
36+
+            if (pattern.matcher(file.getName()).matches() ||
37+
+                        pattern2.matcher(file.getName()).matches()) {
38+
                 return file;
39+
             }
40+
         }
41+
-- 
42+
2.15.1
43+
gradle-match-files-witouht-version-number.patch unknown status 2
1-
From df92ed786feeff0f54681d2f559ea25c9bbcef49 Mon Sep 17 00:00:00 2001
2-
From: Julien Lepiller <julien@lepiller.eu>
3-
Date: Thu, 14 Dec 2017 19:26:57 +0100
4-
Subject: [PATCH] Also match files without version number.
5-
6-
Guix usually build java libraries without embedding their version number
7-
in the file name.  This patch allows gradle to match these files too.
8-
---
9-
 .../org/gradle/api/internal/classpath/DefaultModuleRegistry.java | 9 ++++++---
10-
 1 file changed, 6 insertions(+), 3 deletions(-)
11-
12-
diff --git a/subprojects/core/src/main/java/org/gradle/api/internal/classpath/DefaultModuleRegistry.java b/subprojects/core/src/main/java/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
13-
index bcd55e3..b0ffd2b 100644
14-
--- a/subprojects/core/src/main/java/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
15-
+++ b/subprojects/core/src/main/java/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
16-
@@ -227,18 +227,21 @@ public class DefaultModuleRegistry implements ModuleRegistry {
17-
     }
18-
 
19-
     private File findJar(String name) {
20-
-        Pattern pattern = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar");
21-
+        Pattern pattern = Pattern.compile(Pattern.quote(name) + "\\.jar");
22-
+        Pattern pattern2 = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar");
23-
         if (gradleInstallation != null) {
24-
             for (File libDir : gradleInstallation.getLibDirs()) {
25-
                 for (File file : libDir.listFiles()) {
26-
-                    if (pattern.matcher(file.getName()).matches()) {
27-
+                    if (pattern.matcher(file.getName()).matches() ||
28-
+                                pattern2.matcher(file.getName()).matches()) {
29-
                         return file;
30-
                     }
31-
                 }
32-
             }
33-
         }
34-
         for (File file : classpath) {
35-
-            if (pattern.matcher(file.getName()).matches()) {
36-
+            if (pattern.matcher(file.getName()).matches() ||
37-
+                        pattern2.matcher(file.getName()).matches()) {
38-
                 return file;
39-
             }
40-
         }
41-
-- 
42-
2.15.1
43-
more/packages/gradle.scm
2929 
  #:use-module (gnu packages java)
3030 
  #:use-module (gnu packages maven)
3131 
  #:use-module (gnu packages web)
32+
  #:use-module (gnu packages version-control)
3233 
  #:use-module (gnu packages xml)
3334 
  #:use-module (more packages java))
3435 
…
6162 
@code{projects} and @code{runtime} parameters."
6263 
  (package
6364 
    (name (string-append "gradle-" subproject))
64-
    (version "4.4.0")
65+
    (version "4.8.0")
6566 
    (source (origin
6667 
              (method url-fetch)
6768 
              (uri (string-append "https://github.com/gradle/gradle/archive/v"
…
6970 
              (file-name (string-append "gradle-" version ".tar.gz"))
7071 
              (sha256
7172 
               (base32
72-
                "026232dy578nl8gzj1nfc9r25p8alcwdbwb9b8s3bw4krxmy6saz"))
73+
                "1jbw9044g0czn8pm46i6j4y0gx6l3b3iwamh9d7ja14i2wrx5shf"))
7374 
              (patches
7475 
                (search-patches
75-
                  "gradle-match-files-witouht-version-number.patch"))))
76+
                  "gradle-match-files-without-version-number.patch"))))
7677 
    (build-system ant-build-system)
7778 
    (arguments
7879 
     ;; The jar-name must be this exactly: gradle will not find its jar files
7980 
     ;; if they are named differently.
80-
     `(#:jar-name (string-append "gradle-" ,subproject "-4.4.jar")
81+
     `(#:jar-name (string-append "gradle-" ,subproject "-4.8.jar")
8182 
       #:source-dir (string-append "subprojects/" ,subproject "/src/main/java")
8283 
       #:jdk ,icedtea-8
8384 
       #:tests? #f;; Ignore tests for now
…
9293 
               (("message=\"")
9394 
                (string-append "message=\"Implementation-Title: Gradle"
9495 
                               "${line.separator}"
95-
                               "Implementation-Version: 4.4"
96+
                               "Implementation-Version: 4.8"
9697 
                               "${line.separator}")))
9798 
             #t))
9899 
         (add-before 'build 'add-properties
…
129130 
             (let ((resources (string-append "subprojects/" ,subproject
130131 
                                             "/src/main/resources")))
131132 
               (if (file-exists? resources)
132-
                 (copy-recursively resources "build/classes"))))))))
133+
                 (copy-recursively resources "build/classes")))
134+
             #t)))))
133135 
    (inputs '())
134-
    (native-inputs '())
136+
    (native-inputs
137+
      `(("java-junit" ,java-junit)))
135138 
    (home-page "")
136139 
    (synopsis "Build system")
137140 
    (description "Build system")
…
167170 
                   ;; FIXME: Can't we use groovy-ant for that?
168171 
                   (("<project basedir=\".\">")
169172 
                    "<project basedir=\".\"><taskdef name=\"groovyc\"
170-
classname=\"org.codehaus.groovy.ant.Groovyc\" />"))))))))
173+
classname=\"org.codehaus.groovy.ant.Groovyc\" />")
174+
                   ;; Tests are in test.home/groovy, not /java
175+
                   (("\\}/java") "}/groovy"))))))))
171176 
      (native-inputs
172177 
       `(("groovy" ,groovy)
173178 
         ,@(package-inputs groovy))))))
…
241246 
           (lambda _
242247 
             (substitute* '("buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/SourceMetaDataVisitor.java"
243248 
                            "buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/ExtractDslMetaDataTask.groovy")
244-
               (("groovyjarjarantlr") "antlr"))))
249+
               (("groovyjarjarantlr") "antlr"))
250+
             #t))
245251 
         (add-before 'build 'fixes
246252 
           (lambda _
247253 
             (substitute* "buildSrc/src/main/groovy/org/gradle/binarycompatibility/rules/SinceAnnotationMissingRule.java"
…
339345 
                 (mkdir-p "build/classes/org/gradle")
340346 
                 (with-output-to-file "build/classes/org/gradle/build-receipt.properties"
341347 
                   (lambda _
342-
                     (format #t "baseVersion=4.4
348+
                     (format #t "baseVersion=4.8
343349 
commitId=cf7821a6f79f8e2a598df21780e3ff7ce8db2b82
344350 
buildTimestamp=19710101000000+0000
345351 
buildTimestampIso=1971-01-01 00\\:00\\:00 UTC
346-
versionNumber=4.4
352+
versionNumber=4.8
347353 
isSnapshot=false")))
348354 
                 #t))))))
349355 
      (inputs
…
377383 
       ("java-jsr305" ,java-jsr305)))))
378384 
379385 
(define-public gradle-cli
380-
  (package
381-
    (inherit (gradle-subproject "cli" '() '()))))
386+
  (gradle-subproject "cli" '() '()))
382387 
383388 
(define-public gradle-native
384389 
  (package
…
417422 
         ("gradle-base-services-groovy" ,gradle-base-services-groovy)
418423 
         ("java-asm-6" ,java-asm-6)
419424 
         ("java-commons-lang" ,java-commons-lang)
425+
         ("java-fastutil" ,java-fastutil)
420426 
         ("java-guava-for-gradle" ,java-guava-for-gradle)
421427 
         ("java-jsr305" ,java-jsr305)
422428 
         ("java-kryo" ,java-kryo)
…
589595 
     `(("gradle-base-services" ,gradle-base-services)
590596 
       ("gradle-process-services" ,gradle-process-services)))))
591597 
598+
(define-public gradle-plugin-use
599+
  (let ((base (gradle-subproject
600+
                "plugin-use"
601+
                '("gradle-resources-http" "gradle-core" "gradle-dependency-management")
602+
                '())))
603+
    (package
604+
      (inherit base)
605+
      (inputs
606+
       `(("gradle-base-services" ,gradle-base-services)
607+
         ("gradle-base-services-groovy" ,gradle-base-services-groovy)
608+
         ("gradle-core" ,gradle-core)
609+
         ("gradle-core-api" ,gradle-core-api)
610+
         ("gradle-dependency-management" ,gradle-dependency-management)
611+
         ("gradle-logging" ,gradle-logging)
612+
         ("gradle-messaging" ,gradle-messaging)
613+
         ("groovy" ,groovy)
614+
         ("java-guava-for-gradle" ,java-guava-for-gradle)
615+
         ("java-jsr305" ,java-jsr305))))))
616+
592617 
(define-public gradle-core
593618 
  (let ((base (gradle-subproject
594619 
                "core"
…
698723 
(define-public gradle-launcher
699724 
  (let ((base (gradle-subproject
700725 
                "launcher"
701-
                '("gradle-base-services" "gradle-core-api" "gradle-core")
726+
                '("gradle-base-services" "gradle-core-api" "gradle-core" "gradle-tooling-api")
702727 
                '("java-asm-6" "java-commons-io" "java-slf4j-api"))))
703728 
    (package
704729 
      (inherit base)
…
732757 
                   (substitute* "build.xml"
733758 
                     (("message=\"")
734759 
                      (string-append "message=\"Class-Path: "
735-
                                     "gradle-base-services-4.4.jar "
736-
                                     "gradle-core-api-4.4.jar "
737-
                                     "gradle-core-4.4.jar"
760+
                                     "gradle-base-services-4.8.jar "
761+
                                     "gradle-core-api-4.8.jar "
762+
                                     "gradle-core-4.8.jar"
738763 
                                     "${line.separator}")))
739-
                   #t))))))))))
764+
                   #t))
765+
                ;; This phase fails, because the jar files are not actually
766+
                ;; present in the output directory.  This is because gradle
767+
                ;; uses class loading: we need to put all its dependencies
768+
                ;; in the same package, which is done later.  Then the
769+
                ;; classpath becomes correct.
770+
                (delete 'generate-jar-indices)))))))))
740771 
741772 
(define-public gradle-installation-beacon
742773 
  (package
…
776807 
       ("java-commons-lang" ,java-commons-lang)
777808 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
778809 
       ("java-jatl" ,java-jatl)
779-
       ("java-javax-inject" ,java-javax-inject)))))
810+
       ("java-javax-inject" ,java-javax-inject)
811+
       ("java-jsr305" ,java-jsr305)))))
780812 
781813 
(define-public gradle-resources-http
782814 
  (package
…
784816 
               "resources-http"
785817 
               '("gradle-resources" "gradle-base-services" "gradle-core")
786818 
               ;; TODO: jcl-over-slf4j
787-
               '("java-httpcomponents-client" "java-httpcomponents-core"
819+
               '("java-httpcomponents-httpclient" "java-httpcomponents-httpcore"
788820 
                 "java-commons-codec" "java-jcifs" "java-slf4j-api"
789821 
                 "java-guava-for-gradle" "java-commons-lang" "java-commons-io"
790822 
                 "java-nekohtml" "java-xerces" "java-jaxp")))
…
798830 
       ("java-commons-io" ,java-commons-io)
799831 
       ("java-commons-lang" ,java-commons-lang)
800832 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
801-
       ("java-httpcomponents-client" ,java-httpcomponents-client)
802-
       ("java-httpcomponents-core" ,java-httpcomponents-core)
833+
       ("java-httpcomponents-httpclient" ,java-httpcomponents-httpclient)
834+
       ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore)
803835 
       ("java-jaxp" ,java-jaxp)
804836 
       ("java-jcifs" ,java-jcifs)
805837 
       ("java-jsr305" ,java-jsr305)
…
807839 
       ("java-slf4j-api" ,java-slf4j-api)
808840 
       ("java-xerces" ,java-xerces)))))
809841 
842+
(define-public gradle-version-control
843+
  (let ((base (gradle-subproject
844+
                "version-control"
845+
                '("gradle-core" "gradle-core-api")
846+
                ;TODO: jcl-over-slf4j-1.7.16.jar
847+
                '("java-httpcomponents-httpclient" "java-httpcomponents-httpcore"
848+
                  "java-commons-codec" "java-jgit" "java-jsch"
849+
                  "java-slf4j-api"))))
850+
    (package
851+
      (inherit base)
852+
      (inputs
853+
       `(("gradle-base-services" ,gradle-base-services)
854+
         ("gradle-core" ,gradle-core)
855+
         ("gradle-core-api" ,gradle-core-api)
856+
         ("gradle-logging" ,gradle-logging)
857+
         ("gradle-persistent-cache" ,gradle-persistent-cache)
858+
         ("java-commons-codec" ,java-commons-codec)
859+
         ("java-guava-for-gradle" ,java-guava-for-gradle)
860+
         ("java-httpcomponents-httpclient" ,java-httpcomponents-httpclient)
861+
         ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore)
862+
         ("java-jgit" ,java-jgit)
863+
         ("java-jsch" ,java-jsch)
864+
         ("java-jsr305" ,java-jsr305)
865+
         ("java-slf4j-api" ,java-slf4j-api))))))
866+
810867 
(define-public gradle-dependency-management
811868 
  (let ((base (gradle-subproject
812869 
                 "dependency-management"
…
823880 
                 ;; maven-settings maven-settings-builder xbean-reflect
824881 
                 '("java-asm-6" "java-commons-lang" "java-commons-io"
825882 
                   "java-apache-ivy" "java-slf4j-api" "java-gson"
826-
                   "java-jcip-annotations" "java-bouncycastle-bcprov"
883+
                   "java-jcip-annotations" "java-bouncycastle"
827884 
                   "java-jsch"))))
828885 
    (package
829886 
      (inherit base)
…
852909 
         ("gradle-persistent-cache" ,gradle-persistent-cache)
853910 
         ("gradle-resources" ,gradle-resources)
854911 
         ("gradle-resources-http" ,gradle-resources-http)
912+
         ("gradle-version-control" ,gradle-version-control)
855913 
         ("groovy" ,groovy)
856914 
         ("java-apache-ivy" ,java-apache-ivy)
857915 
         ("java-asm-6" ,java-asm-6)
…
11171175 
       ("groovy" ,groovy)
11181176 
       ("java-asm-6" ,java-asm-6)
11191177 
       ("java-commons-lang" ,java-commons-lang)
1178+
       ("java-fastutil" ,java-fastutil)
11201179 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
11211180 
       ("java-javax-inject" ,java-javax-inject)
11221181 
       ("java-jsr305" ,java-jsr305)
…
14711530 
org/objenesis
14721531 
"))))
14731532 
             (mkdir-p "build/jar")
1474-
             (zero? (system* "jar" "cf" "build/jar/gradle-gradle-runtime-api-info-4.4.jar"
1475-
                             "-C" "build/classes" ".")))))))))))
1533+
             (invoke "jar" "cf" "build/jar/gradle-runtime-api-info-4.8.jar"
1534+
                             "-C" "build/classes" ".")
1535+
             #t)))))))))
14761536 
14771537 
;; This package doesn't work. I need to understand how api-mapping.txt and
14781538 
;; default-imports.txt are generated. Currently they are generated by a custom
…
26712731 
WorkerExecutionException:org.gradle.workers.WorkerExecutionException;
26722732 
WorkerExecutor:org.gradle.workers.WorkerExecutor;
26732733 
")))
2674-
                (zero? (system* "ant" "jar")))))))))))
2734+
                (invoke "ant" "jar")
2735+
                #t)))))))))
26752736 
26762737 
;; Gradle doesn't provide a gradle binary or script, so we provide it instead.
26772738 
;; Gradle expects that all its modules and dependency jars are located in the
…
27022763 
                          (filename (string-append bindir "/gradle"))
27032764 
                          (plugins
27042765 
                           '("gradle-workers"
2766+
                             "gradle-version-control"
27052767 
                             "gradle-testing-jvm"
27062768 
                             "gradle-testing-base"
27072769 
                             "gradle-resources-http"
…
27102772 
                             "gradle-platform-native"
27112773 
                             "gradle-platform-jvm"
27122774 
                             "gradle-platform-base"
2775+
                             "gradle-plugin-use"
27132776 
                             "gradle-language-jvm"
27142777 
                             "gradle-language-java"
27152778 
                             "gradle-language-groovy"
27162779 
                             "gradle-diagnostics"
2717-
                             "gradle-dependency-management"))
2780+
                             "gradle-dependency-management"
2781+
                             "java-apache-ivy"
2782+
                             "java-bouncycastle"
2783+
                             "java-bsh"
2784+
                             "java-commons-codec"
2785+
                             "java-gson"
2786+
                             "java-hamcrest-all"
2787+
                             "java-httpcomponents-httpclient"
2788+
                             "java-httpcomponents-httpcore"
2789+
                             "java-jatl"
2790+
                             "java-jcifs"
2791+
                             "java-jcommander"
2792+
                             "java-jgit"
2793+
                             "java-jsch"
2794+
                             "java-snakeyaml"
2795+
                             "java-testng"
2796+
                             "java-junit"
2797+
                             "java-nekohtml"
2798+
                             "java-xerces"))
2799+
                          ;; java-asm-6 and java-jansi are already present in groovy.
27182800 
                          (dependencies 
27192801 
                           '("gradle-wrapper"
27202802 
                             "gradle-tooling-api"
…
27392821 
                             "gradle-base-services-groovy"
27402822 
                             "gradle-base-services"
27412823 
                             "groovy"
2742-
                             "java-asm-6"
27432824 
                             "java-commons-compress"
27442825 
                             "java-commons-collections"
27452826 
                             "java-commons-io"
27462827 
                             "java-commons-lang"
27472828 
                             "java-guava-for-gradle"
2748-
                             "java-jansi"
27492829 
                             "java-jansi-native"
27502830 
                             "java-javax-inject"
27512831 
                             "java-jaxp"
…
27712851 
                                 output
27722852 
                                 (string-append (assoc-ref %build-inputs "icedtea-8")
27732853 
                                                "/bin/java")
2774-
                                 (string-append libdir "/gradle-launcher-4.4.jar"))))
2854+
                                 (string-append libdir "/gradle-launcher-4.8.jar"))))
27752855 
                     (chmod filename #o755)
27762856 
                     ;; Create a symlink for every dependency listed above.
27772857 
                     (for-each
…
27932873 
                                         ".*.jar"))
27942874 
                           plugins)))
27952875 
                     ;; Using a symlink for gradle-launcher doesn't seem to work.
2796-
                     (delete-file (string-append libdir "/gradle-launcher-4.4.jar"))
2876+
                     (delete-file (string-append libdir "/gradle-launcher-4.8.jar"))
27972877 
                     (copy-file (string-append (assoc-ref %build-inputs "gradle-launcher")
2798-
                                               "/share/java/gradle-launcher-4.4.jar")
2878+
                                               "/share/java/gradle-launcher-4.8.jar")
27992879 
                                (string-append libdir
2800-
                                               "/gradle-launcher-4.4.jar"))))))
2880+
                                               "/gradle-launcher-4.8.jar"))))))
28012881 
    (inputs
28022882 
     `(("gradle-wrapper"               ,gradle-wrapper)
28032883 
       ("gradle-workers"               ,gradle-workers)
2884+
       ("gradle-version-control"       ,gradle-version-control)
28042885 
       ("gradle-tooling-api"           ,gradle-tooling-api)
28052886 
       ("gradle-testing-jvm"           ,gradle-testing-jvm)
28062887 
       ("gradle-testing-base"          ,gradle-testing-base)
…
28092890 
       ("gradle-resources"             ,gradle-resources)
28102891 
       ("gradle-reporting"             ,gradle-reporting)
28112892 
       ("gradle-process-services"      ,gradle-process-services)
2893+
       ("gradle-plugin-use"            ,gradle-plugin-use)
28122894 
       ("gradle-plugins"               ,gradle-plugins)
28132895 
       ("gradle-platform-native"       ,gradle-platform-native)
28142896 
       ("gradle-platform-jvm"          ,gradle-platform-jvm)
…
28392921 
       ("groovy" ,groovy)
28402922 
       ("icedtea-8" ,icedtea-8)
28412923 
       ("java-asm-6" ,java-asm-6)
2924+
       ("java-apache-ivy" ,java-apache-ivy)
2925+
       ("java-bouncycastle" ,java-bouncycastle)
2926+
       ("java-bsh" ,java-bsh)
2927+
       ("java-commons-codec" ,java-commons-codec)
28422928 
       ("java-commons-compress" ,java-commons-compress)
28432929 
       ("java-commons-collections" ,java-commons-collections)
28442930 
       ("java-commons-io" ,java-commons-io)
28452931 
       ("java-commons-lang" ,java-commons-lang)
2932+
       ("java-gson" ,java-gson)
28462933 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
2934+
       ("java-hamcrest-all" ,java-hamcrest-all)
2935+
       ("java-httpcomponents-httpclient" ,java-httpcomponents-httpclient)
2936+
       ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore)
28472937 
       ("java-jansi" ,java-jansi)
28482938 
       ("java-jansi-native" ,java-jansi-native)
2939+
       ("java-jatl" ,java-jatl)
28492940 
       ("java-javax-inject" ,java-javax-inject)
28502941 
       ("java-jaxp" ,java-jaxp)
2942+
       ("java-jcifs" ,java-jcifs)
28512943 
       ("java-jcip-annotations" ,java-jcip-annotations)
2944+
       ("java-jcommander" ,java-jcommander)
2945+
       ("java-jgit" ,java-jgit)
2946+
       ("java-jsch" ,java-jsch)
28522947 
       ("java-jsr305" ,java-jsr305)
28532948 
       ("java-jul-to-slf4j" ,java-jul-to-slf4j)
2949+
       ("java-junit" ,java-junit)
28542950 
       ("java-kryo" ,java-kryo)
28552951 
       ("java-minlog" ,java-minlog)
28562952 
       ("java-native-platform" ,java-native-platform)
2953+
       ("java-nekohtml" ,java-nekohtml)
28572954 
       ("java-objenesis" ,java-objenesis)
28582955 
       ("java-reflectasm" ,java-reflectasm)
28592956 
       ("java-slf4j-api" ,java-slf4j-api)
2957+
       ("java-snakeyaml" ,java-snakeyaml)
2958+
       ("java-testng" ,java-testng)
2959+
       ("java-xerces" ,java-xerces)
28602960 
       ("ant" ,ant)
28612961 
       ("bash" ,bash)))
28622962 
    (native-inputs '())))
more/packages/java.scm
4848 
  #:use-module (gnu packages xorg)
4949 
  #:use-module (more packages python))
5050 
51+
(define-public java-fastutil
52+
  (package
53+
    (name "java-fastutil")
54+
    (version "8.2.1")
55+
    (source (origin
56+
              (method url-fetch)
57+
              (uri (string-append "http://fastutil.di.unimi.it/fastutil-"
58+
                                  version "-src.tar.gz"))
59+
              (sha256
60+
               (base32
61+
                "039gh3b9a72dvc9jmijfhshd2i7bnj18p2yi67200qfrnw17wbkj"))))
62+
    (build-system ant-build-system)
63+
    (arguments
64+
     `(#:jdk ,icedtea-8
65+
       #:tests? #f; no tests
66+
       #:phases
67+
       (modify-phases %standard-phases
68+
         (add-before 'build 'generate-sources
69+
           (lambda _
70+
             (invoke "make" "CC=gcc" "sources")
71+
             #t))
72+
         (add-after 'build 'generate-javadoc
73+
           (lambda _
74+
             (invoke "ant" "javadoc")
75+
             #t))
76+
         (replace 'install
77+
           (install-jars ".")))))
78+
    (home-page "http://fastutil.di.unimi.it/")
79+
    (synopsis "")
80+
    (description "")
81+
    (license license:asl2.0)))
82+
5183 
;; Maintained version of http-builder (groovyx.net.http)
5284 
(define-public java-http-builder-ng
5385 
  (package
…
267299 
(define-public java-jcifs
268300 
  (package
269301 
    (name "java-jcifs")
270-
    (version "1.3.18")
302+
    (version "1.3.19")
271303 
    (source (origin
272304 
              (method url-fetch)
273305 
              (uri (string-append "https://jcifs.samba.org/src/jcifs-"
274306 
                                  version ".tgz"))
275307 
              (sha256
276308 
               (base32
277-
                "04li1j2y9ndvp77g67dzp8yra1899wx21mg5gkbldpy4f190vq0m"))
309+
                "19kzac3c19j0fyssibcj47868k8079wlj9azgsd7i6yqmdgqyk3y"))
278310 
              (modules '((guix build utils)))
279311 
              (snippet
280312 
                `(delete-file (string-append "jcifs-" ,version ".jar")))))