0002-Commons-configuration2.patch

@@ -0,0 +1,72 @@
+--- doxia-1.12.0/doxia-modules/doxia-module-fo/pom.xml.orig	2023-01-09 21:09:18.000000000 -0700
++++ doxia-1.12.0/doxia-modules/doxia-module-fo/pom.xml	2023-06-12 15:58:35.171254714 -0600
+@@ -71,9 +71,9 @@ under the License.
+ 
+     <!-- misc -->
+     <dependency>
+-      <groupId>commons-configuration</groupId>
+-      <artifactId>commons-configuration</artifactId>
+-      <version>1.10</version>
++      <groupId>org.apache.commons</groupId>
++      <artifactId>commons-configuration2</artifactId>
++      <version>2.9.0</version>
+     </dependency>
+     <dependency>
+       <groupId>commons-collections</groupId>
+--- doxia-1.12.0/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java.orig	2023-01-09 21:09:18.000000000 -0700
++++ doxia-1.12.0/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java	2023-06-12 17:00:19.630450286 -0600
+@@ -20,14 +20,16 @@ package org.apache.maven.doxia.module.fo
+  */
+ 
+ import java.io.File;
++import java.io.FileReader;
+ import java.io.IOException;
+ import java.util.List;
+ 
+ import javax.swing.text.MutableAttributeSet;
+ import javax.swing.text.SimpleAttributeSet;
+ 
+-import org.apache.commons.configuration.ConfigurationException;
+-import org.apache.commons.configuration.XMLConfiguration;
++import org.apache.commons.configuration2.XMLConfiguration;
++import org.apache.commons.configuration2.ex.ConfigurationException;
++import org.apache.commons.configuration2.io.FileLocatorUtils;
+ import org.apache.maven.doxia.sink.impl.SinkUtils;
+ import org.codehaus.plexus.util.ReaderFactory;
+ 
+@@ -55,9 +57,6 @@ public class FoConfiguration
+     {
+         this.config = new XMLConfiguration();
+ 
+-        // necessary because some attributes contain commas:
+-        config.setDelimiterParsingDisabled( true );
+-
+         loadDefaultConfig();
+     }
+ 
+@@ -75,10 +74,11 @@ public class FoConfiguration
+             throws IOException
+     {
+         config.clear();
++        config.initFileLocator( FileLocatorUtils.fileLocator().basePath( configFile.getParent() ).fileName( configFile.getName() ).create() );
+ 
+         try
+         {
+-            config.load( configFile );
++            config.read( new FileReader(configFile) );
+         }
+         catch ( ConfigurationException cex )
+         {
+@@ -182,9 +182,11 @@ public class FoConfiguration
+     /** Load the default fo configuration file. */
+     private void loadDefaultConfig()
+     {
++        config.initFileLocator( FileLocatorUtils.fileLocator().sourceURL( getClass().getResource( "/fo-styles.xslt" ) ).create() );
++
+         try
+         {
+-            config.load( ReaderFactory.newXmlReader( getClass().getResourceAsStream( "/fo-styles.xslt" ) ) );
++            config.read( ReaderFactory.newXmlReader( getClass().getResourceAsStream( "/fo-styles.xslt" ) ) );
+         }
+         catch ( ConfigurationException | IOException cex )
+         {

LICENSE-2.0.txt

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

_service

@@ -1,15 +0,0 @@
-<services>
-	<service name="tar_scm" mode="disabled">
-		<param name="scm">git</param>
-		<param name="url">https://github.com/apache/maven-doxia.git</param>
-		<param name="revision">doxia-2.0.0</param>
-		<param name="match-tag">doxia-*</param>
-		<param name="versionformat">@PARENT_TAG@</param>
-		<param name="versionrewrite-pattern">doxia-(.*)</param>
-	</service>
-	<service name="recompress" mode="disabled">
-		<param name="file">*.tar</param>
-		<param name="compression">xz</param>
-	</service>
-	<service name="set_version" mode="disabled"/>
-</services>

maven-doxia-2.0.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c082b4d44efb4c086c53eb451ea30383ba93ce15d7047e3dc2b6ba31d3e2d20e
-size 250504

maven-doxia.changes

@@ -1,129 +1,3 @@
--------------------------------------------------------------------
-Thu Oct  3 14:00:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Upgrade to upstream version 2.0.0
-  * Sub-task
-    + DOXIA-599: Replace <a /> element's name attribute with id
-      attribute
-    + DOXIA-668: Remove all obsolete attributes in HTML5
-    + DOXIA-672: Parse id attribute only on <a /> elements by
-      default
-    + DOXIA-674: Replace table border handling with new CSS class
-    + DOXIA-675: Replace table alignment attributes with CSS styles
-  * Bug
-    + DOXIA-590: Either provided element class or default class
-      gets ignored
-    + DOXIA-598: Generated XHTML5 content does not pass W3 HTML5
-      Validation Service
-    + DOXIA-619: Sink.sectionTitle1() creates <h2> instead of <h1>
-    + DOXIA-641: AptParser throws exception if title is not present
-    + DOXIA-649: Plexus to Sisu migration missed singleton
-      annotation
-    + DOXIA-662: Non unique IDs generated by IndexingSink
-    + DOXIA-671: Double quotes contained in markdown page are
-      removed in HTML output
-    + DOXIA-689: Restore incorrectly removed (HTML5) attributes
-    + DOXIA-690: Markdown Parser: Multiline metadata incorrectly
-      rendered
-    + DOXIA-691: APT: Emit multiple authors in separate meta tags
-    + DOXIA-692: Markdown Sink: Incorrect escape characters
-    + DOXIA-693: Markdown Sink: Incorrect ordered list item prefixes
-    + DOXIA-694: Markdown Sink: Too many line separators
-    + DOXIA-695: Support of h6 in xhtml output is broken
-    + DOXIA-699: Xhtml5Parser may emit sectionX() without
-      sectionX_() when using both <hX> and <section>
-    + DOXIA-704: style and class attributes not merged when
-      user-supplied in XHTML5 sink
-    + DOXIA-706: Sink.text(String, SinkEventAttributes) not properly
-      supported by Xhtml5BaseSink
-    + DOXIA-714: MarkdownSink: Fix table justification and figures
-    + DOXIA-715: Sink.text(String, SinkEventAttributes) not properly
-      supported by AptSink and MarkdownSink
-    + DOXIA-724: Sink pipeline returned by
-      AbstractParser.getWrappedSink(...) has wrong order
-    + DOXIA-726: MarkdownSink: Incorrect escaping of <,>,",' and &
-    + DOXIA-727: MarkdownSink: Incorrect escaping inside code spans
-    + DOXIA-734: XHTML 1.0 elements/attributes which are obsolete in
-      XHTML5 no longer detected by XdocParser/FmlParser
-    + DOXIA-737: [REGRESSION] Making EmitAnchorsForIndexableEntries
-      by default does not extract document titles anymore
-    + DOXIA-740: Rendering Markdown silently truncates files that
-      skip a heading level
-  * New Feature
-    + DOXIA-569: Add Markdown Sink to be able to convert anything to
-      Markdown
-    + DOXIA-660: Add ability to hide table rows via CSS
-    + DOXIA-722: Optionally create anchors for indexable entries
-      (used in TOC macro)
-  * Improvement
-    + DOXIA-617: doxia-module-markdown: Add support for --- header
-      section marks
-    + DOXIA-665: Add anchors around FML parts
-    + DOXIA-667: Add <summary> and <details> to recognized tag list
-    + DOXIA-669: Improve/rework CachedFileEntityResolver
-    + DOXIA-676: Remove all obsolete elements in HTML5 and add new
-      ones
-    + DOXIA-679: Introduce Sink#tableRows(void) method
-    + DOXIA-680: Don't wrap elements in anchors
-    + DOXIA-684: replace flexmark-all dependency with core + only
-      the used extensions
-    + DOXIA-685: Replace SinkEventAttributes#BOXED with #SOURCE to
-      clearly separate between regular verbatim and verbatim source
-      (code)
-    + DOXIA-687: Introduce Sink#verbatim(void) method
-    + DOXIA-700: Streamline, update and simplify Doxia ID generation
-    + DOXIA-709: Clarify usage of overlapping Sink methods
-    + DOXIA-711: Introduce SinkWrapper with factory
-    + DOXIA-716: Update and unify XMLReader creation and
-      configuration
-    + DOXIA-723: Optionally expose document location in Sink
-    + DOXIA-728: MarkdownSink: Support blockquotes
-    + DOXIA-731: Simplify HTML emitted from Sink.verbatim(...)
-    + DOXIA-732: Do not fail for duplicate anchor names
-    + DOXIA-738: Add Footnote extention for Markdown module
-    + DOXIA-739: Disable source code highlighters for verbatim
-      blocks for Markdown
-  * Task
-    + DOXIA-534: Remove Doxia Logging API
-    + DOXIA-630: Remove all deprecated modules
-    + DOXIA-631: Remove all deprecated macros
-    + DOXIA-632: Remove remaining deprecated code
-    + DOXIA-633: Drop and replace usage of HttpComponents in Core
-    + DOXIA-634: Drop and replace usage of Commons Lang in Core
-    + DOXIA-635: Drop and replace usage of Commons IO in Markdown
-      Module
-    + DOXIA-638: Replace Plexus Container Default with Sisu Plexus
-      Shim
-    + DOXIA-643: Upgrade to Java 8
-    + DOXIA-644: Replace Plexus Annotations with Java Inject along
-      with JUnit 5
-    + DOXIA-645: Clean up exceptions
-    + DOXIA-650: Make MarkdownParser to be a text parser with text
-      markup
-    + DOXIA-652: Drop build-info.properties in favor of default
-      pom.properties
-    + DOXIA-656: Make XHTML5 default implementation of HTML
-    + DOXIA-657: Deprecate XHML(4) module
-    + DOXIA-663: Remove deprecated XHTML module
-    + DOXIA-666: Remove code duplication Xhtml5Sink
-    + DOXIA-670: Drop dead XdocSink#link(String, String) method
-    + DOXIA-673: Remove compat handling of absent Sink#tableRows()
-      calls
-    + DOXIA-678: Add missing elements in Xhtml5BaseParser
-    + DOXIA-688: Remove empty alt attribute value on images which
-      causes the browser not to render replacement icon
-    + DOXIA-702: Fix dependency warnings in Markdown module
-    + DOXIA-705: Remove remaining deprecated/duplicated code
-- Removed patch:
-  * 0002-Commons-configuration2.patch
-    + The upstream version is already ported to
-      commons-configuration2
-
--------------------------------------------------------------------
-Sun Sep 29 19:57:08 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- A runtime dependency needs to be resolved with %%mvn_install
-
 -------------------------------------------------------------------
 Mon Jun 10 16:37:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

maven-doxia.spec

@@ -17,29 +17,39 @@
 
 
 Name:           maven-doxia
-Version:        2.0.0
+Version:        1.12.0
 Release:        0
 Summary:        Content generation framework
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://maven.apache.org/doxia/
-Source0:        %{name}-%{version}.tar.xz
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/doxia-%{version}-source-release.zip
 Source1:        %{name}-build.tar.xz
-Source2:        https://www.apache.org/licenses/LICENSE-2.0.txt
+Patch0:         0002-Commons-configuration2.patch
 BuildRequires:  ant
-BuildRequires:  apache-commons-io
+BuildRequires:  apache-commons-configuration2
 BuildRequires:  apache-commons-lang3
 BuildRequires:  apache-commons-text
-BuildRequires:  atinject
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.8
+BuildRequires:  httpcomponents-client
-BuildRequires:  javapackages-local >= 6
+BuildRequires:  httpcomponents-core
-BuildRequires:  jetbrains-annotations
+BuildRequires:  javapackages-local
-BuildRequires:  modello
+BuildRequires:  modello >= 2.0.0
+BuildRequires:  parboiled
+BuildRequires:  pegdown
+BuildRequires:  plexus-containers-component-annotations
+BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xml
-BuildRequires:  sisu-inject
+BuildRequires:  sisu-plexus
-BuildRequires:  slf4j
+BuildRequires:  unzip
+BuildRequires:  xmlgraphics-commons
+BuildRequires:  xmlgraphics-fop
+BuildRequires:  xmlunit
+BuildRequires:  xmvn-install
+BuildRequires:  xmvn-resolve
+BuildRequires:  mvn(log4j:log4j)
+BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildArch:      noarch
 
 %description
@@ -51,22 +61,19 @@ generation systems like blogs, wikis and content management systems.
 %package core
 Summary:        Core module for %{name}
 Group:          Development/Libraries/Java
-# Make the upgrades easier. The last version
+Obsoletes:      %{name}-module-itext
-# before 2.0.0 was 1.12.0
+Obsoletes:      %{name}-module-markdown
-Obsoletes:      %{name}-logging-api < 1.13
-Obsoletes:      %{name}-module-confluence < 1.13
-Obsoletes:      %{name}-module-docbook-simple < 1.13
-Obsoletes:      %{name}-module-fo < 1.13
-Obsoletes:      %{name}-module-itext < 1.13
-Obsoletes:      %{name}-module-latex < 1.13
-Obsoletes:      %{name}-module-markdown < 1.13
-Obsoletes:      %{name}-module-rtf < 1.13
-Obsoletes:      %{name}-module-twiki < 1.13
-Obsoletes:      %{name}-module-xhtml < 1.13
 
 %description core
 This package provides %{summary}.
 
+%package logging-api
+Summary:        Logging-api module for %{name}
+Group:          Development/Libraries/Java
+
+%description logging-api
+This package provides %{summary}.
+
 %package module-apt
 Summary:        APT module for %{name}
 Group:          Development/Libraries/Java
@@ -74,6 +81,20 @@ Group:          Development/Libraries/Java
 %description module-apt
 This package provides %{summary}.
 
+%package module-confluence
+Summary:        Confluence module for %{name}
+Group:          Development/Libraries/Java
+
+%description module-confluence
+This package provides %{summary}.
+
+%package module-docbook-simple
+Summary:        Simplified DocBook module for %{name}
+Group:          Development/Libraries/Java
+
+%description module-docbook-simple
+This package provides %{summary}.
+
 %package module-fml
 Summary:        FML module for %{name}
 Group:          Development/Libraries/Java
@@ -81,6 +102,34 @@ Group:          Development/Libraries/Java
 %description module-fml
 This package provides %{summary}.
 
+%package module-fo
+Summary:        FO module for %{name}
+Group:          Development/Libraries/Java
+
+%description module-fo
+This package provides %{summary}.
+
+%package module-latex
+Summary:        Latex module for %{name}
+Group:          Development/Libraries/Java
+
+%description module-latex
+This package provides %{summary}.
+
+%package module-rtf
+Summary:        RTF module for %{name}
+Group:          Development/Libraries/Java
+
+%description module-rtf
+This package provides %{summary}.
+
+%package module-twiki
+Summary:        TWiki module for %{name}
+Group:          Development/Libraries/Java
+
+%description module-twiki
+This package provides %{summary}.
+
 %package module-xdoc
 Summary:        XDoc module for %{name}
 Group:          Development/Libraries/Java
@@ -88,6 +137,13 @@ Group:          Development/Libraries/Java
 %description module-xdoc
 This package provides %{summary}.
 
+%package module-xhtml
+Summary:        XHTML module for %{name}
+Group:          Development/Libraries/Java
+
+%description module-xhtml
+This package provides %{summary}.
+
 %package module-xhtml5
 Summary:        XHTML5 module for %{name}
 Group:          Development/Libraries/Java
@@ -117,75 +173,121 @@ Group:          Documentation/HTML
 API documentation for %{name}.
 
 %prep
-%setup -q -a1
+%setup -q -n doxia-%{version} -a1
-cp %{SOURCE2} LICENSE
+%patch -P 0 -p1
+
+# we don't have clirr-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml
+
+# complains
+%pom_remove_plugin :apache-rat-plugin
+
+# requires network
+rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
+
+%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-core
+for i in doxia-module-docbook-simple doxia-module-fml doxia-module-fo doxia-module-itext doxia-module-markdown doxia-module-xdoc doxia-module-xhtml doxia-module-xhtml5; do
+  %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-modules/${i}
+done
+
+%pom_disable_module doxia-module-itext doxia-modules
+%pom_disable_module doxia-module-markdown doxia-modules
+
+%{mvn_package} :doxia __noinstall
+%{mvn_package} :doxia-modules __noinstall
+%{mvn_package} :{*} @1
 
 %build
 mkdir -p lib
 build-jar-repository -s lib \
-    apache-commons-lang3 \
+    apache-commons-text \
-    apache-commons-text/commons-text \
+    commons-configuration2 \
-    atinject \
+    commons-lang3 \
-    commons-io \
+    httpcomponents/httpclient \
-    jetbrains-annotations \
+    httpcomponents/httpcore \
-    org.eclipse.sisu.inject \
+    org.eclipse.sisu.plexus \
+    parboiled/core \
+    pegdown \
+    plexus-containers/plexus-component-annotations \
     plexus/utils \
     plexus/xml \
-    slf4j/api
+    xmlgraphics-commons \
+    xmlgraphics-fop
 
-ant package javadoc
+%{ant} -Dtest.skip=true \
+    package javadoc
 
 mkdir -p target/site/apidocs
 
-%install
+%{mvn_artifact} pom.xml
-install -dm 0755 %{buildroot}%{_javadir}/%{name}
-install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
-
 for i in \
+    doxia-logging-api \
     doxia-sink-api \
     doxia-test-docs \
     doxia-core; do
-  install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
+  %{mvn_artifact} ${i}/pom.xml ${i}/target/${i}-%{version}.jar
-  %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
-  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
   if [ -d ${i}/target/site/apidocs ]; then
-    cp -r ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
+    cp -r ${i}/target/site/apidocs target/site/apidocs/${i}
   fi
 done
 
+%{mvn_artifact} doxia-modules/pom.xml
 for i in \
     doxia-module-apt \
+    doxia-module-confluence \
+    doxia-module-docbook-simple \
     doxia-module-fml \
+    doxia-module-fo \
+    doxia-module-latex \
+    doxia-module-rtf \
+    doxia-module-twiki \
     doxia-module-xdoc \
+    doxia-module-xhtml \
     doxia-module-xhtml5; do
-  install -pm 0644 doxia-modules/${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
+  %{mvn_artifact} doxia-modules/${i}/pom.xml doxia-modules/${i}/target/${i}-%{version}.jar
-  %{mvn_install_pom} doxia-modules/${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
-  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
   if [ -d doxia-modules/${i}/target/site/apidocs ]; then
-    cp -r doxia-modules/${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
+    cp -r doxia-modules/${i}/target/site/apidocs target/site/apidocs/${i}
   fi
 done
 
+%install
+%mvn_install
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files core -f .mfiles-doxia-core
+
+%files logging-api -f .mfiles-doxia-logging-api
 %license LICENSE
+%doc NOTICE
 
 %files module-apt -f .mfiles-doxia-module-apt
 
+%files module-confluence -f .mfiles-doxia-module-confluence
+
+%files module-docbook-simple -f .mfiles-doxia-module-docbook-simple
+
 %files module-fml -f .mfiles-doxia-module-fml
 
+%files module-fo -f .mfiles-doxia-module-fo
+
+%files module-latex -f .mfiles-doxia-module-latex
+
+%files module-rtf -f .mfiles-doxia-module-rtf
+
+%files module-twiki -f .mfiles-doxia-module-twiki
+
 %files module-xdoc -f .mfiles-doxia-module-xdoc
 
+%files module-xhtml -f .mfiles-doxia-module-xhtml
+
 %files module-xhtml5 -f .mfiles-doxia-module-xhtml5
 
 %files sink-api -f .mfiles-doxia-sink-api
 
 %files test-docs -f .mfiles-doxia-test-docs
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
-%{_javadocdir}/%{name}
 %license LICENSE
+%doc NOTICE
 
 %changelog