Improve java packages

Julien LepillerSat Sep 15 13:59:07+0200 2018

834ec43

Improve java packages

more/packages/java.scm

20802080 
    ;; A link to the license is present in pom.xml
20812081 
    (license license:bsd-3)))
20822082 
2083+
(define license:epl2.0 license:epl1.0)
2084+
(define-public java-javax-interceptor
2085+
  (package
2086+
    (name "java-javax-interceptor")
2087+
    (version "1.2.2")
2088+
    (source (origin
2089+
              (method url-fetch)
2090+
              (uri (string-append "https://github.com/javaee/javax.interceptor/"
2091+
                                  "archive/" version ".tar.gz"))
2092+
              (sha256
2093+
               (base32
2094+
                "1c93q8x7rxml747vzmw13s1gkjhwi0xs8ra27254cvyl0q8fh1kv"))))
2095+
    (build-system ant-build-system)
2096+
    (arguments
2097+
     `(#:jar-name "javax-interceptor.jar"
2098+
       #:tests? #f; no tests
2099+
       #:source-dir "src/main/java"
2100+
       #:phases
2101+
       (modify-phases %standard-phases
2102+
         (add-before 'build 'copy-resources
2103+
           (lambda _
2104+
             (copy-recursively "src/main/resources" "build/classes")
2105+
             #t)))))
2106+
    (home-page "https://github.com/eclipse-ee4j/interceptor-api")
2107+
    (synopsis "")
2108+
    (description "")
2109+
    ;; Either EPL2.0 or GPL2.0 with classpath exception
2110+
    (license (list license:epl2.0 license:gpl2+))))
2111+
2112+
;; JTA or JSR907
2113+
;; Same as java-jboss-transaction-api-spec?
2114+
(define-public java-javax-transaction
2115+
  (package
2116+
    (name "java-javax-transaction")
2117+
    (version "1.3")
2118+
    (source (origin
2119+
              (method url-fetch)
2120+
              (uri (string-append "https://github.com/javaee/javax.transaction/"
2121+
                                  "archive/javax.transaction-api-" version
2122+
                                  ".tar.gz"))
2123+
              (sha256
2124+
               (base32
2125+
                "13c04282r59pyp784ppnihdi4krksmg8w4ksy2crgw9c9a7wfdh5"))))
2126+
    (build-system ant-build-system)
2127+
    (arguments
2128+
     `(#:jar-name "javax-transaction.jar"
2129+
       #:tests? #f; no tests
2130+
       #:source-dir "src/main/java"
2131+
       #:phases
2132+
       (modify-phases %standard-phases
2133+
         (add-before 'build 'copy-resources
2134+
           (lambda _
2135+
             (copy-recursively "src/main/resources" "build/classes")
2136+
             #t)))))
2137+
    (inputs
2138+
     `(("java-cdi-api" ,java-cdi-api)
2139+
       ("java-javax-interceptor" ,java-javax-interceptor)))
2140+
    (home-page "https://github.com/eclipse-ee4j/jta-api")
2141+
    (synopsis "")
2142+
    (description "")
2143+
    (license (list license:cddl1.1))))
2144+
2145+
;; jax-rpc
2146+
(define-public java-javax-xml-rpc
2147+
  (package
2148+
    (name "java-javax-xml-rpc")
2149+
    (version "1.1.2")
2150+
    (source (origin
2151+
              (method url-fetch)
2152+
              (uri (string-append "https://github.com/javaee/javax.xml.rpc/"
2153+
                                  "archive/javax.xml.rpc-api-" version
2154+
                                  ".tar.gz"))
2155+
              (sha256
2156+
               (base32
2157+
                "1x4ldqr25s8knadmvwd33nbhyigqi471d62mz09vciy8j5waqys9"))))
2158+
    (build-system ant-build-system)
2159+
    (arguments
2160+
     `(#:jar-name "javax-xml-rpc.jar"
2161+
       #:tests? #f; no tests
2162+
       #:source-dir "src/main/java"
2163+
       #:phases
2164+
       (modify-phases %standard-phases
2165+
         (add-before 'build 'copy-resources
2166+
           (lambda _
2167+
             (copy-recursively "src/main/resources" "build/classes")
2168+
             #t)))))
2169+
    (inputs
2170+
     `(("java-javaee-servletapi" ,java-javaee-servletapi)))
2171+
    (home-page "https://github.com/eclipse-ee4j/jax-rpc-api")
2172+
    (synopsis "")
2173+
    (description "")
2174+
    (license (list license:cddl1.1))))
2175+
2176+
(define-public java-javax-ejb
2177+
  (package
2178+
    (name "java-javax-ejb")
2179+
    (version "3.2.2")
2180+
    (source (origin
2181+
              (method url-fetch)
2182+
              (uri (string-append "https://github.com/javaee/javax.ejb/archive/"
2183+
                                  version ".tar.gz"))
2184+
              (sha256
2185+
               (base32
2186+
                "15ipffv3dkbg6psa5knp4bq1bkp0qy21mzsgs94k6xw714igsij5"))))
2187+
    (build-system ant-build-system)
2188+
    (arguments
2189+
     `(#:jar-name "javax-ejb.jar"
2190+
       #:tests? #f; no tests
2191+
       #:source-dir "src/main/java"
2192+
       #:phases
2193+
       (modify-phases %standard-phases
2194+
         (add-before 'build 'copy-resources
2195+
           (lambda _
2196+
             (copy-recursively "src/main/resources" "build/classes")
2197+
             #t)))))
2198+
    (inputs
2199+
     `(("java-javax-transaction" ,java-javax-transaction)
2200+
       ("java-javax-xml-rpc" ,java-javax-xml-rpc)))
2201+
    (home-page "https://github.com/eclipse-ee4j/ejb-api")
2202+
    (synopsis "")
2203+
    (description "")
2204+
    ;; Either EPL2.0 or GPL2.0 with classpath exception
2205+
    (license (list license:epl2.0 license:gpl2+))))
2206+
2207+
;; JSR380 jsr380
20832208 
(define-public java-javax-validation
20842209 
  (package
20852210 
    (name "java-javax-validation")
…
21032228 
           (lambda _
21042229 
             (copy-recursively "src/main/resources" "build/classes")
21052230 
             #t)))))
2106-
         ;(replace 'check
2107-
         ;  (lambda _
2108-
         ;    (mkdir-p "build/test-classes")
2109-
         ;    (apply invoke "javac" "-cp"
2110-
         ;           (string-append (getenv "CLASSPATH") ":build/classes")
2111-
         ;           "-d" "build/test-classes" (find-files "src/test/java" ".*.java$"))
2112-
         ;    (with-directory-excursion "build/test-classes"
2113-
         ;      (invoke "java" "-cp"
2114-
         ;              (string-append (getenv "CLASSPATH") ":../classes:.")
2115-
         ;              "org.testng.TestNG" "-verbose" "5" "-testclass"
2116-
         ;              "javax.validation.ValidationTest"))
2117-
         ;    #t)))))
21182231 
    (native-inputs
21192232 
     `(("java-hamcrest-core" ,java-hamcrest-core)
21202233 
       ("java-testng" ,java-testng)))
…
21232236 
    (description "")
21242237 
    (license license:asl2.0)))
21252238 
2239+
(define-public java-fasterxml-classmate
2240+
  (package
2241+
    (name "java-fasterxml-classmate")
2242+
    (version "1.4.0")
2243+
    (source (origin
2244+
              (method url-fetch)
2245+
              (uri (string-append "https://github.com/FasterXML/java-classmate/"
2246+
                                  "archive/classmate-" version ".tar.gz"))
2247+
              (sha256
2248+
               (base32
2249+
                "143gsrgsf7dzqbmd2pw4ky2cd1lhlgmh7daygda03vka73ns6qr3"))))
2250+
    (build-system ant-build-system)
2251+
    (arguments
2252+
     `(#:jar-name "fasterxml-classmate.jar"
2253+
       #:source-dir "src/main/java"
2254+
       #:test-exclude
2255+
       (list
2256+
         "**/Abstract*.java"
2257+
         ;; Base class with no tests
2258+
         "**/BaseTest.java")
2259+
       #:phases
2260+
       (modify-phases %standard-phases
2261+
         (add-before 'build 'copy-resources
2262+
           (lambda _
2263+
             (copy-recursively "engine/src/main/resources" "build/classes")
2264+
             #t)))))
2265+
    (native-inputs
2266+
     `(("java-hamcrest-core" ,java-hamcrest-core)
2267+
       ("java-junit" ,java-junit)))
2268+
    (home-page "https://fasterxml.com")
2269+
    (synopsis "")
2270+
    (description "")
2271+
    (license license:asl2.0)))
2272+
2273+
(define-public java-jboss-modules
2274+
  (package
2275+
    (name "java-jboss-modules")
2276+
    (version "1.8.6")
2277+
    (source (origin
2278+
              (method url-fetch)
2279+
              (uri (string-append "https://github.com/jboss-modules/"
2280+
                                  "jboss-modules/archive/" version ".Final.tar.gz"))
2281+
              (file-name (string-append name "-" version ".tar.gz"))
2282+
              (sha256
2283+
               (base32
2284+
                "0cm8z4kc1lq4jg3866dzhjaaz5kglsn9bymp4ra7jimyij84xxv2"))))
2285+
    (build-system ant-build-system)
2286+
    (arguments
2287+
     `(#:jar-name "jboss-modules.jar"
2288+
       #:source-dir "src/main/java"
2289+
       #:tests? #f; require jboss.shrinkwrap
2290+
       #:phases
2291+
       (modify-phases %standard-phases
2292+
         (add-before 'build 'copy-resources
2293+
           (lambda _
2294+
             (copy-recursively "src/main/resources" "build/classes")
2295+
             #t)))))
2296+
    (native-inputs
2297+
     `(("java-junit" ,java-junit)))
2298+
    (home-page "")
2299+
    (synopsis "")
2300+
    (description "")
2301+
    (license license:asl2.0)))
2302+
2303+
(define-public java-wildfly-common
2304+
  (package
2305+
    (name "java-wildfly-common")
2306+
    (version "1.4.0")
2307+
    (source (origin
2308+
              (method url-fetch)
2309+
              (uri (string-append "https://github.com/wildfly/wildfly-common/"
2310+
                                  "archive/" version ".Final.tar.gz"))
2311+
              (file-name (string-append name "-" version ".tar.gz"))
2312+
              (sha256
2313+
               (base32
2314+
                "1qgp5b77wj0g3c8wzx2k8qslzk4ran1kbk5scjzj955ljpwvygah"))))
2315+
    (build-system ant-build-system)
2316+
    (arguments
2317+
     `(#:jar-name "wildfly-common.jar"
2318+
       #:source-dir "src/main/java"))
2319+
    (inputs
2320+
     `(("java-jboss-logging-bootstrap" ,java-jboss-logging-bootstrap)))
2321+
    (home-page "")
2322+
    (synopsis "")
2323+
    (description "")
2324+
    (license license:lgpl2.1)))
2325+
2326+
(define-public java-jboss-logging-annotations
2327+
  (package
2328+
    (name "java-jboss-logging-annotations")
2329+
    (version "2.1.0")
2330+
    (source (origin
2331+
              (method url-fetch)
2332+
              (uri (string-append "https://github.com/jboss-logging/"
2333+
                                  "jboss-logging-tools/archive/" version ".Final.tar.gz"))
2334+
              (file-name (string-append name "-" version ".tar.gz"))
2335+
              (sha256
2336+
               (base32
2337+
                "1azi76q31qhmyq3v9cx0aq1gvddymj080bpc3lvacg45kh7vx9zm"))))
2338+
    (build-system ant-build-system)
2339+
    (arguments
2340+
     `(#:jar-name "jboss-logging-annotations.jar"
2341+
       #:source-dir "annotations/src/main/java"
2342+
       #:tests? #f; no tests
2343+
       #:phases
2344+
       (modify-phases %standard-phases
2345+
         (add-before 'build 'copy-resources
2346+
           (lambda _
2347+
             (copy-recursively "annotations/src/main/resources" "build/classes")
2348+
             #t)))))
2349+
    (home-page "")
2350+
    (synopsis "")
2351+
    (description "")
2352+
    (license license:lgpl2.1+)))
2353+
2354+
(define-public java-jboss-logmanager
2355+
  (package
2356+
    (name "java-jboss-logmanager")
2357+
    (version "2.1.4")
2358+
    (source (origin
2359+
              (method url-fetch)
2360+
              (uri (string-append "https://github.com/jboss-logging/"
2361+
                                  "jboss-logmanager/archive/" version ".Final.tar.gz"))
2362+
              (file-name (string-append name "-" version ".tar.gz"))
2363+
              (sha256
2364+
               (base32
2365+
                "09qj82wa612bfmwdpgpskg7qvi3n7q6v1arbhs7zbbrzlfgb7wnx"))))
2366+
    (build-system ant-build-system)
2367+
    (arguments
2368+
     `(#:jar-name "jboss-logmanager.jar"
2369+
       #:source-dir "src/main/java"
2370+
       #:tests? #f; no tests
2371+
       #:phases
2372+
       (modify-phases %standard-phases
2373+
         (add-before 'build 'copy-resources
2374+
           (lambda _
2375+
             (copy-recursively "src/main/resources" "build/classes")
2376+
             #t)))))
2377+
    (inputs
2378+
     `(("java-jboss-modules" ,java-jboss-modules)
2379+
       ("java-jsonp" ,java-jsonp)
2380+
       ("java-wildfly-common" ,java-wildfly-common)))
2381+
    (home-page "")
2382+
    (synopsis "")
2383+
    (description "")
2384+
    (license license:asl2.0)))
2385+
2386+
(define-public java-jboss-logging
2387+
  (package
2388+
    (name "java-jboss-logging")
2389+
    (version "3.3.2")
2390+
    (source (origin
2391+
              (method url-fetch)
2392+
              (uri (string-append "https://github.com/jboss-logging/"
2393+
                                  "jboss-logging/archive/" version ".Final.tar.gz"))
2394+
              (file-name (string-append name "-" version ".tar.gz"))
2395+
              (sha256
2396+
               (base32
2397+
                "1kcibwahdja95zdm8yh2zlqlq6xj42pddjby1845jam2xg7q9pqh"))))
2398+
    (build-system ant-build-system)
2399+
    (arguments
2400+
     `(#:jar-name "jboss-logging.jar"
2401+
       #:source-dir "src/main/java"
2402+
       #:tests? #f; no tests
2403+
       #:phases
2404+
       (modify-phases %standard-phases
2405+
         (add-before 'build 'copy-resources
2406+
           (lambda _
2407+
             (copy-recursively "src/main/resources" "build/classes")
2408+
             #t)))))
2409+
    (inputs
2410+
     `(("java-jboss-logmanager" ,java-jboss-logmanager)
2411+
       ("java-log4j-api" ,java-log4j-api)))
2412+
    (home-page "")
2413+
    (synopsis "")
2414+
    (description "")
2415+
    (license license:asl2.0)))
2416+
2417+
(define-public java-jboss-logging-bootstrap
2418+
  (package
2419+
    (inherit java-jboss-logging)
2420+
    (name "java-jboss-logging-bootstrap")
2421+
    (arguments
2422+
     `(#:jar-name "jboss-logging-bootstrap.jar"
2423+
       #:tests? #f; no tests
2424+
       #:phases
2425+
       (modify-phases %standard-phases
2426+
         (replace 'build
2427+
           (lambda _
2428+
             (mkdir-p "build/classes")
2429+
             (mkdir-p "build/jar")
2430+
             (apply invoke "javac" "-d" "build/classes"
2431+
                    (map (lambda (file) (string-append
2432+
                                          "src/main/java/org/jboss/logging/"
2433+
                                          file))
2434+
                         '("Messages.java" "LoggingLocale.java")))
2435+
             (invoke "jar" "cf" "build/jar/jboss-logging-bootstrap.jar"
2436+
                     "-C" "build/classes" ".")
2437+
             #t)))))
2438+
    (inputs
2439+
     `(("java-log4j-api" ,java-log4j-api)))))
2440+
2441+
(define-public java-hibernate-validator-engine
2442+
  (package
2443+
    (name "java-hibernate-validator-engine")
2444+
    (version "6.0.13")
2445+
    (source (origin
2446+
              (method url-fetch)
2447+
              (uri (string-append "https://github.com/hibernate/"
2448+
                                  "hibernate-validator/archive/" version
2449+
                                  ".Final.tar.gz"))
2450+
              (sha256
2451+
               (base32
2452+
                "107220ydll2fgvqzmzrby7b65vi4hsvrnmbb6idrxfmckm05grn4"))))
2453+
    (build-system ant-build-system)
2454+
    (arguments
2455+
     `(#:jar-name "hibernate-validator-engine.jar"
2456+
       #:source-dir "engine/src/main/java"
2457+
       #:phases
2458+
       (modify-phases %standard-phases
2459+
         (add-before 'build 'copy-resources
2460+
           (lambda _
2461+
             (copy-recursively "engine/src/main/resources" "build/classes")
2462+
             #t)))))
2463+
    (inputs
2464+
     `(("java-fasterxml-classmate" ,java-fasterxml-classmate)
2465+
       ("java-javax-validation" ,java-javax-validation)
2466+
       ("java-jboss-logging" ,java-jboss-logging)
2467+
       ("java-joda-time" ,java-joda-time)
2468+
       ("java-jsoup" ,java-jsoup)
2469+
       ;; For javax-el (el-api)
2470+
       ("java-tomcat" ,java-tomcat)))
2471+
    (home-page "https://hibernate.org/validator/")
2472+
    (synopsis "")
2473+
    (description "")
2474+
    (license license:asl2.0)))
2475+
21262476 
;; javax.enterprise.concurrency
21272477 
(define-public java-concurrency-api
21282478 
  (package
…
21522502 
(define-public java-spring-framework-core
21532503 
  (package
21542504 
    (name "java-spring-framework-core")
2155-
    (version "4.3.10")
2505+
    (version "4.3.19")
21562506 
    (source (origin
21572507 
              (method url-fetch)
21582508 
              (uri (string-append "https://github.com/spring-projects/"
…
21602510 
                                  ".RELEASE.tar.gz"))
21612511 
              (sha256
21622512 
               (base32
2163-
                "036jcwh2g3qlv14lalhkpkjnwc1hjn4zdqf251231vywxyd838zm"))
2513+
                "1796ch4ahhx8jq9v3v16dr0xcdx9fqf8waf75cjh52fxvi6ipnqj"))
21642514 
              (patches (search-patches "java-spring-framework-remove-non-free.patch"))))
21652515 
    (arguments
21662516 
     `(#:jar-name "java-spring-framework-core.jar"
…
24472797 
             ;; Needed because tests look for data in src/... directly.
24482798 
             (chdir "spring-context")
24492799 
             #t))
2800+
         (add-before 'build 'fix-cglib
2801+
           (lambda _
2802+
             (with-directory-excursion "src/main/java/org/springframework"
2803+
               (substitute*
2804+
                 (list
2805+
                   "context/annotation/ConfigurationClassEnhancer.java"
2806+
                   "scripting/support/ScriptFactoryPostProcessor.java")
2807+
                 (("org.springframework.cglib") "net.sf.cglib")
2808+
                 (("net.sf.cglib.core.SpringNamingPolicy")
2809+
                  "org.springframework.cglib.core.SpringNamingPolicy")))
2810+
             #t))
24502811 
         (add-before 'build 'remove-jruby
24512812 
           (lambda _
24522813 
             (delete-file-recursively
…
24632824 
             #t)))))
24642825 
    (inputs
24652826 
     `(("groovy" ,groovy)
2827+
       ("java-aspectj-weaver" ,java-aspectj-weaver)
24662828 
       ("java-bsh" ,java-bsh)
24672829 
       ("java-cglib" ,java-cglib)
24682830 
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
24692831 
       ("java-concurrency-api" ,java-concurrency-api)
2832+
       ("java-hibernate-validator-engine" ,java-hibernate-validator-engine)
2833+
       ("java-javax-ejb" ,java-javax-ejb)
24702834 
       ("java-javax-inject" ,java-javax-inject)
2835+
       ("java-javax-interceptor" ,java-javax-interceptor)
24712836 
       ("java-javax-validation" ,java-javax-validation)
24722837 
       ("java-joda-time" ,java-joda-time)
24732838 
       ("java-snakeyaml" ,java-snakeyaml)
…
43514716 
    (description "")
43524717 
    (license license:bsd-2)))
43534718 
4354-
;; vanished from the face of the earth :/
43554719 
(define-public java-jsonp
43564720 
  (package
43574721 
    (name "java-jsonp")
4358-
    (version "1.0.4")
4722+
    (version "1.1.3")
43594723 
    (source (origin
4360-
              (method git-fetch)
4361-
              (uri (git-reference
4362-
                     (url "git://java.net/jsonp~git")
4363-
                     (commit "a586e706aea82dc80fb05bdf59f2a25150ee1801")))
4724+
              (method url-fetch)
4725+
              (uri (string-append "https://github.com/eclipse-ee4j/jsonp/archive/"
4726+
                                  version "-RELEASE.tar.gz"))
43644727 
              (file-name (string-append name "-" version))
43654728 
              (sha256
43664729 
               (base32
4367-
                "01r4syivcywpvxkr1hn0az9316pr7qpnx154zzzw0nijfmdlbw7n"))))
4730+
                "15d7rp4xb482h8r0j3j83wa34bmz84q89s9n8ydfgz6l492syfhc"))))
43684731 
    (build-system ant-build-system)
43694732 
    (arguments
4370-
     `(#:jar-name (string-append ,name "-" ,version ".jar")
4733+
     `(#:jar-name "jsonp.jar"
43714734 
       #:tests? #f
4372-
       #:source-dir "api/src"))
4373-
    (home-page "https://jsonp.java.net")
4735+
       #:source-dir "api/src/main/java"
4736+
       #:test-dir "api/src/test"))
4737+
    (home-page "https://javaee.github.io/jsonp/")
43744738 
    (synopsis "")
43754739 
    (description "")
43764740 
    (license (list license:gpl2
4377-
                   license:cddl1.1))))
4741+
                   license:epl2.0))))
43784742 
43794743 
(define-public ant-junit
43804744 
  (package