[bug#30417] [PATCH] java-plexus and java-modello

[bug#30417] [PATCH] java-plexus and java-modello

[Julien Lepiller]

Hi, this patch series adds more java packages required by maven. We're
almost there: only ~50 packages (including maven) left after these ones.

[bug#30417] [PATCH 01/11] gnu: Add java-plexus-component-annotations.

[Julien Lepiller]

* gnu/packages/java.scm (java-plexus-component-annotations): New
variable.
---
 gnu/packages/java.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e714a031c..b7f3fd54e 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2662,6 +2662,17 @@ archives (jar).")
      `(("archiver" ,java-plexus-archiver)
        ("hamcrest" ,java-hamcrest-core)))))
 
+(define-public java-plexus-component-annotations
+  (package
+    (inherit java-plexus-container-default)
+    (name "java-plexus-component-annotations")
+    (arguments
+     `(#:jar-name "plexus-component-annotations.jar"
+       #:source-dir "plexus-component-annotations/src/main/java"
+       #:tests? #f)); no tests
+    (inputs '())
+    (native-inputs '())))
+
 (define-public java-asm
   (package
     (name "java-asm")
-- 
2.16.1

[bug#30417] [PATCH 01/11] gnu: Add java-plexus-component-annotations.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:28 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> * gnu/packages/java.scm (java-plexus-component-annotations): New
> variable.
> ---
>  gnu/packages/java.scm | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index e714a031c..b7f3fd54e 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2662,6 +2662,17 @@ archives (jar).")
>       `(("archiver" ,java-plexus-archiver)
>         ("hamcrest" ,java-hamcrest-core)))))
>  
> +(define-public java-plexus-component-annotations
> +  (package
> +    (inherit java-plexus-container-default)
> +    (name "java-plexus-component-annotations")
> +    (arguments
> +     `(#:jar-name "plexus-component-annotations.jar"
> +       #:source-dir "plexus-component-annotations/src/main/java"
> +       #:tests? #f)); no tests
> +    (inputs '())
> +    (native-inputs '())))
> +
>  (define-public java-asm
>    (package
>      (name "java-asm")

* This one inherits java-plexus-container-default, but does not adapt
synopsis/description. Is that OK?

* Sorry for being so late, but I also looked into the
  java-plexus-container-default-bootstrap: It contains some jar's in
  the test path. Is that OK?

find . -name "*.jar"
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/test-components/component-a-2.0-SNAPSHOT.jar
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/test-components/plexus-archiver-1.0-alpha-8.jar
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/test-components/component-c-1.0-SNAPSHOT.jar
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/test-components/plugin1-1.0-SNAPSHOT.jar
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/test-components/component-b-1.0-SNAPSHOT.jar
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/test-components/component-a-1.0-SNAPSHOT.jar
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/test-components/plugin0-1.0-SNAPSHOT.jar
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/resources/jar-repository/c.jar
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/resources/jar-repository/b.jar
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/resources/jar-repository/d.jar
./plexus-containers-plexus-containers-1.7.1/plexus-container-default/src/test/resources/jar-repository/a.jar

* We have a java-plexus-container-default and
  java-plexus-container-default-bootstrap. Both are "define-public".
  Should we make the bootstrap non-public?

Otherwise, LGTM.

And even though I have my comments, thanks for all this
awesome Java/Maven work!

Björn

[bug#30417] [PATCH 02/11] gnu: Add java-plexus-cipher.

[Julien Lepiller]

* gnu/packages/java.scm (java-plexus-cipher): New variable.
---
 gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b7f3fd54e..8b51f7122 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2673,6 +2673,42 @@ archives (jar).")
     (inputs '())
     (native-inputs '())))
 
+(define-public java-plexus-cipher
+  (package
+    (name "java-plexus-cipher")
+    (version "1.7")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/codehaus-plexus/plexus-cipher"
+                                  "/archive/plexus-cipher-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1j3r8xzlxlk340snkjp6lk2ilkxlkn8qavsfiq01f43xmvv8ymk3"))))
+    (build-system ant-build-system)
+    (arguments
+     `(#:jar-name "plexus-cipher.jar"
+       #:source-dir "src/main/java"
+       #:jdk ,icedtea-8
+       #:tests? #f; FIXME: requires sisu-inject-bean
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'copy-resources
+           (lambda _
+             (copy-recursively "src/main/resources" "build/classes")
+             (mkdir-p "build/classes/META-INF/sisu")
+             (with-output-to-file "build/classes/META-INF/sisu/javax.inject.Named"
+               (lambda _
+                 (display "org.sonatype.plexus.components.cipher.DefaultPlexusCipher\n")))
+             #t)))))
+    (inputs
+     `(("java-cdi-api" ,java-cdi-api)
+       ("java-javax-inject" ,java-javax-inject)))
+    (home-page "http://codehaus-plexus.github.io/plexus-cipher/")
+    (synopsis "Encryption/decryption Component")
+    (description "Plexus-cipher contains a component to deal with encryption
+and decryption.")
+    (license license:asl2.0)))
+
 (define-public java-asm
   (package
     (name "java-asm")
-- 
2.16.1

[bug#30417] [PATCH 02/11] gnu: Add java-plexus-cipher.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:29 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> * gnu/packages/java.scm (java-plexus-cipher): New variable.
> ---
>  gnu/packages/java.scm | 36 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
> 
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index b7f3fd54e..8b51f7122 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2673,6 +2673,42 @@ archives (jar).")
>      (inputs '())
>      (native-inputs '())))
>  
> +(define-public java-plexus-cipher
> +  (package
> +    (name "java-plexus-cipher")
> +    (version "1.7")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> "https://github.com/codehaus-plexus/plexus-cipher"
> +                                  "/archive/plexus-cipher-" version
> ".tar.gz"))
> +              (sha256
> +               (base32
> +
> "1j3r8xzlxlk340snkjp6lk2ilkxlkn8qavsfiq01f43xmvv8ymk3"))))
> +    (build-system ant-build-system)
> +    (arguments
> +     `(#:jar-name "plexus-cipher.jar"
> +       #:source-dir "src/main/java"
> +       #:jdk ,icedtea-8
> +       #:tests? #f; FIXME: requires sisu-inject-bean
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'build 'copy-resources
> +           (lambda _
> +             (copy-recursively "src/main/resources" "build/classes")
> +             (mkdir-p "build/classes/META-INF/sisu")
> +             (with-output-to-file
> "build/classes/META-INF/sisu/javax.inject.Named"
> +               (lambda _
> +                 (display
> "org.sonatype.plexus.components.cipher.DefaultPlexusCipher\n")))
> +             #t)))))
> +    (inputs
> +     `(("java-cdi-api" ,java-cdi-api)
> +       ("java-javax-inject" ,java-javax-inject)))
> +    (home-page "http://codehaus-plexus.github.io/plexus-cipher/")

For the Homepage I get a 404.
That's what I find as an
alternative:

https://github.com/sonatype/plexus-cipher

Otherwise, LGTM


Björn

[bug#30417] [PATCH 03/11] gnu: Add java-plexus-compiler-api.

[Julien Lepiller]

* gnu/packages/java.scm (java-plexus-compiler-api): New variable.
---
 gnu/packages/java.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 8b51f7122..55233b7ba 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2709,6 +2709,34 @@ archives (jar).")
 and decryption.")
     (license license:asl2.0)))
 
+(define-public java-plexus-compiler-api
+  (package
+    (name "java-plexus-compiler-api")
+    (version "2.8.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/codehaus-plexus/plexus-compiler"
+                                  "/archive/plexus-compiler-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0g3x26pymcdnfnwv2a1i57pd5s26f5zqfi1rdy98z1bn01klx25k"))))
+    (build-system ant-build-system)
+    (arguments
+     `(#:jar-name "plexus-compiler-api.jar"
+       #:source-dir "plexus-compiler-api/src/main/java"
+       #:jdk ,icedtea-8
+       #:test-dir "plexus-compiler-api/src/test"))
+    (inputs
+     `(("java-plexus-container-default" ,java-plexus-container-default)
+       ("java-plexus-util" ,java-plexus-utils)))
+    (native-inputs
+     `(("java-junit" ,java-junit)))
+    (home-page "https://github.com/codehaus-plexus/plexus-compiler")
+    (synopsis "Plexus Compilers component's API to manipulate compilers")
+    (description "This package contains the API used by components to manipulate
+compilers.")
+    (license license:asl2.0)))
+
 (define-public java-asm
   (package
     (name "java-asm")
-- 
2.16.1

[bug#30417] [PATCH 03/11] gnu: Add java-plexus-compiler-api.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:30 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> * gnu/packages/java.scm (java-plexus-compiler-api): New variable.
> ---
>  gnu/packages/java.scm | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
> 
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index 8b51f7122..55233b7ba 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2709,6 +2709,34 @@ archives (jar).")
>  and decryption.")
>      (license license:asl2.0)))
>  
> +(define-public java-plexus-compiler-api
> +  (package
> +    (name "java-plexus-compiler-api")
> +    (version "2.8.2")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> "https://github.com/codehaus-plexus/plexus-compiler"
> +                                  "/archive/plexus-compiler-"
> version ".tar.gz"))
> +              (sha256
> +               (base32
> +
> "0g3x26pymcdnfnwv2a1i57pd5s26f5zqfi1rdy98z1bn01klx25k"))))
> +    (build-system ant-build-system)
> +    (arguments
> +     `(#:jar-name "plexus-compiler-api.jar"
> +       #:source-dir "plexus-compiler-api/src/main/java"
> +       #:jdk ,icedtea-8
> +       #:test-dir "plexus-compiler-api/src/test"))
> +    (inputs
> +
> `(("java-plexus-container-default" ,java-plexus-container-default)
> +       ("java-plexus-util" ,java-plexus-utils)))
> +    (native-inputs
> +     `(("java-junit" ,java-junit)))
> +    (home-page "https://github.com/codehaus-plexus/plexus-compiler")
> +    (synopsis "Plexus Compilers component's API to manipulate
> compilers")
> +    (description "This package contains the API used by components
> to manipulate +compilers.")
> +    (license license:asl2.0)))

There are some files licensed under "MIT" (which one is that exactly in
FSF-speach again?), for example:
https://github.com/codehaus-plexus/plexus-compiler/blob/master/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java

I haven't done a full review of it yet.

Björn

[bug#30417] [PATCH 03/11] gnu: Add java-plexus-compiler-api.

[Björn Höfling]

On Mon, 12 Feb 2018 00:47:35 +0100
Björn Höfling <bjoern.hoefling@bjoernhoefling.de> wrote:

> On Sun, 11 Feb 2018 00:04:30 +0100
> Julien Lepiller <julien@lepiller.eu> wrote:
> 
> > * gnu/packages/java.scm (java-plexus-compiler-api): New variable.

[...]

> > +    (license license:asl2.0)))  
> 
> There are some files licensed under "MIT" (which one is that exactly
> in FSF-speach again?), for example:
> https://github.com/codehaus-plexus/plexus-compiler/blob/master/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java
> 
> I haven't done a full review of it yet.

Apart from the missing "license:expat" this LGTM.

Björn

[bug#30417] [PATCH 04/11] gnu: Add java-plexus-compiler-javac.

[Julien Lepiller]

gnu/packages/java.scm (java-plexus-compiler-javac): New variable.
---
 gnu/packages/java.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 55233b7ba..29439d667 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2737,6 +2737,26 @@ and decryption.")
 compilers.")
     (license license:asl2.0)))
 
+(define-public java-plexus-compiler-javac
+  (package
+    (inherit java-plexus-compiler-api)
+    (name "java-plexus-compiler-javac")
+    (arguments
+     `(#:jar-name "plexus-compiler-javac.jar"
+       #:source-dir "plexus-compilers/plexus-compiler-javac/src/main/java"
+       #:jdk ,icedtea-8
+       #:tests? #f; depends on compiler-test -> maven-core -> ... -> this package.
+       #:test-dir "plexus-compilers/plexus-compiler-javac/src/test"))
+    (inputs
+     `(("java-plexus-compiler-api" ,java-plexus-compiler-api)
+       ("java-plexus-utils" ,java-plexus-utils)
+       ("java-plexus-container-default" ,java-plexus-container-default)))
+    (native-inputs
+     `(("java-junit" ,java-junit)))
+    (synopsis "Javac Compiler support for Plexus Compiler component")
+    (description "This package contains the Javac Compiler support for Plexus
+Compiler component.")))
+
 (define-public java-asm
   (package
     (name "java-asm")
-- 
2.16.1

[bug#30417] [PATCH 04/11] gnu: Add java-plexus-compiler-javac.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:31 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> gnu/packages/java.scm (java-plexus-compiler-javac): New variable.
> ---
>  gnu/packages/java.scm | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index 55233b7ba..29439d667 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2737,6 +2737,26 @@ and decryption.")
>  compilers.")
>      (license license:asl2.0)))
>  
> +(define-public java-plexus-compiler-javac
> +  (package
> +    (inherit java-plexus-compiler-api)
> +    (name "java-plexus-compiler-javac")

LGTM, except of this comment:

This one also has some source files unde license:expat. As the package
inherits from java-plexus-compiler-api, and if you add the missing
license there, everything should be fine automatically.


Björn

[bug#30417] [PATCH 05/11] gnu: Add java-sisu-build-api.

[Julien Lepiller]

* gnu/packages/java.scm (java-sisu-build-api): New variable.
---
 gnu/packages/java.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 29439d667..af9acd71f 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2757,6 +2757,60 @@ compilers.")
     (description "This package contains the Javac Compiler support for Plexus
 Compiler component.")))
 
+(define-public java-sisu-build-api
+  (package
+    (name "java-sisu-build-api")
+    (version "0.0.7")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/sonatype/sisu-build-api/"
+                                  "archive/plexus-build-api-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1c3rrpma3x634xp2rm2p5iskfhzdyc7qfbhjzr70agrl1jwghgy2"))))
+    (build-system ant-build-system)
+    (arguments
+     `(#:jar-name "sisu-build-api.jar"
+       #:source-dir "src/main/java"
+       #:jdk ,icedtea-8
+       #:tests? #f; FIXME: how to run the tests?
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'copy-resurces
+           (lambda _
+             (mkdir-p "build/classes/org/sonatype/plexus/build/incremental")
+             (copy-file "src/main/resources/org/sonatype/plexus/build/incremental/version.properties"
+                        "build/classes/org/sonatype/plexus/build/incremental/version.properties")
+             #t))
+         (add-before 'build 'generate-plexus-compontent
+           (lambda _
+             (mkdir-p "build/classes/META-INF/plexus")
+             ;; This file is required for plexus to inject this package.
+             ;; FIXME: how is it generated?
+             (with-output-to-file "build/classes/META-INF/plexus/components.xml"
+               (lambda _
+                 (display
+                   "<component-set>\n
+  <components>\n
+    <component>\n
+      <role>org.sonatype.plexus.build.incremental.BuildContext</role>\n
+      <role-hint>default</role-hint>\n
+      <implementation>org.sonatype.plexus.build.incremental.DefaultBuildContext</implementation>\n
+      <description>Filesystem based non-incremental build context implementation which behaves as if all files\n
+were just created.</description>\n
+    </component>\n
+  </components>\n
+</component-set>\n"))))))))
+    (inputs
+     `(("java-plexus-utils" ,java-plexus-utils)
+       ("java-plexus-container-default" ,java-plexus-container-default)))
+    (home-page "https://github.com/sonatype/sisu-build-api/")
+    (synopsis "Base build API for maven")
+    (description "This package contains the base build API for maven and
+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-asm
   (package
     (name "java-asm")
-- 
2.16.1

[bug#30417] [PATCH 05/11] gnu: Add java-sisu-build-api.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:32 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> * gnu/packages/java.scm (java-sisu-build-api): New variable.
> ---
>  gnu/packages/java.scm | 54
> +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed,
> 54 insertions(+)
> 
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index 29439d667..af9acd71f 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2757,6 +2757,60 @@ compilers.")
>      (description "This package contains the Javac Compiler support
> for Plexus Compiler component.")))
>  
> +(define-public java-sisu-build-api
> +  (package
> +    (name "java-sisu-build-api")
> +    (version "0.0.7")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> "https://github.com/sonatype/sisu-build-api/"
> +                                  "archive/plexus-build-api-"
> version ".tar.gz"))
> +              (sha256
> +               (base32
> +
> "1c3rrpma3x634xp2rm2p5iskfhzdyc7qfbhjzr70agrl1jwghgy2"))))
> +    (build-system ant-build-system)
> +    (arguments
> +     `(#:jar-name "sisu-build-api.jar"
> +       #:source-dir "src/main/java"
> +       #:jdk ,icedtea-8
> +       #:tests? #f; FIXME: how to run the tests?
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'build 'copy-resurces
> +           (lambda _
> +             (mkdir-p
> "build/classes/org/sonatype/plexus/build/incremental")
> +             (copy-file
> "src/main/resources/org/sonatype/plexus/build/incremental/version.properties"
> +
> "build/classes/org/sonatype/plexus/build/incremental/version.properties")

The content of this file is:

api.version = ${project.version}

Is that OK? Or should we better write the correct version into the file?


> +             #t))
> +         (add-before 'build 'generate-plexus-compontent
> +           (lambda _
> +             (mkdir-p "build/classes/META-INF/plexus")
> +             ;; This file is required for plexus to inject this
> package.
> +             ;; FIXME: how is it generated?
> +             (with-output-to-file
> "build/classes/META-INF/plexus/components.xml"
> +               (lambda _
> +                 (display
> +                   "<component-set>\n
> +  <components>\n
> +    <component>\n
> +
> <role>org.sonatype.plexus.build.incremental.BuildContext</role>\n
> +      <role-hint>default</role-hint>\n
> +
> <implementation>org.sonatype.plexus.build.incremental.DefaultBuildContext</implementation>\n
> +      <description>Filesystem based non-incremental build context
> implementation which behaves as if all files\n +were just
> created.</description>\n
> +    </component>\n
> +  </components>\n
> +</component-set>\n"))))))))


R5RS specifies that "with-output-to-file re-turn(s) the value(s)
yielded by thunk". As your last call within thunk is "(display..."),
the return value is unspecified. Add a "#t" to either the thunk or
after (call-with-output-to-file ..").

Linter complained about some too long lines, but I think that's OK. At
least I wouldn't know how to do better.

Otherwise, LGTM.

Björn

[bug#30417] [PATCH 06/11] gnu: Add java-modello-core.

[Julien Lepiller]

* gnu/packages/java.scm (java-modello-core): New variable.
---
 gnu/packages/java.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index af9acd71f..d75960831 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2811,6 +2811,56 @@ 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 _
+             (substitute* '("modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java"
+                            "modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java")
+               (("src/test") "modello-core/src/test")))))))
+    (inputs
+     `(("java-plexus-utils" ,java-plexus-utils)
+       ("java-plexus-container-default-bootstrap" ,java-plexus-container-default-bootstrap)
+       ("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 license:asl2.0)))
+
 (define-public java-asm
   (package
     (name "java-asm")
-- 
2.16.1

[bug#30417] [PATCH 06/11] gnu: Add java-modello-core.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:33 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> * gnu/packages/java.scm (java-modello-core): New variable.
> ---
>  gnu/packages/java.scm | 50
> ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50
> insertions(+)
> 
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index af9acd71f..d75960831 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2811,6 +2811,56 @@ 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 _
> +             (substitute*
> '("modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java"
> +
> "modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java")
> +               (("src/test") "modello-core/src/test")))))))
> +    (inputs
> +     `(("java-plexus-utils" ,java-plexus-utils)
> +
> ("java-plexus-container-default-bootstrap" ,java-plexus-container-default-bootstrap)
> +       ("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 license:asl2.0)))

I'm not sure about how to declare the license:

If you consider only the code under modello-core, that is only
license:expat (if I havent overseen anything).

But as you are not working with snippets here, I think you have to look
at every file in the original source package. And there I found three
types of licenses:

* expat, as above
* asl2.0, like
  in ./modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java
* Finally, some kind of "5-clause-BSD":
./modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JNaming.java
I always have my troubles matching a license text to one of the
available licenses, so I quote it in full here:

/**
 * Redistribution and use of this software and associated documentation
 * ("Software"), with or without modification, are permitted provided
 * that the following conditions are met:
 *
 * 1. Redistributions of source code must retain copyright
 *    statements and notices.  Redistributions must also contain a
 *    copy of this document.
 *
 * 2. Redistributions in binary form must reproduce the
 *    above copyright notice, this list of conditions and the
 *    following disclaimer in the documentation and/or other
 *    materials provided with the distribution.
 *
 * 3. The name "Exolab" must not be used to endorse or promote
 *    products derived from this Software without prior written
 *    permission of Intalio, Inc.  For written permission,
 *    please contact info@codehaus.org.
 *
 * 4. Products derived from this Software may not be called "Exolab"
 *    nor may "Exolab" appear in their names without prior written
 *    permission of Intalio, Inc. Exolab is a registered
 *    trademark of Intalio, Inc.
 *
 * 5. Due credit should be given to the Exolab Project
 *    (http://www.codehaus.org/).
 *
 * THIS SOFTWARE IS PROVIDED BY INTALIO, INC. AND CONTRIBUTORS
 * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
 * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
 * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
 * INTALIO, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 * Copyright 1999-2000 (C) Intalio, Inc. All Rights Reserved.
 *
 * $Id$
 */


> +
>  (define-public java-asm
>    (package
>      (name "java-asm")

Linter found 3 lines too long:

/home/bjoern/guix/guix/gnu/packages/java.scm:2903:2:
java-modello-core@1.9.1: line 2930 is way too long (110
characters) /home/bjoern/guix/guix/gnu/packages/java.scm:2903:2:
java-modello-core@1.9.1: line 2931 is way too long (107
characters) /home/bjoern/guix/guix/gnu/packages/java.scm:2903:2:
java-modello-core@1.9.1: line 2935 is way too long (91 characters)

The first ones are the substitute*, I think that is OK. The last one
is the dependency:

       ("java-plexus-container-default-bootstrap" ,java-plexus-container-default-bootstrap)

That could be broken up in two lines.


Björn

[bug#30417] [PATCH 06/11] gnu: Add java-modello-core.

[Julien Lepiller]

Le Wed, 14 Feb 2018 21:22:25 +0100,
Björn Höfling <bjoern.hoefling@bjoernhoefling.de> a écrit :

> On Sun, 11 Feb 2018 00:04:33 +0100
> Julien Lepiller <julien@lepiller.eu> wrote:
> 
> > * gnu/packages/java.scm (java-modello-core): New variable.
> > ---
> >  gnu/packages/java.scm | 50
> > ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed,
> > 50 insertions(+)
> > 
> > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> > index af9acd71f..d75960831 100644
> > --- a/gnu/packages/java.scm
> > +++ b/gnu/packages/java.scm
> > @@ -2811,6 +2811,56 @@ 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 _
> > +             (substitute*
> > '("modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java"
> > +
> > "modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java")
> > +               (("src/test") "modello-core/src/test")))))))
> > +    (inputs
> > +     `(("java-plexus-utils" ,java-plexus-utils)
> > +
> > ("java-plexus-container-default-bootstrap" ,java-plexus-container-default-bootstrap)
> > +       ("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 license:asl2.0)))  
> 
> I'm not sure about how to declare the license:
> 
> If you consider only the code under modello-core, that is only
> license:expat (if I havent overseen anything).
> 
> But as you are not working with snippets here, I think you have to
> look at every file in the original source package. And there I found
> three types of licenses:
> 
> * expat, as above
> * asl2.0, like
>   in ./modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java
> * Finally, some kind of "5-clause-BSD":
> ./modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JNaming.java
> I always have my troubles matching a license text to one of the
> available licenses, so I quote it in full here:
> 
> /**
>  * Redistribution and use of this software and associated
> documentation
>  * ("Software"), with or without modification, are permitted provided
>  * that the following conditions are met:
>  *
>  * 1. Redistributions of source code must retain copyright
>  *    statements and notices.  Redistributions must also contain a
>  *    copy of this document.
>  *
>  * 2. Redistributions in binary form must reproduce the
>  *    above copyright notice, this list of conditions and the
>  *    following disclaimer in the documentation and/or other
>  *    materials provided with the distribution.
>  *
>  * 3. The name "Exolab" must not be used to endorse or promote
>  *    products derived from this Software without prior written
>  *    permission of Intalio, Inc.  For written permission,
>  *    please contact info@codehaus.org.
>  *
>  * 4. Products derived from this Software may not be called "Exolab"
>  *    nor may "Exolab" appear in their names without prior written
>  *    permission of Intalio, Inc. Exolab is a registered
>  *    trademark of Intalio, Inc.
>  *
>  * 5. Due credit should be given to the Exolab Project
>  *    (http://www.codehaus.org/).
>  *
>  * THIS SOFTWARE IS PROVIDED BY INTALIO, INC. AND CONTRIBUTORS
>  * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
>  * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
>  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
>  * INTALIO, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
>  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
>  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
>  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
>  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
>  * OF THE POSSIBILITY OF SUCH DAMAGE.
>  *
>  * Copyright 1999-2000 (C) Intalio, Inc. All Rights Reserved.
>  *
>  * $Id$
>  */

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?

> 
> 
> > +
> >  (define-public java-asm
> >    (package
> >      (name "java-asm")  
> 
> Linter found 3 lines too long:
> 
> /home/bjoern/guix/guix/gnu/packages/java.scm:2903:2:
> java-modello-core@1.9.1: line 2930 is way too long (110
> characters) /home/bjoern/guix/guix/gnu/packages/java.scm:2903:2:
> java-modello-core@1.9.1: line 2931 is way too long (107
> characters) /home/bjoern/guix/guix/gnu/packages/java.scm:2903:2:
> java-modello-core@1.9.1: line 2935 is way too long (91 characters)
> 
> The first ones are the substitute*, I think that is OK. The last one
> is the dependency:
> 
>        ("java-plexus-container-default-bootstrap" ,java-plexus-container-default-bootstrap)
> 
> That could be broken up in two lines.
> 
> 
> Björn

[bug#30417] [PATCH 06/11] gnu: Add java-modello-core.

[Björn Höfling]

On Wed, 14 Feb 2018 22:56:38 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> Le Wed, 14 Feb 2018 21:22:25 +0100,
> Björn Höfling <bjoern.hoefling@bjoernhoefling.de> a écrit :
> 
> > On Sun, 11 Feb 2018 00:04:33 +0100
> > Julien Lepiller <julien@lepiller.eu> wrote:
> >   
> > > * gnu/packages/java.scm (java-modello-core): New variable.
> > > ---
> > >  gnu/packages/java.scm | 50
> > > ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed,
> > > 50 insertions(+)
> > > 
> > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> > > index af9acd71f..d75960831 100644
> > > --- a/gnu/packages/java.scm
> > > +++ b/gnu/packages/java.scm
> > > @@ -2811,6 +2811,56 @@ 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 _
> > > +             (substitute*
> > > '("modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java"
> > > +
> > > "modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java")
> > > +               (("src/test") "modello-core/src/test")))))))
> > > +    (inputs
> > > +     `(("java-plexus-utils" ,java-plexus-utils)
> > > +
> > > ("java-plexus-container-default-bootstrap" ,java-plexus-container-default-bootstrap)
> > > +       ("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 license:asl2.0)))    
> > 
> > I'm not sure about how to declare the license:
> > 
> > If you consider only the code under modello-core, that is only
> > license:expat (if I havent overseen anything).
> > 
> > But as you are not working with snippets here, I think you have to
> > look at every file in the original source package. And there I found
> > three types of licenses:
> > 
> > * expat, as above
> > * asl2.0, like
> >   in ./modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java
> > * Finally, some kind of "5-clause-BSD":
> > ./modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JNaming.java
> > I always have my troubles matching a license text to one of the
> > available licenses, so I quote it in full here:
> > 
> > /**
> >  * Redistribution and use of this software and associated
> > documentation
> >  * ("Software"), with or without modification, are permitted
> > provided
> >  * that the following conditions are met:
> >  *
> >  * 1. Redistributions of source code must retain copyright
> >  *    statements and notices.  Redistributions must also contain a
> >  *    copy of this document.
> >  *
> >  * 2. Redistributions in binary form must reproduce the
> >  *    above copyright notice, this list of conditions and the
> >  *    following disclaimer in the documentation and/or other
> >  *    materials provided with the distribution.
> >  *
> >  * 3. The name "Exolab" must not be used to endorse or promote
> >  *    products derived from this Software without prior written
> >  *    permission of Intalio, Inc.  For written permission,
> >  *    please contact info@codehaus.org.
> >  *
> >  * 4. Products derived from this Software may not be called "Exolab"
> >  *    nor may "Exolab" appear in their names without prior written
> >  *    permission of Intalio, Inc. Exolab is a registered
> >  *    trademark of Intalio, Inc.
> >  *
> >  * 5. Due credit should be given to the Exolab Project
> >  *    (http://www.codehaus.org/).
> >  *
> >  * THIS SOFTWARE IS PROVIDED BY INTALIO, INC. AND CONTRIBUTORS
> >  * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
> >  * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
> >  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
> > SHALL
> >  * INTALIO, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
> >  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> > DAMAGES
> >  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> > OR
> >  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> > INTERRUPTION)
> >  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> > CONTRACT,
> >  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> >  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> > ADVISED
> >  * OF THE POSSIBILITY OF SUCH DAMAGE.
> >  *
> >  * Copyright 1999-2000 (C) Intalio, Inc. All Rights Reserved.
> >  *
> >  * $Id$
> >  */  
> 
> 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?

Björn

[bug#30417] [PATCH 06/11] gnu: Add java-modello-core.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 7604 bytes --]

Björn Höfling <bjoern.hoefling@bjoernhoefling.de> writes:

> On Wed, 14 Feb 2018 22:56:38 +0100
> Julien Lepiller <julien@lepiller.eu> wrote:
>
>> Le Wed, 14 Feb 2018 21:22:25 +0100,
>> Björn Höfling <bjoern.hoefling@bjoernhoefling.de> a écrit :
>> 
>> > On Sun, 11 Feb 2018 00:04:33 +0100
>> > Julien Lepiller <julien@lepiller.eu> wrote:
>> >   
>> > > * gnu/packages/java.scm (java-modello-core): New variable.
>> > > ---
>> > >  gnu/packages/java.scm | 50
>> > > ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed,
>> > > 50 insertions(+)
>> > > 
>> > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
>> > > index af9acd71f..d75960831 100644
>> > > --- a/gnu/packages/java.scm
>> > > +++ b/gnu/packages/java.scm
>> > > @@ -2811,6 +2811,56 @@ 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 _
>> > > +             (substitute*
>> > > '("modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java"
>> > > +
>> > > "modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java")
>> > > +               (("src/test") "modello-core/src/test")))))))
>> > > +    (inputs
>> > > +     `(("java-plexus-utils" ,java-plexus-utils)
>> > > +
>> > > ("java-plexus-container-default-bootstrap" ,java-plexus-container-default-bootstrap)
>> > > +       ("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 license:asl2.0)))    
>> > 
>> > I'm not sure about how to declare the license:
>> > 
>> > If you consider only the code under modello-core, that is only
>> > license:expat (if I havent overseen anything).
>> > 
>> > But as you are not working with snippets here, I think you have to
>> > look at every file in the original source package. And there I found
>> > three types of licenses:
>> > 
>> > * expat, as above
>> > * asl2.0, like
>> >   in ./modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java
>> > * Finally, some kind of "5-clause-BSD":
>> > ./modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JNaming.java
>> > I always have my troubles matching a license text to one of the
>> > available licenses, so I quote it in full here:
>> > 
>> > /**
>> >  * Redistribution and use of this software and associated
>> > documentation
>> >  * ("Software"), with or without modification, are permitted
>> > provided
>> >  * that the following conditions are met:
>> >  *
>> >  * 1. Redistributions of source code must retain copyright
>> >  *    statements and notices.  Redistributions must also contain a
>> >  *    copy of this document.
>> >  *
>> >  * 2. Redistributions in binary form must reproduce the
>> >  *    above copyright notice, this list of conditions and the
>> >  *    following disclaimer in the documentation and/or other
>> >  *    materials provided with the distribution.
>> >  *
>> >  * 3. The name "Exolab" must not be used to endorse or promote
>> >  *    products derived from this Software without prior written
>> >  *    permission of Intalio, Inc.  For written permission,
>> >  *    please contact info@codehaus.org.
>> >  *
>> >  * 4. Products derived from this Software may not be called "Exolab"
>> >  *    nor may "Exolab" appear in their names without prior written
>> >  *    permission of Intalio, Inc. Exolab is a registered
>> >  *    trademark of Intalio, Inc.
>> >  *
>> >  * 5. Due credit should be given to the Exolab Project
>> >  *    (http://www.codehaus.org/).
>> >  *
>> >  * THIS SOFTWARE IS PROVIDED BY INTALIO, INC. AND CONTRIBUTORS
>> >  * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
>> >  * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
>> >  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
>> > SHALL
>> >  * INTALIO, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
>> >  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
>> > DAMAGES
>> >  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
>> > OR
>> >  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>> > INTERRUPTION)
>> >  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>> > CONTRACT,
>> >  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>> >  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
>> > ADVISED
>> >  * OF THE POSSIBILITY OF SUCH DAMAGE.
>> >  *
>> >  * Copyright 1999-2000 (C) Intalio, Inc. All Rights Reserved.
>> >  *
>> >  * $Id$
>> >  */  
>> 
>> 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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30417] [PATCH 06/11] gnu: Add java-modello-core.

[Julien Lepiller]

[-- Attachment #1: Type: text/plain, Size: 8308 bytes --]

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:
> >  
> >> Le Wed, 14 Feb 2018 21:22:25 +0100,
> >> Björn Höfling <bjoern.hoefling@bjoernhoefling.de> a écrit :
> >>   
> >> > On Sun, 11 Feb 2018 00:04:33 +0100
> >> > Julien Lepiller <julien@lepiller.eu> wrote:
> >> >     
> >> > > * gnu/packages/java.scm (java-modello-core): New variable.
> >> > > ---
> >> > >  gnu/packages/java.scm | 50
> >> > > ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file
> >> > > changed, 50 insertions(+)
> >> > > 
> >> > > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> >> > > index af9acd71f..d75960831 100644
> >> > > --- a/gnu/packages/java.scm
> >> > > +++ b/gnu/packages/java.scm
> >> > > @@ -2811,6 +2811,56 @@ 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 _
> >> > > +             (substitute*
> >> > > '("modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java"
> >> > > +
> >> > > "modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java")
> >> > > +               (("src/test") "modello-core/src/test")))))))
> >> > > +    (inputs
> >> > > +     `(("java-plexus-utils" ,java-plexus-utils)
> >> > > +
> >> > > ("java-plexus-container-default-bootstrap" ,java-plexus-container-default-bootstrap)
> >> > > +       ("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 license:asl2.0)))      
> >> > 
> >> > I'm not sure about how to declare the license:
> >> > 
> >> > If you consider only the code under modello-core, that is only
> >> > license:expat (if I havent overseen anything).
> >> > 
> >> > But as you are not working with snippets here, I think you have
> >> > to look at every file in the original source package. And there
> >> > I found three types of licenses:
> >> > 
> >> > * expat, as above
> >> > * asl2.0, like
> >> >   in ./modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java
> >> > * Finally, some kind of "5-clause-BSD":
> >> > ./modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JNaming.java
> >> > I always have my troubles matching a license text to one of the
> >> > available licenses, so I quote it in full here:
> >> > 
> >> > /**
> >> >  * Redistribution and use of this software and associated
> >> > documentation
> >> >  * ("Software"), with or without modification, are permitted
> >> > provided
> >> >  * that the following conditions are met:
> >> >  *
> >> >  * 1. Redistributions of source code must retain copyright
> >> >  *    statements and notices.  Redistributions must also contain
> >> > a
> >> >  *    copy of this document.
> >> >  *
> >> >  * 2. Redistributions in binary form must reproduce the
> >> >  *    above copyright notice, this list of conditions and the
> >> >  *    following disclaimer in the documentation and/or other
> >> >  *    materials provided with the distribution.
> >> >  *
> >> >  * 3. The name "Exolab" must not be used to endorse or promote
> >> >  *    products derived from this Software without prior written
> >> >  *    permission of Intalio, Inc.  For written permission,
> >> >  *    please contact info@codehaus.org.
> >> >  *
> >> >  * 4. Products derived from this Software may not be called
> >> > "Exolab"
> >> >  *    nor may "Exolab" appear in their names without prior
> >> > written
> >> >  *    permission of Intalio, Inc. Exolab is a registered
> >> >  *    trademark of Intalio, Inc.
> >> >  *
> >> >  * 5. Due credit should be given to the Exolab Project
> >> >  *    (http://www.codehaus.org/).
> >> >  *
> >> >  * THIS SOFTWARE IS PROVIDED BY INTALIO, INC. AND CONTRIBUTORS
> >> >  * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
> >> > BUT
> >> >  * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
> >> >  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
> >> > SHALL
> >> >  * INTALIO, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
> >> >  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> >> > DAMAGES
> >> >  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
> >> > GOODS OR
> >> >  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> >> > INTERRUPTION)
> >> >  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> >> > CONTRACT,
> >> >  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> >> >  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> >> > ADVISED
> >> >  * OF THE POSSIBILITY OF SUCH DAMAGE.
> >> >  *
> >> >  * Copyright 1999-2000 (C) Intalio, Inc. All Rights Reserved.
> >> >  *
> >> >  * $Id$
> >> >  */    
> >> 
> >> 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?

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0007-gnu-Add-java-modello-core.patch --]
[-- Type: text/x-patch, Size: 3883 bytes --]

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

[bug#30417] [PATCH 06/11] gnu: Add java-modello-core.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 5362 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30417] [PATCH 07/11] gnu: Add java-modello-plugins-java.

[Julien Lepiller]

* gnu/packages/java.scm (java-modello-plugins-java): New variable.
---
 gnu/packages/java.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d75960831..76a586a98 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2861,6 +2861,28 @@ single model, including Java POJOs, XML/JSON/YAML marshallers/unmarshallers,
 XSD and documentation.")
     (license license:asl2.0)))
 
+(define-public java-modello-plugins-java
+  (package
+    (inherit java-modello-core)
+    (name "java-modello-plugins-java")
+    (arguments
+     `(#:jar-name "modello-plugins-java.jar"
+       #:source-dir "modello-plugins/modello-plugin-java/src/main/java"
+       #:test-dir "modello-plugins/modello-plugin-java/src/test"
+       #:jdk ,icedtea-8
+       #:tests? #f; requires maven-model, which depends on this package
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'copy-resources
+           (lambda _
+             (mkdir-p "build/classes")
+             (copy-recursively "modello-plugins/modello-plugin-java/src/main/resources"
+                               "build/classes")
+             #t)))))
+    (inputs
+     `(("java-modello-core" ,java-modello-core)
+       ,@(package-inputs java-modello-core)))))
+
 (define-public java-asm
   (package
     (name "java-asm")
-- 
2.16.1

[bug#30417] [PATCH 07/11] gnu: Add java-modello-plugins-java.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:34 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> * gnu/packages/java.scm (java-modello-plugins-java): New variable.
> ---
>  gnu/packages/java.scm | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index d75960831..76a586a98 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2861,6 +2861,28 @@ single model, including Java POJOs,
> XML/JSON/YAML marshallers/unmarshallers, XSD and documentation.")
>      (license license:asl2.0)))
>  
> +(define-public java-modello-plugins-java
> +  (package
> +    (inherit java-modello-core)
> +    (name "java-modello-plugins-java")
> +    (arguments
> +     `(#:jar-name "modello-plugins-java.jar"
> +       #:source-dir
> "modello-plugins/modello-plugin-java/src/main/java"
> +       #:test-dir "modello-plugins/modello-plugin-java/src/test"
> +       #:jdk ,icedtea-8
> +       #:tests? #f; requires maven-model, which depends on this
> package
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'build 'copy-resources
> +           (lambda _
> +             (mkdir-p "build/classes")
> +             (copy-recursively
> "modello-plugins/modello-plugin-java/src/main/resources"
> +                               "build/classes")
> +             #t)))))
> +    (inputs
> +     `(("java-modello-core" ,java-modello-core)
> +       ,@(package-inputs java-modello-core)))))
> +
>  (define-public java-asm
>    (package
>      (name "java-asm")

License: This is again a mixture of ASL and "5-clause-BSD" like in
./modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JModifiers.java

Compare with comments in java-modello-core.

Synopsys and Description are inherited from java-modello-core but
should be specialized here.

Otherwise, LGTM.

Björn

[bug#30417] [PATCH 08/11] gnu: Add java-modello-plugins-xml.

[Julien Lepiller]

* gnu/packages/java.scm (java-modello-plugins-xml): New variable.
---
 gnu/packages/java.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 76a586a98..1f29e3a29 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2883,6 +2883,32 @@ XSD and documentation.")
      `(("java-modello-core" ,java-modello-core)
        ,@(package-inputs java-modello-core)))))
 
+(define-public java-modello-plugins-xml
+  (package
+    (inherit java-modello-core)
+    (name "java-modello-plugins-xml")
+    (arguments
+     `(#:jar-name "modello-plugins-xml.jar"
+       #:source-dir "modello-plugins/modello-plugin-xml/src/main/java"
+       #:test-dir "modello-plugins/modello-plugin-xml/src/test"
+       #:jdk ,icedtea-8
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'copy-resources
+           (lambda _
+             (mkdir-p "build/classes")
+             (copy-recursively "modello-plugins/modello-plugin-xml/src/main/resources"
+                               "build/classes")
+             #t))
+         (add-before 'check 'fix-paths
+           (lambda _
+             (substitute* "modello-plugins/modello-plugin-xml/src/test/java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java"
+               (("src/test") "modello-plugins/modello-plugin-xml/src/test")))))))
+    (inputs
+     `(("java-modello-core" ,java-modello-core)
+       ("java-modello-plugins-java" ,java-modello-plugins-java)
+       ,@(package-inputs java-modello-core)))))
+
 (define-public java-asm
   (package
     (name "java-asm")
-- 
2.16.1

[bug#30417] [PATCH 08/11] gnu: Add java-modello-plugins-xml.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:35 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> * gnu/packages/java.scm (java-modello-plugins-xml): New variable.

All comments for java-modello-plugins-java hold here too.

Björn

[bug#30417] [PATCH 09/11] gnu: Add java-modello-test.

[Julien Lepiller]

gnu/packages/java.scm (java-modello-test): New variable.
---
 gnu/packages/java.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 1f29e3a29..18ba46c5c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2909,6 +2909,21 @@ XSD and documentation.")
        ("java-modello-plugins-java" ,java-modello-plugins-java)
        ,@(package-inputs java-modello-core)))))
 
+(define-public java-modello-test
+  (package
+    (inherit java-modello-core)
+    (name "java-modello-test")
+    (arguments
+     `(#:jar-name "modello-test.jar"
+       #:source-dir "modello-test/src/main/java"
+       #:tests? #f; no tests
+       #:jdk ,icedtea-8))
+    (inputs
+     `(("java-plexus-utils" ,java-plexus-utils)
+       ("java-plexus-compiler-api" ,java-plexus-compiler-api)
+       ("java-plexus-compiler-javac" ,java-plexus-compiler-javac)
+       ("java-plexus-container-default" ,java-plexus-container-default)))))
+
 (define-public java-asm
   (package
     (name "java-asm")
-- 
2.16.1

[bug#30417] [PATCH 09/11] gnu: Add java-modello-test.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:36 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> gnu/packages/java.scm (java-modello-test): New variable.

All comments for java-modello-plugins-java hold here too.

Especially synopsis/description should be different here,
 as this is a testing package like junit is.

Björn

[bug#30417] [PATCH 10/11] gnu: Add java-modello-plugins-xpp3.

[Julien Lepiller]

gnu/packages/java.scm (java-modello-plugins-xpp3): New variable.
---
 gnu/packages/java.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 18ba46c5c..758665df9 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2924,6 +2924,34 @@ XSD and documentation.")
        ("java-plexus-compiler-javac" ,java-plexus-compiler-javac)
        ("java-plexus-container-default" ,java-plexus-container-default)))))
 
+(define-public java-modello-plugins-xpp3
+  (package
+    (inherit java-modello-core)
+    (name "java-modello-plugins-xpp3")
+    (arguments
+     `(#:jar-name "modello-plugins-xpp3.jar"
+       #:source-dir "modello-plugins/modello-plugin-xpp3/src/main/java"
+       #:test-dir "modello-plugins/modello-plugin-xpp3/src/test"
+       #:tests? #f; I can find some of its dependencies, for instance org.codehaus.modello.test.features.io.xpp3.ModelloFeaturesTestXpp3Reader
+       #:jdk ,icedtea-8
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'copy-resources
+           (lambda _
+             (mkdir-p "build/classes")
+             (copy-recursively "modello-plugins/modello-plugin-xpp3/src/main/resources"
+                               "build/classes")
+             #t)))))
+    (inputs
+     `(("java-modello-core" ,java-modello-core)
+       ("java-modello-plugins-java" ,java-modello-plugins-java)
+       ("java-modello-plugins-xml" ,java-modello-plugins-xml)
+       ,@(package-inputs java-modello-core)))
+    (native-inputs
+     `(("java-xmlunit" ,java-xmlunit)
+       ("java-modello-test" ,java-modello-test)
+       ,@(package-native-inputs java-modello-core)))))
+
 (define-public java-asm
   (package
     (name "java-asm")
-- 
2.16.1

[bug#30417] [PATCH 10/11] gnu: Add java-modello-plugins-xpp3.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:37 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> gnu/packages/java.scm (java-modello-plugins-xpp3): New variable.
> ---
>  gnu/packages/java.scm | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
> 
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index 18ba46c5c..758665df9 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2924,6 +2924,34 @@ XSD and documentation.")
>         ("java-plexus-compiler-javac" ,java-plexus-compiler-javac)
>         ("java-plexus-container-default" ,java-plexus-container-default)))))
>  
> +(define-public java-modello-plugins-xpp3
> +  (package
> +    (inherit java-modello-core)
> +    (name "java-modello-plugins-xpp3")
> +    (arguments
> +     `(#:jar-name "modello-plugins-xpp3.jar"
> +       #:source-dir
> "modello-plugins/modello-plugin-xpp3/src/main/java"
> +       #:test-dir "modello-plugins/modello-plugin-xpp3/src/test"

The following line is too long:

> +       #:tests? #f; I can find some of its dependencies, for
> instance
> org.codehaus.modello.test.features.io.xpp3.ModelloFeaturesTestXpp3Reader

Did you really mean "I can find" or did you mean the opposite: "I can't
find"? I would expect here reasons of why the tests are NOT executable.

> +       #:jdk ,icedtea-8
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'build 'copy-resources
> +           (lambda _
> +             (mkdir-p "build/classes")
> +             (copy-recursively
> "modello-plugins/modello-plugin-xpp3/src/main/resources"
> +                               "build/classes")
> +             #t)))))
> +    (inputs
> +     `(("java-modello-core" ,java-modello-core)
> +       ("java-modello-plugins-java" ,java-modello-plugins-java)
> +       ("java-modello-plugins-xml" ,java-modello-plugins-xml)
> +       ,@(package-inputs java-modello-core)))
> +    (native-inputs
> +     `(("java-xmlunit" ,java-xmlunit)
> +       ("java-modello-test" ,java-modello-test)
> +       ,@(package-native-inputs java-modello-core)))))
> +
>  (define-public java-asm
>    (package
>      (name "java-asm")

License, description, synopsis: See java-modello-plugins-java.

Björn

[bug#30417] [PATCH 11/11] gnu: Add java-plexus-sec-dispatcher.

[Julien Lepiller]

* gnu/packages/java.scm (java-plexus-sec-dispatcher): New variable.
---
 gnu/packages/java.scm | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 758665df9..bd3fc7e70 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2757,6 +2757,94 @@ compilers.")
     (description "This package contains the Javac Compiler support for Plexus
 Compiler component.")))
 
+(define-public java-plexus-sec-dispatcher
+  (package
+    (name "java-plexus-sec-dispatcher")
+    (version "1.4") ;; Newest release listed at the Maven Central Repository.
+    (source (origin
+              ;; This project doesn't tag releases or publish tarballs, so we take
+              ;; the "prepare release plexus-sec-dispatcher-1.4" git commit.
+              (method url-fetch)
+              (uri (string-append "https://github.com/sonatype/plexus-sec-dispatcher/"
+                                  "archive/7db8f88048.tar.gz"))
+              (sha256
+               (base32
+                "1smfrk4n7xbrsxpxcp2j4i0j8q86j73w0w6xg7qz83dp6dagdjgp"))
+              (file-name (string-append name "-" version ".tar.gz"))))
+    (arguments
+     `(#:jar-name "plexus-sec-dispatcher.jar"
+       #:source-dir "src/main/java"
+       #:jdk ,icedtea-8
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'generate-models
+           (lambda* (#:key inputs #:allow-other-keys)
+             (define (modello-single-mode file version mode)
+               (zero? (system* "java"
+                               "org.codehaus.modello.ModelloCli"
+                               file mode "src/main/java" version
+                               "false" "true")))
+             (let ((file "src/main/mdo/settings-security.mdo"))
+               (and
+               (modello-single-mode file "1.0.0" "java")
+               (modello-single-mode file "1.0.0" "xpp3-reader")
+               (modello-single-mode file "1.0.0" "xpp3-writer")))))
+         (add-before 'build 'generate-components.xml
+           (lambda _
+             (mkdir-p "build/classes/META-INF/plexus")
+             (with-output-to-file "build/classes/META-INF/plexus/components.xml"
+               (lambda _
+                 (display
+                   "<component-set>\n
+  <components>\n
+    <component>\n
+      <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role>\n
+      <role-hint>default</role-hint>\n
+      <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation>\n
+      <description></description>\n
+      <requirements>\n
+        <requirement>\n
+          <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>\n
+          <field-name>_cipher</field-name>\n
+        </requirement>\n
+        <requirement>\n
+          <role>org.sonatype.plexus.components.sec.dispatcher.PasswordDecryptor</role>\n
+          <field-name>_decryptors</field-name>\n
+        </requirement>\n
+      </requirements>\n
+      <configuration>\n
+        <_configuration-file>~/.settings-security.xml</_configuration-file>\n
+      </configuration>\n
+    </component>\n
+  </components>\n
+</component-set>\n")))))
+         (add-before 'check 'fix-paths
+           (lambda _
+             (copy-recursively "src/test/resources" "target"))))))
+    (inputs
+     `(("java-plexus-cipher" ,java-plexus-cipher)))
+    (native-inputs
+     `(("java-modello-core" ,java-modello-core)
+       ;; for modello:
+       ("java-plexus-container-default" ,java-plexus-container-default)
+       ("java-plexus-classworlds" ,java-plexus-classworlds)
+       ("java-plexus-utils" ,java-plexus-utils)
+       ("java-guava" ,java-guava)
+       ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect)
+       ("java-sisu-build-api" ,java-sisu-build-api)
+       ;; modello plugins:
+       ("java-modellop-plugins-java" ,java-modello-plugins-java)
+       ("java-modellop-plugins-xml" ,java-modello-plugins-xml)
+       ("java-modellop-plugins-xpp3" ,java-modello-plugins-xpp3)
+       ;; for tests
+       ("java-junit" ,java-junit)))
+    (build-system ant-build-system)
+    (home-page "http://spice.sonatype.org/plexus-sec-dispatcher/")
+    (synopsis "Plexus Security Dispatcher Component")
+    (description "This package is the Plexus Security Dispatcher Component.
+This component descrypts a string passed to it")
+    (license license:asl2.0)))
+
 (define-public java-sisu-build-api
   (package
     (name "java-sisu-build-api")
-- 
2.16.1

[bug#30417] [PATCH 11/11] gnu: Add java-plexus-sec-dispatcher.

[Björn Höfling]

On Sun, 11 Feb 2018 00:04:38 +0100
Julien Lepiller <julien@lepiller.eu> wrote:

> * gnu/packages/java.scm (java-plexus-sec-dispatcher): New variable.
> ---
>  gnu/packages/java.scm | 88
> +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed,
> 88 insertions(+)
> 
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index 758665df9..bd3fc7e70 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2757,6 +2757,94 @@ compilers.")
>      (description "This package contains the Javac Compiler support
> for Plexus Compiler component.")))
>  
> +(define-public java-plexus-sec-dispatcher
> +  (package
> +    (name "java-plexus-sec-dispatcher")

[...]

> +    (home-page "http://spice.sonatype.org/plexus-sec-dispatcher/")
> +    (synopsis "Plexus Security Dispatcher Component")
> +    (description "This package is the Plexus Security Dispatcher
> Component. +This component descrypts a string passed to it")

Spelling: s/descrypts/decrypts/
Add a full-stop "." at the end of the last sentence.

Otherwise, LGTM.

Björn

[bug#30417] [PATCH 11/11] gnu: Add java-plexus-sec-dispatcher.

[Björn Höfling]

On Wed, 14 Feb 2018 21:59:19 +0100
Björn Höfling <bjoern.hoefling@bjoernhoefling.de> wrote:

> On Sun, 11 Feb 2018 00:04:38 +0100
> Julien Lepiller <julien@lepiller.eu> wrote:
> 
> > * gnu/packages/java.scm (java-plexus-sec-dispatcher): New variable.
> > ---
> >  gnu/packages/java.scm | 88
> > +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed,
> > 88 insertions(+)
> > 
> > diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> > index 758665df9..bd3fc7e70 100644
> > --- a/gnu/packages/java.scm
> > +++ b/gnu/packages/java.scm
> > @@ -2757,6 +2757,94 @@ compilers.")
> >      (description "This package contains the Javac Compiler support
> > for Plexus Compiler component.")))
> >  
> > +(define-public java-plexus-sec-dispatcher
> > +  (package
> > +    (name "java-plexus-sec-dispatcher")  
> 
> [...]
> 
> > +    (home-page "http://spice.sonatype.org/plexus-sec-dispatcher/")
> > +    (synopsis "Plexus Security Dispatcher Component")
> > +    (description "This package is the Plexus Security Dispatcher
> > Component. +This component descrypts a string passed to it")  
> 
> Spelling: s/descrypts/decrypts/
> Add a full-stop "." at the end of the last sentence.
> 
> Otherwise, LGTM.
> 
> Björn

Sorry, here is one more point:

The linter didn't complain about the homepage, but for me this is not
reachable. I would suggest:

https://github.com/sonatype/plexus-sec-dispatcher

Björn

bug#30417: [PATCH] java-plexus and java-modello

[Julien Lepiller]

Le Sat, 10 Feb 2018 23:48:11 +0100,
Julien Lepiller <julien@lepiller.eu> a écrit :

> Hi, this patch series adds more java packages required by maven. We're
> almost there: only ~50 packages (including maven) left after these
> ones.

Pushed as 0aa85081d6319b582d53e9113be41cbe1a59f2a8. Thank you for your
review!