rename inputs to there package name

Julien LepillerSun Nov 19 12:47:20+0100 2017

060936b

rename inputs to there package name

more/packages/java.scm

6464 
             (zero? (system* "antlr3" "-o" "buildSrc/src/main/java/com/sun/scenario/effect/compiler"
6565 
                             "buildSrc/src/main/antlr/JSL.g")))))))
6666 
    (inputs
67-
     `(("antlr" ,antlr3)
68-
       ("ST4" ,java-stringtemplate)))
67+
     `(("antlr3" ,antlr3)
68+
       ("java-stringtemplate" ,java-stringtemplate)))
6969 
    (native-inputs
70-
     `(("junit" ,java-junit)
71-
       ("hamcrest" ,java-hamcrest-core)))
70+
     `(("java-junit" ,java-junit)
71+
       ("java-hamcrest-core" ,java-hamcrest-core)))
7272 
    (home-page "http://openjdk.java.net/projects/openjfx/")
7373 
    (synopsis "")
7474 
    (description "")

…

115115 
  (package (inherit java-openjfx)
116116 
    (name "java-openjfx-media")
117117 
    (inputs
118-
     `(("graphics" ,java-openjfx-graphics)
119-
       ("base" ,java-openjfx-base)
120-
       ("openjfx" ,java-openjfx)))
118+
     `(("java-openjxf-graphics" ,java-openjfx-graphics)
119+
       ("java-openjxf-base" ,java-openjfx-base)
120+
       ("java-openjfx" ,java-openjfx)))
121121 
    (arguments
122122 
     `(#:jar-name "java-openjfx-media.jar"
123123 
       #:source-dir "modules/media/src/main/java"

…

137137 
                "03zfr6lw6ry643l6pbg0myg52clypxd0y0igd84dslchf3svvkb9"))))
138138 
    (build-system ant-build-system)
139139 
    (native-inputs
140-
     `(("junit" ,java-junit)))
140+
     `(("java-junit" ,java-junit)))
141141 
    (arguments
142142 
     `(#:jar-name "brotli-dec.jar"
143143 
       #:tests? #f; no test target

…

163163 
               (base32
164164 
                "1msfjbknfgx78j96fsiqk44r45plz10x9sw88flrpf3yaf4d3br1"))))
165165 
    (inputs
166-
     `(("dec" ,java-brotli-dec)
166+
     `(("java-brotli-dec" ,java-brotli-dec)
167167 
       ,@(package-inputs java-commons-compress)))))
168168 
169169 
(define-public java-jmapviewer
…
396396 
       #:tests? #f; no tests
397397 
       #:source-dir "src"))
398398 
    (inputs
399-
     `(("bcprov" ,java-bouncycastle-bcprov)
400-
       ("bcpkix" ,java-bouncycastle-bcpkix)))
399+
     `(("java-bouncycastle-bcprov" ,java-bouncycastle-bcprov)
400+
       ("java-bouncycastle-bcpkix" ,java-bouncycastle-bcpkix)))
401401 
    (native-inputs
402-
     `(("junit" ,java-junit)))
402+
     `(("java-junit" ,java-junit)))
403403 
    (home-page "https://www.bouncycastle.org")
404404 
    (synopsis "Cryptographic library")
405405 
    (description "")
…
468468 
     `(#:jar-name "java-jboss-el-api_spec.jar"
469469 
       #:jdk ,icedtea-8))
470470 
    (inputs
471-
     `(("junit" ,java-junit)))
471+
     `(("java-junit" ,java-junit)))
472472 
    (home-page "https://github.com/jboss/jboss-el-api_spec")
473473 
    (synopsis "")
474474 
    (description "")
…
493493 
       #:source-dir "src/main/java"
494494 
       #:tests? #f)); no tests
495495 
    (inputs
496-
     `(("cdi-api" ,java-cdi-api)
497-
       ("interceptors" ,java-jboss-interceptors-api-spec)))
496+
     `(("java-cdi-api" ,java-cdi-api)
497+
       ("java-jboss-interceptors-api-spec" ,java-jboss-interceptors-api-spec)))
498498 
    (home-page "https://github.com/jboss/jboss-transaction-api_spec")
499499 
    (synopsis "")
500500 
    (description "")
…
538538 
             (mkdir-p "build/classes")
539539 
             (copy-file "aspectj_1_5_0.dtd" "build/classes/aspectj_1_5_0.dtd"))))))
540540 
    (inputs
541-
     `(("commons-logging" ,java-commons-logging-minimal)
542-
       ("asm" ,java-asm)))
541+
     `(("java-commons-logging-minimal" ,java-commons-logging-minimal)
542+
       ("java-asm" ,java-asm)))
543543 
    (home-page "https://www.eclipse.org/aspectj")
544544 
    (synopsis "")
545545 
    (description "")
…
578578 
           (lambda* (#:key inputs #:allow-other-keys)
579579 
             (copy-recursively (assoc-ref inputs "resources") "../test-resources"))))))
580580 
    (native-inputs
581-
     `(("junit" ,java-junit)
582-
       ("mockito" ,java-mockito-1)
583-
       ("hamcrest" ,java-hamcrest-all)
584-
       ("objenesis" ,java-objenesis)
585-
       ("asm" ,java-asm)
586-
       ("cglib" ,java-cglib)
581+
     `(("java-junit" ,java-junit)
582+
       ("java-mockito-1" ,java-mockito-1)
583+
       ("java-hamcrest-all" ,java-hamcrest-all)
584+
       ("java-objenesis" ,java-objenesis)
585+
       ("java-asm" ,java-asm)
586+
       ("java-cglib" ,java-cglib)
587587 
       ("resources" ,java-xmlunit-test-resources)))
588588 
    (home-page "https://github.com/xmlunit/xmlunit")
589589 
    (synopsis "")
…
599599 
       #:source-dir "xmlunit-legacy/src/main/java"
600600 
       #:test-dir "xmlunit-legacy/src/test"))
601601 
    (inputs
602-
     `(("xmlunit" ,java-xmlunit)
603-
       ("junit" ,java-junit)))
602+
     `(("java-xmlunit" ,java-xmlunit)
603+
       ("java-junit" ,java-junit)))
604604 
    (native-inputs
605-
     `(("mockito" ,java-mockito-1)))))
605+
     `(("java-mockito-1" ,java-mockito-1)))))
606606 
607607 
(define-public java-spring-framework-core
608608 
  (package
…
663663 
                             (copy-file file (string-append dir file)))
664664 
                   (find-files "." ".*")))))))))
665665 
    (inputs
666-
     `(("logging" ,java-commons-logging-minimal)
666+
     `(("java-commons-logging-minimal" ,java-commons-logging-minimal)
667667 
       ("java-jopt-simple" ,java-jopt-simple)
668668 
       ("java-commons-codec" ,java-commons-codec)
669669 
       ("java-log4j-1.2-api" ,java-log4j-1.2-api)
670-
       ("objenesis" ,java-objenesis)
671-
       ("cglib" ,java-cglib)
672-
       ("weaver" ,java-aspectj-weaver)))
670+
       ("java-objenesis" ,java-objenesis)
671+
       ("java-cglib" ,java-cglib)
672+
       ("java-aspectj-weaver" ,java-aspectj-weaver)))
673673 
    (native-inputs
674-
     `(("junit" ,java-junit)
675-
       ("hamcrest" ,java-hamcrest-all)
676-
       ("asm" ,java-asm)
674+
     `(("java-junit" ,java-junit)
675+
       ("java-hamcrest-all" ,java-hamcrest-all)
676+
       ("java-asm" ,java-asm)
677677 
       ("java-jboss-annotations-api-spec" ,java-jboss-annotations-api-spec)
678678 
       ("java-xmlunit-legacy" ,java-xmlunit-legacy)
679679 
       ("java-xmlunit" ,java-xmlunit)
680-
       ("java-mockito" ,java-mockito-1)))
680+
       ("java-mockito-1" ,java-mockito-1)))
681681 
    (build-system ant-build-system)
682682 
    (home-page "https://projects.spring.io/spring-framework/")
683683 
    (synopsis "")
…
696696 
;     `(("core" ,java-spring-framework-core)
697697 
;       ("aspectj" ,java-aspectj-weaver)
698698 
;       ("tomcat" ,java-tomcat)
699-
;       ("logging" ,java-commons-logging-minimal)))
699+
;       ("java-commons-logging-minimal" ,java-commons-logging-minimal)))
700700 
;    (native-inputs '())))
701701 
;
702702 
;(define-public java-spring-framework-test
…
712712 
;       ("http" ,java-spring-framework-web)
713713 
;       ("aspectj" ,java-aspectj-weaver)
714714 
;       ("tomcat" ,java-tomcat)
715-
;       ("logging" ,java-commons-logging-minimal)))
715+
;       ("java-commons-logging-minimal" ,java-commons-logging-minimal)))
716716 
;    (native-inputs '())))
717717 
;
718718 
;(define-public java-spring-framework-aop
…
727727 
;     `(("core" ,java-spring-framework-core)
728728 
;       ("beans" ,java-spring-framework-beans)
729729 
;       ("aspectj" ,java-aspectj-weaver)
730-
;       ("logging" ,java-commons-logging-minimal)))
730+
;       ("java-commons-logging-minimal" ,java-commons-logging-minimal)))
731731 
;    (native-inputs '())))
732732 
;
733733 
;(define-public java-spring-framework-beans
…
750750 
;                "net.sf.cglib.core.DefaultGeneratorStrategy")))))))
751751 
;    (inputs
752752 
;     `(("core" ,java-spring-framework-core)
753-
;       ("cglib" ,java-cglib)
753+
;       ("java-cglib" ,java-cglib)
754754 
;       ("inject" ,java-javax-inject)
755755 
;       ("snakeyaml" ,java-snakeyaml)
756756 
;       ("el" ,java-jboss-el-api-spec)
757757 
;       ("aspectj" ,java-aspectj-weaver)
758-
;       ("logging" ,java-commons-logging-minimal)))
758+
;       ("java-commons-logging-minimal" ,java-commons-logging-minimal)))
759759 
;    (native-inputs
760-
;     `(("junit" ,java-junit)
761-
;       ("hamcrest" ,java-hamcrest-all)
760+
;     `(("java-junit" ,java-junit)
761+
;       ("java-hamcrest-all" ,java-hamcrest-all)
762762 
;       ("test" ,java-spring-framework-test)
763-
;       ("mockito" ,java-mockito-1)))))
763+
;       ("java-mockito-1" ,java-mockito-1)))))
764764 
;
765765 
;(define-public java-spring-framework-context
766766 
;  (package (inherit java-spring-framework-core)
…
795795 
       #:tests? #f)); FIXME: circular dependencies
796796 
    (build-system ant-build-system)
797797 
    (native-inputs
798-
     `(("junit" ,java-junit)))
798+
     `(("java-junit" ,java-junit)))
799799 
    (home-page "https://lucene.apache.org/")
800800 
    (synopsis "")
801801 
    (description "")
…
812812 
       #:test-dir "queries/src/test"
813813 
       #:tests? #f));; FIXME: not in java subdirectory
814814 
    (inputs
815-
     `(("lucene" ,java-lucene-core)))))
815+
     `(("java-lucene-core" ,java-lucene-core)))))
816816 
817817 
(define-public java-lucene-sandbox
818818 
  (package
…
825825 
       #:test-dir "sandbox/src/test"
826826 
       #:tests? #f));; FIXME: not in java subdirectory
827827 
    (inputs
828-
     `(("lucene" ,java-lucene-core)
829-
       ("queries" ,java-lucene-queries)))))
828+
     `(("java-lucene-core" ,java-lucene-core)
829+
       ("java-lucene-queries" ,java-lucene-queries)))))
830830 
831831 
(define-public java-lucene-queryparser
832832 
  (package
…
839839 
       #:test-dir "queryparser/src/test"
840840 
       #:tests? #f));; FIXME: not in java subdirectory
841841 
    (inputs
842-
     `(("lucene" ,java-lucene-core)
843-
       ("sandbox" ,java-lucene-sandbox)
844-
       ("queries" ,java-lucene-queries)))))
842+
     `(("java-lucene-core" ,java-lucene-core)
843+
       ("java-lucene-sandbox" ,java-lucene-sandbox)
844+
       ("java-lucene-queries" ,java-lucene-queries)))))
845845 
846846 
(define-public java-jts
847847 
  (package
…
861861 
       #:test-dir "modules/core/src/test"
862862 
       #:tests? #f)); requires swingui from junit3
863863 
    (native-inputs
864-
     `(("junit" ,java-junit)))
864+
     `(("java-junit" ,java-junit)))
865865 
    (home-page "")
866866 
    (synopsis "")
867867 
    (description "")
…
897897 
             (substitute* "h2/src/main/org/h2/fulltext/FullTextLucene.java"
898898 
               (("queryParser.QueryParser") "queryparser.classic.QueryParser")))))))
899899 
    (inputs
900-
     `(("osgi" ,java-osgi-framework)
901-
       ("tomcat" ,java-tomcat)
902-
       ("jts" ,java-jts)
903-
       ("lucene" ,java-lucene-core)
904-
       ("lucene-queryparser" ,java-lucene-queryparser)
905-
       ("slf4j" ,java-slf4j-api)
906-
       ("osgi-service-jdbc" ,java-osgi-service-jdbc)))
900+
     `(("java-osgi-framework" ,java-osgi-framework)
901+
       ("java-tomcat" ,java-tomcat)
902+
       ("java-jts" ,java-jts)
903+
       ("java-lucene-core" ,java-lucene-core)
904+
       ("java-lucene-queryparser" ,java-lucene-queryparser)
905+
       ("java-slf4j-api" ,java-slf4j-api)
906+
       ("java-osgi-service-jdbc" ,java-osgi-service-jdbc)))
907907 
    (home-page "http://h2database.com")
908908 
    (synopsis "")
909909 
    (description "")
…
971971 
                               "}\n"
972972 
                               "public Bundle getBundle()"))))))))
973973 
    (inputs
974-
     `(("framework" ,java-osgi-framework)
975-
       ("log" ,java-osgi-service-log)
976-
       ("cm" ,java-osgi-service-cm)
977-
       ("tracker" ,java-osgi-util-tracker)))
974+
     `(("java-osgi-framework" ,java-osgi-framework)
975+
       ("java-osgi-service-log" ,java-osgi-service-log)
976+
       ("java-osgi-service-cm" ,java-osgi-service-cm)
977+
       ("java-osgi-util-tracker" ,java-osgi-util-tracker)))
978978 
    (native-inputs
979-
     `(("junit" ,java-junit)
980-
       ("hamcrest" ,java-hamcrest-core)))
979+
     `(("java-junit" ,java-junit)
980+
       ("java-hamcrest-core" ,java-hamcrest-core)))
981981 
    (home-page "")
982982 
    (synopsis "")
983983 
    (description "")
…
10001000 
     `(#:jar-name "felix-resolver.jar"
10011001 
       #:source-dir "src/main/java"))
10021002 
    (inputs
1003-
     `(("resource" ,java-osgi-resource)
1004-
       ("framework" ,java-osgi-framework)))
1003+
     `(("java-osgi-resource" ,java-osgi-resource)
1004+
       ("java-osgi-framework" ,java-osgi-framework)))
10051005 
    (native-inputs
1006-
     `(("junit" ,java-junit)
1007-
       ("mockito" ,java-mockito-1)
1008-
       ("utils" ,java-apache-felix-utils)
1009-
       ("hamcrest" ,java-hamcrest-core)
1010-
       ("cglib" ,java-cglib)
1011-
       ("asm" ,java-asm)
1012-
       ("objenesis" ,java-objenesis)))
1006+
     `(("java-junit" ,java-junit)
1007+
       ("java-mockito-1" ,java-mockito-1)
1008+
       ("java-apache-felix-utils" ,java-apache-felix-utils)
1009+
       ("java-hamcrest-core" ,java-hamcrest-core)
1010+
       ("java-cglib" ,java-cglib)
1011+
       ("java-asm" ,java-asm)
1012+
       ("java-objenesis" ,java-objenesis)))
10131013 
    (home-page "")
10141014 
    (synopsis "")
10151015 
    (description "")
…
10331033 
       #:source-dir "src/main/java"
10341034 
       #:tests? #f)); tests require easymock 2, but we have easymock 3
10351035 
    (inputs
1036-
     `(("osgi-annotation" ,java-osgi-annotation)
1037-
       ("resolver" ,java-apache-felix-resolver)
1038-
       ("osgi-service-resolver" ,java-osgi-service-resolver)))
1036+
     `(("java-osgi-annotation" ,java-osgi-annotation)
1037+
       ("java-apache-felix-resolver" ,java-apache-felix-resolver)
1038+
       ("java-osgi-service-resolver" ,java-osgi-service-resolver)))
10391039 
    (native-inputs
1040-
     `(("junit" ,java-junit)
1041-
       ("hamcrest" ,java-hamcrest-core)
1042-
       ("asm" ,java-asm)
1043-
       ("easymock" ,java-easymock)
1044-
       ("mockito" ,java-mockito-1)))
1040+
     `(("java-junit" ,java-junit)
1041+
       ("java-hamcrest-core" ,java-hamcrest-core)
1042+
       ("java-asm" ,java-asm)
1043+
       ("java-easymock" ,java-easymock)
1044+
       ("java-mockito-1" ,java-mockito-1)))
10451045 
    (home-page "https://felix.apache.org/")
10461046 
    (synopsis "")
10471047 
    (description "")
…
11241124 
       #:tests? #f; FIXME: not in the java subdirectory
11251125 
       #:test-dir "src/test"))
11261126 
    (inputs
1127-
     `(("log" ,java-avalon-logkit)))
1127+
     `(("java-avalon-logkit" ,java-avalon-logkit)))
11281128 
    (native-inputs
1129-
     `(("junit" ,java-junit)))
1129+
     `(("java-junit" ,java-junit)))
11301130 
    (home-page "")
11311131 
    (synopsis "")
11321132 
    (description "")
…
11561156 
           (lambda _
11571157 
             (copy-recursively "src/test/resources" "build/test-classes"))))))
11581158 
    (inputs
1159-
     `(("logging" ,java-commons-logging-minimal)
1160-
       ("cglib" ,java-cglib)
1161-
       ("beanutils", java-commons-beanutils)))
1159+
     `(("java-commons-logging-minimal" ,java-commons-logging-minimal)
1160+
       ("java-cglib" ,java-cglib)
1161+
       ("java-commons-beanutils", java-commons-beanutils)))
11621162 
    (native-inputs
1163-
     `(("junit" ,java-junit)
1164-
       ("hamcrest" ,java-hamcrest-core)))
