Comment updated packages that conflict with upstream

LEPILLER JulienWed Jan 24 17:39:53+0100 2018

da020c4

Comment updated packages that conflict with upstream

more/packages/java.scm

28062806
    (license license:bsd-3)))
28072807
28082808
; propose update
2809-
(define-public java-commons-cli
2810-
  (package
2811-
    (name "java-commons-cli")
2812-
    (version "1.4")
2813-
    (source (origin
2814-
              (method url-fetch)
2815-
              (uri (string-append "http://mirrors.ircam.fr/pub/apache/commons/"
2816-
                                  "cli/source/commons-cli-" version "-src.tar.gz"))
2817-
              (file-name (string-append name "-" version ".tar.gz"))
2818-
              (sha256
2819-
               (base32
2820-
                "05hgi2z01fqz374y719gl1dxzqvzci5af071zm7vxrjg9vczipm1"))))
2821-
    (build-system ant-build-system)
2822-
    (arguments
2823-
     `(#:jar-name "commons-cli-1.4.jar"
2824-
       #:tests? #f))
2825-
    (native-inputs
2826-
     `(("java-junit" ,java-junit)))
2827-
    (home-page "https://commons.apache.org/proper/commons-cli")
2828-
    (synopsis "Java API for parsing command line options passed to programs")
2829-
    (description "Apache Commons CLI library provides an API for parsing command
2830-
line options passed to programs. It's also able to print help messages detailing
2831-
the options available for a command line tool.")
2832-
    (license license:asl2.0)))
2809+
;(define-public java-commons-cli
2810+
;  (package
2811+
;    (name "java-commons-cli")
2812+
;    (version "1.4")
2813+
;    (source (origin
2814+
;              (method url-fetch)
2815+
;              (uri (string-append "http://mirrors.ircam.fr/pub/apache/commons/"
2816+
;                                  "cli/source/commons-cli-" version "-src.tar.gz"))
2817+
;              (file-name (string-append name "-" version ".tar.gz"))
2818+
;              (sha256
2819+
;               (base32
2820+
;                "05hgi2z01fqz374y719gl1dxzqvzci5af071zm7vxrjg9vczipm1"))))
2821+
;    (build-system ant-build-system)
2822+
;    (arguments
2823+
;     `(#:jar-name "commons-cli-1.4.jar"
2824+
;       #:tests? #f))
2825+
;    (native-inputs
2826+
;     `(("java-junit" ,java-junit)))
2827+
;    (home-page "https://commons.apache.org/proper/commons-cli")
2828+
;    (synopsis "Java API for parsing command line options passed to programs")
2829+
;    (description "Apache Commons CLI library provides an API for parsing command
2830+
;line options passed to programs. It's also able to print help messages detailing
2831+
;the options available for a command line tool.")
2832+
;    (license license:asl2.0)))
28332833
28342834
; propose update
2835-
(define-public java-jsr305
2836-
  (package
2837-
    (name "java-jsr305")
2838-
    (version "3.0.2")
2839-
    (source (origin
2840-
              (method git-fetch)
2841-
              (uri (git-reference
2842-
                     (url "https://github.com/amaembo/jsr-305.git")
2843-
                     (commit "d7734b13c61492982784560ed5b4f4bd6cf9bb2c")))
2844-
              (file-name (string-append name "-" version))
2845-
              (sha256
2846-
               (base32
2847-
                "1wk159136pgc6i54drbq2whazfmdilvfqlxj3k19s9dfwbayf621"))))
2848-
    (build-system ant-build-system)
2849-
    (arguments
2850-
     `(#:jar-name (string-append ,name "-" ,version ".jar")
2851-
       #:source-dir "ri/src/main/java"
2852-
       #:tests? #f))
2853-
    (home-page "https://github.com/amaembo/jsr-305")
2854-
    (synopsis "")
2855-
    (description "")
2856-
    (license license:bsd-3)))
2835+
;(define-public java-jsr305
2836+
;  (package
2837+
;    (name "java-jsr305")
2838+
;    (version "3.0.2")
2839+
;    (source (origin
2840+
;              (method git-fetch)
2841+
;              (uri (git-reference
2842+
;                     (url "https://github.com/amaembo/jsr-305.git")
2843+
;                     (commit "d7734b13c61492982784560ed5b4f4bd6cf9bb2c")))
2844+
;              (file-name (string-append name "-" version))
2845+
;              (sha256
2846+
;               (base32
2847+
;                "1wk159136pgc6i54drbq2whazfmdilvfqlxj3k19s9dfwbayf621"))))
2848+
;    (build-system ant-build-system)
2849+
;    (arguments
2850+
;     `(#:jar-name (string-append ,name "-" ,version ".jar")
2851+
;       #:source-dir "ri/src/main/java"
2852+
;       #:tests? #f))
2853+
;    (home-page "https://github.com/amaembo/jsr-305")
2854+
;    (synopsis "")
2855+
;    (description "")
2856+
;    (license license:bsd-3)))
28572857
28582858
(define-public java-jsr250
28592859
  (package