Julien Lepiller <julien@lepiller.eu> writes:

> Le Sat, 17 Feb 2018 16:06:19 +0100,
> Marius Bakke <mbakke@fastmail.com> a écrit :
>
>> Björn Höfling <bjoern.hoefling@bjoernhoefling.de> writes:
>> 
>> > On Wed, 14 Feb 2018 22:56:38 +0100
>> > Julien Lepiller <julien@lepiller.eu> wrote:
>> >> We don't have anything for that license. I've seen it in some other
>> >> java packages, and I used (non-copyleft "file:///LICENSE.txt"),
>> >> except this time, LICENSE.txt contains only the expat license. The
>> >> files that have this license are also licensed under the expat
>> >> license. Is it OK to declare only the expat license here, as it is
>> >> the only one in LICENSE.txt?  
>> >
>> >
>> > I'm not a license expert. Has anyone else a opinion on that?  
>> 
>> I haven't checked, but if these source files are not part of the
>> installed product (e.g. they are only used for tests, or optional
>> plugins/features), AFAIU we don't need to list them in the
>> (license ...) field.
>> 
>> But please add a comment about them regardless.
>
> I've addressed all the comments in other packages, but this one
> remains. Here is what I did. Do you think it's OK (I don't really like
> to use string-append, but it shortens the length of lines). What do you
> think?

LGTM.

> From 5b1ecd2d2c451d3aba05eb9647bff39574b02e4f Mon Sep 17 00:00:00 2001
> From: Julien Lepiller <julien@lepiller.eu>
> Date: Sat, 10 Feb 2018 22:51:17 +0100
> Subject: [PATCH 07/12] gnu: Add java-modello-core.
>
> * gnu/packages/java.scm (java-modello-core): New variable.
> ---
>  gnu/packages/java.scm | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 63 insertions(+)
>
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index a274055a5..6288a2a63 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2814,6 +2814,69 @@ a default implementation of it.  This API is about scanning files in a
>  project and determining what files need to be rebuilt.")
>      (license license:asl2.0)))
>  
> +(define-public java-modello-core
> +  (package
> +    (name "java-modello-core")
> +    (version "1.9.1")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://github.com/codehaus-plexus/modello"
> +                                  "/archive/modello-" version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "0l2pvns8pmlrmjm3iknp7gpg3654y1m8qhy55b19sdwdchdcyxfh"))))
> +    (build-system ant-build-system)
> +    (arguments
> +     `(#:jar-name "modello-core.jar"
> +       #:source-dir "modello-core/src/main/java"
> +       #:test-dir "modello-core/src/test"
> +       #:main-class "org.codehaus.modello.ModelloCli"
> +       #:jdk ,icedtea-8
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'build 'copy-resources
> +           (lambda _
> +             (mkdir-p "build/classes/META-INF/plexus")
> +             (copy-file "modello-core/src/main/resources/META-INF/plexus/components.xml"
> +                        "build/classes/META-INF/plexus/components.xml")
> +             #t))
> +         (add-before 'check 'fix-tests
> +           (lambda _
> +             (with-directory-excursion "modello-core/src/test/java/org/codehaus"
> +               (substitute* '("modello/core/DefaultModelloCoreTest.java"
> +                              "modello/core/io/ModelReaderTest.java")
> +                 (("src/test") "modello-core/src/test")))
> +             #t)))))
> +    (inputs
> +     `(("java-plexus-utils" ,java-plexus-utils)
> +       ("java-plexus-container-default" ,java-plexus-container-default)
> +       ("java-sisu-build-api" ,java-sisu-build-api)))
> +    (native-inputs
> +     `(("java-junit" ,java-junit)
> +       ("java-plexus-classworlds" ,java-plexus-classworlds)
> +       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
> +       ("java-guava" ,java-guava)))
> +    (home-page "http://codehaus-plexus.github.io/modello/")
> +    (synopsis "Framework for code generation from a simple model")
> +    (description "Modello is a framework for code generation from a simple model.
> +
> +Modello generates code from a simple model format: based on a plugin
> +architecture, various types of code and descriptors can be generated from the
> +single model, including Java POJOs, XML/JSON/YAML marshallers/unmarshallers,
> +XSD and documentation.")
> +    (license (list
> +               license:expat
> +               ;; Although this package uses only files licensed under expat,
> +               ;; other parts of the source are licensed under different
> +               ;; licenses.  We include them to be inherited by other packages.
> +               license:asl2.0
> +               ;; Some files in modello-plugin-java are licensed under a
> +               ;; 5-clause BSD license.
> +               (license:non-copyleft
> +                 (string-append "file:///modello-plugins/modello-plugin-java/"
> +                                "src/main/java/org/codehaus/modello/plugin/"
> +                                "java/javasource/JNaming.java"))))))
> +
>  (define-public java-asm
>    (package
>      (name "java-asm")
> -- 
> 2.16.2