1163+
     `(("java-junit" ,java-junit)
1164+
       ("java-hamcrest-core" ,java-hamcrest-core)))
11651165 
    (home-page "https://commons.apache.org/proper/commons-digester/")
11661166 
    (synopsis "")
11671167 
    (description "")
…
12281228 
               (("createDigester\\(rulesUrl\\)")
12291229 
                "newLoader(rulesModule(rulesUrl)).newDigester()")))))))
12301230 
    (inputs
1231-
     `(("digester" ,java-commons-digester)
1232-
       ("beanutils" ,java-commons-beanutils)
1233-
       ("collections" ,java-commons-collections)
1234-
       ("logging" ,java-commons-logging-minimal)))
1231+
     `(("java-commons-digester" ,java-commons-digester)
1232+
       ("java-commons-beanutils" ,java-commons-beanutils)
1233+
       ("java-commons-collections" ,java-commons-collections)
1234+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)))
12351235 
    (native-inputs
1236-
     `(("junit" ,java-junit)))
1236+
     `(("java-junit" ,java-junit)))
12371237 
    (home-page "https://commons.apache.org/proper/commons-validator")
12381238 
    (synopsis "")
12391239 
    (description "")
…
12841284 
             ;                               (assoc-ref inputs "docbook-xml"))
12851285 
             ;                               )))))))
12861286 
    (inputs
1287-
     `(("javassist" ,java-jboss-javassist)))
1287+
     `(("java-jboos-javassist" ,java-jboss-javassist)))
12881288 
    (native-inputs
1289-
     `(("junit" ,java-junit)
1290-
       ("hamcrest" ,java-hamcrest-core)
1289+
     `(("java-junit" ,java-junit)
1290+
       ("java-hamcrest-core" ,java-hamcrest-core)
12911291 
       ("docbook-xml" ,docbook-xml)
12921292 
       ("docbook-xsl" ,docbook-xsl)
12931293 
       ("libxml2" ,libxml2)))
…
13131313 
       #:source-dir "src/core/src/main/java"
13141314 
       #:test-dir "src/core/src/test"))
13151315 
    (inputs
1316-
     `(("log4j" ,java-log4j-api)
1317-
       ("lang3" ,java-commons-lang3)
1318-
       ("io" ,java-commons-io)
1319-
       ("logging" ,java-commons-logging-minimal)
1320-
       ("servlet" ,java-classpathx-servletapi)
1321-
       ("ognl" ,java-ognl)
1322-
       ("velocity" ,java-velocity)
1323-
       ("testng" ,java-testng)))
1316+
     `(("java-log4j-api" ,java-log4j-api)
1317+
       ("java-commons-lang3" ,java-commons-lang3)
1318+
       ("java-commons-io" ,java-commons-io)
1319+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
1320+
       ("java-classpathx-servletapi" ,java-classpathx-servletapi)
1321+
       ("java-ognl" ,java-ognl)
1322+
       ("java-velocity" ,java-velocity)
1323+
       ("java-testng" ,java-testng)))
13241324 
    (native-inputs
1325-
     `(("junit" ,java-junit)
1325+
     `(("java-junit" ,java-junit)
13261326 
       ("unzip" ,unzip)))
13271327 
    (home-page "https://struts.apache.org/")
13281328 
    (synopsis "")
…
14321432 
                                  "/main/java/org/apache/velocity/runtime/parser")
14331433 
                   "velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/Parser.jj"))))))))
14341434 
    (native-inputs
1435-
     `(("javacc" ,java-javacc-5)))
1435+
     `(("java-javacc-5" ,java-javacc-5)))
14361436 
    (propagated-inputs '())
14371437 
    (inputs
14381438 
     `(("java-commons-collections" ,java-commons-collections)
…
14781478 
               (copy-file "../bin/velocity-tools-2.0.jar"
14791479 
                          (string-append dir "/velocity-tools-2.0.jar"))))))))
14801480 
    (inputs
1481-
     `(("dom4j" ,java-dom4j)
1482-
       ("velocity" ,java-velocity)
1483-
       ("digester" ,java-commons-digester)
1484-
       ("validator" ,java-commons-validator)
1485-
       ("beanutils", java-commons-beanutils)))
1481+
     `(("java-dom4j" ,java-dom4j)
1482+
       ("java-velocity" ,java-velocity)
1483+
       ("java-commons-digester" ,java-commons-digester)
1484+
       ("java-commons-validator" ,java-commons-validator)
1485+
       ("java-commons-beanutils", java-commons-beanutils)))
14861486 
    ;; apache struts
14871487 
    (home-page "https://velocity.apache.org/tools/devel")
14881488 
    (synopsis "")
…
15501550 
       #:source-dir "httpcore/src/main"
15511551 
       #:test-dir "httpcore/src/test"))
15521552 
    (native-inputs
1553-
     `(("junit" ,java-junit)
1554-
       ("logging" ,java-commons-logging-minimal)
1553+
     `(("java-junit" ,java-junit)
1554+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
15551555 
       ("lang3" ,java-commons-lang3)
1556-
       ("mockito" ,java-mockito-1)))
1556+
       ("java-mockito-1" ,java-mockito-1)))
15571557 
    (home-page "https://hc.apache.org/")
15581558 
    (synopsis "")
15591559 
    (description "")
…
15771577 
       #:source-dir "httpclient/src/main"
15781578 
       #:test-dir "httpclient/src/test"))
15791579 
    (inputs
1580-
     `(("core" ,java-httpcomponents-core)
1581-
       ("codec" ,java-commons-codec)
1582-
       ("logging" ,java-commons-logging-minimal)))
1580+
     `(("java-httpcomponents-core" ,java-httpcomponents-core)
1581+
       ("java-commons-codec" ,java-commons-codec)
1582+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)))
15831583 
    (native-inputs
1584-
     `(("junit" ,java-junit)
1585-
       ("mockito" ,java-mockito-1)
1586-
       ("hamcrest" ,java-hamcrest-core)))
1584+
     `(("java-junit" ,java-junit)
1585+
       ("java-mockito-1" ,java-mockito-1)
1586+
       ("java-hamcrest-core" ,java-hamcrest-core)))
15871587 
    (home-page "https://hc.apache.org/")
15881588 
    (synopsis "")
15891589 
    (description "")
…
16061606 
       #:source-dir "gson/src/main/java"
16071607 
       #:test-dir "gson/src/test"))
16081608 
    (native-inputs
1609-
     `(("junit" ,java-junit)
1610-
       ("hamcrest" ,java-hamcrest-core)))
1609+
     `(("java-junit" ,java-junit)
1610+
       ("java-hamcrest-core" ,java-hamcrest-core)))
16111611 
    (home-page "")
16121612 
    (synopsis "")
16131613 
    (description "")
…
16401640 
                               (copy-file file dist)))
16411641 
                   (find-files "." ".*.properties")))))))))
16421642 
    (native-inputs
1643-
     `(("junit" ,java-junit)
1644-
       ("hamcrest" ,java-hamcrest-core)
1643+
     `(("java-junit" ,java-junit)
1644+
       ("java-hamcrest-core" ,java-hamcrest-core)
16451645 
       ("gson" ,java-gson)))
16461646 
    (home-page "https://jsoup.org")
16471647 
    (synopsis "HTML Parser")
…
17041704 
                             target)))))))
17051705 
    (build-system ant-build-system)
17061706 
    (inputs
1707-
     `(("cglib" ,java-cglib)))
1707+
     `(("java-cglib" ,java-cglib)))
17081708 
    (native-inputs
17091709 
     `(("java-junit" ,java-junit)
1710-
       ("java-hamcrest" ,java-hamcrest-core)
1711-
       ("asm" ,java-asm)
1712-
       ("objenesis" ,java-objenesis)))
1710+
       ("java-hamcrest-core" ,java-hamcrest-core)
1711+
       ("java-asm" ,java-asm)
1712+
       ("java-objenesis" ,java-objenesis)))
17131713 
    (home-page "https://commons.apache.org/proper/commons-pool")
17141714 
    (synopsis "")
17151715 
    (description "")
…
17461746 
             #t)))))
17471747 
    (inputs
17481748 
     `(("java-javax-inject" ,java-javax-inject)
1749-
       ("javax-el" ,java-jboss-el-api-spec)
1750-
       ("javax-interceptors" ,java-jboss-interceptors-api-spec)))
1749+
       ("java-jboss-el-api-spec" ,java-jboss-el-api-spec)
1750+
       ("java-jboss-interceptors-api-spec" ,java-jboss-interceptors-api-spec)))
17511751 
    (native-inputs
1752-
     `(("testng" ,java-testng)
1753-
       ("hamcrest" ,java-hamcrest-core)))
1752+
     `(("java-testng" ,java-testng)
1753+
       ("java-hamcrest-core" ,java-hamcrest-core)))
17541754 
    (home-page "")
17551755 
    (synopsis "")
17561756 
    (description "")
…
18421842 
       ("java-commons-dbcp" ,java-commons-dbcp2)
18431843 
       ("java-velocity" ,java-velocity)))
18441844 
    (native-inputs
1845-
     `(("junit" ,java-junit)))
1845+
     `(("java-junit" ,java-junit)))
18461846 
    (home-page "https://commons.apache.org/proper/commons-jcs/")
18471847 
    (synopsis "")
18481848 
    (description "")
…
18891889 
               (symlink (string-append bin "/javacc")
18901890 
                        (string-append bin "/jjtree"))))))))
18911891 
    (native-inputs
1892-
     `(("junit" ,java-junit)))
1892+
     `(("java-junit" ,java-junit)))
18931893 
    (home-page "https://javacc.org")
18941894 
    (synopsis "")
18951895 
    (description "")
…
19711971 
       #:source-dir "org.abego.treelayout/src/main/java"
19721972 
       #:test-dir "org.abego.treelayout/src/test"))
19731973 
    (inputs
1974-
     `(("junit" ,java-junit)))
1974+
     `(("java-junit" ,java-junit)))
19751975 
    (native-inputs
1976-
     `(("hamcrest" ,java-hamcrest-core)))
1976+
     `(("java-hamcrest-core" ,java-hamcrest-core)))
19771977 
    (home-page "http://treelayout.sourceforge.net")
19781978 
    (synopsis "")
19791979 
    (description "")
…
19971997 
     `(#:jar-name "commons-cli-1.4.jar"
19981998 
       #:tests? #f))
19991999 
    (native-inputs
2000-
     `(("junit" ,java-junit)))
2000+
     `(("java-junit" ,java-junit)))
20012001 
    (home-page "https://commons.apache.org/proper/commons-cli")
20022002 
    (synopsis "Java API for parsing command line options passed to programs")
20032003 
    (description "Apache Commons CLI library provides an API for parsing command
…
20962096 
       #:jdk ,icedtea-8))
20972097 
    (native-inputs
20982098 
     `(("guice" ,java-guice)
2099-
       ("junit" ,java-junit)))
2099+
       ("java-junit" ,java-junit)))
21002100 
    (home-page "https://github.com/square/javapoet")
21012101 
    (synopsis "")
21022102 
    (description "")
…
21212121 
       #:jdk ,icedtea-8
21222122 
       #:tests? #f))
21232123 
    (inputs
2124-
     `(("guava" ,java-guava)
2125-
       ("javapoet" ,java-javapoet)))
2124+
     `(("java-guava" ,java-guava)
2125+
       ("java-javapoet" ,java-javapoet)))
21262126 
    (home-page "https://github.com/google/auto/tree/master/value")
21272127 
    (synopsis "")
21282128 
    (description "")
…
21632163 
     `(("guava" ,java-guava)
21642164 
       ("java-jsr305" ,java-jsr305)))
21652165 
    (native-inputs
2166-
     `(("junit" ,java-junit)))
2166+
     `(("java-junit" ,java-junit)))
21672167 
    (build-system ant-build-system)
21682168 
    (home-page "https://github.com/KengoTODA/java-diff-utils")
21692169 
    (synopsis "")
…
23112311 
                "1350yl003y1fjzdwis0dg5jhi5kggk2sxnkv9821z5janw4p986m"))))
23122312 
    (build-system ant-build-system)
23132313 
    (propagated-inputs
2314-
     `(("asm" ,java-asm)))
2314+
     `(("java-asm" ,java-asm)))
23152315 
    (arguments
23162316 
     `(#:tests? #f
23172317 
       #:jar-name (string-append ,name "-" ,version ".jar")
…
24022402 
    (inputs
24032403 
     `(("java-guava" ,java-guava)))
24042404 
    (native-inputs
2405-
     `(("junit" ,java-junit)
2406-
       ("hamcrest" ,java-hamcrest-core)))
2405+
     `(("java-junit" ,java-junit)
2406+
       ("java-hamcrest-core" ,java-hamcrest-core)))
24072407 
    (home-page "")
24082408 
    (synopsis "")
24092409 
    (description "")
…
24642464 
    (inputs
24652465 
     `(("java-joda-convert" ,java-joda-convert)))
24662466 
    (native-inputs
2467-
     `(("junit" ,java-junit)
2468-
       ("hamcrest" ,java-hamcrest-core)
2467+
     `(("java-junit" ,java-junit)
2468+
       ("java-hamcrest-core" ,java-hamcrest-core)
24692469 
       ("tzdata" ,tzdata)))
24702470 
    (home-page "")
24712471 
    (synopsis "")
…
24932493 
                            "**/BadgerFishDOMTest.java"
24942494 
                            "**/MappedDOMTest.java")))
24952495 
    (native-inputs
2496-
     `(("junit" ,java-junit)))
2496+
     `(("java-junit" ,java-junit)))
24972497 
    (home-page "")
24982498 
    (synopsis "")
24992499 
    (description "")
…
25452545 
     `(#:jar-name (string-append "xml-resolver.jar")
25462546 
       #:tests? #f)); no tests
25472547 
    (native-inputs
2548-
     `(("junit" ,java-junit)))
2548+
     `(("java-junit" ,java-junit)))
25492549 
    (home-page "http://xerces.apache.org/xml-commons/")
25502550 
    (synopsis "")
25512551 
    (description "TODO")
…
25692569 
       #:source-dir ".."
25702570 
       #:tests? #f)); no tests
25712571 
    ;; TODO: Debian builds several jars out of this: jaxp-1.4.jar,
2572-
    ;; xml-apis.jar and xml-apis-1.4.01.jar. Additionally it adds maven-repo
2573-
    ;; data (.pom). The poms get fetch directly using wget, see
2574-
    ;; <https://anonscm.debian.org/viewvc/pkg-java/trunk/libjaxp1.3-java/debian/rules?revision=15402&view=markup>
2572+
    ;; xml-apis.jar and xml-apis-1.4.01.jar.
25752573 
    (home-page "http://xerces.apache.org/xml-commons/")
25762574 
    (synopsis "Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)")
25772575 
    (description "xml-apis.jar from the Apache XML Commons project is used by
…
26542652 
enable normalization checking as described in section 2.13 of this
26552653 
specification. It also handles namespaces according to the XML Namespaces 1.1
26562654 
Candidate Recommendation, and will correctly serialize XML 1.1 documents if
2657-
the DOM level 3 load/save API's are in use.
2658-
2659-
TODO Verify signature")
2655+
the DOM level 3 load/save API's are in use.")
26602656 
    (license license:asl2.0)))
26612657 
26622658 
;; This is very old (2002)!
…
27762772 
       #:jar-name "xsdlib.jar"
27772773 
       #:jdk ,icedtea-8))
27782774 
    (inputs
2779-
     `(("xerces" ,java-xerces)))
2775+
     `(("java-xerces" ,java-xerces)))
27802776 
    (home-page "")
27812777 
    (synopsis "")
27822778 
    (description "")
…
28012797 
       ;; FIXME: requires org.openjdk.jmh.* and com.sun.jna.platform.win32 for tests
28022798 
       #:tests? #f))
28032799 
    (native-inputs
2804-
     `(("junit" ,java-junit)
2800+
     `(("java-junit" ,java-junit)
28052801 
       ("collections" ,java-commons-collections4)
28062802 
       ("lang3" ,java-commons-lang3)
28072803 
       ("io" ,java-commons-io)))
…
28902886 
       #:jdk ,icedtea-8
28912887 
       #:tests? #f)); no tests
28922888 
    (inputs
2893-
     `(("bcel" ,java-commons-bcel)
2894-
       ("xerces" ,java-xerces)))
2889+
     `(("java-commons-bcel" ,java-commons-bcel)
2890+
       ("java-xerces" ,java-xerces)))
28952891 
    (home-page "")
28962892 
    (synopsis "")
28972893 
    (description "")
…
29002896 
(define-public java-dom4j
29012897 
  (package
29022898 
    (name "java-dom4j")
2903-
    (version "2.0.1")
2899+
    (version "2.1.0")
29042900 
    (source (origin
29052901 
              (method url-fetch)
29062902 
              (uri (string-append "https://github.com/dom4j/dom4j/archive/"
…
29082904 
              (file-name (string-append name "-" version ".tar.gz"))
29092905 
              (sha256
29102906 
               (base32
2911-
                "04snvb8m4290l0z1nkzdhlgxhfzi36wfkk674fn90q75s80s72j6"))
2907+
                "101drpnw6agmcvsi1jrfi0kn97r7liazrh5jbrip9vx26axn2fx9"))
29122908 
              (modules '((guix build utils)))
29132909 
              (snippet
29142910 
                '(begin ;; Delete bundled jar archives.
…
29192915 
     `(#:jar-name "dom4j.jar"
29202916 
       #:jdk ,icedtea-8
29212917 
       #:source-dir "src/main/java"
2922-
       #:tests? #f; we can't build xalan
2918+
       #:tests? #f; Requires xalan, but xalan -> java-cup -> jflex -> java-cup...
29232919 
       #:phases
29242920 
       (modify-phases %standard-phases
29252921 
         (add-before 'build 'copy-jaxen-sources
…
29312927 
             (copy-file "jaxen-sources/org/jaxen/dom4j/DocumentNavigator.java"
29322928 
                        "src/main/java/org/jaxen/dom4j/DocumentNavigator.java")
29332929 
             (copy-file "jaxen-sources/org/jaxen/dom4j/Dom4jXPath.java"
2934-
                        "src/main/java/org/jaxen/dom4j/Dom4jXPath.java")))
2930+
                        "src/main/java/org/jaxen/dom4j/Dom4jXPath.java")
2931+
             #t))
29352932 
         (add-before 'build 'fix-old-xpp2
29362933 
           (lambda _
29372934 
             ;; This package normally depends on xpp2 2.0, but we can only package
…
29472944 
                  "}\n"
29482945 
                  "\n"
29492946 
                  "public void resetStartTag"))
2950-
               (("Atttribute") "Attribute")))))))
2947+
               (("Atttribute") "Attribute"))
2948+
             #t)))))
