From patchwork Sun Jun 12 18:25:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 39888 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 27C8127BBEA; Sun, 12 Jun 2022 19:26:16 +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=ham 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 BECAF27BBE9 for ; Sun, 12 Jun 2022 19:26:13 +0100 (BST) Received: from localhost ([::1]:53972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0SHr-0003wV-2V for patchwork@mira.cbaines.net; Sun, 12 Jun 2022 14:26:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0SHi-0003w0-Bv for guix-patches@gnu.org; Sun, 12 Jun 2022 14:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34337) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0SHi-0007S8-3e for guix-patches@gnu.org; Sun, 12 Jun 2022 14:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o0SHh-0001br-V0 for guix-patches@gnu.org; Sun, 12 Jun 2022 14:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55929] [PATCH] gnu: maven: Add maven-doxia-sink-api Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Jun 2022 18:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55929 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55929@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16550583236107 (code B ref -1); Sun, 12 Jun 2022 18:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jun 2022 18:25:23 +0000 Received: from localhost ([127.0.0.1]:56459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0SGz-0001aK-AF for submit@debbugs.gnu.org; Sun, 12 Jun 2022 14:25:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:33206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0SGu-0001a8-VR for submit@debbugs.gnu.org; Sun, 12 Jun 2022 14:25:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0SGu-0003ZH-PR for guix-patches@gnu.org; Sun, 12 Jun 2022 14:25:12 -0400 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]:33662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0SGs-0007FE-IJ for guix-patches@gnu.org; Sun, 12 Jun 2022 14:25:12 -0400 Received: by mail-lj1-x22f.google.com with SMTP id y15so4143232ljc.0 for ; Sun, 12 Jun 2022 11:25:09 -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=8YemscT3JlvmLmZC2KcAbFKVrsiUOsmB5CVbK/s7c1k=; b=La76xBZZ12a84Nc5s9IVjRcQNXDk4QlxJGPeaZWBmYczUjsCzQ9F4eui+eWOj5FwDF 8zomlsdgcZx7j9PWD3xyhe6gcra31FGE/HG9aBHZ+NGOTatonHCyUpFfzJWGChcioU0h c71ZfmC6C/6OcSLfJF7IK/xLMoy2pKbPtawk7ty7sO4TMXA9dqCdemYohBpZXGL/pve4 Txwfg/HuKXx6IwQBWuEVUylvZxYGAZpY4dsLUXyYHC0kFJ0yzjAQifP4R/MFPj4V7hlo tetwM4VK1WZ/2IjSM4UKCqRAnaags4iM10+Vdz7EQ1eFwqDyHQhgD8D2lu8Er5AHAS8X fE2g== 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=8YemscT3JlvmLmZC2KcAbFKVrsiUOsmB5CVbK/s7c1k=; b=NZ46xtj4U9F0gIhDtGmNassfeqEBHYFvJ62O3/ZcgrpLYCiTS5wJVO93HN8dZx0oKB MI8V4b1Z3CvfOloeiHEkUMI/X5xvoGpDbs9EqKDAUhSUAaIwGDUj5/zvr38nzmMFecH2 Ka0xCHiVcEh9TkPpq6UWdJEIARAuiGWHcyoJiru1tP1P2LmpU1YGA6CfMFjWpyuFVHjW eJhRI6USzpOHFX/oga10xib9FxoT+/FYjJFvJiizp5wEQdLxGC1D/hKgImwYfqbL1hHA QP1bFynMySQMyST0NpeP67ZsaEhYv96ngkmy9bj80K1KxlN8QuaONOUF99Oe1Z9Dg34h X+Pw== X-Gm-Message-State: AOAM531Ca6a67bKWL/XWzPrLeEfAE2Py71YQn1j4Nr7trEhI1a1hPiOq Gr/1KbDUdLWMAgcS6nCLhsiBaQQOHdw= X-Google-Smtp-Source: ABdhPJwGnYK2atPrSPxqWz1ZHNIbA9OnEUfXr0y/qC84KBCSspz8BuzJeOPDjgqUcPZyIGdAynxUfw== X-Received: by 2002:a2e:a7c9:0:b0:255:a379:fa04 with SMTP id x9-20020a2ea7c9000000b00255a379fa04mr16273759ljp.519.1655058307979; Sun, 12 Jun 2022 11:25:07 -0700 (PDT) Received: from elephant ([5.164.222.47]) by smtp.gmail.com with ESMTPSA id b4-20020ac247e4000000b00479342519e5sm686508lfp.210.2022.06.12.11.25.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jun 2022 11:25:07 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sun, 12 Jun 2022 21:25:03 +0300 Message-ID: <87h74pyc1s.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=poptsov.artyom@gmail.com; helo=mail-lj1-x22f.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-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, this patch adds 'Doxia Sink API'[1] under the name 'maven-doxia-sink-api'. The module contains a Java interface that is used by Doxia Core module. This patch is the first in the future patch set based on my effort to add Doxia modules. The Doxia itself required for other useful Maven plugins. - Artyom References: 1. https://maven.apache.org/doxia/doxia/doxia-sink-api/ From 59d2a34e7443406741d6b3b800e808467ac2254c Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 12 Jun 2022 21:11:55 +0300 Subject: [PATCH] gnu: maven: Add maven-doxia-sink-api * gnu/packages/maven.scm (maven-doxia-sink-api): New variable. --- gnu/packages/maven.scm | 135 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 817fee1c71..c0609618c9 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2022 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,8 +25,10 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix utils) #:use-module (guix build-system ant) + #:use-module (guix build-system maven) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages compression) @@ -3887,3 +3890,135 @@ reports in two different file formats, plain text and xml."))) (description "This plugin provides the capability to build jars. If you would like to sign jars please use the Maven Jarsigner Plugin instead.") (license license:asl2.0))) + +(define-public maven-plugin-plugin + (package + (name "maven-plugin-plugin") + (version "3.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/maven/" + "plugin-tools/maven-plugin-tools-" version + "-source-release.zip")) + (sha256 (base32 "1ryqhs62j5pas93brhf5dsnvp99hxbvssf681yj5rk3r9h24hqm2")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "maven-plugin-annotations.jar" + #:source-dir "maven-plugin-plugin/src/main/java" + #:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'install + (install-from-pom "maven-plugin-plugin/pom.xml"))))) + (propagated-inputs + (list maven-artifact maven-plugin-tools-parent-pom)) + (native-inputs + (list unzip)) + (home-page "https://maven.apache.org/plugin-tools/maven-plugin-plugin/") + (synopsis "create a Maven plugin descriptor for any Mojo's") + (description "The Plugin Plugin is used to create a Maven plugin +descriptor for any Mojo's found in the source tree, to include in the JAR. It +is also used to generate Xdoc files for the Mojos as well as the artifact +metadata and a generic help goal. ") + (license license:asl2.0))) + +(define-public maven-doxia-sink-api + (package + (name "maven-doxia-sink-api") + (version "2.0.0-M2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitbox.apache.org/repos/asf/maven-doxia.git") + (commit (string-append "doxia-" version)))) + (file-name (git-file-name "doxia" version)) + (sha256 + (base32 + "0jx96lg0hgjsrm8mynhac4hwh2hmgiwjpwpx2k03yr14040zcr48")))) + (build-system ant-build-system) + (native-inputs + (list java-javax-inject)) + (arguments + (list #:jar-name "doxia-core.jar" + #:source-dir "doxia-sink-api/src/main/java" + #:tests? #f)) ; no tests + (home-page "https://maven.apache.org/doxia/index.html") + (synopsis "Generic markup language interface") + (description "The @code{Sink} interface is a generic markup language +interface provided as a Java API. It contains several methods that encapsulate +common text syntax. A start tag is denoted by @code{xxxx()} method and a end +of tag by @code{xxxx_()} method.") + (license license:asl2.0))) + +(define-public maven-doxia-core + (package + (name "maven-doxia-core") + (version "2.0.0-M2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitbox.apache.org/repos/asf/maven-doxia.git") + (commit (string-append "doxia-" version)))) + (file-name (git-file-name "doxia" version)) + (sha256 + (base32 + "0jx96lg0hgjsrm8mynhac4hwh2hmgiwjpwpx2k03yr14040zcr48")))) + (build-system ant-build-system) + (inputs + (list maven-doxia-sink-api)) + (native-inputs + (list java-javax-inject + java-plexus-utils + java-commons-lang3 + java-slf4j-api)) + (arguments + (list #:jar-name "doxia-core.jar" + #:source-dir "doxia-core/src/main/java" + #:test-dir "doxia-core/src/test")) + (home-page "https://maven.apache.org/doxia/index.html") + (synopsis "") + (description "") + (license license:asl2.0))) + +(define-public maven-bundle-plugin + (let ((revision 1865227)) + (package + (name "maven-bundle-plugin") + (version "4.2.1") + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (string-append + "http://svn.apache.org/repos/asf/felix/releases/maven-bundle-plugin-" + version)) + (revision revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "15b3s7jaf2bwx1fzif0s7zbvrfqg1chdxvbrhvxkgyrnfn68ds3c")))) + (build-system maven-build-system) + (native-inputs + (list maven-plugin-annotations)) + (propagated-inputs + (list maven-archiver + maven-compiler-plugin + maven-plugin-plugin + maven-3.0-artifact + maven-3.0-core + maven-3.0-plugin-api + maven-file-management + maven-shared-utils + java-plexus-archiver + java-plexus-utils)) + ;; (propagated-inputs + ;; (list maven-core + ;; maven-shared-utils + ;; maven-plugin-api)) + (inputs + (list maven-plugin-annotations)) + (home-page "https://felix.apache.org/documentation/_attachments/components/bundle-plugin/") + (synopsis "Maven plugin that supports creating an OSGi bundle") + (description "Provides a maven plugin that supports creating an OSGi (Open +Service Gateway Initiative) bundle from the contents of the compilation +classpath along with its resources and dependencies.") + (license license:asl2.0)))) -- 2.25.1