some java improvements

LEPILLER JulienMon Oct 23 09:29:32+0200 2017

7310c7a

some java improvements

more/packages/java.scm

5858 
       (modify-phases %standard-phases
5959 
         (add-after 'unpack 'properties
6060 
           (lambda _
61+
             (for-each delete-file (find-files "." ".*.jar$"))
6162 
             (mkdir "downloads")
6263 
             (substitute* "build.xml"
6364 
               (("download-compile,") "")

…

20392040 
       ("java-bsh" ,java-bsh)
20402041 
       ("java-jcommander" ,java-jcommander)
20412042 
       ("java-guice" ,java-guice)
2042-
       ("snakeyaml" ,java-snakeyaml-notests)))
2043+
       ("snakeyaml" ,java-snakeyaml)))
20432044 
    (native-inputs
20442045 
     `(("guava" ,java-guava)
20452046 
       ("java-javax-inject" ,java-javax-inject)

…

24452446 
       #:source-dir "log4j-1.2-api/src/main/java"
24462447 
       #:test-dir "log4j-1.2-api/src/test"
24472448 
       #:jdk ,icedtea-8
2448-
       ;#:tests? #f; requires maven
2449-
       #:phases
2450-
       (modify-phases %standard-phases
2451-
         (add-before 'check 'copy-test-classes
2452-
           (lambda _
2453-
             (let ((from "log4j-core/src/test/java/org/apache/logging/log4j/")
2454-
                   (to "log4j-1.2-api/src/test/java/org/apache/logging/log4j/"))
2455-
               (for-each (lambda (file)
2456-
                           (mkdir-p (dirname (string-append to file)))
2457-
                           (copy-file (string-append from file)
2458-
                                      (string-append to file)))
2459-
                 '("test/appender/ListAppender.java"
2460-
                   "junit/LoggerContextRule.java"
2461-
                   "osgi/equinox/AbstractEquinoxLoadBundleTest.java"
2462-
                   "osgi/OsgiRule.java"
2463-
                   "osgi/BundleTestInfo.java"
2464-
                   "osgi/AbstractLoadBundleTest.java"
2465-
                   "osgi/felix/AbstractFelixLoadBundleTest.java"))))))))
2449+
       #:tests? #f)); requires maven-model (and other maven subprojects),
2450+
                    ; which is a cyclic dependency
24662451 
    (inputs
24672452 
     `(("log4j-api" ,java-log4j-api)
24682453 
       ("log4j-core" ,java-log4j-core)

…

35343519 
    (arguments
35353520 
     `(#:jar-name (string-append ,name "-" ,version ".jar")
35363521 
       #:source-dir "src/main/java"
3537-
       #:test-eclude (list "**/test*/**.java")))
3522+
       #:test-exclude (list "**/test*/**.java")))
35383523 
    (inputs
35393524 
     `(("java-guava" ,java-guava)))
35403525 
    (native-inputs