29512949 
    (inputs
2952-
     `(("jaxen" ,java-jaxen-no-rec-deps)
2953-
       ("jaxen-sources" ,(package-source java-jaxen-no-rec-deps))
2954-
       ("xmlpull" ,java-xmlpull)
2955-
       ("xmlpull2" ,java-xmlpull2)
2956-
       ("xsdlib" ,java-xsdlib)))
2950+
     `(("java-jaxen-no-rec-deps" ,java-jaxen-no-rec-deps)
2951+
       ("java-jaxen-sources" ,(package-source java-jaxen-no-rec-deps))
2952+
       ("java-xmlpull2" ,java-xmlpull2)
2953+
       ("java-xpp3" ,java-xpp3)
2954+
       ("java-xsdlib" ,java-xsdlib)))
29572955 
    (native-inputs
2958-
     `(("testng" ,java-testng)
2959-
       ("xerces" ,java-xerces)))
2960-
    (home-page "https://github.com/dom4j/dom4j/")
2961-
    ; Note: dom4j.org is outdated
2956+
     `(("java-testng" ,java-testng)
2957+
       ("java-xerces" ,java-xerces)))
2958+
    (home-page "https://dom4j.github.io/")
29622959 
    (synopsis "Flexible XML framework for Java")
2963-
    (description "")
2964-
    (license license:expat))) ;; TODO: some 4-clause license
2960+
    (description "Dom4j is a flexible XML framework for Java.  ")
2961+
    ;; some BSD-like 5-clause license
2962+
    (license (license:non-copyleft "file://LICENSE"))))
29652963 
29662964 
(define-public java-jaxen-no-rec-deps
29672965 
  (package
…
29862984 
             (delete-file-recursively "src/org/jaxen/dom4j")
29872985 
             (delete-file-recursively "src/org/jaxen/xom"))))))
29882986 
    (inputs
2989-
     `(("jdom" ,java-jdom)))
2987+
     `(("java-jdom" ,java-jdom)))
29902988 
    (home-page "")
29912989 
    (synopsis "")
29922990 
    (description "")
…
29972995 
    (inherit java-jaxen-no-rec-deps)
29982996 
    (name "java-jaxen")
29992997 
    (inputs
3000-
     `(("jodm" ,java-jdom)
3001-
       ("xom" ,java-xom)
3002-
       ("dom4j" ,java-dom4j)))))
2998+
     `(("java-jodm" ,java-jdom)
2999+
       ("java-xom" ,java-xom)
3000+
       ("java-dom4j" ,java-dom4j)))))
30033001 
30043002 
(define-public java-xom
30053003 
  (package
…
30293027 
           (lambda _
30303028 
             (delete-file "src/nu/xom/tools/XHTMLJavaDoc.java"))))))
30313029 
    (inputs
3032-
     `(("jdom" ,java-jdom)
3033-
       ("junit" ,java-junit)
3034-
       ("servlet" ,java-tomcat)
3035-
       ("jaxen" ,java-jaxen-no-rec-deps)
3036-
       ("xerces" ,java-xerces)))
3030+
     `(("java-jdom" ,java-jdom)
3031+
       ("java-junit" ,java-junit)
3032+
       ("java-tomcat" ,java-tomcat)
3033+
       ("java-jaxen-no-rec-deps" ,java-jaxen-no-rec-deps)
3034+
       ("java-xerces" ,java-xerces)))
30373035 
    (home-page "")
30383036 
    (synopsis "")
30393037 
    (description "")
…
30563054 
     `(#:jar-name "kxml2.jar"
30573055 
       #:tests? #f)); no tests
30583056 
    (inputs
3059-
     `(("xmlpull" ,java-xpp3)))
3057+
     `(("java-xpp3" ,java-xpp3)))
30603058 
    (home-page "http://kxml.org")
30613059 
    (synopsis "")
30623060 
    (description "")
…
31093107 
       #:jdk ,icedtea-8
31103108 
       #:source-dir "xstream/src/java"))
31113109 
    (inputs
3112-
     `(("jdom" ,java-jdom)
3113-
       ("jdom2" ,java-jdom2)
3114-
       ("cglib" ,java-cglib)
3115-
       ("time" ,java-joda-time)
3116-
       ("jettison" ,java-jettison)
3117-
       ("xom" ,java-xom)
3118-
       ("xmlpull3" ,java-xpp3)
3119-
       ("dom4j" ,java-dom4j)
3120-
       ("stax2" ,java-stax2-api)
3121-
       ("woodstox" ,java-woodstox-core)
3122-
       ("kxml2" ,java-kxml2)
3123-
       ("stax" ,java-stax)))
3110+
     `(("java-jdom" ,java-jdom)
3111+
       ("java-jdom2" ,java-jdom2)
3112+
       ("java-cglib" ,java-cglib)
3113+
       ("java-joda-time" ,java-joda-time)
3114+
       ("java-jettison" ,java-jettison)
3115+
       ("java-xom" ,java-xom)
3116+
       ("java-xpp3" ,java-xpp3)
3117+
       ("java-dom4j" ,java-dom4j)
3118+
       ("java-stax2-api" ,java-stax2-api)
3119+
       ("java-woodstox-core" ,java-woodstox-core)
3120+
       ("java-kxml2" ,java-kxml2)
3121+
       ("java-stax" ,java-stax)))
31243122 
    (native-inputs
31253123 
     `(("unzip" ,unzip)))
31263124 
    (home-page "https://x-stream.github.io")
…
31683166 
                 (copy-file "libhawtjni.so" (string-append lib "/libhawtjni.so"))
31693167 
                 (copy-file "hawtjni.h" (string-append inc "/hawtjni.h")))))))))
31703168 
    (inputs
3171-
     `(("cli" ,java-commons-cli)
3172-
       ("asm" ,java-asm)
3173-
       ("finder" ,java-geronimo-xbean-finder)))
3169+
     `(("java-commons-cli" ,java-commons-cli)
3170+
       ("java-asm" ,java-asm)
3171+
       ("java-geronimo-xbean-finder" ,java-geronimo-xbean-finder)))
31743172 
    (home-page "https://fusesource.github.io/hawtjni/")
31753173 
    (synopsis "")
31763174 
    (description "")
…
32163214 
                        (string-append (assoc-ref outputs "out")
32173215 
                                       "/bin/jansi.h")))))))
32183216 
    (inputs
3219-
     `(("hawtjni" ,java-hawtjni)))
3217+
     `(("java-hawtjni" ,java-hawtjni)))
32203218 
    (home-page "https://fusesource.github.io/jansi/")
32213219 
    (synopsis "")
32223220 
    (description "")
…
32393237 
       #:source-dir "jansi/src/main/java"
32403238 
       #:test-dir "jansi/src/test"))
32413239 
    (inputs
3242-
     `(("jansi-native" ,java-jansi-native)))
3240+
     `(("java-jansi-native" ,java-jansi-native)))
32433241 
    (native-inputs
3244-
     `(("junit" ,java-junit)
3245-
       ("hamcrest" ,java-hamcrest-core)))
3242+
     `(("java-junit" ,java-junit)
3243+
       ("java-hamcrest-core" ,java-hamcrest-core)))
32463244 
    (home-page "https://fusesource.github.io/jansi/")
32473245 
    (synopsis "")
32483246 
    (description "")
…
32763274 
                 "keybindings.properties"
32773275 
                 "windowsbindings.properties")))))))
32783276 
    (native-inputs
3279-
     `(("junit" ,java-junit)))
3277+
     `(("java-junit" ,java-junit)))
32803278 
    (home-page "https://jline.github.io")
32813279 
    (synopsis "")
32823280 
    (description "")
…
33743372 
             (substitute* "build.xml"
33753373 
               (("a") "a")))))))
33763374 
    (native-inputs
3377-
     `(("junit" ,java-junit)
3378-
       ("antlr" ,antlr2)
3379-
       ("jmock" ,java-jmock-1)
3380-
       ("xmlunit" ,java-xmlunit-legacy)))
3375+
     `(("java-junit" ,java-junit)
3376+
       ("antlr2" ,antlr2)
3377+
       ("java-jmock-1" ,java-jmock-1)
3378+
       ("java-xmlunit-legacy" ,java-xmlunit-legacy)))
33813379 
    (inputs
3382-
     `(("commons-cli" ,java-commons-cli)
3383-
       ("asm" ,java-asm)
3384-
       ("servlet" ,java-tomcat)
3385-
       ("xstream" ,java-xstream)
3386-
       ("jansi" ,java-jansi)
3387-
       ("jline" ,java-jline)))
3380+
     `(("java-commons-cli" ,java-commons-cli)
3381+
       ("java-asm" ,java-asm)
3382+
       ("java-tomcat" ,java-tomcat)
3383+
       ("java-xstream" ,java-xstream)
3384+
       ("java-jansi" ,java-jansi)
3385+
       ("java-jline" ,java-jline)))
33883386 
    (home-page "")
33893387 
    (synopsis "")
33903388 
    (description "")
33913389 
    (license (list license:gpl2
3392-
                   ;; actually CDDL 1.1
3393-
                   license:cddl1.0))))
3390+
                   license:cddl1.1))))
33943391 
33953392 
;(define-public antlr3-3.4
33963393 
;  (package
…
34753472 
;     `(("antlr" ,antlr2)
34763473 
;       ("antlr3" ,antlr3-3.3)))
34773474 
;    (inputs
3478-
;     `(("junit" ,java-junit)))
3475+
;     `(("java-junit" ,java-junit)))
34793476 
;    (propagated-inputs
34803477 
;     `(("stringtemplate" ,java-stringtemplate-3)
34813478 
;       ("stringtemplate4" ,java-stringtemplate)
…
34963493 
       ("automake" ,automake)
34973494 
       ("libtool" ,libtool)))
34983495 
    (propagated-inputs
3499-
     `(("antlr" ,antlr3)))
3496+
     `(("antlr3" ,antlr3)))
35003497 
    (arguments
35013498 
     `(#:configure-flags (list "--enable-64bit" "--disable-static")
35023499 
       #:phases
…
36263623 
               (system* "antlr3" "SourceGenTriggers.g")))))))
36273624 
    (inputs
36283625 
     `(("antlr3" ,antlr3)
3629-
       ("icu4j" ,java-icu4j)
3626+
       ("java-icu4j" ,java-icu4j)
36303627 
       ("java-json" ,java-json)
3631-
       ("treelayout" ,java-treelayout)
3632-
       ("stringtemplate4" ,java-stringtemplate)))
3628+
       ("java-treelayout" ,java-treelayout)
3629+
       ("java-stringtemplate" ,java-stringtemplate)))
36333630 
    (native-inputs
3634-
     `(("runtime" ,java-antlr4-runtime)))
3631+
     `(("java-antlr4-runtime" ,java-antlr4-runtime)))
36353632 
    (home-page "https://antlr.org")
36363633 
    (synopsis "")
36373634 
    (description "")
…
37173714 
               (copy-file (string-append "batik-" ,version "/lib/batik-all-" ,version ".jar")
37183715 
                          (string-append dir "batik-all.jar"))))))))
37193716 
    (inputs
3720-
     `(("xmlgraphics" ,java-xmlgraphics-commons)))
3717+
     `(("java-xmlgraphics-commons" ,java-xmlgraphics-commons)))
37213718 
    (home-page "https://xmlgraphics.apache.org/batik")
37223719 
    (synopsis "")
37233720 
    (description "")
…
37413738 
       #:test-dir "src/test"
37423739 
       #:tests? #f)); FIXME: need commons-xml-resolver
37433740 
    (inputs
3744-
     `(("commons-io" ,java-commons-io)
3745-
       ("commons-logging" ,java-commons-logging-minimal)))
3741+
     `(("java-commons-io" ,java-commons-io)
3742+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)))
37463743 
    (native-inputs
3747-
     `(("junit" ,java-junit)
3748-
       ("mockito" ,java-mockito-1)))
3744+
     `(("java-junit" ,java-junit)
3745+
       ("java-mockito-1" ,java-mockito-1)))
37493746 
    (home-page "https://xmlgraphics.apache.org")
37503747 
    (synopsis "")
37513748 
    (description "")
…
38133810 
                       "CLASSPATH=\"$CLASSPATH:" (getenv "CLASSPATH") "\""))))))))))
38143811 
    (home-page "https://xmlgraphics.apache.org/fop")
38153812 
    (inputs
3816-
     `(("apache-logging" ,java-commons-logging-minimal)
3817-
       ("commons-io" ,java-commons-io)
3818-
       ("xmlgraphics" ,java-xmlgraphics-commons)
3819-
       ("tomcat" ,java-tomcat)
3820-
       ("batik" ,java-batik)
3821-
       ("avalon" ,java-avalon-framework-api)
3822-
       ("avalon" ,java-avalon-logkit)))
3813+
     `(("java-commons-logging-minimal" ,java-commons-logging-minimal)
3814+
       ("java-commons-io" ,java-commons-io)
3815+
       ("java-xmlgraphics-commons" ,java-xmlgraphics-commons)
3816+
       ("java-tomcat" ,java-tomcat)
3817+
       ("java-batik" ,java-batik)
3818+
       ("java-avalon-framework-api" ,java-avalon-framework-api)
3819+
       ("java-avalon-logkit" ,java-avalon-logkit)))
38233820 
    (native-inputs
3824-
     `(("junit" ,java-junit)))
3821+
     `(("java-junit" ,java-junit)))
38253822 
    (synopsis "")
38263823 
    (description "")
38273824 
    (license license:asl2.0)))
…
38353832 
       #:source-dir "fop-util/src/main/java"
38363833 
       #:tests? #f)); no tests
38373834 
    (inputs
3838-
     `(("io" ,java-commons-io)
3839-
       ("xmlgraphics" ,java-xmlgraphics-commons)
3840-
       ("logging" ,java-commons-logging-minimal)))))
3835+
     `(("java-commons-io" ,java-commons-io)
3836+
       ("java-xmlgraphics-commons" ,java-xmlgraphics-commons)
3837+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)))))
38413838 
38423839 
(define-public java-fop-events
38433840 
  (package
…
38483845 
       #:source-dir "fop-events/src/main/java"
38493846 
       #:test-dir "fop-events/src/test"))
38503847 
    (inputs
3851-
     `(("io" ,java-commons-io)
3852-
       ("xmlgraphics" ,java-xmlgraphics-commons)
3853-
       ("logging" ,java-commons-logging-minimal)
3854-
       ("fop-util" ,java-fop-util)))))
3848+
     `(("java-commons-io" ,java-commons-io)
3849+
       ("java-xmlgraphics-commons" ,java-xmlgraphics-commons)
3850+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
3851+
       ("java-fop-util" ,java-fop-util)))))
38553852 
38563853 
;;
38573854 
;;
…
38903887 
       #:tests? #f
38913888 
       #:source-dir "src/java"))
38923889 
    (inputs
3893-
     `(("servlet" ,java-tomcat)
3894-
       ("jdom" ,java-jdom)
3895-
       ("beanutils" ,java-commons-beanutils)))
3890+
     `(("java-tomcat" ,java-tomcat)
3891+
       ("java-jdom" ,java-jdom)
3892+
       ("java-commons-beanutils" ,java-commons-beanutils)))
38963893 
    (native-inputs
3897-
     `(("junit" ,java-junit)))
3894+
     `(("java-junit" ,java-junit)))
38983895 
    (home-page "http://commons.apache.org/jxpath/")
38993896 
    (synopsis "Simple interpreter of an expression language called XPath.")
39003897 
    (description "The org.apache.commons.jxpath package defines a simple
…
39323929 
                               "}\n"
39333930 
                               "public Bundle getBundle()"))))))))
39343931 
    (inputs
3935-
     `(("slf4j" ,java-slf4j-api)
3936-
       ("asm" ,java-asm)
3937-
       ("framework" ,java-osgi-framework)
3938-
       ("eclipse-osgi" ,java-eclipse-osgi)
3939-
       ("packageadmin" ,java-osgi-service-packageadmin)))))
3932+
     `(("java-slf4j-api" ,java-slf4j-api)
3933+
       ("java-asm" ,java-asm)
3934+
       ("java-osgi-framework" ,java-osgi-framework)
3935+
       ("java-eclipse-osgi" ,java-eclipse-osgi)
3936+
       ("java-osgi-service-packageadmin" ,java-osgi-service-packageadmin)))))
39403937 
39413938 
(define-public java-geronimo-xbean-asm-util
39423939 
  (package
…
39473944 
       #:source-dir "xbean-asm-util/src/main/java"
39483945 
       #:tests? #f)); no tests
39493946 
    (inputs
3950-
     `(("asm" ,java-asm)))))
3947+
     `(("java-asm" ,java-asm)))))
39513948 
39523949 
(define-public java-geronimo-xbean-finder
39533950 
  (package
…
39583955 
       #:source-dir "xbean-finder/src/main/java"
39593956 
       #:test-dir "xbean-finder/src/test"))
39603957 
    (inputs
3961-
     `(("slf4j" ,java-slf4j-api)
3962-
       ("asm" ,java-asm)
3963-
       ("bundleutils" ,java-geronimo-xbean-bundleutils)
3964-
       ("asm-util" ,java-geronimo-xbean-asm-util)
3965-
       ("packageadmin" ,java-osgi-service-packageadmin)
3966-
       ("framework" ,java-osgi-framework)))
3958+
     `(("java-slf4j-api" ,java-slf4j-api)
3959+
       ("java-asm" ,java-asm)
3960+
       ("java-geronimo-xbean-bundleutils" ,java-geronimo-xbean-bundleutils)
3961+
       ("java-geronimo-xbean-asm-util" ,java-geronimo-xbean-asm-util)
3962+
       ("java-osgi-service-packageadmin" ,java-osgi-service-packageadmin)
3963+
       ("java-osgi-framework" ,java-osgi-framework)))
39673964 
    (native-inputs
3968-
     `(("junit" ,java-junit)
3969-
       ("hamcrest" ,java-hamcrest-core)))))
3965+
     `(("java-junit" ,java-junit)
3966+
       ("java-hamcrest-core" ,java-hamcrest-core)))))
