From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 26 02:55:57 2022 Received: (at submit) by debbugs.gnu.org; 26 Jun 2022 06:55:57 +0000 Received: from localhost ([127.0.0.1]:46605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o5MBL-00042q-Hi for submit@debbugs.gnu.org; Sun, 26 Jun 2022 02:55:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:35774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o5MBI-00042h-LS for submit@debbugs.gnu.org; Sun, 26 Jun 2022 02:55:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5MBI-00070q-Cq for guix-patches@gnu.org; Sun, 26 Jun 2022 02:55:40 -0400 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]:37494) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o5MBG-0003wS-4R for guix-patches@gnu.org; Sun, 26 Jun 2022 02:55:40 -0400 Received: by mail-lf1-x135.google.com with SMTP id t24so11422644lfr.4 for ; Sat, 25 Jun 2022 23:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:user-agent:mime-version; bh=kVBnVBJQL3Zdj9Sfjv099KR1xh0ZfEu6x1ky7VULtNw=; b=Y3qiIQP55F6em1cNIAtjsjfURRBRCvPiTrmXBVqu6aMgo4uZUwTrji7Cx11vh//2cp vft2gfwXOEqkzyEouEyfLbSLUnwChUo3sHtADG5dyoviwQ3CrgQagxth2q4kttnIErgv s+F8ogmh4zQ/UhHuGgCJhLoYN0iQ0lM6jEef4orFm8IGAWlPET2vULPYpKsRot+Dv9Gp c+jFKAgxtOuUmCnBBlUVgvhle60NTx4vh3dsblrzFbUDUcjcuOXPCMU8dbxNoShLecWK YMjUfTffjIx2n5+X+DywjuECzcfutUfVD1WuoUQ+X+IXNOFAXmC4ZhUB1wXH/CSJo9GQ JGow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=kVBnVBJQL3Zdj9Sfjv099KR1xh0ZfEu6x1ky7VULtNw=; b=M6EJDo6VpX+qCuX8jGzz7+0WecnCyI3lsiDys7aV+MLf08P5xyzE2XRBzyn4z2l6xL ut4hKck5l23/m15eDwdlbAhFk0zKc+5A3Q5rRTt1Bz70WDm/+9RpnMO2SUB/YIQz5Q2S LXiqYqOdOK1pSNgKVuxv59AGDa/lXFnJd7LbmuqfYAso+3Bx14hynOEZp39SivPMiXtA 2Efqq/ADAvWDSurDXJ1Lo5vY6SNEybCvqfA4aa5LalbkaLalPMgaDd1rWbTKVvKVnEv9 YvFuTYbizn76qhDH+D0ZK+k4vPOxL94TXjpcZ/jc7KgTY1jxUWIvwJBLt9UzZzSWV0Jt ZaRQ== X-Gm-Message-State: AJIora9sy0k6aTg0GhWruRZHePuK3vJ+4DV0QFPoznKW61lM4YT5hutf i2yf8inra2i8Pn8hJ2Cll929JrmY/qM= X-Google-Smtp-Source: AGRyM1sRdqTcI9W90obZV80Z5eDkJafpvzSq2wAvUZQBcBfBjLfK6xOmE85n7sXEiE9BCS68MW6lMw== X-Received: by 2002:a05:6512:12c1:b0:481:1245:4cec with SMTP id p1-20020a05651212c100b0048112454cecmr1337930lfg.249.1656226535820; Sat, 25 Jun 2022 23:55:35 -0700 (PDT) Received: from elephant ([5.164.222.47]) by smtp.gmail.com with ESMTPSA id v6-20020a05651203a600b0047fae90bfb4sm1235311lfp.56.2022.06.25.23.55.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jun 2022 23:55:35 -0700 (PDT) From: "Artyom V. Poptsov" To: guix-patches@gnu.org Subject: [PATCH] gnu: Add 'maven-doxia-test-docs' and some Doxia modules Date: Sun, 26 Jun 2022 09:55:31 +0300 Message-ID: <87sfnr3od8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x135.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello, this patchset adds 'maven-doxia-test-docs' and the following Doxia modules: - 'maven-doxia-module-apt' - 'maven-doxia-module-xdoc' - 'maven-doxia-module-xhtml' - 'maven-doxia-module-xhtml5' --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-Add-maven-doxia-test-docs.patch Content-Transfer-Encoding: quoted-printable From=2047508fa7b17bc6957e18f7c547c6ffc1339e551c Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 26 Jun 2022 09:15:44 +0300 Subject: [PATCH 1/5] gnu: Add maven-doxia-test-docs. * gnu/packages/maven.scm (maven-doxia-test-docs): New variable. =2D-- gnu/packages/maven.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index f84f1ae177..f26a1acda4 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3965,3 +3965,30 @@ techniques for generating static and dynamic content= , supporting a variety of markup languages. =20 This package contains Doxia core classes and interfaces."))) + +(define-public maven-doxia-test-docs + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-test-docs") + (arguments + `(#:jar-name "doxia-test-docs.jar" + #:tests? #f ; no tests. + #:source-dir "doxia-test-docs/src/main/" + #:phases (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes") + (copy-recursively "doxia-test-docs/src/main/resource= s" + "build/classes") + #t)) + (replace 'install + (install-from-pom "doxia-test-docs/pom.xml"))))) + (propagated-inputs (list maven-doxia-parent-pom)) + (synopsis "Several test documents to check syntax structures under Dox= ia") + (description + "Doxia is a content generation framework that provides powerful +techniques for generating static and dynamic content, supporting a variety= of +markup languages. + +This package contains several test documents to check syntax structures un= der +Doxia."))) =2D-=20 2.25.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-gnu-Add-maven-doxia-module-apt.patch Content-Transfer-Encoding: quoted-printable From=20e20493b649abe268adf6755c82cc9c5d33f1deb4 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 26 Jun 2022 04:08:35 +0300 Subject: [PATCH 2/5] gnu: Add maven-doxia-module-apt. * gnu/packages/maven.scm (maven-doxia-module-apt): New variable. (maven-doxia-modules-parent-pom): New private variable. =2D-- gnu/packages/maven.scm | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index f26a1acda4..ac5b6bc3bc 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3992,3 +3992,50 @@ markup languages. =20 This package contains several test documents to check syntax structures un= der Doxia."))) + +(define maven-doxia-modules-parent-pom + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-modules-parent-pom") + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "doxia-modules/pom.xml"))))) + (propagated-inputs + (list maven-doxia-parent-pom + maven-doxia-sink-api + maven-doxia-core)) + (synopsis "Content generation framework") + (description "@samp{Doxia} is a content generation framework that prov= ides +powerful techniques for generating static and dynamic content, supporting a +variety of markup languages. + +This package contains the parent POM of all Doxia modules."))) + +(define-public maven-doxia-module-apt + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-module-apt") + (arguments + `(#:jar-name "doxia-module-apt.jar" + #:source-dir "doxia-modules/doxia-module-apt/src/main/java" + #:test-dir "doxia-modules/doxia-module-apt/src/test/java" + #:tests? #f ;tests require JUnit5 + #:phases (modify-phases %standard-phases + (replace 'install + (install-from-pom "doxia-modules/doxia-module-apt/pom.= xml"))))) + (native-inputs (list maven-doxia-test-docs + java-junit + java-guice + java-xmlunit + java-xmlunit-matchers + java-slf4j-simple)) + (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api + java-javax-inject java-plexus-utils)) + (synopsis "Doxia module for APT source documents") + (description "A Doxia module for Almost Plain Text source documents. = APT +format is supported both as source and target formats."))) + =2D-=20 2.25.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0003-gnu-Add-maven-doxia-module-xdoc.patch Content-Transfer-Encoding: quoted-printable From=20e4e292e99ff5ee9d2ba8a53f429d2b1e14d37658 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 26 Jun 2022 09:44:40 +0300 Subject: [PATCH 3/5] gnu: Add maven-doxia-module-xdoc. * gnu/packages/maven.scm (maven-doxia-module-xdoc): New variable. =2D-- gnu/packages/maven.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index ac5b6bc3bc..520652812a 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -4039,3 +4039,27 @@ This package contains the parent POM of all Doxia mo= dules."))) (description "A Doxia module for Almost Plain Text source documents. = APT format is supported both as source and target formats."))) =20 +(define-public maven-doxia-module-xdoc + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-module-xdoc") + (arguments + `(#:jar-name "doxia-module-xdoc.jar" + #:source-dir "doxia-modules/doxia-module-xdoc/src/main/java" + #:test-dir "doxia-modules/doxia-module-xdoc/src/test/java" + #:tests? #f ;tests require JUnit5 + #:phases (modify-phases %standard-phases + (replace 'install + (install-from-pom "doxia-modules/doxia-module-xdoc/pom= .xml"))))) + (native-inputs (list maven-doxia-test-docs + java-junit + java-guice + java-xmlunit + java-xmlunit-matchers + java-slf4j-simple)) + (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api + java-javax-inject java-plexus-utils)) + (synopsis "Doxia module for Xdoc source documents") + (description "A Doxia module for Xdoc source documents. Xdoc format is +supported both as source and target formats."))) + =2D-=20 2.25.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0004-gnu-Add-maven-doxia-module-xhtml.patch Content-Transfer-Encoding: quoted-printable From=207674444b9d93c2f4827c34ed072b15f0adf49324 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 26 Jun 2022 09:46:36 +0300 Subject: [PATCH 4/5] gnu: Add maven-doxia-module-xhtml. * gnu/packages/maven.scm (maven-doxia-module-xhtml): New variable. =2D-- gnu/packages/maven.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 520652812a..536ec8bda6 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -4063,3 +4063,27 @@ format is supported both as source and target format= s."))) (description "A Doxia module for Xdoc source documents. Xdoc format is supported both as source and target formats."))) =20 +(define-public maven-doxia-module-xhtml + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-module-xhtml") + (arguments + `(#:jar-name "doxia-module-xhtml.jar" + #:source-dir "doxia-modules/doxia-module-xhtml/src/main/java" + #:test-dir "doxia-modules/doxia-module-xhtml/src/test/java" + #:tests? #f ;tests require JUnit5 + #:phases (modify-phases %standard-phases + (replace 'install + (install-from-pom "doxia-modules/doxia-module-xhtml/po= m.xml"))))) + (native-inputs (list maven-doxia-test-docs + java-junit + java-guice + java-xmlunit + java-xmlunit-matchers + java-slf4j-simple)) + (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api + java-javax-inject java-plexus-utils)) + (synopsis "Doxia module for Xhtml source documents") + (description "A Doxia module for Xhtml source documents. Xhtml format= is +supported both as source and target formats."))) + =2D-=20 2.25.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0005-gnu-Add-maven-doxia-module-xhtml5.patch Content-Transfer-Encoding: quoted-printable From=20d3460af65680529ae678b95a68ddb511b88b84ce Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 26 Jun 2022 09:49:39 +0300 Subject: [PATCH 5/5] gnu: Add maven-doxia-module-xhtml5. * gnu/packages/maven.scm (maven-doxia-module-xhtml5): New variable. =2D-- gnu/packages/maven.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 536ec8bda6..fbe5f5b62f 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -4087,3 +4087,27 @@ supported both as source and target formats."))) (description "A Doxia module for Xhtml source documents. Xhtml format= is supported both as source and target formats."))) =20 +(define-public maven-doxia-module-xhtml5 + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-module-xhtml5") + (arguments + `(#:jar-name "doxia-module-xhtml5.jar" + #:source-dir "doxia-modules/doxia-module-xhtml5/src/main/java" + #:test-dir "doxia-modules/doxia-module-xhtml5/src/test/java" + #:tests? #f ;tests require JUnit5 + #:phases (modify-phases %standard-phases + (replace 'install + (install-from-pom "doxia-modules/doxia-module-xhtml5/p= om.xml"))))) + (native-inputs (list maven-doxia-test-docs + java-junit + java-guice + java-xmlunit + java-xmlunit-matchers + java-slf4j-simple)) + (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api + java-javax-inject java-plexus-utils)) + (synopsis "Doxia module for Xhtml5 source documents") + (description "A Doxia module for Xhtml5 source documents. Xhtml5 form= at is +supported both as source and target formats."))) + =2D-=20 2.25.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Thanks, =2D Artyom =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmK4AuMACgkQ6cWi2QiY oC+8mggAsAl5LgaH4h3TAp583q57eGrdsE8bx35yD5WV8VdtAE14VkJyJ0ZBXUXR 5E0Y9TqUGQ/Ed/TjokDJ00cXkr4PvPtzL25qUOexPvnOKZSCjtwJJKxrv/Sq7d7Q nlnk6osHaR5din38P1c7UrY9i+UvEABCyYsLt7gU+c2AWGXUxJFjI7WVzyYoNedo Xa0nC4Hxnp+KBXgl1Zq7qOaNDiAPjhNRhmZDPXD6HQtPQLgNi/2Uv6FbI4feZhcM IAS+rLKrc1VStYUb/9mSEIdqUH3Ls53c05cW1wJcqfOurZcYRbsCFFWJ4ghTb/le pefPRj5ntbMD5ztfAOsUUyQUY8Kafw== =rksQ -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 20 13:46:15 2022 Received: (at submit) by debbugs.gnu.org; 20 Sep 2022 17:46:15 +0000 Received: from localhost ([127.0.0.1]:59554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oahK2-0003Rw-8V for submit@debbugs.gnu.org; Tue, 20 Sep 2022 13:46:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:35178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oahK0-0003Ro-9N for submit@debbugs.gnu.org; Tue, 20 Sep 2022 13:46:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oahJz-0003D3-Ct for guix-patches@gnu.org; Tue, 20 Sep 2022 13:46:12 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]:45752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oahJr-0005Ph-2B for guix-patches@gnu.org; Tue, 20 Sep 2022 13:46:11 -0400 Received: by mail-lf1-x12b.google.com with SMTP id w8so5009010lft.12 for ; Tue, 20 Sep 2022 10:46:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:to:from:from:to:cc:subject:date; bh=0cFVWu2MfToJrgTlaStLUilq7RxjKcGGdBPhO6uGUZo=; b=q4O1liJRqfz01r595fizJCkPk0noBcLc9QJdKdXrxaIp+2C8WuPbks6oeR6k5GxAsj IoTn3V5N8+OU+84T09QxJnQ8JjMx+92Kr/AksUsO4jiv/npVRz7CrU0pJGPu3PdFAX/U CmomC6Yo+k+P4UmSDQle13PZkuRwQDJ2gJeFmVuKwU3/smeLxYf7eaSU+sFXIZS26L3a YXMqOFrU6EKwZIoGwK7vXq1buWc9PqAuCwgKStMDz4BpfQFlSIpu99Cq4Pi++63lR75r MTVS7jhUaTPLHOGaXKgKzKLHaCDBrfgOfL3Qk87yHIhiO/FMYd1Ol7X9O9Hx79wcoy9Z J1qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:to:from:x-gm-message-state:from:to:cc:subject:date; bh=0cFVWu2MfToJrgTlaStLUilq7RxjKcGGdBPhO6uGUZo=; b=OWWs8Jmih21+na2mHE6NuJOjOBXe270Cmnln4woTWuDCJTWy9nLBXWZqeLY5TBb0St Xf+2hiHh15RWsFPHtSKCTCCzDTMCx0zN/lqwx0gLhfcDgzJ3OI2a//8HmPpzHu8UCr8O ezfR3Fj/Jymh8yZJhcds0sbBht3xIMJ2DHuptEF87dTyWeG56JPlzMEfAuNUfbPt7Tj2 1HG2CmJYhW7AWDzT1HcC2eDEPzcFsTNKILdaM8NWhRTVOFFZIMRK/MQy326aGMHys1xa QPCWrsL5UdSsritH1UYbGGiVjq3k+2bbu+WLb154VHkmm1YWlR3+5VBQRKJCmc2fewFR YV0w== X-Gm-Message-State: ACrzQf1GtGyhQtKGTgWGINTe5iKOExdyrVzZep0ucpMO5ypRbuX/C7HK Yk3ae2BoYSsF3xFaV7VuGssss5q3lkk= X-Google-Smtp-Source: AMsMyM7Tl8MSxT3oxMqPELVEnxHgk+dpHZRZNGke+Zlsx+IheYLIs7Q4DT2le/AicYt/7c1OUp5QXg== X-Received: by 2002:a05:6512:3084:b0:49e:2275:fbb8 with SMTP id z4-20020a056512308400b0049e2275fbb8mr8232542lfd.40.1663695960357; Tue, 20 Sep 2022 10:46:00 -0700 (PDT) Received: from elephant ([95.79.3.69]) by smtp.gmail.com with ESMTPSA id q8-20020a056512210800b0049311968ca4sm55921lfr.261.2022.09.20.10.45.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:45:58 -0700 (PDT) From: "Artyom V. Poptsov" To: guix-patches@gnu.org Subject: Re: [PATCH] gnu: Add 'maven-doxia-test-docs' and some Doxia modules References: <87sfnr3od8.fsf@gmail.com> Date: Tue, 20 Sep 2022 20:45:55 +0300 In-Reply-To: <87sfnr3od8.fsf@gmail.com> (Artyom V. Poptsov's message of "Sun, 26 Jun 2022 09:55:31 +0300") Message-ID: <8735cmaqi4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a00:1450:4864:20::12b; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x12b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello, I rebased this patch series onto the Guix "master" branch. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-Add-maven-doxia-test-docs.patch Content-Transfer-Encoding: quoted-printable From=206c2d9a9a6ba4c62cf5bb66914151da3ed0c08942 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 26 Jun 2022 09:15:44 +0300 Subject: [PATCH 1/5] gnu: Add maven-doxia-test-docs. * gnu/packages/maven.scm (maven-doxia-test-docs): New variable. =2D-- gnu/packages/maven.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 28ec4eb9a8..7e1457ad42 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3965,3 +3965,30 @@ (define-public maven-doxia-core markup languages. =20 This package contains Doxia core classes and interfaces."))) + +(define-public maven-doxia-test-docs + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-test-docs") + (arguments + `(#:jar-name "doxia-test-docs.jar" + #:tests? #f ; no tests. + #:source-dir "doxia-test-docs/src/main/" + #:phases (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (mkdir-p "build/classes") + (copy-recursively "doxia-test-docs/src/main/resource= s" + "build/classes") + #t)) + (replace 'install + (install-from-pom "doxia-test-docs/pom.xml"))))) + (propagated-inputs (list maven-doxia-parent-pom)) + (synopsis "Several test documents to check syntax structures under Dox= ia") + (description + "Doxia is a content generation framework that provides powerful +techniques for generating static and dynamic content, supporting a variety= of +markup languages. + +This package contains several test documents to check syntax structures un= der +Doxia."))) =2D-=20 2.34.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-gnu-Add-maven-doxia-module-apt.patch Content-Transfer-Encoding: quoted-printable From=206a5b6c3b846ca64f91706078f7138e7bdad11a7e Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 26 Jun 2022 04:08:35 +0300 Subject: [PATCH 2/5] gnu: Add maven-doxia-module-apt. * gnu/packages/maven.scm (maven-doxia-module-apt): New variable. (maven-doxia-modules-parent-pom): New private variable. =2D-- gnu/packages/maven.scm | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 7e1457ad42..84879003e9 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3992,3 +3992,50 @@ (define-public maven-doxia-test-docs =20 This package contains several test documents to check syntax structures un= der Doxia."))) + +(define maven-doxia-modules-parent-pom + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-modules-parent-pom") + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file "doxia-modules/pom.xml"))))) + (propagated-inputs + (list maven-doxia-parent-pom + maven-doxia-sink-api + maven-doxia-core)) + (synopsis "Content generation framework") + (description "@samp{Doxia} is a content generation framework that prov= ides +powerful techniques for generating static and dynamic content, supporting a +variety of markup languages. + +This package contains the parent POM of all Doxia modules."))) + +(define-public maven-doxia-module-apt + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-module-apt") + (arguments + `(#:jar-name "doxia-module-apt.jar" + #:source-dir "doxia-modules/doxia-module-apt/src/main/java" + #:test-dir "doxia-modules/doxia-module-apt/src/test/java" + #:tests? #f ;tests require JUnit5 + #:phases (modify-phases %standard-phases + (replace 'install + (install-from-pom "doxia-modules/doxia-module-apt/pom.= xml"))))) + (native-inputs (list maven-doxia-test-docs + java-junit + java-guice + java-xmlunit + java-xmlunit-matchers + java-slf4j-simple)) + (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api + java-javax-inject java-plexus-utils)) + (synopsis "Doxia module for APT source documents") + (description "A Doxia module for Almost Plain Text source documents. = APT +format is supported both as source and target formats."))) + =2D-=20 2.34.1 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0003-gnu-Add-maven-doxia-module-xdoc.patch Content-Transfer-Encoding: quoted-printable From=20c2594adfb967797321672edddd69417775d96d33 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 26 Jun 2022 09:44:40 +0300 Subject: [PATCH 3/5] gnu: Add maven-doxia-module-xdoc. * gnu/packages/maven.scm (maven-doxia-module-xdoc): New variable. =2D-- gnu/packages/maven.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 84879003e9..e8105b109b 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -4039,3 +4039,27 @@ (define-public maven-doxia-module-apt (description "A Doxia module for Almost Plain Text source documents. = APT format is supported both as source and target formats."))) =20 +(define-public maven-doxia-module-xdoc + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-module-xdoc") + (arguments + `(#:jar-name "doxia-module-xdoc.jar" + #:source-dir "doxia-modules/doxia-module-xdoc/src/main/java" + #:test-dir "doxia-modules/doxia-module-xdoc/src/test/java" + #:tests? #f ;tests require JUnit5 + #:phases (modify-phases %standard-phases + (replace 'install + (install-from-pom "doxia-modules/doxia-module-xdoc/pom= .xml"))))) + (native-inputs (list maven-doxia-test-docs + java-junit + java-guice + java-xmlunit + java-xmlunit-matchers + java-slf4j-simple)) + (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api + java-javax-inject java-plexus-utils)) + (synopsis "Doxia module for Xdoc source documents") + (description "A Doxia module for Xdoc source documents. Xdoc format is +supported both as source and target formats."))) + =2D-=20 2.34.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0004-gnu-Add-maven-doxia-module-xhtml.patch Content-Transfer-Encoding: quoted-printable From=206bbec9cba6f9790d4332aa85d70b8965bd707390 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 26 Jun 2022 09:46:36 +0300 Subject: [PATCH 4/5] gnu: Add maven-doxia-module-xhtml. * gnu/packages/maven.scm (maven-doxia-module-xhtml): New variable. =2D-- gnu/packages/maven.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index e8105b109b..918610eb7f 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -4063,3 +4063,27 @@ (define-public maven-doxia-module-xdoc (description "A Doxia module for Xdoc source documents. Xdoc format is supported both as source and target formats."))) =20 +(define-public maven-doxia-module-xhtml + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-module-xhtml") + (arguments + `(#:jar-name "doxia-module-xhtml.jar" + #:source-dir "doxia-modules/doxia-module-xhtml/src/main/java" + #:test-dir "doxia-modules/doxia-module-xhtml/src/test/java" + #:tests? #f ;tests require JUnit5 + #:phases (modify-phases %standard-phases + (replace 'install + (install-from-pom "doxia-modules/doxia-module-xhtml/po= m.xml"))))) + (native-inputs (list maven-doxia-test-docs + java-junit + java-guice + java-xmlunit + java-xmlunit-matchers + java-slf4j-simple)) + (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api + java-javax-inject java-plexus-utils)) + (synopsis "Doxia module for Xhtml source documents") + (description "A Doxia module for Xhtml source documents. Xhtml format= is +supported both as source and target formats."))) + =2D-=20 2.34.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0005-gnu-Add-maven-doxia-module-xhtml5.patch Content-Transfer-Encoding: quoted-printable From=20e8c3df3afe203796a3b49af6595d48dabda2a75a Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 26 Jun 2022 09:49:39 +0300 Subject: [PATCH 5/5] gnu: Add maven-doxia-module-xhtml5. * gnu/packages/maven.scm (maven-doxia-module-xhtml5): New variable. =2D-- gnu/packages/maven.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 918610eb7f..ec116de5e9 100644 =2D-- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -4087,3 +4087,27 @@ (define-public maven-doxia-module-xhtml (description "A Doxia module for Xhtml source documents. Xhtml format= is supported both as source and target formats."))) =20 +(define-public maven-doxia-module-xhtml5 + (package + (inherit maven-doxia-sink-api) + (name "maven-doxia-module-xhtml5") + (arguments + `(#:jar-name "doxia-module-xhtml5.jar" + #:source-dir "doxia-modules/doxia-module-xhtml5/src/main/java" + #:test-dir "doxia-modules/doxia-module-xhtml5/src/test/java" + #:tests? #f ;tests require JUnit5 + #:phases (modify-phases %standard-phases + (replace 'install + (install-from-pom "doxia-modules/doxia-module-xhtml5/p= om.xml"))))) + (native-inputs (list maven-doxia-test-docs + java-junit + java-guice + java-xmlunit + java-xmlunit-matchers + java-slf4j-simple)) + (propagated-inputs (list maven-doxia-modules-parent-pom java-slf4j-api + java-javax-inject java-plexus-utils)) + (synopsis "Doxia module for Xhtml5 source documents") + (description "A Doxia module for Xhtml5 source documents. Xhtml5 form= at is +supported both as source and target formats."))) + =2D-=20 2.34.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D Artyom =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmMp/FMZHHBvcHRzb3Yu YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigL9x+CACsm23W2I0HdTASAjz4hWCm ENweVkPjvBtCJUpeARuC9G9euq6COCKNp+xJLjhmMMy4fYITklaDUYe7NsXLxSKl GgbfBCDGXlZ0V5Ijsx3V9AFcZNo/oeb4Mgnbw5vTaMm2Or4ft+cdAfoR9egh0XrG ye9/QoJqRZ8h6VR4dn2areQLIqGaSXnma3wmw0orF1+QDADwfw8Rqg+GX1Pdfvkm 1Y3Evjc0V7oz94J4Q3S1Gc6l9PBtPlLYa3k7cUArhZ8yEwWhg8Z84+xkXp5yQH9R aTc259pawyX0N9i/x4wPb69YU9kRpbChG948iymdWS2jGsaXMgedoWiI66WiqaPm =VWjl -----END PGP SIGNATURE----- --==-=-=--