From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ephFi-0002hU-A9 for guix-patches@gnu.org; Sat, 24 Feb 2018 16:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ephFe-0006GR-1d for guix-patches@gnu.org; Sat, 24 Feb 2018 16:21:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:51195) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ephFd-0006GL-Tv for guix-patches@gnu.org; Sat, 24 Feb 2018 16:21:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ephFd-0006fl-Nx for guix-patches@gnu.org; Sat, 24 Feb 2018 16:21:01 -0500 Subject: [bug#30417] [PATCH 06/11] gnu: Add java-modello-core. Resent-Message-ID: From: Marius Bakke In-Reply-To: <20180224221108.63006124@lepiller.eu> References: <20180210234811.40ddec07@lepiller.eu> <20180210230438.26794-6-julien@lepiller.eu> <20180214212225.07b5d25b@alma-ubu> <20180214225638.374d098f@lepiller.eu> <20180216201637.73fe7c9c@alma-ubu> <878tbrveok.fsf@fastmail.com> <20180224221108.63006124@lepiller.eu> Date: Sat, 24 Feb 2018 22:20:13 +0100 Message-ID: <87o9ke84qa.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Julien Lepiller , 30417@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Julien Lepiller writes: > Le Sat, 17 Feb 2018 16:06:19 +0100, > Marius Bakke a =C3=A9crit : > >> Bj=C3=B6rn H=C3=B6fling writes: >>=20 >> > On Wed, 14 Feb 2018 22:56:38 +0100 >> > Julien Lepiller 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?=20=20 >> > >> > >> > I'm not a license expert. Has anyone else a opinion on that?=20=20 >>=20 >> 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. >>=20 >> 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 > 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))) >=20=20 > +(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/mo= dello" > + "/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/c= odehaus" > + (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 simp= le model. > + > +Modello generates code from a simple model format: based on a plugin > +architecture, various types of code and descriptors can be generated fro= m the > +single model, including Java POJOs, XML/JSON/YAML marshallers/unmarshall= ers, > +XSD and documentation.") > + (license (list > + license:expat > + ;; Although this package uses only files licensed under e= xpat, > + ;; other parts of the source are licensed under different > + ;; licenses. We include them to be inherited by other pa= ckages. > + 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/plug= in/" > + "java/javasource/JNaming.java")))))) > + > (define-public java-asm > (package > (name "java-asm") > --=20 > 2.16.2 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqR1w0ACgkQoqBt8qM6 VPoJ0AgA0QT3GI4x4SXCOhm5RcqEFDjd9ZSs0tJMhtyT0zAFFxhcWNvPLPoQySlG 5hdx88uILiSdqT6NIVRYZytboQaJ4d0R2faYiAeaJ+Ku03uQgtMgSnTBKwbmMwEn U7gOc5ltEBVz5LabmwKuk7+zxJ1Ch0lbOdiZzKetoWErDc/5EHrjJNqZypd+iTPn ytGo6Cek8CRSoiXQ9kn3+BgDOH2q0QXQEFlwDBAnLKvS9l7AFjYL8ICNjwhp/CTd 2trzD/oj1UvYKisub7LmstJ3i03DeRO72toI789Qgc/ZP4VJB/bnQuzl0lMqlSae YeicWRj9tIbDE690cmbv8x/X4RbbUg== =cvZ7 -----END PGP SIGNATURE----- --=-=-=--