39703967 
39713968 
(define-public java-plexus-component-annotations
39723969 
  (package
…
40444041 
       #:jdk ,icedtea-8
40454042 
       #:test-dir "src/test"))
40464043 
    (inputs
4047-
     `(("cli" ,java-commons-cli)
4048-
       ("container" ,java-plexus-container-default)
4049-
       ("classworlds" ,java-plexus-classworlds)))
4044+
     `(("java-commons-cli" ,java-commons-cli)
4045+
       ("java-plexus-container-default" ,java-plexus-container-default)
4046+
       ("java-plexus-classworlds" ,java-plexus-classworlds)))
40504047 
    (native-inputs
4051-
     `(("utils" ,java-plexus-utils)
4052-
       ("junit" ,java-junit)
4053-
       ("guava" ,java-guava)))
4048+
     `(("java-plexus-utils" ,java-plexus-utils)
4049+
       ("java-junit" ,java-junit)
4050+
       ("java-guava" ,java-guava)))
40544051 
    (home-page "https://codehaus-plexus.github.io/plexus-cli")
40554052 
    (synopsis "")
40564053 
    (description "")
…
41034100 
                               "build/classes/")
41044101 
             #t)))))
41054102 
    (inputs
4106-
     `(("container" ,java-plexus-container-default)
4107-
       ("annotations" ,java-plexus-component-annotations)
4108-
       ("utils" ,java-plexus-utils)
4109-
       ("cli" ,java-plexus-cli)
4110-
       ("classworlds" ,java-plexus-classworlds)
4111-
       ("plugin-api" ,maven-plugin-api)
4112-
       ("plugin-annotations" ,maven-plugin-annotations)
4113-
       ("core" ,maven-core-boot)
4114-
       ("model" ,maven-model)
4115-
       ("cli" ,java-commons-cli)
4116-
       ("qdox" ,java-qdox)
4117-
       ("jdom2" ,java-jdom2)
4118-
       ("asm" ,java-asm)))
4103+
     `(("java-plexus-container-default" ,java-plexus-container-default)
4104+
       ("java-plexu-component-annotations" ,java-plexus-component-annotations)
4105+
       ("java-plexus-utils" ,java-plexus-utils)
4106+
       ("java-plexus-cli" ,java-plexus-cli)
4107+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
4108+
       ("maven-plugin-api" ,maven-plugin-api)
4109+
       ("maven-plugin-annotations" ,maven-plugin-annotations)
4110+
       ("maven-core-boot" ,maven-core-boot)
4111+
       ("maven-model" ,maven-model)
4112+
       ("java-commons-cli" ,java-commons-cli)
4113+
       ("java-qdox" ,java-qdox)
4114+
       ("java-jdom2" ,java-jdom2)
4115+
       ("java-asm" ,java-asm)))
41194116 
    (native-inputs
4120-
     `(("junit" ,java-junit)
4121-
       ("guava" ,java-guava)
4122-
       ("xbean" ,java-geronimo-xbean-reflect)))))
4117+
     `(("java-junit" ,java-junit)
4118+
       ("java-guava" ,java-guava)
4119+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)))))
41234120 
41244121 
(define-public java-sisu-build-api
41254122 
  (package
…
41674164 
                     "  </components>\n"
41684165 
                     "</component-set>\n")))))))))
41694166 
    (inputs
4170-
     `(("plexus-utils" ,java-plexus-utils)
4171-
       ("plexus-container-default" ,java-plexus-container-default)))
4167+
     `(("java-plexus-utils" ,java-plexus-utils)
4168+
       ("java-plexus-container-default" ,java-plexus-container-default)))
41724169 
    (home-page "")
41734170 
    (synopsis "")
41744171 
    (description "")
…
41894186 
       #:jdk ,icedtea-8
41904187 
       #:test-dir "plexus-compiler-api/src/test"))
41914188 
    (inputs
4192-
     `(("container" ,java-plexus-container-default)
4193-
       ("util" ,java-plexus-utils)))
4189+
     `(("java-plexus-container-default" ,java-plexus-container-default)
4190+
       ("java-plexus-util" ,java-plexus-utils)))
41944191 
    (native-inputs
4195-
     `(("junit" ,java-junit)))
4192+
     `(("java-junit" ,java-junit)))
41964193 
    (home-page "")
41974194 
    (synopsis "")
41984195 
    (description "")
…
42094206 
       #:tests? #f; depends on compiler-test -> maven-core -> ... -> this package.
42104207 
       #:test-dir "plexus-compilers/plexus-compiler-javac/src/test"))
42114208 
    (inputs
4212-
     `(("api" ,java-plexus-compiler-api)
4213-
       ("utils" ,java-plexus-utils)
4214-
       ("logging" ,java-plexus-container-default)))
4209+
     `(("java-plexus-compiler-api" ,java-plexus-compiler-api)
4210+
       ("java-plexus-utils" ,java-plexus-utils)
4211+
       ("java-plexus-container-default" ,java-plexus-container-default)))
42154212 
    (native-inputs
4216-
     `(("junit" ,java-junit)))))
4213+
     `(("java-junit" ,java-junit)))))
42174214 
42184215 
(define-public java-modello-core
42194216 
  (package
…
42444241 
                            "modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java")
42454242 
               (("src/test") "modello-core/src/test")))))))
42464243 
    (inputs
4247-
     `(("plexus-utils" ,java-plexus-utils)
4248-
       ("container" ,java-plexus-container-default-bootstrap)
4249-
       ("sisu" ,java-sisu-build-api)))
4244+
     `(("java-plexus-utils" ,java-plexus-utils)
4245+
       ("java-plexus-container-default-bootstrap" ,java-plexus-container-default-bootstrap)
4246+
       ("java-sisu-build-api" ,java-sisu-build-api)))
42504247 
    (native-inputs
4251-
     `(("junit" ,java-junit)
4252-
       ("classworlds" ,java-plexus-classworlds)
4253-
       ("xbean" ,java-geronimo-xbean-reflect)
4254-
       ("guava" ,java-guava)))
4248+
     `(("java-junit" ,java-junit)
4249+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
4250+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
4251+
       ("java-guava" ,java-guava)))
42554252 
    (home-page "http://codehaus-plexus.github.io/modello/")
42564253 
    (synopsis "")
42574254 
    (description "")
…
42764273 
                               "build/classes")
42774274 
             #t)))))
42784275 
    (inputs
4279-
     `(("core" ,java-modello-core)
4276+
     `(("java-modello-core" ,java-modello-core)
42804277 
       ,@(package-inputs java-modello-core)))))
42814278 
42824279 
(define-public java-modello-plugins-xml
…
43014298 
             (substitute* "modello-plugins/modello-plugin-xml/src/test/java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java"
43024299 
               (("src/test") "modello-plugins/modello-plugin-xml/src/test")))))))
43034300 
    (inputs
4304-
     `(("core" ,java-modello-core)
4305-
       ("java" ,java-modello-plugins-java)
4301+
     `(("java-modello-core" ,java-modello-core)
4302+
       ("java-modello-plugins-java" ,java-modello-plugins-java)
43064303 
       ,@(package-inputs java-modello-core)))))
43074304 
43084305 
(define-public java-modello-test
…
43154312 
       #:tests? #f; no tests
43164313 
       #:jdk ,icedtea-8))
43174314 
    (inputs
4318-
     `(("utils" ,java-plexus-utils)
4319-
       ("compiler-api" ,java-plexus-compiler-api)
4320-
       ("compiler-javac" ,java-plexus-compiler-javac)
4321-
       ("container" ,java-plexus-container-default)))))
4315+
     `(("java-plexus-utils" ,java-plexus-utils)
4316+
       ("java-plexus-compiler-api" ,java-plexus-compiler-api)
4317+
       ("java-plexus-compiler-javac" ,java-plexus-compiler-javac)
4318+
       ("java-plexus-container-default" ,java-plexus-container-default)))))
43224319 
43234320 
(define-public java-modello-plugins-xpp3
43244321 
  (package
…
43394336 
                               "build/classes")
43404337 
             #t)))))
43414338 
    (inputs
4342-
     `(("core" ,java-modello-core)
4343-
       ("java" ,java-modello-plugins-java)
4344-
       ("xml" ,java-modello-plugins-xml)
4339+
     `(("java-modello-core" ,java-modello-core)
4340+
       ("java-modello-plugins-java" ,java-modello-plugins-java)
4341+
       ("java-modello-plugins-xml" ,java-modello-plugins-xml)
43454342 
       ,@(package-inputs java-modello-core)))
43464343 
    (native-inputs
4347-
     `(("xmlunit" ,java-xmlunit)
4348-
       ("test" ,java-modello-test)
4344+
     `(("java-xmlunit" ,java-xmlunit)
4345+
       ("java-modello-test" ,java-modello-test)
43494346 
       ,@(package-native-inputs java-modello-core)))))
43504347 
43514348 
(define-public java-plexus-cipher
…
43724369 
                 (display "org.sonatype.plexus.components.cipher.DefaultPlexusCipher\n")))
43734370 
             #t)))))
43744371 
    (inputs
4375-
     `(("cdi-api" ,java-cdi-api)
4376-
       ("inject" ,java-javax-inject)))
4372+
     `(("java-cdi-api" ,java-cdi-api)
4373+
       ("java-javax-inject" ,java-javax-inject)))
43774374 
    (home-page "http://codehaus-plexus.github.io/plexus-cipher/")
43784375 
    (synopsis "Encryption/decryption Component")
43794376 
    (description "")
…
44474444 
             (copy-file "src/test/resources/test-sec.xml"
44484445 
                        "target/sec.xml"))))))
44494446 
    (inputs
4450-
     `(("cipher" ,java-plexus-cipher)))
4447+
     `(("java-plexus-cipher" ,java-plexus-cipher)))
44514448 
    (native-inputs
4452-
     `(("modello" ,java-modello-core)
4449+
     `(("java-modello-core" ,java-modello-core)
44534450 
       ;; for modello:
4454-
       ("container" ,java-plexus-container-default)
4455-
       ("classworlds" ,java-plexus-classworlds)
4456-
       ("utils" ,java-plexus-utils)
4457-
       ("guava" ,java-guava)
4458-
       ("xbean" ,java-geronimo-xbean-reflect)
4459-
       ("build-api" ,java-sisu-build-api)
4451+
       ("java-plexus-container-default" ,java-plexus-container-default)
4452+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
4453+
       ("java-plexus-utils" ,java-plexus-utils)
4454+
       ("java-guava" ,java-guava)
4455+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
4456+
       ("java-sisu-build-api" ,java-sisu-build-api)
44604457 
       ;; modello plugins:
4461-
       ("java" ,java-modello-plugins-java)
4462-
       ("xml" ,java-modello-plugins-xml)
4463-
       ("xpp3" ,java-modello-plugins-xpp3)
4458+
       ("java-modellop-plugins-java" ,java-modello-plugins-java)
4459+
       ("java-modellop-plugins-xml" ,java-modello-plugins-xml)
4460+
       ("java-modellop-plugins-xpp3" ,java-modello-plugins-xpp3)
44644461 
       ;; for tests
4465-
       ("junit" ,java-junit)))
4462+
       ("java-junit" ,java-junit)))
44664463 
    (build-system ant-build-system)
44674464 
    (home-page "http://spice.sonatype.org/plexus-sec-dispatcher/")
44684465 
    (synopsis "Plexus Security Dispatcher Component")
…
44874484 
       #:jdk ,icedtea-8
44884485 
       #:tests? #f)); no tests
44894486 
    (inputs
4490-
     `(("guice" ,java-guice)
4491-
       ("guice-servlet" ,java-guice-servlet)
4492-
       ("javax-inject" ,java-javax-inject)
4493-
       ("servlet" ,java-tomcat)
4494-
       ("junit" ,java-junit)
4495-
       ("slf4j" ,java-slf4j-api)
4487+
     `(("java-guice" ,java-guice)
4488+
       ("java-guice-servlet" ,java-guice-servlet)
4489+
       ("java-javax-inject" ,java-javax-inject)
4490+
       ("java-tomcat" ,java-tomcat)
4491+
       ("java-junit" ,java-junit)
4492+
       ("java-slf4j-api" ,java-slf4j-api)
44964493 
       ("java-jsr305" ,java-jsr305)
44974494 
       ("java-jsr250" ,java-jsr250)
4498-
       ("cdi-api" ,java-cdi-api)
4499-
       ("osgi-framework" ,java-osgi-framework)
4500-
       ("osgi-util-tracker" ,java-osgi-util-tracker)
4501-
       ("testng" ,java-testng)))
4495+
       ("java-cdi-api" ,java-cdi-api)
4496+
       ("java-osgi-framework" ,java-osgi-framework)
4497+
       ("java-osgi-util-tracker" ,java-osgi-util-tracker)
4498+
       ("java-testng" ,java-testng)))
45024499 
    (home-page "https://www.eclipse.org/sisu/")
45034500 
    (synopsis "")
45044501 
    (description "")
…
45294526 
                           "build/classes/META-INF/plexus")
45304527 
             #t)))))
45314528 
    (inputs
4532-
     `(("classworlds" ,java-plexus-classworlds)
4533-
       ("util" ,java-plexus-utils)
4534-
       ("annotations" ,java-plexus-component-annotations)
4535-
       ("framework" ,java-osgi-framework)
4536-
       ("sisu-inject" ,java-eclipse-sisu-inject)
4537-
       ("guice" ,java-guice)
4538-
       ("javax-inject" ,java-javax-inject)
4539-
       ("slf4j" ,java-slf4j-api)
4540-
       ("junit" ,java-junit)))
4529+
     `(("java-plexus-classworlds" ,java-plexus-classworlds)
4530+
       ("java-plexus-util" ,java-plexus-utils)
4531+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
4532+
       ("java-osgi-framework" ,java-osgi-framework)
4533+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
4534+
       ("java-guice" ,java-guice)
4535+
       ("java-javax-inject" ,java-javax-inject)
4536+
       ("java-slf4j-api" ,java-slf4j-api)
4537+
       ("java-junit" ,java-junit)))
45414538 
    (home-page "https://www.eclipse.org/sisu/")
45424539 
    (synopsis "")
45434540 
    (description "")
…
45584555 
           (lambda _
45594556 
             (chdir "jetty-xml"))))))
45604557 
    (inputs
4561-
     `(("util" ,java-eclipse-jetty-util)))
4558+
     `(("java-eclipse-jetty-util" ,java-eclipse-jetty-util)))
45624559 
    (native-inputs
4563-
     `(("io" ,java-eclipse-jetty-io)
4560+
     `(("java-eclipse-jetty-io" ,java-eclipse-jetty-io)
45644561 
       ,@(package-native-inputs java-eclipse-jetty-util)))))
45654562 
45664563 
(define-public java-eclipse-jetty-xml-9.2
…
45794576 
           (lambda _
45804577 
             (chdir "jetty-xml"))))))
45814578 
    (inputs
4582-
     `(("util" ,java-eclipse-jetty-util-9.2)
4579+
     `(("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
45834580 
       ,@(package-inputs java-eclipse-jetty-util-9.2)))
45844581 
    (native-inputs
4585-
     `(("io" ,java-eclipse-jetty-io-9.2)
4582+
     `(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
45864583 
       ,@(package-native-inputs java-eclipse-jetty-util-9.2)))))
45874584 
45884585 
(define-public java-eclipse-jetty-webapp
…
46024599 
           (lambda _
46034600 
             (chdir "jetty-webapp"))))))
46044601 
    (inputs
4605-
     `(("util" ,java-eclipse-jetty-util)
4606-
       ("http" ,java-eclipse-jetty-http)
4607-
       ("server" ,java-eclipse-jetty-server)
4608-
       ("servlet" ,java-eclipse-jetty-servlet)
4609-
       ("security" ,java-eclipse-jetty-security)
4610-
       ("xml" ,java-eclipse-jetty-xml)
4611-
       ("servlet" ,java-tomcat)))
4602+
     `(("java-eclipse-jetty-util" ,java-eclipse-jetty-util)
4603+
       ("java-eclipse-jetty-http" ,java-eclipse-jetty-http)
4604+
       ("java-eclipse-jetty-server" ,java-eclipse-jetty-server)
4605+
       ("java-eclipse-jetty-servlet" ,java-eclipse-jetty-servlet)
4606+
       ("java-eclipse-jetty-security" ,java-eclipse-jetty-security)
4607+
       ("java-eclipse-jetty-xml" ,java-eclipse-jetty-xml)
4608+
       ("java-tomcat" ,java-tomcat)))
46124609 
    (native-inputs
4613-
     `(("io" ,java-eclipse-jetty-io)
4610+
     `(("java-eclipse-jetty-io" ,java-eclipse-jetty-io)
46144611 
       ,@(package-native-inputs java-eclipse-jetty-util)))))
46154612 
46164613 
(define-public java-eclipse-jetty-webapp-9.2
…
46314628 
           (lambda _
46324629 
             (chdir "jetty-webapp"))))))
46334630 
    (inputs
4634-
     `(("util" ,java-eclipse-jetty-util-9.2)
4635-
       ("http" ,java-eclipse-jetty-http-9.2)
4636-
       ("server" ,java-eclipse-jetty-server-9.2)
4637-
       ("servlet" ,java-eclipse-jetty-servlet-9.2)
4638-
       ("security" ,java-eclipse-jetty-security-9.2)
4639-
       ("xml" ,java-eclipse-jetty-xml-9.2)
4640-
       ("servlet" ,java-tomcat)
4631+
     `(("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
4632+
       ("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2)
4633+
       ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
4634+
       ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
4635+
       ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
4636+
       ("java-eclipse-jetty-xml9.2" ,java-eclipse-jetty-xml-9.2)
4637+
       ("java-tomcat" ,java-tomcat)
46414638 
       ,@(package-inputs java-eclipse-jetty-util-9.2)))
46424639 
    (native-inputs
4643-
     `(("io" ,java-eclipse-jetty-io-9.2)
4640+
     `(("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
46444641 
       ,@(package-native-inputs java-eclipse-jetty-util-9.2)))))
46454642 
46464643 
;(define-public java-eclipse-aether-api
…
46604657 
;       #:source-dir "aether-api/src/main/java"
46614658 
;       #:test-dir "aether-api/src/test"))
46624659 
;    (native-inputs
4663-
;     `(("junit" ,java-junit)
4664-
;       ("hamcrest" ,java-hamcrest-core)))
4660+
;     `(("java-junit" ,java-junit)
4661+
;       ("java-hamcrest-core" ,java-hamcrest-core)))
46654662 
;    (home-page "https://projects.eclipse.org/projects/technology.aether")
46664663 
;    (synopsis "")
46674664 
;    (description "")
…
47014698 
;    (inputs
47024699 
;     `(("api" ,java-eclipse-aether-api)))
47034700 
;    (native-inputs
4704-
;     `(("junit" ,java-junit)
4705-
;       ("hamcrest" ,java-hamcrest-core)
4701+
;     `(("java-junit" ,java-junit)
4702+
;       ("java-hamcrest-core" ,java-hamcrest-core)
47064703 
;       ("test-util" ,java-eclipse-aether-test-util)))))
47074704 
;
47084705 
;(define-public java-eclipse-aether-impl
…
47534750 
;       ("javax-inject" ,java-javax-inject)
47544751 
;       ("sisu-inject" ,java-eclipse-sisu-inject)
47554752 
;       ("guice" ,java-guice)
4756-
;       ("slf4j" ,java-slf4j-api)))
4753+
;       ("java-slf4j-api" ,java-slf4j-api)))
47574754 
;    (native-inputs
4758-
;     `(("junit" ,java-junit)
4759-
;       ("hamcrest" ,java-hamcrest-core)
4755+
;     `(("java-junit" ,java-junit)
4756+
;       ("java-hamcrest-core" ,java-hamcrest-core)
47604757 
;       ("guava" ,java-guava)
4761-
;       ("cglib" ,java-cglib)
4762-
;       ("asm" ,java-asm)
4758+
;       ("java-cglib" ,java-cglib)
4759+
;       ("java-asm" ,java-asm)
47634760 
;       ("aopalliance" ,java-aopalliance)
47644761 
;       ("test-util" ,java-eclipse-aether-test-util)))))
47654762 
…
48044801 
           (lambda _
48054802 
             (chdir "janino"))))))
48064803 
    (inputs
4807-
     `(("compiler" ,java-commons-compiler)))
4804+
     `(("java-commons-compiler" ,java-commons-compiler)))
48084805 
    (native-inputs
4809-
     `(("junit" ,java-junit)
4810-
       ("hamcrest" ,java-hamcrest-core)))))
4806+
     `(("java-junit" ,java-junit)
4807+
       ("java-hamcrest-core" ,java-hamcrest-core)))))
48114808 
48124809 
(define-public java-logback-core
48134810 
  (package
…
48324829 
           (lambda _
48334830 
             (chdir "logback-core"))))))
48344831 
    (inputs
4835-
     `(("java-mail" ,java-javax-mail)
4836-
       ("servlet" ,java-tomcat)
4837-
       ("compiler" ,java-commons-compiler)
4838-
       ("janino" ,java-janino)))
