more dependencies

Julien LepillerSun Jan 20 22:59:03+0100 2019

5a6041f

more dependencies

more/packages/binary.scm

3333 
  #:use-module (gnu packages multiprecision)
3434 
  #:use-module (gnu packages pkg-config)
3535 
  #:use-module (gnu packages python)
36+
  #:use-module (gnu packages python-xyz)
3637 
  #:use-module (gnu packages python-crypto)
3738 
  #:use-module (gnu packages qt)
3839 
  #:use-module (gnu packages tls)

more/packages/geo.scm

3939 
  #:use-module (gnu packages web)
4040 
  #:use-module (gnu packages xml))
4141 
42-
(define-public tegola
43-
  (package
44-
    (name "tegola")
45-
    (version "0.7.0")
46-
    (source (origin
47-
              (method url-fetch)
48-
              (uri (string-append
49-
                     "https://github.com/go-spatial/tegola/archive/v"
50-
                     version ".tar.gz"))
51-
              (sha256
52-
               (base32
53-
                "09vnzxfn0r70kmd776kcdfqxhzdj11syxa0b27z4ci1k367v7viw"))))
54-
    (build-system go-build-system)
55-
    (arguments
56-
     `(#:import-path "github.com/go-spatial/tegola/cmd/tegola"
57-
       #:unpack-path "github.com/go-spatial"
58-
       #:phases
59-
       (modify-phases %standard-phases
60-
         (add-before 'build 'rename-import
61-
           (lambda _
62-
             (rename-file (string-append "src/github.com/go-spatial/tegola-" ,version)
63-
                          "src/github.com/go-spatial/tegola")
64-
             #t)))))
65-
    (home-page "http://tegola.io")
66-
    (synopsis "Vector tile server for maps")
67-
    (description "Tegola is a free vector tile server written in Go.  Tegola
68-
takes geospatial data and slices it into vector tiles that can be efficiently
69-
delivered to any client.")
70-
    (license license:expat)))
71-
72-
(define-public protozero
73-
  (package
74-
    (name "protozero")
75-
    (version "1.6.3")
76-
    (source
77-
      (origin
78-
        (method url-fetch)
79-
        (uri (string-append "https://github.com/mapbox/protozero/archive/v"
80-
			    version ".tar.gz"))
81-
	(file-name (string-append name "-" version ".tar.gz"))
82-
        (sha256
83-
         (base32
84-
          "1xaj4phz1r7xn0vgdfvfkz8b0bizgb6mavjky1zqcvdmbwgwgly5"))))
85-
    (build-system cmake-build-system)
86-
    (home-page "https://github.com/mapbox/protozero")
87-
    (synopsis "Minimalistic protocol buffer decoder and encoder in C++")
88-
    (description "Protozero is a minimalistic protocol buffer decored and
89-
encoder in C++.  The developer using protozero has to manually translate the
90-
@file{.proto} description into code.")
91-
    (license (list
92-
	       license:asl2.0; for folly
93-
	       license:bsd-2))))
94-
95-
(define-public libosmium
96-
  (package
97-
    (name "libosmium")
98-
    (version "2.14.2")
99-
    (source
100-
      (origin
101-
        (method url-fetch)
102-
        (uri (string-append "https://github.com/osmcode/libosmium/archive/v"
103-
			    version ".tar.gz"))
104-
	(file-name (string-append name "-" version ".tar.gz"))
105-
        (sha256
106-
         (base32
107-
          "0d9b46qiw7zkw1h9lygjdwqxnbhm3c7v8kydzw9f9f778cyagc94"))))
108-
    (build-system cmake-build-system)
109-
    (inputs
110-
     `(("boost" ,boost)
111-
       ("expat" ,expat)
112-
       ("gdal" ,gdal)
113-
       ("geos" ,geos)
114-
       ("proj.4" ,proj.4)
115-
       ("protozero" ,protozero)
116-
       ("sparsehash" ,sparsehash)
117-
       ("zlib" ,zlib)))
118-
    (native-inputs
119-
     `(("doxygen" ,doxygen)))
120-
    (home-page "https://osmcode.org/libosmium")
121-
    (synopsis "C++ library for working with OpenStreetMap data")
122-
    (description "Libosmium is a fast and flexible C++ library for working with
123-
OpenStreetMap data.")
124-
    (license license:boost1.0)))
125-
126-
(define-public imposm3
127-
  (package
128-
    (name "imposm3")
129-
    (version "0.6.0-alpha.4")
130-
    (source
131-
      (origin
132-
        (method url-fetch)
133-
        (uri (string-append "https://github.com/omniscale/imposm3/archive/v"
134-
			    version ".tar.gz"))
135-
	(file-name (string-append name "-" version ".tar.gz"))
136-
        (sha256
137-
         (base32
138-
          "06f0kwmv52yd5m9jlckqxqmkf0cnqy3hamakrvg9lspplyqrds80"))))
139-
    (build-system go-build-system)
140-
    (arguments
141-
     `(#:import-path "github.com/omniscale/imposm3/cmd/imposm"
142-
       #:unpack-path "github.com/omniscale"
143-
       #:phases
144-
       (modify-phases %standard-phases
145-
         (add-before 'build 'rename-import
146-
           (lambda _
147-
             (rename-file (string-append "src/github.com/omniscale/imposm3-" ,version)
148-
                          "src/github.com/omniscale/imposm3")
149-
             #t)))))
150-
    (inputs
151-
     `(("geos" ,geos)
152-
       ("leveldb" ,leveldb)))
153-
    (home-page "http://imposm.org/")
154-
    (synopsis "OpenStreetMap importer for PostGIS.")
155-
    (description "OpenStreetMap importer for PostGIS.")
156-
    (license license:asl2.0)))
157-
15842 
(define-public osmconvert
15943 
  (package
16044 
    (name "osmconvert")
…
18771 
    (synopsis "")
18872 
    (description "")
18973 
    (license license:agpl3+)))
190-
191-
(define-public osm2pgsql
192-
  (package
193-
    (name "osm2pgsql")
194-
    (version "0.96.0")
195-
    (source (origin
196-
              (method url-fetch)
197-
              (uri (string-append "https://github.com/openstreetmap/osm2pgsql/archive/"
198-
                                  version ".tar.gz"))
199-
              (file-name (string-append name "-" version ".tar.gz"))
200-
              (sha256
201-
               (base32
202-
                "08y7776r4l9v9177a4q6cfdri0lpirky96m6g699hwl7v1vhw0mn"))))
203-
    (build-system cmake-build-system)
204-
    (arguments
205-
      ;; failure
206-
     `(#:tests? #f))
207-
    (inputs
208-
     `(("boost" ,boost)
209-
       ("expat" ,expat)
210-
       ("lua" ,lua)
211-
       ("postgresql" ,postgresql)
212-
       ("proj.4" ,proj.4)
213-
       ("zlib" ,zlib)))
214-
    (home-page "")
215-
    (synopsis "")
216-
    (description "")
217-
    (license license:gpl2)))
218-
219-
(define-public tippecanoe
220-
  (package
221-
    (name "tippecanoe")
222-
    (version "1.31.5")
223-
    (source (origin
224-
              (method url-fetch)
225-
              (uri (string-append "https://github.com/mapbox/tippecanoe/archive/"
226-
                                  version ".tar.gz"))
227-
              (file-name (string-append name "-" version ".tar.gz"))
228-
              (sha256
229-
               (base32
230-
                "1057na1dkgjaryr7jr15lqkxpam111d3l5zdpdkqzzzpxmdjxqcf"))))
231-
    (build-system gnu-build-system)
232-
    (arguments
233-
     `(#:phases
234-
       (modify-phases %standard-phases (delete 'configure))
235-
       #:test-target "test"
236-
       #:make-flags
237-
       (list "CC=gcc"
238-
             (string-append "PREFIX=" (assoc-ref %outputs "out")))))
239-
    (inputs
240-
     `(("sqlite" ,sqlite)
241-
       ("zlib" ,zlib)))
242-
    (native-inputs
243-
     `(("perl" ,perl)))
244-
    (home-page "")
245-
    (synopsis "")
246-
    (description "")
247-
    (license license:bsd-2)))
more/packages/gnuzilla.scm
6464 
  #:use-module (gnu packages pulseaudio)
6565 
  #:use-module (gnu packages python)
6666 
  #:use-module (gnu packages rust)
67+
  #:use-module (gnu packages sqlite)
6768 
  #:use-module (gnu packages version-control)
6869 
  #:use-module (gnu packages video)
6970 
  #:use-module (gnu packages xdisorg)
more/packages/gradle.scm
11 
;;; GNU Guix --- Functional package management for GNU
2-
;;; Copyright ?? 2017, 2018 Julien Lepiller <julien@lepiller.eu>
2+
;;; Copyright ?? 2017-2019 Julien Lepiller <julien@lepiller.eu>
33 
;;;
44 
;;; This file is part of GNU Guix.
55 
;;;
…
3737 
3838 
;; Gradle requires guava@17.
3939 
;; TODO: patch gradle to support at least guava@20 and send it upstream.
40-
(define-public java-guava-for-gradle
41-
  (package
42-
    (inherit java-guava)
43-
    (version "17.0")
44-
    (source (origin
45-
              (method url-fetch)
46-
              (uri (string-append "https://github.com/google/guava/"
47-
                                  "archive/v" version ".tar.gz"))
48-
              (sha256
49-
               (base32
50-
                "0kg2n0dfdncbm3kgf8fa6kig8djfhar24vf0yf287x27w5sqzhnb"))))
51-
    (arguments
52-
     `(#:jar-name "guava.jar"
53-
       #:source-dir "guava/src/"
54-
       #:tests? #f)))); Not in a "java" subdirectory
40+
(define-public java-guava-for-gradle java-guava-25)
41+
;  (package
42+
;    (inherit java-guava)
43+
;    (version "17.0")
44+
;    (source (origin
45+
;              (method url-fetch)
46+
;              (uri (string-append "https://github.com/google/guava/"
47+
;                                  "archive/v" version ".tar.gz"))
48+
;              (sha256
49+
;               (base32
50+
;                "0kg2n0dfdncbm3kgf8fa6kig8djfhar24vf0yf287x27w5sqzhnb"))))
51+
;    (arguments
52+
;     `(#:jar-name "guava.jar"
53+
;       #:jdk ,icedtea-7
54+
;       #:source-dir "guava/src/"
55+
;       #:tests? #f)))); Not in a "java" subdirectory
5556 
5657 
(define (gradle-subproject subproject projects runtime)
5758 
  "Gradle is made of a lot of subprojects. Each subproject can be compiled in
…
6162 
6263 
Each subproject contains at least a text file, gradle-*-classpath.properties
6364 
that contain dependency information. This file is created using the
64-
@code{projects} and @code{runtime} parameters."
65+
@code{projects} and @code{runtime} parameters.
66+
67+
@code{projects} is a list of gradle projects.  The right list is present in
68+
the @file{build.gradle} file of the subproject,
69+
70+
@code{runtime} is a list of dependencies on non-gradle libraries.  The exact
71+
list to pass is present in the @file{build.gradle} file of the subproject: in
72+
the dependencies section, look for @code{compile libraries.*.coordinates}."
6573 
  (package
6674 
    (name (string-append "gradle-" subproject))
67-
    (version "4.9.0")
75+
    ;(version "4.9.0")
76+
    (version "5.1.1")
6877 
    (source (origin
6978 
              (method url-fetch)
7079 
              (uri (string-append "https://github.com/gradle/gradle/archive/v"
…
7281 
              (file-name (string-append "gradle-" version ".tar.gz"))
7382 
              (sha256
7483 
               (base32
75-
                "19x1sksin2nh277pvd1f7h6kphbbqv4fb6sax696kvn1ci5h2fvp"))
84+
                ;"19x1sksin2nh277pvd1f7h6kphbbqv4fb6sax696kvn1ci5h2fvp"))
85+
                "0brjlj3gzgqfh0j132xrakl0jd4gpkm2q889yr688mglbmp5phw3"))
7686 
              (patches
7787 
                (search-patches
7888 
                  "gradle-match-files-without-version-number.patch"))))
…
8292 
     ;; if they are named differently.
8393 
     `(#:jar-name (string-append "gradle-" ,subproject "-" ,version ".jar")
8494 
       #:source-dir (string-append "subprojects/" ,subproject "/src/main/java")
85-
       #:jdk ,icedtea-8
95+
       #:jdk ,openjdk9
8696 
       #:tests? #f;; Ignore tests for now
8797 
       #:test-dir (string-append "subprojects/" ,subproject "/src/test")
8898 
       #:phases
…
92102 
             ;; Add implementation information to the MANIFEST.MF file.  We can
93103 
             ;; substitute this in the manifest phase.
94104 
             (substitute* "build.xml"
95-
               (("message=\"")
96-
                (string-append "message=\"Implementation-Title: Gradle"
97-
                               "${line.separator}"
98-
                               "Implementation-Version: " ,version
99-
                               "${line.separator}")))
105+
               (("</manifest>")
106+
                (string-append "<attribute name=\"Implementation-Title\" "
107+
                               "value=\"Gradle\" />"
108+
                               "<attribute name=\"Implementation-Version\" "
109+
                               "value=\"" ,version "\" /></manifest>")))
100110 
             #t))
101111 
         (add-before 'build 'add-properties
102112 
           (lambda* (#:key inputs #:allow-other-keys)
…
148158 
  (let ((base (gradle-subproject subproject projects runtime)))
149159 
    (package
150160 
      (inherit base)
161+
      (version (package-version base))
151162 
      (arguments
152163 
       (substitute-keyword-arguments (package-arguments base)
153164 
         ((#:source-dir source-dir)
154165 
          `(string-append "subprojects/" ,subproject "/src/main/groovy"))
155166 
         ((#:phases phases)
156167 
          `(modify-phases ,phases
157-
             (add-before 'build 'use-groovy
168+
             (replace 'build
158169 
               (lambda _
159-
                 (substitute* "build.xml"
160-
                   ;; Change the compiler to groovyc
161-
                   (("javac") "groovyc")
162-
                   ;; Make it fork
163-
                   (("includeantruntime=\"false\"")
164-
                    "includeantruntime=\"false\" fork=\"yes\"")
165-
                   ;; groovyc doesn't understand the --classpath argument (bug?)
166-
                   (("classpath=\"@refidclasspath\"")
167-
                    "classpathref=\"classpath\"")
168-
                   ;; To enable joint compilation
169-
                   (("classpathref=\"classpath\" />")
170-
                    "classpathref=\"classpath\"><javac source=\"1.5\" target=\"1.5\" /></groovyc>")
171-
                   ;; Actually create a definition of the groovyc task.
172-
                   ;; FIXME: Can't we use groovy-ant for that?
173-
                   (("<project basedir=\".\">")
174-
                    "<project basedir=\".\"><taskdef name=\"groovyc\"
175-
classname=\"org.codehaus.groovy.ant.Groovyc\" />")
176-
                   ;; Tests are in test.home/groovy, not /java
177-
                   (("\\}/java") "}/groovy"))))))))
170+
                 (mkdir-p "build/classes")
171+
                 (mkdir-p "build/jar")
172+
                 (invoke "ant" "manifest")
173+
                 (apply invoke "java" "-cp" (getenv "CLASSPATH")
174+
                               "org.codehaus.groovy.tools.FileSystemCompiler"
175+
                               "--classpath" (getenv "CLASSPATH")
176+
                               "-d" "build/classes" "-j"
177+
                               (find-files (string-append "subprojects/" ,subproject
178+
                                                          "/src/main/groovy")
179+
                                           ".*\\.(groovy|java)$"))
180+
                 (invoke "jar" "cmf" "build/manifest/MANIFEST.MF"
181+
                         (string-append "build/jar/gradle-" ,subproject
182+
                                        "-" ,version ".jar")
183+
                         "-C" "build/classes" ".")
184+
                 #t))))))
178185 
      (native-inputs
179-
       `(("groovy" ,groovy)
180-
         ,@(package-inputs groovy))))))
186+
       `(("groovy" ,groovy))))))
181187 
182188 
;; This gradle plugin is not a subproject, but it is required by buildsrc.
183189 
(define-public gradle-japicmp-plugin
…
355361 
isSnapshot=false" ,(package-version base) ,(package-version base))))
356362 
                 #t))))))
357363 
      (inputs
358-
       `(("java-guava-for-gradle" ,java-guava-for-gradle)
364+
       `(("java-asm-7" ,java-asm-7)
365+
         ("java-guava-for-gradle" ,java-guava-for-gradle)
359366 
         ("java-slf4j-api" ,java-slf4j-api)
360367 
         ("java-commons-lang" ,java-commons-lang)
361368 
         ("java-commons-io" ,java-commons-io)
…
372379 
    (inputs
373380 
     `(("gradle-base-services" ,gradle-base-services)
374381 
       ("groovy" ,groovy)
375-
       ("java-asm-6" ,java-asm-6)
382+
       ("java-asm-7" ,java-asm-7)
376383 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
377384 
       ("java-jsr305" ,java-jsr305)))))
378385 
…
405412 
(define-public gradle-messaging
406413 
  (let ((base  (gradle-subproject "messaging" '("gradle-base-services")
407414 
                                  '("java-slf4j-api" "java-kryo" "java-objenesis"
408-
                                    "java-minlog" "java-reflectasm" "java-asm-6"))))
415+
                                    "java-minlog" "java-reflectasm" "java-asm-7"))))
409416 
    (package
410417 
      (inherit base)
411418 
      (arguments
…
424431 
      (inputs
425432 
       `(("gradle-base-services" ,gradle-base-services)
426433 
         ("gradle-base-services-groovy" ,gradle-base-services-groovy)
427-
         ("java-asm-6" ,java-asm-6)
434+
         ("java-asm-7" ,java-asm-7)
428435 
         ("java-commons-lang" ,java-commons-lang)
429436 
         ("java-fastutil" ,java-fastutil)
430437 
         ("java-guava-for-gradle" ,java-guava-for-gradle)
…
444451 
                 "java-commons-io" "java-commons-lang")))
445452 
    (inputs
446453 
     `(("gradle-base-services" ,gradle-base-services)
454+
       ("gradle-logging" ,gradle-logging)
447455 
       ("gradle-messaging" ,gradle-messaging)
448456 
       ("gradle-native" ,gradle-native)
457+
       ("gradle-resources" ,gradle-resources)
449458 
       ("java-commons-collections" ,java-commons-collections)
450459 
       ("java-commons-io" ,java-commons-io)
451460 
       ("java-commons-lang" ,java-commons-lang)
…
573582 
               "model-core"
574583 
               '("gradle-base-services-groovy" "gradle-base-services")
575584 
               '("groovy" "java-slf4j-api" "java-guava-for-gradle"
576-
                 "java-jcip-annotations" "java-commons-lang" "java-asm-6")))
585+
                 "java-jcip-annotations" "java-commons-lang" "java-asm-7")))
577586 
    (inputs
578587 
     `(("gradle-base-services" ,gradle-base-services)
579588 
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)
589+
       ("gradle-core-api" ,gradle-core-api)
590+
       ("gradle-logging" ,gradle-logging)
580591 
       ("groovy" ,groovy)
581-
       ("java-asm-6" ,java-asm-6)
592+
       ("java-asm-7" ,java-asm-7)
582593 
       ("java-commons-lang" ,java-commons-lang)
583594 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
584595 
       ("java-jcip-annotations" ,java-jcip-annotations)
…
594605 
               '("java-guava-for-gradle" "java-commons-io")))
595606 
    (inputs
596607 
     `(("gradle-base-services" ,gradle-base-services)
597-
       ("gradle-model-core" ,gradle-model-core)
598608 
       ("gradle-native" ,gradle-native)
599609 
       ("java-commons-io" ,java-commons-io)
600610 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
601-
       ("java-jsr305" ,java-jsr305)))))
611+
       ("java-jsr305" ,java-jsr305)
612+
       ("java-slf4j-api" ,java-slf4j-api)))))
