From patchwork Tue Sep 20 17:45:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 42787 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8856E27BBEA; Wed, 21 Sep 2022 00:02:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ABE9727BBE9 for ; Wed, 21 Sep 2022 00:02:52 +0100 (BST) Received: from localhost ([::1]:44012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oamGR-0007aH-SG for patchwork@mira.cbaines.net; Tue, 20 Sep 2022 19:02:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oahKo-00046g-Tg for guix-patches@gnu.org; Tue, 20 Sep 2022 13:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oahKo-0005TY-L7 for guix-patches@gnu.org; Tue, 20 Sep 2022 13:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oahKo-0003TI-G4 for guix-patches@gnu.org; Tue, 20 Sep 2022 13:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56231] [PATCH] gnu: Add 'maven-doxia-test-docs' and some Doxia modules Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Sep 2022 17:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56231 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56231@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166369597513269 (code B ref -1); Tue, 20 Sep 2022 17:47:02 +0000 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" 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello, I rebased this patch series onto the Guix "master" branch. - Artyom From e8c3df3afe203796a3b49af6595d48dabda2a75a 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. --- 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 --- 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."))) +(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/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 Xhtml5 source documents") + (description "A Doxia module for Xhtml5 source documents. Xhtml5 format is +supported both as source and target formats."))) + -- 2.34.1