4832+
     `(("java-javax-mail" ,java-javax-mail)
4833+
       ("java-tomcat" ,java-tomcat)
4834+
       ("java-commons-compiler" ,java-commons-compiler)
4835+
       ("java-janino" ,java-janino)))
48394836 
    (native-inputs
4840-
     `(("junit" ,java-junit)
4841-
       ("hamcrest" ,java-hamcrest-core)
4842-
       ("mockito" ,java-mockito-1)
4843-
       ("cglib" ,java-cglib)
4844-
       ("asm" ,java-asm)
4845-
       ("objenesis" ,java-objenesis)
4846-
       ("joda-time" ,java-joda-time)))
4837+
     `(("java-junit" ,java-junit)
4838+
       ("java-hamcrest-core" ,java-hamcrest-core)
4839+
       ("java-mockito-1" ,java-mockito-1)
4840+
       ("java-cglib" ,java-cglib)
4841+
       ("java-asm" ,java-asm)
4842+
       ("java-objenesis" ,java-objenesis)
4843+
       ("java-joda-time" ,java-joda-time)))
48474844 
    (home-page "https://logback.qos.ch")
48484845 
    (synopsis "")
48494846 
    (description "")
…
48584855 
       #:source-dir "logback-core/src/test/java"
48594856 
       #:tests? #f))
48604857 
    (inputs
4861-
     `(("core" ,java-logback-core)
4858+
     `(("java-logback-core" ,java-logback-core)
48624859 
       ,@(package-native-inputs java-logback-core)
4863-
       ,@(package-inputs java-logback-core)))))
4860+
       ,@(package-inputs java-logback-core)))
4861+
    (native-inputs '())))
48644862 
48654863 
(define-public java-logback-classic
48664864 
  (package
…
48904888 
                             (find-files "src/main/" ".*\\.(groovy|java)$")))
48914889 
               (zero? (system* "ant" "jar"))))))))
48924890 
    (inputs
4893-
     `(("core" ,java-logback-core)
4894-
       ("slf4j" ,java-slf4j-api)
4891+
     `(("java-logback-core" ,java-logback-core)
4892+
       ("java-slf4j-api" ,java-slf4j-api)
48954893 
       ,@(package-inputs java-logback-core)))
48964894 
    (native-inputs
48974895 
     `(("groovy" ,groovy)
48984896 
       ;; for groovy
4899-
       ("cli" ,java-commons-cli)
4900-
       ("asm" ,java-asm)
4901-
       ("antlr" ,antlr2)
4897+
       ("java-commons-cli" ,java-commons-cli)
4898+
       ("java-asm" ,java-asm)
4899+
       ("antlr2" ,antlr2)
49024900 
       ;; for tests
4903-
       ("junit" ,java-junit)
4904-
       ("hamcrest" ,java-hamcrest-core)
4905-
       ("dom4j" ,java-dom4j)
4906-
       ("log4j" ,java-log4j-api)
4907-
       ("osgi-framework" ,java-osgi-framework)
4908-
       ("assertj" ,java-assertj)
4909-
       ("mockito" ,java-mockito-1)
4910-
       ("slf4j" ,java-slf4j-api)
4911-
       ("core" ,java-logback-core)
4912-
       ("logback-tests" ,java-logback-core-tests)))))
4901+
       ("java-junit" ,java-junit)
4902+
       ("java-hamcrest-core" ,java-hamcrest-core)
4903+
       ("java-dom4j" ,java-dom4j)
4904+
       ("java-log4j-api" ,java-log4j-api)
4905+
       ("java-osgi-framework" ,java-osgi-framework)
4906+
       ("java-assertj" ,java-assertj)
4907+
       ("java-mockito-1" ,java-mockito-1)
4908+
       ("java-slf4j-api" ,java-slf4j-api)
4909+
       ("java-logback-core" ,java-logback-core)
4910+
       ("java-logback-core-tests" ,java-logback-core-tests)))))
49134911 
49144912 
(define java-slf4j-api-tests
49154913 
  (package
…
49204918 
       #:source-dir "slf4j-api/src/test/java"
49214919 
       #:tests? #f))
49224920 
    (inputs
4923-
     `(("slf4j" ,java-slf4j-api)
4921+
     `(("java-slf4j-api" ,java-slf4j-api)
49244922 
       ,@(package-inputs java-slf4j-api)
49254923 
       ,@(package-native-inputs java-slf4j-api)))))
49264924 
…
49434941 
       #:source-dir "maven-plugin-testing-harness/src/main/java"
49444942 
       #:jdk ,icedtea-8))
49454943 
    (inputs
4946-
     `(("artifact" ,maven-artifact)))
4944+
     `(("maven-artifact" ,maven-artifact)))
49474945 
    (native-inputs
49484946 
     `(("unzip" ,unzip)))
49494947 
    (home-page "")
…
49754973 
             (delete-file "src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java")
49764974 
             #t)))))
49774975 
    (inputs
4978-
     `(("jansi" ,java-jansi)
4979-
       ("io" ,java-commons-io)
4980-
       ("jsr305" ,java-jsr305)
4981-
       ("container" ,java-plexus-container-default)))
4976+
     `(("java-jansi" ,java-jansi)
4977+
       ("java-commons-io" ,java-commons-io)
4978+
       ("java-jsr305" ,java-jsr305)
4979+
       ("java-plexus-container-default" ,java-plexus-container-default)))
49824980 
    (native-inputs
49834981 
     `(("unzip" ,unzip)
4984-
       ("junit" ,java-junit)
4985-
       ("hamcrest" ,java-hamcrest-core)
4986-
       ("lang3" ,java-commons-lang3)))
4982+
       ("java-junit" ,java-junit)
4983+
       ("java-hamcrest-core" ,java-hamcrest-core)
4984+
       ("java-commons-lang3" ,java-commons-lang3)))
49874985 
    (home-page "")
49884986 
    (synopsis "")
49894987 
    (description "")
…
50285026 
               (install-file "apache-maven/src/bin/m2.conf" bin)
50295027 
               (copy-recursively "apache-maven/src/conf" conf)))))))
50305028 
    (inputs
5031-
     `(("classworlds" ,java-plexus-classworlds)
5032-
       ("artifact" ,maven-artifact)
5033-
       ("embedder" ,maven-embedder)
5034-
       ("core" ,maven-core)
5035-
       ("compat" ,maven-compat)
5036-
       ("builder" ,maven-builder-support)
5037-
       ("model" ,maven-model)
5038-
       ("model-builder" ,maven-model-builder)
5039-
       ("settings" ,maven-settings)
5040-
       ("settings-builder" ,maven-settings-builder)
5041-
       ("plugin-api" ,maven-plugin-api)
5042-
       ("metadata", maven-repository-metadata)
5043-
       ("shared-utils" ,maven-shared-utils)
5044-
       ("api" ,maven-resolver-api)
5045-
       ("spi" ,maven-resolver-spi)
5046-
       ("util" ,maven-resolver-util)
5047-
       ("impl" ,maven-resolver-impl)
5048-
       ("resolver-connector-basic" ,maven-resolver-connector-basic)
5049-
       ("resolver-provider" ,maven-resolver-provider)
5050-
       ("transport-wagon" ,maven-resolver-transport-wagon)
5051-
       ("wagon" ,maven-wagon-provider-api)
5052-
       ("wagon-file" ,maven-wagon-file)
5053-
       ("wagon-http" ,maven-wagon-http)
5054-
       ("logging" ,java-commons-logging-minimal)
5055-
       ("httpclient" ,java-httpcomponents-client)
5056-
       ("httpcore" ,java-httpcomponents-core)
5057-
       ("wagon-http-shared" ,maven-wagon-http-shared)
5058-
       ("wagon-tck-http" ,maven-wagon-tck-http)
5059-
       ("container" ,java-eclipse-sisu-plexus)
5060-
       ("guice" ,java-guice)
5061-
       ("aop" ,java-aopalliance)
5062-
       ("cglib" ,java-cglib)
5063-
       ("asm" ,java-asm)
5064-
       ("sisu-inject" ,java-eclipse-sisu-inject)
5065-
       ("javax-inject" ,java-javax-inject)
5066-
       ("annots" ,java-plexus-component-annotations)
5067-
       ("plexus-utils" ,java-plexus-utils)
5068-
       ("interpolation" ,java-plexus-interpolation)
5069-
       ("sec-dispatcher" ,java-plexus-sec-dispatcher)
5070-
       ("cipher" ,java-plexus-cipher)
5071-
       ("guava" ,java-guava)
5072-
       ("jansi" ,java-jansi)
5073-
       ("jsr250" ,java-jsr250)
5074-
       ("cdi" ,java-cdi-api)
5075-
       ("cli" ,java-commons-cli)
5076-
       ("io" ,java-commons-io)
5077-
       ("lang3" ,java-commons-lang3)
5078-
       ("slf4j" ,java-slf4j-api)
5029+
     `(("java-plexus-classworlds" ,java-plexus-classworlds)
5030+
       ("maven-artifact" ,maven-artifact)
5031+
       ("maven-embedder" ,maven-embedder)
5032+
       ("maven-core" ,maven-core)
5033+
       ("maven-compat" ,maven-compat)
5034+
       ("maven-builder-support" ,maven-builder-support)
5035+
       ("maven-model" ,maven-model)
5036+
       ("maven-model-builder" ,maven-model-builder)
5037+
       ("maven-settings" ,maven-settings)
5038+
       ("maven-settings-builder" ,maven-settings-builder)
5039+
       ("maven-plugin-api" ,maven-plugin-api)
5040+
       ("maven-repository-metadata", maven-repository-metadata)
5041+
       ("maven-shared-utils" ,maven-shared-utils)
5042+
       ("maven-resolver-api" ,maven-resolver-api)
5043+
       ("maven-resolver-spi" ,maven-resolver-spi)
5044+
       ("maven-resolver-util" ,maven-resolver-util)
5045+
       ("maven-resolver-impl" ,maven-resolver-impl)
5046+
       ("maven-resolver-connector-basic" ,maven-resolver-connector-basic)
5047+
       ("maven-resolver-provider" ,maven-resolver-provider)
5048+
       ("maven-resolver-transport-wagon" ,maven-resolver-transport-wagon)
5049+
       ("maven-wagon-provider-api" ,maven-wagon-provider-api)
5050+
       ("maven-wagon-file" ,maven-wagon-file)
5051+
       ("maven-wagon-http" ,maven-wagon-http)
5052+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
5053+
       ("java-httpcomponents-client" ,java-httpcomponents-client)
5054+
       ("java-httpcomponents-core" ,java-httpcomponents-core)
5055+
       ("maven-wagon-http-shared" ,maven-wagon-http-shared)
5056+
       ("maven-wagon-tck-http" ,maven-wagon-tck-http)
5057+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5058+
       ("java-guice" ,java-guice)
5059+
       ("java-aopalliance" ,java-aopalliance)
5060+
       ("java-cglib" ,java-cglib)
5061+
       ("java-asm" ,java-asm)
5062+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
5063+
       ("java-javax-inject" ,java-javax-inject)
5064+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5065+
       ("java-plexus-utils" ,java-plexus-utils)
5066+
       ("java-plexus-interpolation" ,java-plexus-interpolation)
5067+
       ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher)
5068+
       ("java-plexus-cipher" ,java-plexus-cipher)
5069+
       ("java-guava" ,java-guava)
5070+
       ("java-jansi" ,java-jansi)
5071+
       ("java-jsr250" ,java-jsr250)
5072+
       ("java-cdi-api" ,java-cdi-api)
5073+
       ("java-commons-cli" ,java-commons-cli)
5074+
       ("java-commons-io" ,java-commons-io)
5075+
       ("java-commons-lang3" ,java-commons-lang3)
5076+
       ("java-slf4j-api" ,java-slf4j-api)
50795077 
       ;; TODO: replace with maven-slf4j-provider
5080-
       ("simple" ,java-slf4j-simple)))
5078+
       ("java-slf4j-simple" ,java-slf4j-simple)))
50815079 
    (home-page "")
50825080 
    (synopsis "")
50835081 
    (description "")
…
50965094 
     `(("java-plexus-utils" ,java-plexus-utils)
50975095 
       ("java-commons-lang3" ,java-commons-lang3)))
50985096 
    (native-inputs
5099-
     `(("junit" ,java-junit)))))
5097+
     `(("java-junit" ,java-junit)))))
51005098 
51015099 
(define-public maven-model
51025100 
  (package
…
51235121 
               (modello-single-mode file "4.0.0" "xpp3-writer")
51245122 
               (modello-single-mode file "4.0.0" "xpp3-extended-reader"))))))))
51255123 
    (inputs
5126-
     `(("lang3" ,java-commons-lang3)
5127-
       ("utils" ,java-plexus-utils)))
5124+
     `(("java-commons-lang3" ,java-commons-lang3)
5125+
       ("java-plexus-utils" ,java-plexus-utils)))
51285126 
    (native-inputs
5129-
     `(("modello" ,java-modello-core)
5127+
     `(("java-modello-core" ,java-modello-core)
51305128 
       ;; for modello:
5131-
       ;("container" ,java-plexus-container-default)
5132-
       ("container" ,java-eclipse-sisu-plexus)
5133-
       ("annots" ,java-plexus-component-annotations)
5134-
       ("guice" ,java-guice)
5135-
       ("cglib" ,java-cglib)
5136-
       ("asm" ,java-asm)
5137-
       ("sisu-inject" ,java-eclipse-sisu-inject)
5138-
       ("javax-inject" ,java-javax-inject)
5139-
       ("classworlds" ,java-plexus-classworlds)
5140-
       ("guava" ,java-guava)
5141-
       ("xbean" ,java-geronimo-xbean-reflect)
5142-
       ("build-api" ,java-sisu-build-api)
5129+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5130+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5131+
       ("java-guice" ,java-guice)
5132+
       ("java-cglib" ,java-cglib)
5133+
       ("java-asm" ,java-asm)
5134+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
5135+
       ("java-javax-inject" ,java-javax-inject)
5136+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
5137+
       ("java-guava" ,java-guava)
5138+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
5139+
       ("java-sisu-build-api" ,java-sisu-build-api)
51435140 
       ;; modello plugins:
5144-
       ("java" ,java-modello-plugins-java)
5145-
       ("xml" ,java-modello-plugins-xml)
5146-
       ("xpp3" ,java-modello-plugins-xpp3)
5141+
       ("java-modello-plugins-java" ,java-modello-plugins-java)
5142+
       ("java-modello-plugins-xml" ,java-modello-plugins-xml)
5143+
       ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)
51475144 
       ;; for tests
5148-
       ("junit" ,java-junit)))))
5145+
       ("java-junit" ,java-junit)))))
51495146 
51505147 
(define-public maven-settings
51515148 
  (package
…
51725169 
                 (modello-single-mode file "1.1.0" "xpp3-writer"))))))))
51735170 
    (inputs '())
51745171 
    (native-inputs
5175-
     `(("modello" ,java-modello-core)
5172+
     `(("java-modello-core" ,java-modello-core)
51765173 
       ;; for modello:
51775174 
       ;("container" ,java-plexus-container-default)
5178-
       ("container" ,java-eclipse-sisu-plexus)
5179-
       ("annots" ,java-plexus-component-annotations)
5180-
       ("guice" ,java-guice)
5181-
       ("cglib" ,java-cglib)
5182-
       ("asm" ,java-asm)
5183-
       ("sisu-inject" ,java-eclipse-sisu-inject)
5184-
       ("javax-inject" ,java-javax-inject)
5185-
       ("classworlds" ,java-plexus-classworlds)
5186-
       ("utils" ,java-plexus-utils)
5187-
       ("guava" ,java-guava)
5188-
       ("xbean" ,java-geronimo-xbean-reflect)
5189-
       ("build-api" ,java-sisu-build-api)
5175+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5176+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5177+
       ("java-guice" ,java-guice)
5178+
       ("java-cglib" ,java-cglib)
5179+
       ("java-asm" ,java-asm)
5180+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
5181+
       ("java-javax-inject" ,java-javax-inject)
5182+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
5183+
       ("java-plexus-utils" ,java-plexus-utils)
5184+
       ("java-guava" ,java-guava)
5185+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
5186+
       ("java-sisu-build-api" ,java-sisu-build-api)
51905187 
       ;; modello plugins:
5191-
       ("java" ,java-modello-plugins-java)
5192-
       ("xml" ,java-modello-plugins-xml)
5193-
       ("xpp3" ,java-modello-plugins-xpp3)))))
5188+
       ("java-modello-plugins-java" ,java-modello-plugins-java)
5189+
       ("java-modello-plugins-xml" ,java-modello-plugins-xml)
5190+
       ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)))))
51945191 
51955192 
(define-public maven-builder-support
51965193 
  (package
…
52105207 
               (("target/test-classes") "maven-builder-support/src/test/resources"))
52115208 
             #t)))))
52125209 
    (inputs
5213-
     `(("utils" ,java-plexus-utils)
5214-
       ("lang3" ,java-commons-lang3)))
5210+
     `(("java-plexus-utils" ,java-plexus-utils)
5211+
       ("java-commons-lang3" ,java-commons-lang3)))
52155212 
    (native-inputs
5216-
     `(("junit" ,java-junit)
5217-
       ("hamcrest" ,java-hamcrest-core)))))