602613 
603614 
(define-public gradle-build-cache
604615 
  (package
…
610621 
    (inputs
611622 
     `(("gradle-base-services" ,gradle-base-services)
612623 
       ("gradle-logging" ,gradle-logging)
624+
       ("gradle-messaging" ,gradle-messaging)
613625 
       ("gradle-persistent-cache" ,gradle-persistent-cache)
614626 
       ("gradle-resources" ,gradle-resources)
615627 
       ("java-commons-io" ,java-commons-io)
…
648660 
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)
649661 
       ("gradle-build-cache" ,gradle-build-cache)
650662 
       ("gradle-logging" ,gradle-logging)
651-
       ("gradle-model-core" ,gradle-model-core)
652663 
       ("gradle-persistent-cache" ,gradle-persistent-cache)
653664 
       ("gradle-process-services" ,gradle-process-services)
654665 
       ("gradle-resources" ,gradle-resources)
…
672683 
       ("gradle-base-services-groovy" ,gradle-base-services-groovy)
673684 
       ("gradle-model-core" ,gradle-model-core)
674685 
       ("groovy" ,groovy)
675-
       ("java-asm-6" ,java-asm-6)
686+
       ("java-asm-7" ,java-asm-7)
676687 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
677688 
       ("java-jcip-annotations" ,java-jcip-annotations)
678689 
       ("java-jsr305" ,java-jsr305)))))
…
716727 
                  "gradle-build-cache" "gradle-core-api" "gradle-process-services"
717728 
                  "gradle-jvm-services" "gradle-model-core")
718729 
                '("groovy" "ant" "java-guava-for-gradle"
719-
                  "java-javax-inject" "java-asm-6" "java-slf4j-api"
730+
                  "java-javax-inject" "java-asm-7" "java-slf4j-api"
720731 
                  "java-commons-collections" "java-commons-io"
721732 
                  "java-commons-lang" "java-jcip-annotations" "java-jaxp"
722733 
                  "java-native-platform" "java-commons-compress"))))
…
773784 
         ("gradle-process-services" ,gradle-process-services)
774785 
         ("gradle-resources" ,gradle-resources)
775786 
         ("groovy" ,groovy)
776-
         ("java-asm-6" ,java-asm-6)
787+
         ("java-asm-7" ,java-asm-7)
777788 
         ("java-commons-collections" ,java-commons-collections)
778789 
         ("java-commons-compress" ,java-commons-compress)
779790 
         ("java-commons-io" ,java-commons-io)
…
816827 
  (let ((base (gradle-subproject
817828 
                "launcher"
818829 
                '("gradle-base-services" "gradle-core-api" "gradle-core" "gradle-tooling-api")
819-
                '("java-asm-6" "java-commons-io" "java-slf4j-api"))))
830+
                '("java-asm-7" "java-commons-io" "java-commons-lang" "java-slf4j-api"))))
820831 
    (package
821832 
      (inherit base)
822833 
      (inputs
…
833844 
         ("gradle-process-services" ,gradle-process-services)
834845 
         ("gradle-tooling-api" ,gradle-tooling-api)
835846 
         ("groovy" ,groovy)
836-
         ("java-asm-6" ,java-asm-6)
847+
         ("java-asm-7" ,java-asm-7)
837848 
         ("java-commons-io" ,java-commons-io)
849+
         ("java-commons-lang" ,java-commons-lang)
838850 
         ("java-guava-for-gradle" ,java-guava-for-gradle)
839851 
         ("java-jcip-annotations" ,java-jcip-annotations)
840852 
         ("java-jsr305" ,java-jsr305)
…
971983 
                 ;; plexus-cipher plexus-classworlds plexus-container-default
972984 
                 ;; plexus-component-annotations plexus-interpolation plexus-utils
973985 
                 ;; maven-settings maven-settings-builder xbean-reflect
974-
                 '("java-asm-6" "java-commons-lang" "java-commons-io"
986+
                 '("java-asm-7" "java-commons-lang" "java-commons-io"
975987 
                   "java-apache-ivy" "java-slf4j-api" "java-gson"
976988 
                   "java-jcip-annotations" "java-bouncycastle"
977989 
                   "java-jsch"))))
…
10051017 
         ("gradle-version-control" ,gradle-version-control)
10061018 
         ("groovy" ,groovy)
10071019 
         ("java-apache-ivy" ,java-apache-ivy)
1008-
         ("java-asm-6" ,java-asm-6)
1020+
         ("java-asm-7" ,java-asm-7)
10091021 
         ("java-bouncycastle" ,java-bouncycastle)
10101022 
         ("java-commons-io" ,java-commons-io)
10111023 
         ("java-commons-lang" ,java-commons-lang)
…
10441056 
                "testing-base"
10451057 
                '("gradle-core" "gradle-reporting" "gradle-platform-base")
10461058 
                '("java-kryo" "java-objenesis" "java-minlog" "java-reflectasm"
1047-
                  "java-asm-6"))))
1059+
                  "java-asm-7"))))
10481060 
    (package
10491061 
      (inherit base)
10501062 
      (arguments
…
10691081 
         ("gradle-process-services" ,gradle-process-services)
10701082 
         ("gradle-reporting" ,gradle-reporting)
10711083 
         ("groovy" ,groovy)
1072-
         ("java-asm-6" ,java-asm-6)
1084+
         ("java-asm-7" ,java-asm-7)
10731085 
         ("java-bouncycastle" ,java-bouncycastle)
10741086 
         ("java-commons-io" ,java-commons-io)
10751087 
         ("java-commons-lang" ,java-commons-lang)
…
11281140 
       ("gradle-platform-base" ,gradle-platform-base)
11291141 
       ("gradle-process-services" ,gradle-process-services)
11301142 
       ("groovy" ,groovy)
1131-
       ("java-asm-6" ,java-asm-6)
1143+
       ("java-asm-7" ,java-asm-7)
11321144 
       ("java-commons-io" ,java-commons-io)
11331145 
       ("java-commons-lang" ,java-commons-lang)
11341146 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
…
11601172 
       ("gradle-reporting" ,gradle-reporting)
11611173 
       ("gradle-testing-base" ,gradle-testing-base)
11621174 
       ("groovy" ,groovy)
1163-
       ("java-asm-6" ,java-asm-6)
1175+
       ("java-asm-7" ,java-asm-7)
11641176 
       ("java-bsh" ,java-bsh)
11651177 
       ("java-commons-io" ,java-commons-io)
11661178 
       ("java-commons-lang" ,java-commons-lang)
…
11991211 
       ("java-javax-inject" ,java-javax-inject)
12001212 
       ("java-jsr305" ,java-jsr305)
12011213 
       ("java-native-platform" ,java-native-platform)
1202-
       ("java-slf4j-api" ,java-slf4j-api)))))
1214+
       ("java-slf4j-api" ,java-slf4j-api)
1215+
       ("java-snakeyaml" ,java-snakeyaml)))))
12031216 
12041217 
(define-public gradle-composite-builds
12051218 
  (package
…
12681281 
       ("gradle-process-services" ,gradle-process-services)
12691282 
       ("gradle-workers" ,gradle-workers)
12701283 
       ("groovy" ,groovy)
1271-
       ("java-asm-6" ,java-asm-6)
1284+
       ("java-asm-7" ,java-asm-7)
12721285 
       ("java-commons-lang" ,java-commons-lang)
12731286 
       ("java-fastutil" ,java-fastutil)
12741287 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
…
12961309 
       ("gradle-process-services" ,gradle-process-services)
12971310 
       ("gradle-workers" ,gradle-workers)
12981311 
       ("groovy" ,groovy)
1299-
       ("java-asm-6" ,java-asm-6)
1312+
       ("java-asm-7" ,java-asm-7)
13001313 
       ("java-guava-for-gradle" ,java-guava-for-gradle)
13011314 
       ("java-javax-inject" ,java-javax-inject)
13021315 
       ("java-jsr305" ,java-jsr305)
…
13111324 
                 "gradle-platform-jvm" "gradle-language-jvm"
13121325 
                 "gradle-language-java" "gradle-language-groovy"
13131326 
                 "gradle-diagnostics" "gradle-testing-jvm")
1314-
               '("groovy" "ant" "java-asm-6" "java-commons-io"
1327+
               '("groovy" "ant" "java-asm-7" "java-commons-io"
13151328 
                 "java-commons-lang" "java-commons-cli" "java-slf4j-api")))
13161329 
    (inputs
13171330 
     `(("gradle-base-services" ,gradle-base-services)
…
13361349 
       ("gradle-process-services" ,gradle-process-services)
13371350 
       ("gradle-workers" ,gradle-workers)
13381351 
       ("groovy" ,groovy)
1339-
       ("java-asm-6" ,java-asm-6)
1352+
       ("java-asm-7" ,java-asm-7)
13401353 
       ("java-commons-cli" ,java-commons-cli)
13411354 
       ("java-commons-io" ,java-commons-io)
13421355 
       ("java-commons-lang" ,java-commons-lang)
…
16251638 
org/objenesis
16261639 
"))))
16271640 
             (mkdir-p "build/jar")
1628-
             (invoke "jar" "cf" "build/jar/gradle-runtime-api-info-"
1629-
                     (package-version base) ".jar" "-C" "build/classes" ".")
1641+
             (invoke "jar" "cf"
1642+
                     (string-append
1643+
                       "build/jar/gradle-runtime-api-info-"
1644+
                       ,(package-version base) ".jar")
1645+
                     "-C" "build/classes" ".")
16301646 
             #t)))))))))
16311647 
16321648 
(define-public gradle-announce
…
33323348 
                             "maven-wagon-file"
33333349 
                             "maven-wagon-http"
33343350 
                             "maven-wagon-http-shared"))
3335-
                          ;; java-asm-6 and java-jansi are already present in groovy.
3351+
                          ;; java-asm-7 and java-jansi are already present in groovy.
33363352 
                          (dependencies 
33373353 
                           '("gradle-wrapper"
33383354 
                             "gradle-tooling-api"
…
34743490 
       ("gradle-announce"              ,gradle-announce)
34753491 
       ("groovy" ,groovy)
34763492 
       ("icedtea-8" ,icedtea-8)
3477-
       ("java-asm-6" ,java-asm-6)
3493+
       ("java-asm-7" ,java-asm-7)
34783494 
       ("java-apache-ivy" ,java-apache-ivy)
34793495 
       ("java-bouncycastle" ,java-bouncycastle)
34803496 
       ("java-bsh" ,java-bsh)
more/packages/java.scm
11 
;;; GNU Guix --- Functional package management for GNU
2-
;;; Copyright ?? 2017 Julien Lepiller <julien@lepiller.eu>
2+
;;; Copyright ?? 2017-2019 Julien Lepiller <julien@lepiller.eu>
33 
;;;
44 
;;; This file is part of GNU Guix.
55 
;;;
…
3131 
  #:use-module (guix build-system ant)
3232 
  #:use-module (guix build-system gnu)
3333 
  #:use-module (guix build-system trivial)
34+
  #:use-module (gnu packages apr)
3435 
  #:use-module (gnu packages autotools)
3536 
  #:use-module (gnu packages base)
3637 
  #:use-module (gnu packages compression)
…
4647 
  #:use-module (gnu packages maven)
4748 
  #:use-module (gnu packages perl)
4849 
  #:use-module (gnu packages protobuf)
50+
  #:use-module (gnu packages tls)
4951 
  #:use-module (gnu packages version-control)
5052 
  #:use-module (gnu packages web)
5153 
  #:use-module (gnu packages xml)
5254 
  #:use-module (gnu packages xorg)
5355 
  #:use-module (more packages maven)
54-
  #:use-module (more packages python))
56+
  #:use-module (more packages python)
57+
  #:use-module (more packages tls)
58+
  #:use-module (more packages web))
5559 
5660 
(define-public java-httpcomponents-httpasyncclient
5761 
  (package
…
9599 
(define-public java-fastutil
96100 
  (package
97101 
    (name "java-fastutil")
98-
    (version "8.2.1")
102+
    (version "8.2.2")
99103 
    (source (origin
100104 
              (method url-fetch)
101105 
              (uri (string-append "http://fastutil.di.unimi.it/fastutil-"
102106 
                                  version "-src.tar.gz"))
103107 
              (sha256
104108 
               (base32
105-
                "039gh3b9a72dvc9jmijfhshd2i7bnj18p2yi67200qfrnw17wbkj"))))
109+
                "005d310p97qb2s74icl9avr7b6yqwn0wlbbyb5byzxf3189y3yh8"))))
106110 
    (build-system ant-build-system)
107111 
    (arguments
108-
     `(#:jdk ,icedtea-8
109-
       #:tests? #f; no tests
112+
     `(#:tests? #f; no tests
110113 
       #:phases
111114 
       (modify-phases %standard-phases
112115 
         (add-before 'build 'generate-sources
…
140143 
    (build-system ant-build-system)
141144 
    (arguments
142145 
     `(#:jar-name "http-builder-ng.jar"
143-
       #:jdk ,icedtea-8
144146 
       #:source-dir "http-builder-ng-core/src/main/java"
145147 
       #:test-dir "http-builder-ng-core/src/test"
146148 
       #:tests? #f)); TODO: com.stehno.ersatz
…
178180 
    (build-system ant-build-system)
179181 
    (arguments
180182 
     `(#:jar-name "commons-text.jar"
181-
       #:jdk ,icedtea-8
182183 
       #:source-dir "src/main/java"))
183184 
    (inputs
184185 
     `(("java-commons-lang3" ,java-commons-lang3)))
…
212213 
    (build-system ant-build-system)
213214 
    (arguments
214215 
     `(#:jar-name "opencsv.jar"
215-
       #:jdk ,icedtea-8
216216 
       #:source-dir "src/main/java"
217217 
       #:phases
218218 
       (modify-phases %standard-phases
…
312312 
                `(for-each delete-file (find-files "." ".*.jar")))))
313313 
    (build-system ant-build-system)
314314 
    (arguments
315-
     `(#:jdk ,icedtea-8
316-
       #:tests? #f; No tests
315+
     `(#:tests? #f; No tests
317316 
       #:phases
318317 
       (modify-phases %standard-phases
319318 
         (add-before 'build 'fix-classpath
…
355354 
                `(delete-file (string-append "jcifs-" ,version ".jar")))))
356355 
    (build-system ant-build-system)
357356 
    (arguments
358-
     `(#:jdk ,icedtea-8
359-
       #:tests? #f; No tests
357+
     `(#:tests? #f; No tests
360358 
       #:phases
361359 
       (modify-phases %standard-phases
362360 
         (add-before 'build 'fix-compiler
…
391389 
     `(#:jar-name "airline.jar"
392390 
       #:source-dir "src/main/java"
393391 
       #:test-dir "src/test"
394-
       #:jdk ,icedtea-8
395392 
       #:phases
396393 
       (modify-phases %standard-phases
397394 
         (replace 'check
…
435432 
       #:source-dir "japicmp/src/main/java"
436433 
       #:test-dir "japicmp/src/test"
437434 
       #:tests? #f; require org.junit.contrib
438-
       #:jdk ,icedtea-8
439435 
       #:phases
440436 
       (modify-phases %standard-phases
441437 
         (add-before 'build 'copy-resources
…
467463 
    (build-system ant-build-system)
468464 
    (arguments
469465 
     `(#:jar-name "jatl.jar"
470-
       #:source-dir "src/main/java"
471-
       #:jdk ,icedtea-8))
466+
       #:source-dir "src/main/java"))
472467 
    (native-inputs
473468 
     `(("java-junit" ,java-junit)
474469 
       ("java-hamcrest-core" ,java-hamcrest-core)))
…
748743 
    (build-system ant-build-system)
749744 
    (arguments
750745 
     `(#:jar-name "kryo.jar"
751-
       #:jdk ,icedtea-8
752746 
       #:tests? #f)); No tests
753747 
    (inputs
754748 
     `(("java-minlog" ,java-minlog)
…
976970 
    (arguments
977971 
     `(#:jar-name "spotbugs.jar"
978972 
       #:source-dir "spotbugs-annotations/src/main/java"
979-
       #:tests? #f
980-
       #:jdk ,icedtea-8))
973+
       #:tests? #f))
981974 
    (inputs
982975 
     `(("java-jsr305" ,java-jsr305)))
983976 
    (home-page "https://spotbugs.github.io/")
…
994987 
       #:source-dir "spotbugs/src/main/java:spotbugs-annotations/src/main/java:spotbugs/src/gui"
995988 
       #:test-dir "spotbugs/src/test"
996989 
       #:tests? #f; depend on jdepend
997-
       #:jdk ,icedtea-8
998990 
       #:phases
999991 
       (modify-phases %standard-phases
1000992 
         (add-before 'build 'remove-osx
…
10341026 
     `(#:jar-name "spi.jar"
10351027 
       #:source-dir "org.mangosdk.spi/src/main/java"
10361028 
       #:test-dir "org.mangosdk.spi/src/test"
1037-
       #:tests? #f;; FIXME: tests don't build
1038-
       #:jdk ,icedtea-8))
1029+
       #:tests? #f));; FIXME: tests don't build
10391030 
    (native-inputs
10401031 
     `(("java-junit" ,java-junit)))
10411032 
    (home-page "https://github.com/rspilker/spi")
…
10781069 
    (arguments
10791070 
     `(#:jar-name "lombok-utils.jar"
10801071 
       #:source-dir "src/utils"
1081-
       #:jdk ,icedtea-8
10821072 
       #:tests? #f; No specific test
10831073 
       #:phases
10841074 
       (modify-phases %standard-phases
…
12441234 
    (description "")
12451235 
    (license license:asl2.0)))
12461236 
1247-
(define-public java-intellij-annotation
1237+
(define-public java-jetbrains-annotations
12481238 
  (package
1249-
    (name "java-intellij-annotation")
1250-
    (version "181-1945")
1239+
    (name "java-jetbrains-annotations")
1240+
    (version "16.0.3")
12511241 
    (source (origin
1252-
              (method url-fetch)
1253-
              (uri (string-append "https://github.com/JetBrains/intellij-community/"
1254-
                                  "archive/idea/" version ".tar.gz"))
1255-
              (file-name (string-append name "-" version ".tar.gz"))
1242+
              (method git-fetch)
1243+
              (uri (git-reference
1244+
                     (url "https://github.com/JetBrains/java-annotations/")
1245+
                     (commit version)))
1246+
              (file-name (git-file-name name version))
12561247 
              (sha256
12571248 
               (base32
1258-
                "1mvixizk75pvhaibdy8lriy5prasg0pap80vak6vfj67kw8lmksk"))))
1249+
                "10gz3l6lgjq35q4vqgcxvy84n7vjyqw1qxzaklcmprminqi4g9s4"))))
12591250 
    (build-system ant-build-system)
12601251 
    (arguments
1261-
     `(#:jar-name "java-intellij-annotation.jar"
1262-
       #:source-dir "platform/annotations/src"
1252+
     `(#:jar-name "java-annotations.jar"
1253+
       #:source-dir "java8/src/main/java:common/src/main/java"
12631254 
       #:tests? #f)); no tests
12641255 
    (home-page "http://jetbrains.org")
12651256 
    (synopsis "")
…
12691260 
(define-public java-spockframework-core
12701261 
  (package
12711262 
    (name "java-spockframework-core")
1272-
    (version "1.1")
1263+
    (version "1.2")
12731264 
    (source (origin
12741265 
              (method url-fetch)
12751266 
              (uri (string-append "https://github.com/spockframework/spock/"
12761267 
                                  "archive/spock-" version ".tar.gz"))
12771268 
              (sha256
12781269 
               (base32
1279-
                "1b2bybldlnid41irkavd09bkkzfjyvc2d33grpn2vgaiyw9gzz8z"))))
1270+
                "1nps60666y7d8gmy5bvp18cf1a5jy33kwj8fqhazrdikzphmmp0q"))))
12801271 
    (build-system ant-build-system)
12811272 
    (arguments
12821273 
     `(#:jar-name "spock-core.jar"
12831274 
       #:source-dir "spock-core/src/main/java"
1284-
       #:jdk ,icedtea-8
12851275 
       #:tests? #f)); No tests
12861276 
    (inputs
12871277 
     `(("groovy" ,groovy)
12881278 
       ("java-asm" ,java-asm)
12891279 
       ("java-cglib" ,java-cglib)
12901280 
       ("java-hamcrest-core" ,java-hamcrest-core)
1291-
       ("java-intellij-annotation" ,java-intellij-annotation)
1281+
       ("java-jetbrains-annotations" ,java-jetbrains-annotations)
12921282 
       ("java-junit" ,java-junit)
12931283 
       ("java-objenesis" ,java-objenesis)
1294-
       ("java-byte-buddy-dep" ,java-byte-buddy-dep)
1295-
       ,@(package-inputs groovy)))
1284+
       ("java-byte-buddy-dep" ,java-byte-buddy-dep)))
12961285 
    (home-page "http://spockframework.org/")
12971286 
    (synopsis "")
12981287 
    (description "")
…
13371326 
     `(#:jar-name "java-openjfx.jar"
13381327 
       #:source-dir "buildSrc/src/main/java"
13391328 
       #:test-dir "buildSrc/src/test"
1340-
       #:jdk ,icedtea-8
13411329 
       #:phases
13421330 
       (modify-phases %standard-phases
13431331 
         (add-before 'configure 'generate-jsl-parser
…
13621350 
     `(#:jar-name "java-openjfx-base.jar"
13631351 
       #:source-dir "modules/base/src/main/java:modules/base/src/main/java8:modules/base/src/main/version-info"
13641352 
       #:test-dir "modules/base/src/test"
1365-
       #:jdk ,icedtea-8
13661353 
       #:phases
13671354 
       (modify-phases %standard-phases
13681355 
         (add-before 'check 'remove-empty-file
…
13851372 
     `(#:jar-name "java-openjfx-graphics.jar"
13861373 
       #:source-dir "modules/graphics/src/main/java"
13871374 
       #:tests? #f; require X?
1388-
       #:test-dir "modules/graphics/src/test"
1389-
       #:jdk ,icedtea-8))
1375+
       #:test-dir "modules/graphics/src/test"))
13901376 
    (inputs
13911377 
     `(("java-openjfx" ,java-openjfx)
13921378 
       ("java-openjfx-base" ,java-openjfx-base)
…
14021388 
    (arguments
14031389 
     `(#:jar-name "java-openjfx-media.jar"
14041390 
       #:source-dir "modules/media/src/main/java"
1405-
       #:tests? #f; no tests
1406-
       #:jdk ,icedtea-8))))
1391+
       #:tests? #f)))); no tests
14071392 
14081393 
(define-public java-brotli-dec
14091394 
  (package
…
14321417 
methods.  It is similar in speed with deflate but offers more dense compression.")
14331418 
    (license license:expat)))
14341419 
1420+
(define-public java-ning-compress
1421+
  (package
1422+
    (name "java-ning-compress")
1423+
    (version "1.0.4")
1424+
    (source (origin
1425+
              (method git-fetch)
1426+
              (uri (git-reference
1427+
                     (url "https://github.com/ning/compress.git")
1428+
                     (commit (string-append "compress-lzf-" version))))
1429+
              (file-name (git-file-name name version))
1430+
              (sha256
1431+
               (base32
1432+
                "1scyws9rs268zvi3p6jvq9yc061zrn49ppp7v91y52si8b1xpbg8"))))
1433+
    (build-system ant-build-system)
1434+
    (arguments
1435+
     `(#:jar-name "ning-compress.jar"
1436+
       #:source-dir "src/main/java"
1437+
       #:tests? #f; require testng, not junit
1438+
       #:phases
1439+
       (modify-phases %standard-phases
1440+
         (add-before 'check 'fix-tests
1441+
           (lambda _
1442+
             (substitute* "src/test/lzf/TestLZF.java"
1443+
               (("package lzf;") "package lzf;
1444+
1445+
import com.ning.compress.lzf.*;
1446+
import org.junit.Assert.*;"))
1447+
             #t)))))
1448+
    (native-inputs
1449+
     `(("java-junit" ,java-junit)
1450+
       ("java-testng" ,java-testng)))
1451+
    (home-page "")
1452+
    (synopsis "")
1453+
    (description "")
1454+
    (license license:asl2.0)))
1455+
1456+
(define-public java-lzma-sdk
1457+
  (package
1458+
    (name "java-lzma-sdk")
1459+
    (version "18.06")
1460+
    (source (origin
1461+
              (method url-fetch)
1462+
              (uri "https://www.7-zip.org/a/lzma1806.7z")
1463+
              (sha256
1464+
               (base32
1465+
                "0mcs90vjmp8wjqxvrjq0bl2d70njg8md1vy3zr9dd22vwfpzgy01"))))
1466+
    (build-system ant-build-system)
1467+
    (arguments
1468+
     `(#:source-dir "Java"
1469+
       #:jar-name "lzma.jar"
1470+
       #:tests? #f
1471+
       #:phases
1472+
       (modify-phases %standard-phases
1473+
         (replace 'unpack
1474+
           (lambda* (#:key source #:allow-other-keys)
1475+
             (invoke "7z" "x" source)
1476+
             #t)))))
1477+
    (native-inputs
1478+
     `(("p7zip" ,p7zip)))
1479+
    (home-page "")
1480+
    (synopsis "")
1481+
    (description "")
1482+
    (license license:public-domain)))
1483+
1484+
(define-public java-lzma
1485+
  (package
1486+
    (name "java-lzma")
1487+
    (version "1.3")
1488+
    (source (origin
1489+
              (method git-fetch)
1490+
              (uri (git-reference
1491+
                     (url "https://github.com/jponge/lzma-java.git")
1492+
                     (commit (string-append "lzma-java-" version))))
1493+
              (file-name (git-file-name name version))
1494+
              (sha256
1495+
               (base32
1496+
                "1cmgd95avjq1fsr1bx91cjcvz6ifwgq1iwyzvwvnr6s1w0r8m6hx"))))
1497+
    (build-system ant-build-system)
1498+
    (arguments
1499+
     `(#:jar-name "lzma.jar"
1500+
       #:source-dir "src/main/java"
1501+
       #:phases
1502+
       (modify-phases %standard-phases
1503+
         (add-before 'check 'copy-resources
1504+
           (lambda _
1505+
             (mkdir-p "target/test-classes")
1506+
             (copy-recursively "src/test/resources" "target/test-classes")
1507+
             #t)))))
1508+
    (native-inputs
1509+
     `(("java-commons-io" ,java-commons-io)
1510+
       ("java-junit" ,java-junit)))
1511+
    (home-page "")
1512+
    (synopsis "")
1513+
    (description "")
1514+
    (license license:asl2.0)))
1515+
14351516 
(define-public java-commons-compress-latest
14361517 
  (package
14371518 
    (inherit java-commons-compress)
…
14631544 
     `(("unzip" ,unzip)))
14641545 
    (arguments
14651546 
     `(#:build-target "pack"
1466-
       #:jdk ,icedtea-8
14671547 
       #:tests? #f; No tests
14681548 
       #:phases
14691549 
       (modify-phases %standard-phases
…
15481628 
       ("java-zstd" ,java-zstd)))
15491629 
    (arguments
15501630 
     `(#:tests? #f
1551-
       #:jdk ,icedtea-8
15521631 
       #:jar-name "josm.jar"
15531632 
       #:phases
15541633 
       (modify-phases %standard-phases
…
16911770 
    (build-system ant-build-system)
16921771 
    (arguments
16931772 
     `(#:jar-name "java-jboss-annotations-api_spec.jar"
1694-
       #:jdk ,icedtea-8
16951773 
       #:source-dir "."
16961774 
       #:tests? #f)); no tests
16971775 
    (home-page "https://github.com/jboss/jboss-annotations-api_spec")
…
17141792 
    (build-system ant-build-system)
17151793 
    (arguments
17161794 
     `(#:jar-name "java-jboss-transaction-api_spec.jar"
1717-
       #:jdk ,icedtea-8
17181795 
       #:source-dir "src/main/java"
17191796 
       #:tests? #f)); no tests
17201797 
    (inputs
…
17411818 
    (arguments
17421819 
     `(#:jar-name "java-aspectj-weaver.jar"
17431820 
       #:source-dir "."
1744-
       #:jdk ,icedtea-8
17451821 
       #:tests? #f; no tests
17461822 
       #:phases
17471823 
       (modify-phases %standard-phases
…
17811857 
    (arguments
17821858 
     `(#:jar-name "java-aspectj-rt.jar"
17831859 
       #:source-dir "."
1784-
       #:jdk ,icedtea-8
17851860 
       #:tests? #f; no tests
17861861 
       #:phases
17871862 
       (modify-phases %standard-phases
…
18021877 
;    (arguments
18031878 
;     `(#:jar-name "java-aspectj-tools.jar"
18041879 
;       #:source-dir "."
1805-
;       #:jdk ,icedtea-8
18061880 
;       #:tests? #f; no tests
18071881 
;       #:phases
18081882 
;       (modify-phases %standard-phases
…
20012075 
       #:source-dir "src/main/java"
20022076 
       #:test-dir "src/test"
20032077 
       #:tests? #f; TODO: require spring-framework-test.
2004-
       #:jdk ,icedtea-8
20052078 
       ;#:test-target "test"
20062079 
       #:phases
20072080 
       (modify-phases %standard-phases
…
22982371 
         "**/JmxUtilsTest.java"
22992372 
         ;; Missing hsqldb as a dependency
23002373 
         "**/MonProxyTest.java")
2301-
       #:jdk ,icedtea-8
23022374 
       #:phases
23032375 
       (modify-phases %standard-phases
23042376 
         (add-before 'build 'remove-cyclic-dependency
…
23142386 
       ("java-eclipse-jetty-server" ,java-eclipse-jetty-server)
23152387 
       ("java-eclipse-jetty-util" ,java-eclipse-jetty-util)
23162388 
       ("java-hazelcast-bootstrap" ,java-hazelcast-bootstrap)
2317-
       ;("java-javaee-servletapi" ,java-javaee-servletapi)
23182389 
       ("java-tomcat" ,java-tomcat) ; for catalina and servletapi
23192390 
       ("java-log4j-api" ,java-log4j-api)
23202391 
       ("java-log4j-1.2" ,java-log4j-1.2)))
…
28912962 
    (description "")
28922963 
    (license license:lgpl2.1+)))
28932964 
2965+
(define-public java-jboss-marshalling
2966+
  (package
2967+
    (name "java-jboss-marshalling")
2968+
    (version "2.0.6")
2969+
    (source (origin
2970+
              (method git-fetch)
2971+
              (uri (git-reference
2972+
                     (url "https://github.com/jboss-remoting/jboss-marshalling")
2973+
                     (commit (string-append version ".Final"))))
2974+
              (file-name (git-file-name name version))
2975+
              (sha256
2976+
               (base32
2977+
                "1afcfk0wgcggyzc4c47kfmxskbpkqvi65vr0g3gl6rikqm010knc"))))
2978+
    (build-system ant-build-system)
2979+
    (arguments
2980+
     `(#:jar-name "jboss-marshalling.jar"
2981+
       #:source-dir "api/src/main/java"
2982+
       #:test-dir "api/src/test"))
2983+
    (inputs
2984+
     `(("java-jboss-modules" ,java-jboss-modules)))
2985+
    (native-inputs
2986+
     `(("java-testng" ,java-testng)))
2987+
    (home-page "")
2988+
    (synopsis "")
2989+
    (description "")
2990+
    (license license:lgpl2.1+)))
2991+
28942992 
(define-public java-hibernate-validator-engine
28952993 
  (package
28962994 
    (name "java-hibernate-validator-engine")
…
29923090 
              (patches (search-patches "java-spring-framework-remove-non-free.patch"))))
29933091 
    (arguments
29943092 
     `(#:jar-name "java-spring-framework-core.jar"
2995-
       #:jdk ,icedtea-8
29963093 
       #:source-dir "src/main/java"
29973094 
       #:test-dir "src/test"
29983095 
       #:test-include (list "**/*Tests.java")
…
30893186 
    (name "java-spring-framework-beans")
30903187 
    (arguments
30913188 
     `(#:jar-name "java-spring-framework-beans.jar"
3092-
       #:jdk ,icedtea-8
30933189 
       #:source-dir "src/main/java"
30943190 
       #:test-dir "src/test"
30953191 
       #:phases
…
31473243 
    (name "java-spring-framework-beans-groovy")
31483244 
    (arguments
31493245 
     `(#:jar-name "java-spring-framework-beans-groovy.jar"
3150-
       #:jdk ,icedtea-8
31513246 
       #:source-dir "src/main/java"
31523247 
       #:tests? #f; no tests
31533248 
       #:phases
…
31873282 
    (name "java-spring-framework-aop")
31883283 
    (arguments
31893284 
     `(#:jar-name "java-spring-framework-aop.jar"
3190-
       #:jdk ,icedtea-8
31913285 
       #:source-dir "src/main/java"
31923286 
       #:test-dir "src/test"
31933287 
       #:test-exclude
…
32903384 
    (name "java-spring-framework-instrument")
32913385 
    (arguments
32923386 
     `(#:jar-name "java-spring-framework-instrument.jar"
3293-
       #:jdk ,icedtea-8
32943387 
       #:source-dir "src/main/java"
32953388 
       #:test-dir "src/test"
32963389 
       #:phases
…
33183411 
    (name "java-spring-framework-test")
33193412 
    (arguments
33203413 
     `(#:jar-name "java-spring-framework-test.jar"
3321-
       #:jdk ,icedtea-8
33223414 
       #:source-dir "src/main/java"
33233415 
       #:test-dir "src/test"
33243416 
       #:phases
…
33483440 
    (name "java-spring-framework-context")
33493441 
    (arguments
33503442 
     `(#:jar-name "java-spring-framework-context.jar"
3351-
       #:jdk ,icedtea-8
33523443 
       #:source-dir "src/main/java"
33533444 
       #:test-dir "src/test"
33543445 
       #:tests? #f; TODO: require spring-framework-test
…
34233514 
    (name "java-spring-framework-web")
34243515 
    (arguments
34253516 
     `(#:jar-name "java-spring-framework-web.jar"
3426-
       #:jdk ,icedtea-8
34273517 
       #:source-dir "src/main/java"
34283518 
       #:test-dir "src/test"
34293519 
       #:phases
…
34503540 
             (copy-recursively "src/test/resources" "build/test-classes")
34513541 
             #t)))))
34523542 
    (inputs
3453-
     `(("java-nethandlerr" ,java-netty-handler)
3454-
       ("java-netty-transport" ,java-netty-transport)
3455-
       ("java-spring-framework-beans" ,java-spring-framework-beans)
3456-
       ("java-spring-framework-core" ,java-spring-framework-core)
3543+
     `(("java-aopalliance" ,java-aopalliance)
3544+
       ("java-classpathx-servletapi" ,java-classpathx-servletapi)
3545+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
3546+
       ("java-fasterxml-jackson-annotations" ,java-fasterxml-jackson-annotations)
3547+
       ("java-fasterxml-jackson-core" ,java-fasterxml-jackson-core)
3548+
       ("java-fasterxml-jackson-databind" ,java-fasterxml-jackson-databind)
3549+
       ("java-fasterxml-jackson-dataformat-xml" ,java-fasterxml-jackson-dataformat-xml)
3550+
       ("java-gson" ,java-gson)
34573551 
       ("java-httpcomponents-httpasyncclient" ,java-httpcomponents-httpasyncclient)
34583552 
       ("java-httpcomponents-httpclient" ,java-httpcomponents-httpclient)
34593553 
       ("java-httpcomponents-httpcore" ,java-httpcomponents-httpcore)
3460-
       ("java-httpcomponents-httpcore-nio" ,java-httpcomponents-httpcore-nio)))
3554+
       ("java-httpcomponents-httpcore-nio" ,java-httpcomponents-httpcore-nio)
3555+
       ("java-javax-mail" ,java-javax-mail)
3556+
       ("java-netty-buffer" ,java-netty-buffer)
3557+
       ("java-netty-codec" ,java-netty-codec)
3558+
       ("java-netty-handler" ,java-netty-handler)
3559+
       ("java-netty-transport" ,java-netty-transport)
3560+
       ("java-okhttp" ,java-okhttp)
3561+
       ("java-protobuf" ,java-protobuf)
3562+
       ("java-spring-framework-aop" ,java-spring-framework-aop)
3563+
       ("java-spring-framework-beans" ,java-spring-framework-beans)
3564+
       ("java-spring-framework-context" ,java-spring-framework-context)
3565+
       ("java-spring-framework-core" ,java-spring-framework-core)))
34613566 
    (description "")))
34623567 
34633568 
(define-public java-spring-framework-expression
…
34663571 
    (name "java-spring-framework-expression")
34673572 
    (arguments
34683573 
     `(#:jar-name "java-spring-framework-expression.jar"
3469-
       #:jdk ,icedtea-8
34703574 
       #:source-dir "src/main/java"
34713575 
       #:test-dir "src/test"
34723576 
       #:phases
…
35193623 
                "105z3y931hxygczl602d8vqypbs28h1jfzihdq7zlvcfw0a5b5if"))))
35203624 
    (arguments
35213625 
     `(#:jar-name "lucene-core.jar"
3522-
       #:jdk ,icedtea-8
35233626 
       #:source-dir "core/src/java"
35243627 
       #:test-dir "core/src/test"
35253628 
       #:tests? #f)); FIXME: circular dependencies
…
35373640 
    (name "java-lucene-queries")
35383641 
    (arguments
35393642 
     `(#:jar-name "lucene-queries.jar"
3540-
       #:jdk ,icedtea-8
35413643 
       #:source-dir "queries/src/java"
35423644 
       #:test-dir "queries/src/test"
35433645 
       #:tests? #f));; FIXME: not in java subdirectory
…
35503652 
    (name "java-lucene-sandbox")
35513653 
    (arguments
35523654 
     `(#:jar-name "lucene-sandbox.jar"
3553-
       #:jdk ,icedtea-8
35543655 
       #:source-dir "sandbox/src/java"
35553656 
       #:test-dir "sandbox/src/test"
35563657 
       #:tests? #f));; FIXME: not in java subdirectory
…
35643665 
    (name "java-lucene-queryparser")
35653666 
    (arguments
35663667 
     `(#:jar-name "lucene-queryparser.jar"
3567-
       #:jdk ,icedtea-8
35683668 
       #:source-dir "queryparser/src/java"
35693669 
       #:test-dir "queryparser/src/test"
35703670 
       #:tests? #f));; FIXME: not in java subdirectory
…
36123712 
    (arguments
36133713 
     `(#:jar-name "h2.jar"
36143714 
       #:source-dir "h2/src/main"
3615-
       #:jdk ,icedtea-8
36163715 
       #:tests? #f; no tess
36173716 
       #:phases
36183717 
       (modify-phases %standard-phases
…
37943893 
     `(#:tests? #f ; tests require unpackaged and outdated software
37953894 
       #:test-dir "src/test"
37963895 
       #:source-dir "src/main/java"
3797-
       #:jar-name "log4j-1.2.jar"
3798-
       #:jdk ,icedtea-8))))
3896+
       #:jar-name "log4j-1.2.jar"))))
37993897 
38003898 
(define-public java-avalon-logkit
38013899 
  (package
…
38123910 
                (search-patches "java-avalon-logkit-default-datasource.patch"))))
38133911 
    (build-system ant-build-system)
38143912 
    (arguments
3815-
     `(#:jdk ,icedtea-8
3816-
       #:test-target "test"
3913+
     `(#:test-target "test"
38173914 
       #:phases
38183915 
       (modify-phases %standard-phases
38193916 
         (replace 'install
…
39844081 
    (build-system ant-build-system)
39854082 
    (arguments
39864083 
     `(#:tests? #f; Tests are run as a dependency of "dist"
3987-
       #:jdk ,icedtea-8
39884084 
       #:make-flags (list "-Dcompile.version=7")
39894085 
       #:phases
39904086 
       (modify-phases %standard-phases
…
40204116 
(define-public java-apache-struts
40214117 
  (package
40224118 
    (name "java-apache-struts")
4023-
    (version "2.5.16")
4119+
    (version "2.5.20")
40244120 
    (source (origin
40254121 
              (method url-fetch)
40264122 
              (uri (string-append "mirror://apache/struts/" version "/struts-"
40274123 
                                  version "-src.zip"))
40284124 
              (sha256
40294125 
               (base32
4030-
                "14by1nsz7ky7zdw7ikmki1w9xznnvbyrjj9lbplk7wxsyhqak270"))))
4126+
                "14ds6qrxrjd7np8yizdmqd49jd94yy2gghpq9zlvl53w4bv48kwx"))))
40314127 
    (build-system ant-build-system)
40324128 
    (arguments
40334129 
     `(#:jar-name "apache-struts.jar"
40344130 
       #:source-dir "src/core/src/main/java"
40354131 
       #:test-dir "src/core/src/test"
4036-
       #:jdk ,icedtea-8))
4132+
       #:phases
4133+
       (modify-phases %standard-phases
4134+
         (add-before 'build 'copy-required-classes
4135+
           (lambda* (#:key inputs #:allow-other-keys)
4136+
             (let ((tools (assoc-ref inputs "java-velocity-tools"))
4137+
                   (velocity-dir "build/velocity")
4138+
                   (tools-dir (string-append "build/velocity/velocity-tool-"
4139+
                                             ,(package-version java-velocity-tools)
4140+
                                             "-src")))
4141+
               (mkdir-p velocity-dir)
4142+
               (with-directory-excursion velocity-dir
4143+
                 (invoke "tar" "xf" tools))
4144+
               (with-directory-excursion tools-dir
4145+
                 (for-each
4146+
                   (lambda (file)
4147+
                     (install-file file (string-append "../../src/core/" file)))
4148+
                   (append (find-files "." "ServletToolboxManager.java")))))
4149+
             #t)))))
40374150 
    (inputs
40384151 
     `(("java-apache-freemarker" ,java-apache-freemarker)
40394152 
       ("java-log4j-api" ,java-log4j-api)
4040-
       ("java-commons-lang3" ,java-commons-lang3)
4153+
       ("java-commons-fileupload" ,java-commons-fileupload)
40414154 
       ("java-commons-io" ,java-commons-io)
4155+
       ("java-commons-lang3" ,java-commons-lang3)
40424156 
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
40434157 
       ("java-classpathx-servletapi" ,java-classpathx-servletapi)
40444158 
       ("java-ognl" ,java-ognl)
4159+
       ("java-slf4j-api" ,java-slf4j-api)
40454160 
       ("java-spring-framework-beans" ,java-spring-framework-beans)
40464161 
       ("java-spring-framework-context" ,java-spring-framework-context)
40474162 
       ("java-spring-framework-core" ,java-spring-framework-core)
4048-
       ("java-spring-framework-web" ,java-spring-framework-web)
4163+
       ;("java-spring-framework-web" ,java-spring-framework-web)
40494164 
       ("java-velocity" ,java-velocity)
4165+
       ("java-velocity-tools" ,(package-source java-velocity-tools))
40504166 
       ("java-testng" ,java-testng)))
40514167 
    (native-inputs
40524168 
     `(("java-junit" ,java-junit)
…
40714187 
            (search-patches "java-velocity-dont-use-werken-xpath.patch"))))
40724188 
    (build-system ant-build-system)
40734189 
    (arguments
4074-
     `(#:jdk ,icedtea-8
4075-
       #:test-target "test-main"
4190+
     `(#:test-target "test-main"
40764191 
       #:tests? #f; FIXME: need a fix to build.xml and hsqldb
40774192 
       #:phases
40784193 
       (modify-phases %standard-phases
…
41284243 
     `(#:jar-name "velocity.jar"
41294244 
       #:tests? #f; FIXME: need a fix to build.xml and hsqldb
41304245 
       #:source-dir "velocity-engine-core/src/main/java"
4131-
       #:jdk ,icedtea-8
41324246 
       #:phases
41334247 
       (modify-phases %standard-phases
41344248 
         (add-before 'build 'copy-resources
…
41784292 
                "0d93v8nj95jfdgx7n72axaavdq2h800vxyi4vx35rdphndy1xg51"))))
41794293 
    (build-system ant-build-system)
41804294 
    (arguments
4181-
     `(#:jdk ,icedtea-8
4182-
       #:test-target "test-main"
4295+
     `(#:test-target "test-main"
41834296 
       #:tests? #f; FIXME: need a fix to build.xml and hsqldb
41844297 
       #:phases
41854298 
       (modify-phases %standard-phases
…
41934306 
               (("commons.digester") "commons.digester3"))
41944307 
             #t))
41954308 
         (replace 'install
4196-
           (lambda* (#:key outputs #:allow-other-keys)
4197-
             (let* ((out (assoc-ref outputs "out"))
4198-
                    (dir (string-append out "/share/java")))
4199-
               (mkdir-p dir)
4200-
               (copy-file "../bin/velocity-tools-2.0.jar"
4201-
                          (string-append dir "/velocity-tools-2.0.jar")))
4202-
             #t)))))
4309+
           (install-jars "../bin")))))
42034310 
    (inputs
4204-
     `(("java-dom4j" ,java-dom4j)
4205-
       ("java-velocity" ,java-velocity)
4206-
       ("java-commons-digester" ,java-commons-digester)
4311+
     ;`(("java-apache-struts" ,java-apache-struts)))
4312+
     `(("java-commons-digester" ,java-commons-digester)
42074313 
       ("java-commons-validator" ,java-commons-validator)
42084314 
       ("java-commons-beanutils", java-commons-beanutils)
4209-
       ("java-apache-struts" ,java-apache-struts)))
4210-
    ;; apache struts
4315+
       ("java-dom4j" ,java-dom4j)
4316+
       ("java-velocity" ,java-velocity)))
42114317 
    (home-page "https://velocity.apache.org/tools/devel")
42124318 
    (synopsis "")
42134319 
    (description "")
…
42284334 
    (build-system ant-build-system)
42294335 
    (arguments
42304336 
     `(#:jar-name "java-plexus-velocity-component.jar"
4231-
       #:source-dir "src/main/java"
4232-
       #:jdk ,icedtea-8))
4337+
       #:source-dir "src/main/java"))
42334338 
    (inputs
42344339 
     `(("java-commons-collections" ,java-commons-collections)
42354340 
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
…
43254430 
    (arguments
43264431 
     `(#:source-dir "src/main/java"
43274432 
       #:jar-name "java-commons-dbcp.jar"
4328-
       #:jdk ,icedtea-8
43294433 
       #:tests? #f));??requires apache-geronimo
43304434 
    (inputs
43314435 
     `(("java-commons-pool2" ,java-commons-pool2)
…
43564460 
    (arguments
43574461 
     `(#:source-dir "src/java"
43584462 
       #:jar-name "java-commons-dbcp.jar"
4359-
       #:jdk ,icedtea-8
43604463 
       #:tests? #f)); FIXME: error in a test class
43614464 
    (inputs
43624465 
     `(("java-commons-pool" ,java-commons-pool)
43634466 
       ("java-commons-logging" ,java-commons-logging-minimal)
43644467 
       ("java-jboss-transaction-api-spec" ,java-jboss-transaction-api-spec)))))
43654468 
4366-
43674469 
(define-public java-commons-jcs
43684470 
  (package
43694471 
    (name "java-commons-jcs")
…
43814483 
       #:source-dir "commons-jcs-core/src/main/java"
43824484 
       #:test-dir "commons-jcs-core/src/test"
43834485 
       #:tests? #f; requires hsqldb
4384-
       #:jdk ,icedtea-8
43854486 
       #:phases
43864487 
       (modify-phases %standard-phases
43874488 
         (add-before 'build 'prepare
…
44034504 
    (description "")
44044505 
    (license license:asl2.0)))
44054506 
4507+
(define-public java-portlet-api
4508+
  (package
4509+
    (name "java-portlet-api")
4510+
    (version "3.0.1")
4511+
    (source (origin
4512+
              (method url-fetch)
4513+
              (uri (string-append "mirror://apache/portals/pluto/"
4514+
                                  "pluto-" version "-source-release.zip"))
4515+
              (sha256
4516+
               (base32
4517+
                "0fl1xc1jgfvax2ccnygzfwgqrx60h40hzsv95gcmnp4n99im4pxh"))))
4518+
    (build-system ant-build-system)
4519+
    (arguments
4520+
     `(#:jar-name "portlet-api.jar"
4521+
       #:source-dir "portlet-api/src/main/java"
4522+
       ;; no proper tests
4523+
       #:tests? #f))
4524+
    (inputs
4525+
     `(("java-cdi-api" ,java-cdi-api)
4526+
       ("java-classpathx-servletapi" ,java-classpathx-servletapi)
4527+
       ("java-javax-inject" ,java-javax-inject)))
4528+
    (native-inputs
4529+
     `(("unzip" ,unzip)))
4530+
    (home-page "https://commons.apache.org/proper/commons-fileupload/")
4531+
    (synopsis "")
4532+
    (description "")
4533+
    (license license:asl2.0)))
4534+
4535+
(define-public java-commons-fileupload
4536+
  (package
4537+
    (name "java-commons-fileupload")
4538+
    (version "1.4")
4539+
    (source (origin
4540+
              (method url-fetch)
4541+
              (uri (string-append "mirror://apache/commons/fileupload/source/"
4542+
                                  "commons-fileupload-" version "-src.tar.gz"))
4543+
              (sha256
4544+
               (base32
4545+
                "0w88khx30yj1f629y4dl7s5jiygh3lrdyxz8zmr2vmj8rhzd1dsf"))))
4546+
    (build-system ant-build-system)
4547+
    (arguments
4548+
     `(#:jar-name "commons-fileupload.jar"
4549+
       #:source-dir "src/main/java"
4550+
       #:test-dir "src/test"
4551+
       #:tests? #f)); Bad encoding
4552+
    (inputs
4553+
     `(("java-classpathx-servletapi" ,java-classpathx-servletapi)
4554+
       ("java-commons-io" ,java-commons-io)
4555+
       ("java-portlet-api" ,java-portlet-api)))
4556+
    (home-page "https://commons.apache.org/proper/commons-fileupload/")
4557+
    (synopsis "")
4558+
    (description "")
4559+
    (license license:asl2.0)))
4560+
44064561 
(define-public java-javacc
44074562 
  (package
44084563 
    (name "java-javacc")
…
50045159 
    (arguments
50055160 
     `(#:jar-name (string-append ,name "-" ,version ".jar")
50065161 
       #:source-dir "src/main/java"
5007-
       #:tests? #f; TODO: require google-testing
5008-
       #:jdk ,icedtea-8))
5162+
       #:tests? #f)); TODO: require google-testing
50095163 
    (native-inputs
50105164 
     `(("java-guava-25" ,java-guava-25)
50115165 
       ("java-junit" ,java-junit)
…
50325186 
    (arguments
50335187 
     `(#:jar-name (string-append ,name "-" ,version ".jar")
50345188 
       #:source-dir "value/src/main/java:common/src/main/java:service/src/main/java"
5035-
       #:jdk ,icedtea-8
50365189 
       #:tests? #f))
50375190 
    (inputs
50385191 
     `(("java-guava" ,java-guava)
…
51305283 
;    (version (package-version java-error-prone))
51315284 
;    (arguments
51325285 
;     `(#:tests? #f
5133-
;       #:jdk ,icedtea-8
51345286 
;       #:jar-name (string-append ,name "-" ,version ".jar")
51355287 
;       #:source-dir "check_api/src/main/java"))
51365288 
;    (propagated-inputs
…
51495301 
;    (version (package-version java-error-prone))
51505302 
;    (arguments
51515303 
;     `(#:tests? #f
5152-
;       #:jdk ,icedtea-8
51535304 
;       #:jar-name (string-append ,name "-" ,version ".jar")
51545305 
;       #:source-dir "core/src/main/java"))
51555306 
;    (propagated-inputs
…
52865437 
     `(#:tests? #f                      ; no tests included
52875438 
       #:jar-name "guava.jar"
52885439 
       #:source-dir "guava/src"
5289-
       #:jdk ,icedtea-8
52905440 
       #:phases
52915441 
       (modify-phases %standard-phases
52925442 
         (add-after 'unpack 'trim-sources
…
54305580 
    (build-system ant-build-system)
54315581 
    (arguments
54325582 
     `(#:jar-name "commons-bcel.jar"
5433-
       ;#:jdk ,icedtea-8
54345583 
       #:source-dir "src/main/java"
54355584 
       ;; FIXME: requires org.openjdk.jmh.* and com.sun.jna.platform.win32 for tests
54365585 
       #:tests? #f))
…
55855734 
                   #t))))
55865735 
    (build-system ant-build-system)
55875736 
    (arguments
5588-
     `(#:jdk ,icedtea-8
5589-
       #:test-target "test"
5737+
     `(#:test-target "test"
55905738 
       #:phases
55915739 
       (modify-phases %standard-phases
55925740 
         (replace 'install
…
56375785 
    (inherit java-cup-runtime)
56385786 
    (name "java-cup")
56395787 
    (arguments
5640-
     `(#:jdk ,icedtea-8
5641-
       #:build-target "dist"
5788+
     `(#:build-target "dist"
56425789 
       #:tests? #f; no test target
56435790 
       #:phases
56445791 
       (modify-phases %standard-phases
…
56815828 
    (build-system ant-build-system)
56825829 
    (arguments
56835830 
     `(#:jar-name "xalan.jar"
5684-
       #:jdk ,icedtea-8
56855831 
       #:tests? #f)); no tests
56865832 
    (inputs
56875833 
     `(("java-commons-bcel" ,java-commons-bcel)
…
59096055 
    (build-system ant-build-system)
59106056 
    (arguments
59116057 
     `(#:jar-name (string-append ,name "-" ,version ".jar")
5912-
       #:jdk ,icedtea-8
59136058 
       #:tests? #f; no tests
59146059 
       #:source-dir "src"
59156060 
       #:phases
…
59456090 
    (arguments
59466091 
     `(#:jar-name (string-append ,name "-" ,version ".jar")
59476092 
       #:source-dir "runtime/Java/src:tool/src"
5948-
       #:jdk ,icedtea-8
59496093 
       #:tests? #f
59506094 
       #:phases
59516095 
       (modify-phases %standard-phases
…
60316175 
    (arguments
60326176 
     `(#:jar-name "java-antlr4-runtime.jar"
60336177 
       #:source-dir "runtime/Java/src/org"
6034-
       #:tests? #f
6035-
       #:jdk ,icedtea-8))
6178+
       #:tests? #f))
60366179 
    (native-inputs '())))
60376180 
;
60386181 
;;; Requires gradle.
…
64846627 
                "0j4mgmrivpkk8id0h9sshm58igaaj555bzp5pjcz8kdcma67kq27"))))
64856628 
    (build-system ant-build-system)
64866629 
    (arguments
6487-
     `(#:jdk ,icedtea-8
6488-
       #:phases
6630+
     `(#:phases
64896631 
       (modify-phases %standard-phases
64906632 
         (add-before 'unpack 'subdir
64916633 
           (lambda _
…
65206662 
    (build-system ant-build-system)
65216663 
    (arguments
65226664 
     `(#:jar-name "procyon.jar"
6523-
       #:jdk ,icedtea-8
65246665 
       #:source-dir
65256666 
       (string-append "Procyon.CompilerTools/src/main/java:"
65266667 
                      "Procyon.Core/src/main/java:"
…
65496690 
       #:source-dir "modello-plugins/modello-plugin-xsd/src/main/java"
65506691 
       #:test-dir "modello-plugins/modello-plugin-xsd/src/test"
65516692 
       #:tests? #f; Require some test classes from java-modello
6552-
       #:jdk ,icedtea-8
65536693 
       #:phases
65546694 
       (modify-phases %standard-phases
65556695 
         (add-before 'build 'copy-resources
…
66716811 
       #:test-dir "src/test"
66726812 
       #:source-dir "src/main/java"
66736813 
       #:jar-name "log4j-core.jar"
6674-
       #:jdk ,icedtea-8
66756814 
       #:make-flags
66766815 
       (list (string-append "-Ddist.dir=" (assoc-ref %outputs "out")
66776816 
                            "/share/java"))
…
67406879 
       #:tests? #f
67416880 
       #:phases
67426881 
       (modify-phases %standard-phases
6743-
         (add-before 'build 'build-DescriptorProtos.java
6882+
         (add-before 'build 'build-protos
67446883 
           (lambda _
67456884 
             (for-each
67466885 
               (lambda (proto)
…
67546893 
    (inputs
67556894 
     `(("java-guava" ,java-guava)))
67566895 
    (native-inputs
6757-
     `(("protobuf" ,protobuf)))
6896+
     `(("java-junit" ,java-junit)
6897+
       ("protobuf" ,protobuf)))
67586898 
    (home-page (package-home-page protobuf))
67596899 
    (synopsis "")
67606900 
    (description "")
67616901 
    (license license:bsd-3)))
67626902 
6903+
(define-public java-protobuf-nano
6904+
  (package
6905+
    (inherit java-protobuf)
6906+
    (name "java-protobuf-nano")
6907+
    (version "3.5.2")
6908+
    (source (origin
6909+
              (method git-fetch)
6910+
              (uri (git-reference
6911+
                     (url "https://github.com/protocolbuffers/protobuf")
6912+
                     (commit (string-append "v" version))))
6913+
              (file-name (git-file-name name version))
6914+
              (sha256
6915+
               (base32
6916+
                "14gq6rnv03zvcb5hym240z4yqiphrmd5y4zx9a77n37rwvfgx5qy"))))
6917+
    (arguments
6918+
     `(#:jar-name "protobuf.jar"
6919+
       #:source-dir "javanano/src/main/java"
6920+
       #:tests? #f))));; difficult to generate sources))))
6921+
       ;#:test-dir "javanano/src/test"
6922+
       ;#:phases
6923+
       ;(modify-phases %standard-phases
6924+
       ;  (add-after 'build 'build-protos
6925+
       ;    (lambda _
6926+
       ;      (mkdir-p "build/classes")
6927+
       ;      (apply invoke "protoc" "--javanano_out=build/generated"
6928+
       ;             "--proto_path=javanano/src/test/java/com"
6929+
       ;             (find-files "javanano/src/test" "unittest_.*"))
6930+
       ;      (invoke "protoc" "--javanano_out=build/generated"
6931+
       ;              "--proto_path=javanano/src/test/java/com"
6932+
       ;              "javanano/src/test/java/com/google/protobuf/nano/map_test.proto")
6933+
       ;      #t)))))))
6934+
67636935 
(define-public java-jzlib
67646936 
  (package
67656937 
    (name "java-jzlib")
…
67816953 
    (description "")
67826954 
    (license license:bsd-3)))
67836955 
6956+
(define-public java-conscrypt
6957+
  (package
6958+
    (name "java-conscrypt")
6959+
    (version "1.4.2")
6960+
    (source (origin
6961+
              (method git-fetch)
6962+
              (uri (git-reference
6963+
                     (url "https://github.com/google/conscrypt.git")
6964+
                     (commit version)))
6965+
              (file-name (git-file-name name version))
6966+
              (sha256
6967+
               (base32
6968+
                "1wfcc7gspvxxhm4vwb0yfidpsjj6kcdqnfwj2qsr4zfppn01gv7f"))))
6969+
    (build-system ant-build-system)
6970+
    (arguments
6971+
     `(#:jar-name "conscrypt.jar"
6972+
       #:source-dir "openjdk/src/main/java:common/src/main/java"
6973+
       #:test-dir "openjdk/src/test"
6974+
       #:tests? #f; conscrypt-testing require libcore from android
6975+
       #:phases
6976+
       (modify-phases %standard-phases
6977+
         (add-before 'build 'build-library
6978+
           (lambda* (#:key inputs #:allow-other-keys)
6979+
             (mkdir-p "build/classes/META-INF/native")
6980+
             (let ((jni-include (string-append "-I" (assoc-ref inputs "jdk")
6981+
                                               "/include/linux")))
6982+
               (for-each
6983+
                 (lambda (cpp-file)
6984+
                   (invoke "g++" "-c" cpp-file "-o" (string-append cpp-file ".o")
6985+
                           "-std=c++11" "-fPIC" "-O2" "-Icommon/src/jni/main/include"
6986+
                           "-Icommon/src/jni/unbundled/include" jni-include))
6987+
                 (find-files "common/src/jni/main/cpp" ".*.cc$")))
6988+
             (apply invoke "gcc" "-o"
6989+
                    "build/classes/META-INF/native/libconscrypt.so"
6990+
                    "-shared"
6991+
                    (find-files "common/src/jni/main/cpp" ".*.o$"))
6992+
             #t))
6993+
         (add-before 'build 'generate-constants
6994+
           (lambda _
6995+
             (invoke "g++" "-std=c++11" "-O2" "-o" "gen_constants"
6996+
                     "constants/src/gen/cpp/generate_constants.cc")
6997+
             (with-output-to-file "common/src/main/java/org/conscrypt/NativeConstants.java"
6998+
               (lambda _
6999+
                 (invoke "./gen_constants")))
7000+
             #t))
7001+
         ;(add-before 'build 'build-testing
7002+
         ;  (lambda _
7003+
         ;    (mkdir-p "build/testing-classes")
7004+
         ;    (apply invoke "javac" "-d" "build/testing-classes"
7005+
         ;           "-cp" (getenv "CLASSPATH")
7006+
         ;           (find-files "testing/src/main/java" ".*.java$"))
7007+
         ;    #t))
7008+
         (add-before 'check 'set-classpath
7009+
           (lambda _
7010+
             (setenv "CLASSPATH"
7011+
                     (string-append (getenv "CLASSPATH") ":build/testing-classes"))
7012+
             #t)))))
7013+
    (inputs
7014+
     `(("boringssl" ,boringssl)))
7015+
    ;(native-inputs
7016+
    ; `(("java-bouncycastle" ,java-bouncycastle)
7017+
    ;   ("java-mockito-1" ,java-mockito-1)))
7018+
    (home-page "")
7019+
    (synopsis "")
7020+
    (description "")
7021+
    (license license:asl2.0)))
7022+
7023+
(define-public java-netty-tcnative-boringssl
7024+
  (package
7025+
    (name "java-netty-tcnative-boringssl")
7026+
    (version "2.0.20")
7027+
    (source (origin
7028+
              (method git-fetch)
7029+
              (uri (git-reference
7030+
                     (url "https://github.com/netty/netty-tcnative.git")
7031+
                     (commit (string-append "netty-tcnative-parent-"
7032+
                                            version ".Final"))))
7033+
              (file-name (git-file-name name version))
7034+
              (sha256
7035+
               (base32
7036+
                "1kdgnk5133bw821iwhli8vj5kf8sb8vxav5wpdsv6vhrgrrm8nrl"))))
7037+
    (build-system ant-build-system)
7038+
    (arguments
7039+
     `(#:jar-name "netty-tcnative-boringssl.jar"
7040+
       #:source-dir "openssl-dynamic/src/main/java"
7041+
       #:test-dir "openssl-dynamic/src/test"
7042+
       #:phases
7043+
       (modify-phases %standard-phases
7044+
         (add-before 'build 'build-native
7045+
           (lambda* (#:key inputs system #:allow-other-keys)
7046+
             (let ((native-dir (string-append
7047+
                                 "build/classes/META-INF/native/linux"
7048+
                                 (if (or (string-prefix? "x86_64" system)
7049+
                                         (string-prefix? "aarch64" system))
7050+
                                   "64" "32")))
7051+
                   (apr-include (string-append "-I" (assoc-ref inputs "apr")
7052+
                                               "/include/apr-1"))
7053+
                   (jni-include (string-append "-I" (assoc-ref inputs "jdk")
7054+
                                               "/include/linux")))
7055+
               (mkdir-p native-dir)
7056+
               (for-each
7057+
                 (lambda (source)
7058+
                   (invoke "gcc" "-c" source "-o" (string-append source ".o")
7059+
                           "-fPIC" "-O2" jni-include apr-include))
7060+
                 (find-files "openssl-dynamic/src/main/c" ".*.c$"))
7061+
               (apply invoke "gcc" "-o"
7062+
                      (string-append native-dir "/libnetty_tcnative.so")
7063+
                      "-shared" "-lssl" "-lapr-1" "-lcrypto"
7064+
                      (find-files "openssl-dynamic/src/main/c" ".*.o$")))
7065+
               #t))
7066+
           (add-before 'check 'copy-lib
7067+
             (lambda _
7068+
               (mkdir-p "build/test-classes")
7069+
               (copy-recursively "build/classes/META-INF"
7070+
                                 "build/test-classes/META-INF")
7071+
               #t)))))
7072+
    (inputs
7073+
     `(("apr" ,apr)
7074+
       ("boringssl" ,boringssl)))
7075+
    (native-inputs
7076+
     `(("java-hamcrest-core" ,java-hamcrest-core)
7077+
       ("java-junit" ,java-junit)))
7078+
    (home-page "")
7079+
    (synopsis "")
7080+
    (description "")
7081+
    (license license:asl2.0)))
7082+
67847083 
(define-public java-netty-common
67857084 
  (package
67867085 
    (name "java-netty-common")
…
68707169 
    (arguments
68717170 
     `(#:jar-name "netty-codec.jar"
68727171 
       #:source-dir "codec/src/main/java"
6873-
       #:test-dir "codec/src/test"))
7172+
       #:test-dir "codec/src/test"
7173+
       #:test-exclude
7174+
       (list "**/Abstract*.java" "**/Base64Test.java" "**/ZlibTest.java"
7175+
             "**/marshalling/*.java")
7176+
       #:phases
7177+
       (modify-phases %standard-phases
7178+
         (add-before 'check 'fix-tests
7179+
           (lambda _
7180+
             (with-directory-excursion "codec/src/test/java/io/netty/handler"
7181+
               (substitute* "codec/ByteToMessageCodecTest.java"
7182+
                 (("Equals\\(1, ") "Equals((int) 1, (int)")))
7183+
             #t)))))
68747184 
    (inputs
6875-
     `(("java-netty-buffer" ,java-netty-buffer)
7185+
     `(("java-jboss-marshalling" ,java-jboss-marshalling)
7186+
       ("java-jzlib" ,java-jzlib)
7187+
       ("java-lz4" ,java-lz4)
7188+
       ("java-lzma" ,java-lzma)
7189+
       ("java-netty-buffer" ,java-netty-buffer)
68767190 
       ("java-netty-common" ,java-netty-common)
68777191 
       ("java-netty-transport" ,java-netty-transport)
6878-
       ("java-lz4" ,java-lz4)
6879-
       ("java-jzlib" ,java-jzlib)
7192+
       ("java-ning-compress" ,java-ning-compress)
68807193 
       ("java-protobuf" ,java-protobuf)
6881-
       ,@(package-inputs java-netty-common)))))
7194+
       ("java-protobuf-nano" ,java-protobuf-nano)
7195+
       ,@(package-inputs java-netty-common)))
7196+
    (native-inputs
7197+
     `(("java-commons-compress" ,java-commons-compress)
7198+
       ("java-netty-resolver" ,java-netty-resolver)
7199+
       ,@(package-native-inputs java-netty-common)))))
68827200 
68837201 
(define-public java-netty-handler
68847202 
  (package
…
68877205 
    (arguments
68887206 
     `(#:jar-name "netty-handler.jar"
68897207 
       #:source-dir "handler/src/main/java"
6890-
       #:test-dir "handler/src/test"))
7208+
       #:test-dir "handler/src/test"
7209+
       ;; Reference to assertEquals is ambiguous
7210+
       #:tests? #f))
68917211 
    (inputs
6892-
     `(("java-netty-buffer" ,java-netty-buffer)
7212+
     `(("java-bouncycastle" ,java-bouncycastle)
7213+
       ("java-conscrypt" ,java-conscrypt)
7214+
       ("java-eclipse-jetty-alpn-api" ,java-eclipse-jetty-alpn-api)
7215+
       ("java-eclipse-jetty-npn-api" ,java-eclipse-jetty-npn-api)
7216+
       ("java-netty-buffer" ,java-netty-buffer)
7217+
       ("java-netty-codec" ,java-netty-codec)
68937218 
       ("java-netty-common" ,java-netty-common)
7219+
       ("java-netty-tcnative-boringssl" ,java-netty-tcnative-boringssl)
68947220 
       ("java-netty-transport" ,java-netty-transport)
6895-
       ("java-bouncycastle" ,java-bouncycastle)
6896-
       ,@(package-inputs java-netty-common)))))
7221+
       ,@(package-inputs java-netty-common)))
7222+
    (native-inputs
7223+
     `(("java-logback-classic" ,java-logback-classic)
7224+
       ("java-logback-core" ,java-logback-core)
7225+
       ,@(package-native-inputs java-netty-common)))))
68977226 
68987227 
(define-public java-conversantmedia-disruptor
68997228 
  (package
more/packages/kotlin.scm
4040 
  #:use-module (more packages java))
4141 
4242 
;; Needs maven-core
43-
(define-public kotlin
43+
(define-public kotlin-1.2
4444 
  (package
4545 
    (name "kotlin")
4646 
    ;; last version with a build.xml file
…
7070 
    (description "")
7171 
    (license license:asl2.0)))
7272 
73+
(define-public kotlin
74+
  (package
75+
    (name "kotlin")
76+
    (version "1.3.11")
77+
    (source (origin
78+
              (method git-fetch)
79+
              (uri (git-reference
80+
                     (url "https://github.com/JetBrains/kotlin")
81+
                     (commit (string-append "v" version))))
82+
              (file-name (git-file-name name version))
83+
              (sha256
84+
               (base32
85+
                "123gfr72p0715n925kivl3khlqzk11qpyv65jwlhcplgfvw8rl73"))))
86+
    (build-system ant-build-system)
87+
    (home-page "https://kotlinlang.org/")
88+
    (synopsis "Programming language targetting the JVM")
89+
    (description "")
90+
    (license license:asl2.0)))
91+
7392 
;; The release page on github is a mess
7493 
(define intellij-community-version "0.182.2256")
7594 
(define (intellij-community-source version)
more/packages/python.scm
3232 
  #:use-module (gnu packages python)
3333 
  #:use-module (gnu packages python-crypto)
3434 
  #:use-module (gnu packages python-web)
35+
  #:use-module (gnu packages python-xyz)
3536 
  #:use-module (gnu packages qt)
3637 
  #:use-module (gnu packages serialization)
3738 
  #:use-module (gnu packages time)