5213+
     `(("java-junit" ,java-junit)
5214+
       ("java-hamcrest-core" ,java-hamcrest-core)))))
52185215 
52195216 
(define-public maven-settings-builder
52205217 
  (package
…
52345231 
             (zero? (system* "./components.sh" "maven-settings-builder/src/main/java"
52355232 
                             "build/classes/META-INF/plexus/components.xml")))))))
52365233 
    (inputs
5237-
     `(("utils" ,java-plexus-utils)
5238-
       ("annotations" ,java-plexus-component-annotations)
5239-
       ("interpolation" ,java-plexus-interpolation)
5240-
       ("sec-dispatcher" ,java-plexus-sec-dispatcher)
5241-
       ("support" ,maven-builder-support)
5242-
       ("settings" ,maven-settings)
5243-
       ("lang3" ,java-commons-lang3)))
5234+
     `(("java-plexus-utils" ,java-plexus-utils)
5235+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5236+
       ("java-plexus-interpolation" ,java-plexus-interpolation)
5237+
       ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher)
5238+
       ("maven-builder-support" ,maven-builder-support)
5239+
       ("maven-settings" ,maven-settings)
5240+
       ("java-commons-lang3" ,java-commons-lang3)))
52445241 
    (native-inputs
5245-
     `(("junit" ,java-junit)))))
5242+
     `(("java-junit" ,java-junit)))))
52465243 
52475244 
(define-public maven-plugin-api
52485245 
  (package
…
52685265 
                 (modello-single-mode file "1.0.0" "xpp3-reader")
52695266 
                 (modello-single-mode file "1.0.0" "xpp3-writer"))))))))
52705267 
    (inputs
5271-
     `(("artifact" ,maven-artifact)
5272-
       ("model" ,maven-model)
5273-
       ;("container" ,java-plexus-container-default)
5274-
       ("container" ,java-eclipse-sisu-plexus)
5275-
       ("annots" ,java-plexus-component-annotations)
5268+
     `(("maven-artifact" ,maven-artifact)
5269+
       ("maven-model" ,maven-model)
5270+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5271+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
52765272 
       ("guice" ,java-guice)
5277-
       ("cglib" ,java-cglib)
5278-
       ("asm" ,java-asm)
5273+
       ("java-cglib" ,java-cglib)
5274+
       ("java-asm" ,java-asm)
52795275 
       ("sisu-inject" ,java-eclipse-sisu-inject)
52805276 
       ("javax-inject" ,java-javax-inject)
52815277 
       ("utils" ,java-plexus-utils)))
…
52915287 
       ("xml" ,java-modello-plugins-xml)
52925288 
       ("xpp3" ,java-modello-plugins-xpp3)
52935289 
       ;; for tests
5294-
       ("junit" ,java-junit)))))
5290+
       ("java-junit" ,java-junit)))))
52955291 
52965292 
(define-public maven-model-builder
52975293 
  (package
…
53295325 
       ("lang3" ,java-commons-lang3)
53305326 
       ("guava" ,java-guava)))
53315327 
    (native-inputs
5332-
     `(("junit" ,java-junit)
5333-
       ("hamcrest" ,java-hamcrest-core)
5334-
       ("container" ,java-eclipse-sisu-plexus)
5335-
       ("annots" ,java-plexus-component-annotations)
5328+
     `(("java-junit" ,java-junit)
5329+
       ("java-hamcrest-core" ,java-hamcrest-core)
5330+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5331+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
53365332 
       ("guice" ,java-guice)
5337-
       ("cglib" ,java-cglib)
5338-
       ("asm" ,java-asm)
5333+
       ("java-cglib" ,java-cglib)
5334+
       ("java-asm" ,java-asm)
53395335 
       ("sisu-inject" ,java-eclipse-sisu-inject)
53405336 
       ("javax-inject" ,java-javax-inject)
53415337 
       ("xmlunit" ,java-xmlunit)
…
53715367 
     `(("modello" ,java-modello-core)
53725368 
       ;; for modello:
53735369 
       ;("container" ,java-plexus-container-default)
5374-
       ("container" ,java-eclipse-sisu-plexus)
5375-
       ("annots" ,java-plexus-component-annotations)
5376-
       ("guice" ,java-guice)
5377-
       ("cglib" ,java-cglib)
5378-
       ("asm" ,java-asm)
5379-
       ("sisu-inject" ,java-eclipse-sisu-inject)
5380-
       ("javax-inject" ,java-javax-inject)
5381-
       ("utils" ,java-plexus-utils)
5382-
       ("classworlds" ,java-plexus-classworlds)
5383-
       ("guava" ,java-guava)
5384-
       ("xbean" ,java-geronimo-xbean-reflect)
5385-
       ("build-api" ,java-sisu-build-api)
5370+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5371+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5372+
       ("java-guice" ,java-guice)
5373+
       ("java-cglib" ,java-cglib)
5374+
       ("java-asm" ,java-asm)
5375+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
5376+
       ("java-javax-inject" ,java-javax-inject)
5377+
       ("java-plexus-utils" ,java-plexus-utils)
5378+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
5379+
       ("java-guava" ,java-guava)
5380+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
5381+
       ("java-sisu-build-api" ,java-sisu-build-api)
53865382 
       ;; modello plugins:
5387-
       ("java" ,java-modello-plugins-java)
5388-
       ("xml" ,java-modello-plugins-xml)
5389-
       ("xpp3" ,java-modello-plugins-xpp3)
5383+
       ("java-modello-plugins-java" ,java-modello-plugins-java)
5384+
       ("java-modello-plugins-xml" ,java-modello-plugins-xml)
5385+
       ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)
53905386 
       ;; for tests
5391-
       ("junit" ,java-junit)))))
5387+
       ("java-junit" ,java-junit)))))
53925388 
53935389 
(define-public maven-resolver-provider
53945390 
  (package
…
54095405 
             (zero? (system* "./components.sh" "maven-resolver-provider/src/main/java"
54105406 
                             "build/classes/META-INF/plexus/components.xml")))))))
54115407 
    (inputs
5412-
     `(("spi" ,maven-resolver-spi)
5413-
       ("api" ,maven-resolver-api)
5414-
       ("impl" ,maven-resolver-impl)
5415-
       ("util" ,maven-resolver-util)
5416-
       ("model" ,maven-model)
5417-
       ("model-builder" ,maven-model-builder)
5418-
       ("support" ,maven-builder-support)
5419-
       ("repository" ,maven-repository-metadata)
5420-
       ("utils" ,java-plexus-utils)
5421-
       ("annotations" ,java-plexus-component-annotations)
5422-
       ("lang3" ,java-commons-lang3)
5423-
       ("guice" ,java-guice)
5424-
       ("guava" ,java-guava)
5425-
       ("sisu-inject" ,java-eclipse-sisu-inject)
5426-
       ("javax-inject" ,java-javax-inject)))))
5408+
     `(("maven-resolver-spi" ,maven-resolver-spi)
5409+
       ("maven-resolver-api" ,maven-resolver-api)
5410+
       ("maven-resolver-impl" ,maven-resolver-impl)
5411+
       ("maven-resolver-util" ,maven-resolver-util)
5412+
       ("maven-model" ,maven-model)
5413+
       ("maven-model-builder" ,maven-model-builder)
5414+
       ("maven-builder-support" ,maven-builder-support)
5415+
       ("maven-repository-metadata" ,maven-repository-metadata)
5416+
       ("java-plexus-utils" ,java-plexus-utils)
5417+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5418+
       ("java-commons-lang3" ,java-commons-lang3)
5419+
       ("java-guice" ,java-guice)
5420+
       ("java-guava" ,java-guava)
5421+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
5422+
       ("java-javax-inject" ,java-javax-inject)))))
54275423 
54285424 
;(define-public maven-resolver-provider
54295425 
;  (package
…
54605456 
;    (native-inputs
54615457 
;     `(;; For building tests:
54625458 
;       ("maven-core" ,maven-core-boot)
5463-
;       ("container" ,java-eclipse-sisu-plexus)
5464-
;       ("junit" ,java-junit)
5465-
;       ("mockito" ,java-mockito-1)
5459+
;       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5460+
;       ("java-junit" ,java-junit)
5461+
;       ("java-mockito-1" ,java-mockito-1)
54665462 
;       ;; For running tests:
5467-
;       ("hamcrest" ,java-hamcrest-core)
5463+
;       ("java-hamcrest-core" ,java-hamcrest-core)
54685464 
;       ("aop" ,java-aopalliance)
54695465 
;       ("classworlds" ,java-plexus-classworlds)
54705466 
;       ("plugin" ,maven-plugin-api)
5471-
;       ("cglib" ,java-cglib)
5472-
;       ("asm" ,java-asm)
5467+
;       ("java-cglib" ,java-cglib)
5468+
;       ("java-asm" ,java-asm)
54735469 
;       ("interpolation" ,java-plexus-interpolation)
54745470 
;       ("artifact" ,maven-artifact)
5475-
;       ("objenesis" ,java-objenesis)
5471+
;       ("java-objenesis" ,java-objenesis)
54765472 
;       ("transport-wagon" ,maven-resolver-transport-wagon)
54775473 
;       ("wagon-file" ,maven-wagon-file)
54785474 
;       ("wagon-api" ,maven-wagon-provider-api)
…
55255521 
                 (modello-single-mode file "1.1.0" "xpp3-reader")
55265522 
                 (modello-single-mode file "1.1.0" "xpp3-writer"))))))))
55275523 
    (inputs
5528-
     `(("artifact" ,maven-artifact)
5529-
       ("resolver" ,maven-resolver-provider)
5530-
       ("support" ,maven-builder-support)
5531-
       ("model" ,maven-model)
5532-
       ("model-builder" ,maven-model-builder)
5533-
       ("settings" ,maven-settings)
5534-
       ("settings-builder" ,maven-settings-builder)
5535-
       ("plugin-api" ,maven-plugin-api)
5536-
       ("repository-metadat" ,maven-repository-metadata)
5537-
       ("shared-utils" ,maven-shared-utils)
5538-
       ("annotations" ,java-plexus-component-annotations)
5539-
       ("utils" ,java-plexus-utils)
5540-
       ("lang3" ,java-commons-lang3)
5541-
       ("guava" ,java-guava)
5542-
       ("guice" ,java-guice)
5543-
       ("aether-api" ,maven-resolver-api)
5544-
       ("aether-spi" ,maven-resolver-spi)
5545-
       ("aether-util" ,maven-resolver-util)
5546-
       ("aether-impl" ,maven-resolver-impl)
5547-
       ("sisu-inject" ,java-eclipse-sisu-inject)
5548-
       ("container" ,java-eclipse-sisu-plexus)
5524+
     `(("maven-artifact" ,maven-artifact)
5525+
       ("maven-resolver-provider" ,maven-resolver-provider)
5526+
       ("maven-builder-support" ,maven-builder-support)
5527+
       ("maven-model" ,maven-model)
5528+
       ("maven-model-builder" ,maven-model-builder)
5529+
       ("maven-settings" ,maven-settings)
5530+
       ("maven-settings-builder" ,maven-settings-builder)
5531+
       ("maven-plugin-api" ,maven-plugin-api)
5532+
       ("maven-repository-metadata" ,maven-repository-metadata)
5533+
       ("maven-shared-utils" ,maven-shared-utils)
5534+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5535+
       ("java-plexus-utils" ,java-plexus-utils)
5536+
       ("java-commons-lang3" ,java-commons-lang3)
5537+
       ("java-guava" ,java-guava)
5538+
       ("java-guice" ,java-guice)
5539+
       ("maven-resolver-api" ,maven-resolver-api)
5540+
       ("maven-resolver-spi" ,maven-resolver-spi)
5541+
       ("maven-resolver-util" ,maven-resolver-util)
5542+
       ("maven-resolver-impl" ,maven-resolver-impl)
5543+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
5544+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
55495545 
       ("java-javax-inject" ,java-javax-inject)
5550-
       ("classworld" ,java-plexus-classworlds)))
5546+
       ("java-plexus-classworld" ,java-plexus-classworlds)))
55515547 
    (native-inputs
5552-
     `(("modello" ,java-modello-core)
5553-
       ("cglib" ,java-cglib)
5554-
       ("asm" ,java-asm)
5555-
       ("classworlds" ,java-plexus-classworlds)
5556-
       ("xbean" ,java-geronimo-xbean-reflect)
5557-
       ("build-api" ,java-sisu-build-api)
5558-
       ("java" ,java-modello-plugins-java)
5559-
       ("xml" ,java-modello-plugins-xml)
5560-
       ("xpp3" ,java-modello-plugins-xpp3)
5548+
     `(("java-modello-core" ,java-modello-core)
5549+
       ("java-cglib" ,java-cglib)
5550+
       ("java-asm" ,java-asm)
5551+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
5552+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
5553+
       ("java-sisu-build-api" ,java-sisu-build-api)
5554+
       ("java-modello-plugins-java" ,java-modello-plugins-java)
5555+
       ("java-modello-plugins-xml" ,java-modello-plugins-xml)
5556+
       ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)
55615557 
       ;; tests
5562-
       ("junit" ,java-junit)
5563-
       ("mockito" ,java-mockito-1)
5564-
       ("jxpath" ,java-commons-jxpath)))))
5558+
       ("java-junit" ,java-junit)
5559+
       ("java-mockito-1" ,java-mockito-1)
5560+
       ("java-commons-jxpath" ,java-commons-jxpath)))))
55655561 
55665562 
(define-public maven-core
55675563 
  (package
…
55965592 
                                                    "cat src/main/resources/META-INF/plexus/default-bindings.xml |"
55975593 
                                                    " sed -e 's|<?xml.*||' -e 's|<component-set>||' -e 's|<components>||' )>"
55985594 
                                                    "build/classes/META-INF/plexus/components.xml"))))))
5599-
                     ;(substitute* "build/classes/META-INF/plexus/components.xml"
5600-
                     ;  (("</components>")
5601-
                     ;   (string-append
5602-
                     ;     "  <component>\n"
5603-
                     ;     "    <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role>\n"
5604-
                     ;     "    <role-hint>maven</role-hint>\n"
5605-
                     ;     "    <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation>\n"
5606-
                     ;     "    <description>Maven Security dispatcher</description>\n"
5607-
                     ;     "    <requirements>\n"
5608-
                     ;     "      <requirement>\n"
5609-
                     ;     "        <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>\n"
5610-
                     ;     "        <field-name>_cipher</field-name>\n"
5611-
                     ;     "      </requirement>\n"
5612-
                     ;     "      <requirement>\n"
5613-
                     ;     "        <role>org.sonatype.plexus.components.sec.dispatcher.PasswordDecryptor</role>\n"
5614-
                     ;     "        <field-name>_decryptors</field-name>\n"
5615-
                     ;     "      </requirement>\n"
5616-
                     ;     "    </requirements>\n"
5617-
                     ;     "    <configuration>\n"
5618-
                     ;     "      <_configuration-file>~/.m2/settings-security.xml</_configuration-file>\n"
5619-
                     ;     "    </configuration>\n"
5620-
                     ;     "  </component>\n"
5621-
                     ;     "</components>")))
5622-
                     ;#t)))
5623-
            ;(add-after 'generate-metadata 'fix-metadata
5624-
            ;  (lambda _
5625-
            ;    (substitute* "build/classes/META-INF/plexus/components.xml"
5626-
            ;      (("<field-name>") "<role-hint /><field-name>"))
5627-
            ;    #t))
56285595 
            (add-after 'generate-metadata 'rebuild
56295596 
              (lambda _
56305597 
                (zero? (system* "ant" "jar"))))))))
56315598 
    (native-inputs
5632-
     `(("metadata" ,java-plexus-component-metadata)
5633-
       ("cli" ,java-commons-cli)
5634-
       ("plexus-cli" ,java-plexus-cli)
5635-
       ("jdom2" ,java-jdom2)
5636-
       ("qdox" ,java-qdox)
5637-
       ("core" ,maven-core-boot)
5599+
     `(("java-plexus-component-metadata" ,java-plexus-component-metadata)
5600+
       ("java-commons-cli" ,java-commons-cli)
5601+
       ("java-plexus-cli" ,java-plexus-cli)
5602+
       ("java-jdom2" ,java-jdom2)
5603+
       ("java-qdox" ,java-qdox)
5604+
       ("maven-core-boot" ,maven-core-boot)
56385605 
       ,@(package-native-inputs maven-core-boot)))))
56395606 
56405607 
(define-public maven-wagon-provider-api
…
56525619 
       #:source-dir "wagon-provider-api/src/main/java"
56535620 
       #:test-dir "wagon-provider-api/src/test"))
56545621 
    (inputs
5655-
     `(("utils" ,java-plexus-utils)))
5622+
     `(("java-plexus-utils" ,java-plexus-utils)))
56565623 
    (native-inputs
56575624 
     `(("unzip" ,unzip)
5658-
       ("junit" ,java-junit)
5659-
       ("easymock" ,java-easymock)))
5625+
       ("java-junit" ,java-junit)
5626+
       ("java-easymock" ,java-easymock)))
56605627 
    (home-page "")
56615628 
    (synopsis "")
56625629 
    (description "")
…
56725639 
       #:tests? #f; no tests
56735640 
       #:jdk ,icedtea-8))
56745641 
    (inputs
5675-
     `(("utils" ,java-plexus-utils)
5676-
       ("containers" ,java-plexus-container-default)
5677-
       ("jetty-util" ,java-eclipse-jetty-util-9.2)
5678-
       ("jetty-security" ,java-eclipse-jetty-security-9.2)
5679-
       ("jetty-server" ,java-eclipse-jetty-server-9.2)
5680-
       ("jetty-servlet" ,java-eclipse-jetty-servlet-9.2)
5681-
       ("slf4j" ,java-slf4j-api)
5682-
       ("servlet" ,java-tomcat)
5683-
       ("provider-api" ,maven-wagon-provider-api)))))
5642+
     `(("java-plexus-utils" ,java-plexus-utils)
5643+
       ("java-plexus-container-default" ,java-plexus-container-default)
5644+
       ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
5645+
       ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
5646+
       ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
5647+
       ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
5648+
       ("java-slf4j-api" ,java-slf4j-api)
5649+
       ("java-tomcat" ,java-tomcat)
5650+
       ("maven-wagon-provider-api" ,maven-wagon-provider-api)))))
56845651 
56855652 
(define-public maven-wagon-file
56865653 
  (package
…
57115678 
           (lambda _
57125679 
             (zero? (system* "ant" "jar")))))))
57135680 
    (inputs
5714-
     `(("utils" ,java-plexus-utils)
5715-
       ("provider-api" ,maven-wagon-provider-api)))
5681+
     `(("java-plexus-utils" ,java-plexus-utils)
5682+
       ("maven-wagon-provider-api" ,maven-wagon-provider-api)))
57165683 
    (native-inputs
5717-
     `(("provider-test" ,maven-wagon-provider-test)
5718-
       ("metadata" ,java-plexus-component-metadata)
5719-
       ("annotations" ,java-plexus-component-annotations)
5720-
       ("container" ,java-eclipse-sisu-plexus)
5721-
       ("sisu-inject" ,java-eclipse-sisu-inject)
5722-
       ("classworlds" ,java-plexus-classworlds)
5723-
       ("guava" ,java-guava)
5724-
       ("guice" ,java-guice)
5725-
       ("inject" ,java-javax-inject)
5726-
       ("cglib" ,java-cglib)
5727-
       ("slf4j" ,java-slf4j-api)
5728-
       ("utils" ,java-plexus-utils)
5729-
       ("cli" ,java-plexus-cli)
5730-
       ("plugin-api" ,maven-plugin-api)
5731-
       ("plugin-annotations" ,maven-plugin-annotations)
5732-
       ("core" ,maven-core)
5733-
       ("model" ,maven-model)
5734-
       ("cli" ,java-commons-cli)
5735-
       ("qdox" ,java-qdox)
5736-
       ("jdom2" ,java-jdom2)
5737-
       ("asm" ,java-asm)
5738-
       ("xbean" ,java-geronimo-xbean-reflect)
5684+
     `(("maven-wagon-provider-test" ,maven-wagon-provider-test)
5685+
       ("java-plexus-component-metadata" ,java-plexus-component-metadata)
5686+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5687+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5688+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
5689+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
5690+
       ("java-guava" ,java-guava)
5691+
       ("java-guice" ,java-guice)
5692+
       ("java-javax-inject" ,java-javax-inject)
5693+
       ("java-cglib" ,java-cglib)
5694+
       ("java-slf4j-api" ,java-slf4j-api)
5695+
       ("java-plexus-utils" ,java-plexus-utils)
5696+
       ("java-plexus-cli" ,java-plexus-cli)
5697+
       ("maven-plugin-api" ,maven-plugin-api)
5698+
       ("maven-plugin-annotations" ,maven-plugin-annotations)
5699+
       ("maven-core" ,maven-core)
5700+
       ("maven-model" ,maven-model)
5701+
       ("java-commons-cli" ,java-commons-cli)
5702+
       ("java-qdox" ,java-qdox)
5703+
       ("java-jdom2" ,java-jdom2)
5704+
       ("java-asm" ,java-asm)
5705+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
57395706 
       ,@(package-native-inputs maven-wagon-provider-api)))))
57405707 
57415708 
(define-public maven-wagon-http-shared
…
57635730 
           (lambda _
57645731 
             (zero? (system* "ant" "jar")))))))
57655732 
    (inputs
5766-
     `(("utils" ,java-plexus-utils)
5767-
       ("httpclient" ,java-httpcomponents-client)
5768-
       ("httpcore" ,java-httpcomponents-core)
5769-
       ("io" ,java-commons-io)
5770-
       ("jsoup" ,java-jsoup)
5771-
       ("provider-api" ,maven-wagon-provider-api)))
5733+
     `(("java-plexus-utils" ,java-plexus-utils)
5734+
       ("java-httpcomponents-client" ,java-httpcomponents-client)
5735+
       ("java-httpcomponents-core" ,java-httpcomponents-core)
5736+
       ("java-commons-io" ,java-commons-io)
5737+
       ("java-jsoup" ,java-jsoup)
5738+
       ("maven-wagon-provider-api" ,maven-wagon-provider-api)))
57725739 
    (native-inputs
5773-
     `(("provider-test" ,maven-wagon-provider-test)
5774-
       ("metadata" ,java-plexus-component-metadata)
5775-
       ("annotations" ,java-plexus-component-annotations)
5776-
       ("container" ,java-eclipse-sisu-plexus)
5777-
       ("sisu-inject" ,java-eclipse-sisu-inject)
5778-
       ("classworlds" ,java-plexus-classworlds)
5779-
       ("guava" ,java-guava)
5780-
       ("guice" ,java-guice)
5781-
       ("inject" ,java-javax-inject)
5782-
       ("cglib" ,java-cglib)
5783-
       ("slf4j" ,java-slf4j-api)
5784-
       ("utils" ,java-plexus-utils)
5785-
       ("cli" ,java-plexus-cli)
5786-
       ("plugin-api" ,maven-plugin-api)
5787-
       ("plugin-annotations" ,maven-plugin-annotations)
5788-
       ("core" ,maven-core)
5789-
       ("model" ,maven-model)
5790-
       ("cli" ,java-commons-cli)
5791-
       ("qdox" ,java-qdox)
5792-
       ("jdom2" ,java-jdom2)
5793-
       ("asm" ,java-asm)
5794-
       ("xbean" ,java-geronimo-xbean-reflect)
5740+
     `(("maven-wagon-provider-test" ,maven-wagon-provider-test)
5741+
       ("java-plexus-component-metadata" ,java-plexus-component-metadata)
5742+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5743+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5744+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
5745+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
5746+
       ("java-guava" ,java-guava)
5747+
       ("java-guice" ,java-guice)
5748+
       ("java-javax-inject" ,java-javax-inject)
5749+
       ("java-cglib" ,java-cglib)
5750+
       ("java-slf4j-api" ,java-slf4j-api)
5751+
       ("java-plexus-utils" ,java-plexus-utils)
5752+
       ("java-plexus-cli" ,java-plexus-cli)
5753+
       ("maven-plugin-api" ,maven-plugin-api)
5754+
       ("maven-plugin-annotations" ,maven-plugin-annotations)
5755+
       ("maven-core" ,maven-core)
5756+
       ("maven-model" ,maven-model)
5757+
       ("java-commons-cli" ,java-commons-cli)
5758+
       ("java-qdox" ,java-qdox)
5759+
       ("java-jdom2" ,java-jdom2)
5760+
       ("java-asm" ,java-asm)
5761+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
57955762 
       ,@(package-native-inputs maven-wagon-provider-api)))))
57965763 
57975764 
(define-public maven-wagon-tck-http
…
58045771 
       #:tests? #f; no tests
58055772 
       #:jdk ,icedtea-8))
58065773 
    (inputs
5807-
     `(("util" ,java-plexus-utils)
5808-
       ("provider-api" ,maven-wagon-provider-api)
5809-
       ("servlet" ,java-tomcat)
5810-
       ("slf4j" ,java-slf4j-api)
5811-
       ("codec" ,java-commons-codec)
5812-
       ("container" ,java-eclipse-sisu-plexus)
5813-
       ("classworlds" ,java-plexus-classworlds)
5814-
       ("jetty-util" ,java-eclipse-jetty-util-9.2)
5815-
       ("jetty-webapp" ,java-eclipse-jetty-webapp-9.2)
5816-
       ("jetty-security" ,java-eclipse-jetty-security-9.2)
5817-
       ("jetty-server" ,java-eclipse-jetty-server-9.2)
5818-
       ("jetty-servlet" ,java-eclipse-jetty-servlet-9.2)))))
5774+
     `(("java-plexus-util" ,java-plexus-utils)
5775+
       ("maven-wagon-provider-api" ,maven-wagon-provider-api)
5776+
       ("java-tomcat" ,java-tomcat)
5777+
       ("java-slf4j-api" ,java-slf4j-api)
5778+
       ("java-commons-codec" ,java-commons-codec)
5779+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5780+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
5781+
       ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
5782+
       ("java-eclipse-jetty-webapp-9.2" ,java-eclipse-jetty-webapp-9.2)
5783+
       ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
5784+
       ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
5785+
       ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)))))
58195786 
58205787 
(define-public maven-wagon-http-lightweight
58215788 
  (package
…
58475814 
               (("src/test") "wagon-providers/wagon-http-lightweight/src/test"))
58485815 
             #t)))))
58495816 
    (inputs
5850-
     `(("utils" ,java-plexus-utils)
5851-
       ("httpclient" ,java-httpcomponents-client)
5852-
       ("httpcore" ,java-httpcomponents-core)
5853-
       ("wagon-http-shared" ,maven-wagon-http-shared)
5854-
       ("wagon-tck-http" ,maven-wagon-tck-http)
5855-
       ("provider-api" ,maven-wagon-provider-api)
5856-
       ("io" ,java-commons-io)))
5817+
     `(("java-plexus-utils" ,java-plexus-utils)
5818+
       ("java-httpcomponents-client" ,java-httpcomponents-client)
5819+
       ("java-httpcomponents-core" ,java-httpcomponents-core)
5820+
       ("maven-wagon-http-shared" ,maven-wagon-http-shared)
5821+
       ("maven-wagon-tck-http" ,maven-wagon-tck-http)
5822+
       ("maven-wagon-provider-api" ,maven-wagon-provider-api)
5823+
       ("java-commons-io" ,java-commons-io)))
58575824 
    (native-inputs
5858-
     `(("provider-test" ,maven-wagon-provider-test)
5859-
       ("metadata" ,java-plexus-component-metadata)
5860-
       ("annotations" ,java-plexus-component-annotations)
5861-
       ("container" ,java-eclipse-sisu-plexus)
5862-
       ("sisu-inject" ,java-eclipse-sisu-inject)
5863-
       ("classworlds" ,java-plexus-classworlds)
5864-
       ("guava" ,java-guava)
5865-
       ("guice" ,java-guice)
5866-
       ("inject" ,java-javax-inject)
5867-
       ("cglib" ,java-cglib)
5868-
       ("slf4j" ,java-slf4j-api)
5869-
       ("utils" ,java-plexus-utils)
5870-
       ("cli" ,java-plexus-cli)
5871-
       ("plugin-api" ,maven-plugin-api)
5872-
       ("plugin-annotations" ,maven-plugin-annotations)
5873-
       ("core" ,maven-core)
5874-
       ("model" ,maven-model)
5875-
       ("cli" ,java-commons-cli)
5876-
       ("qdox" ,java-qdox)
5877-
       ("jdom2" ,java-jdom2)
5878-
       ("asm" ,java-asm)
5879-
       ("xbean" ,java-geronimo-xbean-reflect)
5880-
       ("servlet" ,java-tomcat)
5881-
       ("jetty-util" ,java-eclipse-jetty-util-9.2)
5882-
       ("jetty-io" ,java-eclipse-jetty-io-9.2)
5883-
       ("jetty-http" ,java-eclipse-jetty-http-9.2)
5884-
       ("jetty-server" ,java-eclipse-jetty-server-9.2)
5885-
       ("jetty-servlet" ,java-eclipse-jetty-servlet-9.2)
5886-
       ("jetty-security" ,java-eclipse-jetty-security-9.2)
5887-
       ("jsoup" ,java-jsoup)
5888-
       ("hamcrest" ,java-hamcrest-core)
5889-
       ("logging" ,java-commons-logging-minimal)
5890-
       ("simple" ,java-slf4j-simple)
5825+
     `(("maven-wagon-provider-test" ,maven-wagon-provider-test)
5826+
       ("java-plexus-component-metadata" ,java-plexus-component-metadata)
5827+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5828+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5829+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
5830+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
5831+
       ("java-guava" ,java-guava)
5832+
       ("java-guice" ,java-guice)
5833+
       ("java-javax-inject" ,java-javax-inject)
5834+
       ("java-cglib" ,java-cglib)
5835+
       ("java-slf4j-api" ,java-slf4j-api)
5836+
       ("java-plexus-utils" ,java-plexus-utils)
5837+
       ("java-plexus-cli" ,java-plexus-cli)
5838+
       ("maven-plugin-api" ,maven-plugin-api)
5839+
       ("maven-plugin-annotations" ,maven-plugin-annotations)
5840+
       ("maven-core" ,maven-core)
5841+
       ("maven-model" ,maven-model)
5842+
       ("java-commons-cli" ,java-commons-cli)
5843+
       ("java-qdox" ,java-qdox)
5844+
       ("java-jdom2" ,java-jdom2)
5845+
       ("java-asm" ,java-asm)
5846+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
5847+
       ("java-tomcat" ,java-tomcat)
5848+
       ("java-eclispe-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
5849+
       ("java-eclispe-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
5850+
       ("java-eclispe-jetty-http-9.2" ,java-eclipse-jetty-http-9.2)
5851+
       ("java-eclispe-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
5852+
       ("java-eclispe-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
5853+
       ("java-eclispe-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
5854+
       ("java-jsoup" ,java-jsoup)
5855+
       ("java-hamcrest-core" ,java-hamcrest-core)
5856+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
5857+
       ("java-slf4j-simple" ,java-slf4j-simple)
58915858 
       ,@(package-native-inputs maven-wagon-provider-api)))))
58925859 
58935860 
(define-public maven-wagon-http
…
59245891 
               (("src/test") "wagon-providers/wagon-http/src/test"))
59255892 
             #t)))))
59265893 
    (inputs
5927-
     `(("utils" ,java-plexus-utils)
5928-
       ("httpclient" ,java-httpcomponents-client)
5929-
       ("httpcore" ,java-httpcomponents-core)
5930-
       ("wagon-http-shared" ,maven-wagon-http-shared)
5931-
       ("wagon-tck-http" ,maven-wagon-tck-http)
5932-
       ("provider-api" ,maven-wagon-provider-api)))
5894+
     `(("java-plexus-utils" ,java-plexus-utils)
5895+
       ("java-httpcomponents-client" ,java-httpcomponents-client)
5896+
       ("java-httpcomponents-core" ,java-httpcomponents-core)
5897+
       ("maven-wagon-http-shared" ,maven-wagon-http-shared)
5898+
       ("maven-wagon-tck-http" ,maven-wagon-tck-http)
5899+
       ("maven-wagon-provider-api" ,maven-wagon-provider-api)))
59335900 
    (native-inputs
5934-
     `(("provider-test" ,maven-wagon-provider-test)
5935-
       ("metadata" ,java-plexus-component-metadata)
5936-
       ("annotations" ,java-plexus-component-annotations)
5937-
       ("container" ,java-eclipse-sisu-plexus)
5938-
       ("container" ,java-plexus-container-default)
5939-
       ("sisu-inject" ,java-eclipse-sisu-inject)
5940-
       ("classworlds" ,java-plexus-classworlds)
5941-
       ("guava" ,java-guava)
5942-
       ("guice" ,java-guice)
5943-
       ("inject" ,java-javax-inject)
5944-
       ("cglib" ,java-cglib)
5945-
       ("slf4j" ,java-slf4j-api)
5946-
       ("utils" ,java-plexus-utils)
5947-
       ("cli" ,java-plexus-cli)
5948-
       ("plugin-api" ,maven-plugin-api)
5949-
       ("plugin-annotations" ,maven-plugin-annotations)
5950-
       ("core" ,maven-core)
5951-
       ("model" ,maven-model)
5952-
       ("cli" ,java-commons-cli)
5953-
       ("qdox" ,java-qdox)
5954-
       ("jdom2" ,java-jdom2)
5955-
       ("asm" ,java-asm)
5956-
       ("xbean" ,java-geronimo-xbean-reflect)
5957-
       ("servlet" ,java-tomcat)
5958-
       ("jetty-util" ,java-eclipse-jetty-util-9.2)
5959-
       ("jetty-io" ,java-eclipse-jetty-io-9.2)
5960-
       ("jetty-http" ,java-eclipse-jetty-http-9.2)
5961-
       ("jetty-server" ,java-eclipse-jetty-server-9.2)
5962-
       ("jetty-servlet" ,java-eclipse-jetty-servlet-9.2)
5963-
       ("jetty-security" ,java-eclipse-jetty-security-9.2)
5964-
       ("hamcrest" ,java-hamcrest-core)
5965-
       ("logging" ,java-commons-logging-minimal)
5966-
       ("codec" ,java-commons-codec)
5967-
       ("io" ,java-commons-io)
5968-
       ("jsoup" ,java-jsoup)
5969-
       ("simple" ,java-slf4j-simple)
5901+
     `(("maven-wagon-provider-test" ,maven-wagon-provider-test)
5902+
       ("java-plexus-component-metadata" ,java-plexus-component-metadata)
5903+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5904+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5905+
       ("java-plexus-container-default" ,java-plexus-container-default)
5906+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
5907+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
5908+
       ("java-guava" ,java-guava)
5909+
       ("java-guice" ,java-guice)
5910+
       ("java-inject" ,java-javax-inject)
5911+
       ("java-cglib" ,java-cglib)
5912+
       ("java-slf4j-api" ,java-slf4j-api)
5913+
       ("java-plexus-utils" ,java-plexus-utils)
5914+
       ("java-plexus-cli" ,java-plexus-cli)
5915+
       ("maven-plugin-api" ,maven-plugin-api)
5916+
       ("maven-plugin-annotations" ,maven-plugin-annotations)
5917+
       ("maven-core" ,maven-core)
5918+
       ("maven-model" ,maven-model)
5919+
       ("java-commons-cli" ,java-commons-cli)
5920+
       ("java-qdox" ,java-qdox)
5921+
       ("java-jdom2" ,java-jdom2)
5922+
       ("java-asm" ,java-asm)
5923+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
5924+
       ("java-tomcat" ,java-tomcat)
5925+
       ("java-eclipse-jetty-util-9.2" ,java-eclipse-jetty-util-9.2)
5926+
       ("java-eclipse-jetty-io-9.2" ,java-eclipse-jetty-io-9.2)
5927+
       ("java-eclipse-jetty-http-9.2" ,java-eclipse-jetty-http-9.2)
5928+
       ("java-eclipse-jetty-server-9.2" ,java-eclipse-jetty-server-9.2)
5929+
       ("java-eclipse-jetty-servlet-9.2" ,java-eclipse-jetty-servlet-9.2)
5930+
       ("java-eclipse-jetty-security-9.2" ,java-eclipse-jetty-security-9.2)
5931+
       ("java-hamcrest-core" ,java-hamcrest-core)
5932+
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
5933+
       ("java-commons-codec" ,java-commons-codec)
5934+
       ("java-commons-io" ,java-commons-io)
5935+
       ("java-jsoup" ,java-jsoup)
5936+
       ("java-slf4j-simple" ,java-slf4j-simple)
59705937 
       ,@(package-native-inputs maven-wagon-provider-api)))))
59715938 
59725939 
(define-public maven-embedder
…
60135980 
               (("srcdir=\"maven-embedder/src/test\"")
60145981 
                "srcdir=\"maven-embedder/src/test/java\"")))))))
60155982 
    (inputs
6016-
     `(("core" ,maven-core)
6017-
       ("artifact" ,maven-artifact)
6018-
       ("plugin-api" ,maven-plugin-api)
6019-
       ("support" ,maven-builder-support)
6020-
       ("model" ,maven-model)
6021-
       ("model-builder" ,maven-model-builder)
6022-
       ("settings" ,maven-settings)
6023-
       ("settings-builder" ,maven-settings-builder)
5983+
     `(("maven-core" ,maven-core)
5984+
       ("maven-artifact" ,maven-artifact)
5985+
       ("maven-plugin-api" ,maven-plugin-api)
5986+
       ("maven-builder-support" ,maven-builder-support)
5987+
       ("maven-model" ,maven-model)
5988+
       ("maven-model-builder" ,maven-model-builder)
5989+
       ("maven-settings" ,maven-settings)
5990+
       ("maven-settings-builder" ,maven-settings-builder)
60245991 
       ("maven-shared-utils" ,maven-shared-utils)
6025-
       ("classworlds" ,java-plexus-classworlds)
6026-
       ("util" ,java-plexus-utils)
6027-
       ("container" ,java-eclipse-sisu-plexus)
6028-
       ("cipher" ,java-plexus-cipher)
6029-
       ("annotations" ,java-plexus-component-annotations)
6030-
       ("sec-dispatcher" ,java-plexus-sec-dispatcher)
6031-
       ("aether-util" ,maven-resolver-util)
6032-
       ("aether-api" ,maven-resolver-api)
6033-
       ("logback" ,java-logback-core)
6034-
       ("logback-classic" ,java-logback-classic)
6035-
       ("cli" ,java-commons-cli)
6036-
       ("io" ,java-commons-io)
6037-
       ("lang3" ,java-commons-lang3)
6038-
       ("guava" ,java-guava)
6039-
       ("guice" ,java-guice)
6040-
       ("inject" ,java-javax-inject)
6041-
       ("slf4j" ,java-slf4j-api)
6042-
       ("slf4j-simple" ,java-slf4j-simple)))
5992+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
5993+
       ("java-plexus-util" ,java-plexus-utils)
5994+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
5995+
       ("java-plexus-cipher" ,java-plexus-cipher)
5996+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
5997+
       ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher)
5998+
       ("maven-resolevr-util" ,maven-resolver-util)
5999+
       ("maven-resolevr-api" ,maven-resolver-api)
6000+
       ("java-logback-core" ,java-logback-core)
6001+
       ("java-logback-classic" ,java-logback-classic)
6002+
       ("java-commons-cli" ,java-commons-cli)
6003+
       ("java-commons-io" ,java-commons-io)
6004+
       ("java-commons-lang3" ,java-commons-lang3)
6005+
       ("java-guava" ,java-guava)
6006+
       ("java-guice" ,java-guice)
6007+
       ("java-javax-inject" ,java-javax-inject)
6008+
       ("java-slf4j-api" ,java-slf4j-api)
6009+
       ("java-slf4j-simple" ,java-slf4j-simple)))
60436010 
    (native-inputs
6044-
     `(("modello" ,java-modello-core)
6045-
       ("xbean" ,java-geronimo-xbean-reflect)
6046-
       ("build-api" ,java-sisu-build-api)
6047-
       ("container" ,java-eclipse-sisu-plexus)
6048-
       ("sisu-inject" ,java-eclipse-sisu-inject)
6049-
       ("cglib" ,java-cglib)
6050-
       ("asm" ,java-asm)
6051-
       ("java" ,java-modello-plugins-java)
6052-
       ("xml" ,java-modello-plugins-xml)
6053-
       ("xpp3" ,java-modello-plugins-xpp3)
6011+
     `(("java-modello-core" ,java-modello-core)
6012+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
6013+
       ("java-sisu-build-api" ,java-sisu-build-api)
6014+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
6015+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
6016+
       ("java-cglib" ,java-cglib)
6017+
       ("java-asm" ,java-asm)
6018+
       ("java-modello-plugins-java" ,java-modello-plugins-java)
6019+
       ("java-modello-plugins-xml" ,java-modello-plugins-xml)
6020+
       ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)
60546021 
       ;; tests
6055-
       ("junit" ,java-junit)
6056-
       ("hamcrest" ,java-hamcrest-core)))))
6022+
       ("java-junit" ,java-junit)
6023+
       ("java-hamcrest-core" ,java-hamcrest-core)))))
60576024 
60586025 
(define-public maven-resolver-api
60596026 
  (package
…
60726039 
       #:source-dir "maven-resolver-api/src/main/java"
60736040 
       #:test-dir "maven-resolver-api/src/test"))
60746041 
    (native-inputs
6075-
     `(("junit" ,java-junit)
6076-
       ("hamcrest" ,java-hamcrest-core)))
6042+
     `(("java-junit" ,java-junit)
6043+
       ("java-hamcrest-core" ,java-hamcrest-core)))
60776044 
    (home-page "https://github.com/apache/maven-resolver")
60786045 
    (synopsis "")
60796046 
    (description "")
…
60896056 
       #:test-dir "maven-resolver-spi/src/test"
60906057 
       #:jdk ,icedtea-8))
60916058 
    (inputs
6092-
     `(("api" ,maven-resolver-api)))))
6059+
     `(("maven-resolver-api" ,maven-resolver-api)))))
60936060 
60946061 
(define-public maven-resolver-test-util
60956062 
  (package
…
61016068 
       #:test-dir "maven-resolver-test-util/src/test"
61026069 
       #:jdk ,icedtea-8))
61036070 
    (inputs
6104-
     `(("api" ,maven-resolver-api)
6105-
       ("spi" ,maven-resolver-spi)))))
6071+
     `(("maven-resolver-api" ,maven-resolver-api)
6072+
       ("maven-resolver-spi" ,maven-resolver-spi)))))
61066073 
61076074 
(define-public maven-resolver-util
61086075 
  (package
…
61146081 
       #:test-dir "maven-resolver-util/src/test"
61156082 
       #:jdk ,icedtea-8))
61166083 
    (inputs
6117-
     `(("api" ,maven-resolver-api)))
6084+
     `(("maven-resolver-api" ,maven-resolver-api)))
61186085 
    (native-inputs
6119-
     `(("junit" ,java-junit)
6120-
       ("hamcrest" ,java-hamcrest-core)
6121-
       ("test-util" ,maven-resolver-test-util)))))
6086+
     `(("java-junit" ,java-junit)
6087+
       ("java-hamcrest-core" ,java-hamcrest-core)
6088+
       ("maven-resolver-test-util" ,maven-resolver-test-util)))))
61226089 
61236090 
(define-public maven-resolver-impl
61246091 
  (package
…
61626129 
                     "org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider\n"
61636130 
                     "org.eclipse.aether.internal.impl.DefaultDependencyCollector\n")))))))))
61646131 
    (inputs
6165-
     `(("api" ,maven-resolver-api)
6166-
       ("spi" ,maven-resolver-spi)
6167-
       ("util" ,maven-resolver-util)
6168-
       ("sisu" ,java-eclipse-sisu-inject)
6169-
       ("inject" ,java-javax-inject)
6170-
       ("guice" ,java-guice)
6171-
       ("guava" ,java-guava)
6172-
       ("cglib" ,java-cglib)
6173-
       ("asm" ,java-asm)
6174-
       ("aopalliance" ,java-aopalliance)
6175-
       ("slf4j" ,java-slf4j-api)))
6132+
     `(("maven-resolver-api" ,maven-resolver-api)
6133+
       ("maven-resolver-spi" ,maven-resolver-spi)
6134+
       ("maven-resolver-util" ,maven-resolver-util)
6135+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
6136+
       ("java-javax-inject" ,java-javax-inject)
6137+
       ("java-guice" ,java-guice)
6138+
       ("java-guava" ,java-guava)
6139+
       ("java-cglib" ,java-cglib)
6140+
       ("java-asm" ,java-asm)
6141+
       ("jajva-aopalliance" ,java-aopalliance)
6142+
       ("java-slf4j-api" ,java-slf4j-api)))
61766143 
    (native-inputs
6177-
     `(("junit" ,java-junit)
6178-
       ("hamcrest" ,java-hamcrest-core)
6179-
       ("test-util" ,maven-resolver-test-util)))))
6144+
     `(("java-junit" ,java-junit)
6145+
       ("java-hamcrest-core" ,java-hamcrest-core)
6146+
       ("maven-resolver-test-util" ,maven-resolver-test-util)))))
61806147 
61816148 
(define-public maven-resolver-connector-basic
61826149 
  (package
…
61966163 
               (lambda _
61976164 
                 (display "org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory\n"))))))))
61986165 
    (inputs
6199-
     `(("api" ,maven-resolver-api)
6200-
       ("spi" ,maven-resolver-spi)
6201-
       ("util" ,maven-resolver-util)
6202-
       ("inject" ,java-javax-inject)))
6166+
     `(("maven-resolver-api" ,maven-resolver-api)
6167+
       ("maven-resolver-spi" ,maven-resolver-spi)
6168+
       ("maven-resolver-util" ,maven-resolver-util)
6169+
       ("java-javax-inject" ,java-javax-inject)))
62036170 
    (native-inputs
6204-
     `(("junit" ,java-junit)
6205-
       ("hamcrest" ,java-hamcrest-core)
6206-
       ("test-util" ,maven-resolver-test-util)))))
6171+
     `(("java-junit" ,java-junit)
6172+
       ("java-hamcrest-core" ,java-hamcrest-core)
6173+
       ("maven-resolver-test-util" ,maven-resolver-test-util)))))
62076174 
62086175 
(define-public maven-resolver-transport-wagon
62096176 
  (package
…
62656232 
                     "</component-set>\n"))))
62666233 
             #t)))))
62676234 
    (inputs
6268-
     `(("api" ,maven-resolver-api)
6269-
       ("spi" ,maven-resolver-spi)
6270-
       ("util" ,maven-resolver-util)
6271-
       ("inject" ,java-javax-inject)
6272-
       ("wagon-api" ,maven-wagon-provider-api)
6273-
       ("annotation" ,java-plexus-component-annotations)
6274-
       ("classworld" ,java-plexus-classworlds)
6275-
       ("plexus-util" ,java-plexus-utils)
6276-
       ("sisu" ,java-eclipse-sisu-inject)
6277-
       ("sisu" ,java-eclipse-sisu-plexus)))
6235+
     `(("maven-resolver-api" ,maven-resolver-api)
6236+
       ("maven-resolver-spi" ,maven-resolver-spi)
6237+
       ("maven-resolver-util" ,maven-resolver-util)
6238+
       ("java-javax-inject" ,java-javax-inject)
6239+
       ("mavne-wagon-provider-api" ,maven-wagon-provider-api)
6240+
       ("java-plexus-component-annotation" ,java-plexus-component-annotations)
6241+
       ("java-plexus-classworld" ,java-plexus-classworlds)
6242+
       ("java-plexus-plexus-util" ,java-plexus-utils)
6243+
       ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject)
6244+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)))
62786245 
    (native-inputs
6279-
     `(("junit" ,java-junit)
6280-
       ("hamcrest" ,java-hamcrest-core)
6281-
       ("test-util" ,maven-resolver-test-util)
6282-
       ("guava" ,java-guava)
6283-
       ("cglib" ,java-cglib)
6284-
       ("asm" ,java-asm)
6285-
       ("aopalliance" ,java-aopalliance)
6286-
       ("guice" ,java-guice)))))
6246+
     `(("java-junit" ,java-junit)
6247+
       ("java-hamcrest-core" ,java-hamcrest-core)
6248+
       ("maven-resolver-test-util" ,maven-resolver-test-util)
6249+
       ("java-guava" ,java-guava)
6250+
       ("java-cglib" ,java-cglib)
6251+
       ("java-asm" ,java-asm)
6252+
       ("java-aopalliance" ,java-aopalliance)
6253+
       ("java-guice" ,java-guice)))))
62876254 
62886255 
(define-public maven-slf4j-provider
62896256 
  (package
…
63066273 
                               "groovy.ui.GroovyMain" "-Db/c gasedir=/tmp"
63076274 
                               "src/main/script/patch-slf4j-simple.groovy"))))))))
63086275 
    (inputs
6309-
     `(("slf4j" ,java-slf4j-api)
6310-
       ("simple" ,(package-source java-slf4j-simple))
6276+
     `(("java-slf4j-api" ,java-slf4j-api)
6277+
       ("java-slf4j-simple" ,(package-source java-slf4j-simple))
63116278 
       ("maven-shared-utils" ,maven-shared-utils)))
63126279 
    (native-inputs
63136280 
     `(("groovy" ,groovy)
6314-
       ("asm" ,java-asm)
6315-
       ("antlr" ,antlr2)
6316-
       ("cli" ,java-commons-cli)))))
6281+
       ("java-asm" ,java-asm)
6282+
       ("antlr2" ,antlr2)
6283+
       ("java-commons-cli" ,java-commons-cli)))))
63176284 
63186285 
(define-public maven-compat
63196286 
  (package
…
63766343 
           (lambda _
63776344 
             (zero? (system* "ant" "jar")))))))
63786345 
    (inputs
6379-
     `(("artifact" ,maven-artifact)
6380-
       ("repo" ,maven-repository-metadata)
6381-
       ("support" ,maven-builder-support)
6382-
       ("model" ,maven-model)
6383-
       ("model-builder" ,maven-model-builder)
6384-
       ("settings" ,maven-settings)
6385-
       ("settings-builder" ,maven-settings-builder)
6386-
       ("core" ,maven-core)
6387-
       ("wagon" ,maven-wagon-provider-api)
6388-
       ("wagon-file" ,maven-wagon-file)
6389-
       ("resolver-api" ,maven-resolver-api)
6390-
       ("resolver-util" ,maven-resolver-util)
6391-
       ("resolver-spi" ,maven-resolver-spi)
6392-
       ("interpolation" ,java-plexus-interpolation)))
6346+
     `(("maven-artifact" ,maven-artifact)
6347+
       ("maven-repository-metadata" ,maven-repository-metadata)
6348+
       ("maven-builder-support" ,maven-builder-support)
6349+
       ("maven-model" ,maven-model)
6350+
       ("maven-model-builder" ,maven-model-builder)
6351+
       ("maven-settings" ,maven-settings)
6352+
       ("maven-settings-builder" ,maven-settings-builder)
6353+
       ("maven-core" ,maven-core)
6354+
       ("maven-wagon-provider-api" ,maven-wagon-provider-api)
6355+
       ("maven-wagon-file" ,maven-wagon-file)
6356+
       ("maven-resolver-api" ,maven-resolver-api)
6357+
       ("maven-resolver-util" ,maven-resolver-util)
6358+
       ("maven-resolver-spi" ,maven-resolver-spi)
6359+
       ("java-plexus-interpolation" ,java-plexus-interpolation)))
63936360 
    (native-inputs
6394-
     `(("modello" ,java-modello-core)
6395-
       ("utils" ,java-plexus-utils)
6396-
       ("annot" ,java-plexus-component-annotations)
6397-
       ("classworlds" ,java-plexus-classworlds)
6398-
       ("xbean" ,java-geronimo-xbean-reflect)
6399-
       ("build-api" ,java-sisu-build-api)
6400-
       ("container" ,java-eclipse-sisu-plexus)
6401-
       ("sisu-inject" ,java-eclipse-sisu-inject)
6402-
       ("inject" ,java-javax-inject)
6403-
       ("guice" ,java-guice)
6404-
       ("guava" ,java-guava)
6405-
       ("cglib" ,java-cglib)
6406-
       ("asm" ,java-asm)
6407-
       ("java" ,java-modello-plugins-java)
6408-
       ("xml" ,java-modello-plugins-xml)
6409-
       ("xpp3" ,java-modello-plugins-xpp3)
6361+
     `(("java-modello-core" ,java-modello-core)
6362+
       ("java-plexus-utils" ,java-plexus-utils)
6363+
       ("java-plexus-component-annotations" ,java-plexus-component-annotations)
6364+
       ("java-plexus-classworlds" ,java-plexus-classworlds)
6365+
       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
6366+
       ("java-sisu-build-api" ,java-sisu-build-api)
6367+
       ("java-eclipse-sisu-plexus" ,java-eclipse-sisu-plexus)
6368+
       ("java-exclispe-sisu-inject" ,java-eclipse-sisu-inject)
6369+
       ("java-javax-inject" ,java-javax-inject)
6370+
       ("java-guice" ,java-guice)
6371+
       ("java-guava" ,java-guava)
6372+
       ("java-cglib" ,java-cglib)
6373+
       ("java-asm" ,java-asm)
6374+
       ("java-modello-plugins-java" ,java-modello-plugins-java)
6375+
       ("java-modello-plugins-xml" ,java-modello-plugins-xml)
6376+
       ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)
64106377 
       ;; metadata
6411-
       ("metadata" ,java-plexus-component-metadata)
6412-
       ("cli" ,java-commons-cli)
6413-
       ("plexus-cli" ,java-plexus-cli)
6414-
       ("jdom2" ,java-jdom2)
6415-
       ("plugin-api" ,maven-plugin-api)
6416-
       ("qdox" ,java-qdox)
6378+
       ("java-plexus-component-metadata" ,java-plexus-component-metadata)
6379+
       ("java-commons-cli" ,java-commons-cli)
6380+
       ("java-plexus-cli" ,java-plexus-cli)
6381+
       ("java-jdom2" ,java-jdom2)
6382+
       ("maven-plugin-api" ,maven-plugin-api)
6383+
       ("java-qdox" ,java-qdox)
64176384 
       ;; tests
6418-
       ("cipher" ,java-plexus-cipher)
6419-
       ("sec-dispatcher" ,java-plexus-sec-dispatcher)
6420-
       ("jsr250", java-jsr250)
6421-
       ("cdi-api" ,java-cdi-api)
6422-
       ("junit" ,java-junit)
6423-
       ("impl" ,maven-resolver-impl)
6424-
       ("connector-basic" ,maven-resolver-connector-basic)
6425-
       ("transport-wagon" ,maven-resolver-transport-wagon)
6426-
       ("lang3" ,java-commons-lang3)
6427-
       ("aop" ,java-aopalliance)
6428-
       ("resolver-provider" ,maven-resolver-provider)
6429-
       ("slf4j" ,java-slf4j-api)
6430-
       ("slf4j-simple" ,java-slf4j-simple)
6385+
       ("java-plexus-cipher" ,java-plexus-cipher)
6386+
       ("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher)
6387+
       ("java-jsr250", java-jsr250)
6388+
       ("java-cdi-api" ,java-cdi-api)
6389+
       ("java-junit" ,java-junit)
6390+
       ("maven-resolver-impl" ,maven-resolver-impl)
6391+
       ("maven-resolver-connector-basic" ,maven-resolver-connector-basic)
6392+
       ("maven-resolver-transport-wagon" ,maven-resolver-transport-wagon)
6393+
       ("java-commons-lang3" ,java-commons-lang3)
6394+
       ("java-aop" ,java-aopalliance)
6395+
       ("maven-resolver-provider" ,maven-resolver-provider)
6396+
       ("java-slf4j-api" ,java-slf4j-api)
6397+
       ("java-slf4j-simple" ,java-slf4j-simple)
64316398 
       ,@(package-inputs java-slf4j-api)))))
64326399 
64336400 
(define-public maven-plugin-annotations
…
64466413 
       #:source-dir "maven-plugin-annotations/src/main/java"
64476414 
       #:tests? #f))
64486415 
    (inputs
6449-
     `(("artifact" ,maven-artifact)))
6416+
     `(("maven-artifact" ,maven-artifact)))
64506417 
    (native-inputs
64516418 
     `(("unzip" ,unzip)))
64526419 
    (home-page "")