Accepting request 1208208 from Java:packages

4.0.0

OBS-URL: https://build.opensuse.org/request/show/1208208
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-reporting-impl?expand=0&rev=7

0001-Remove-dependency-on-junit-addons.patch

@@ -1,52 +0,0 @@
---- maven-reporting-impl-3.1.0/pom.xml	2022-03-10 17:08:29.894389771 +0100
-+++ maven-reporting-impl-3.1.0/pom.xml	2022-03-10 17:09:12.654649105 +0100
-@@ -140,12 +140,6 @@
-       <version>4.13.1</version>
-       <scope>test</scope>
-     </dependency>
--    <dependency>
--      <groupId>junit-addons</groupId>
--      <artifactId>junit-addons</artifactId>
--      <version>1.4</version>
--      <scope>test</scope>
--    </dependency>
-   </dependencies>
- 
-   <build>
---- maven-reporting-impl-3.1.0/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java	2022-03-10 17:08:29.894389771 +0100
-+++ maven-reporting-impl-3.1.0/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java	2022-03-10 17:09:12.654649105 +0100
-@@ -599,7 +599,7 @@
-      * @param text a text with or without the pattern <code>{text, url}</code>
-      * @return a map of text/href
-      */
--    private static List<String> applyPattern( String text )
-+    static List<String> applyPattern( String text )
-     {
-         if ( StringUtils.isEmpty( text ) )
-         {
---- maven-reporting-impl-3.1.0/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java	2022-03-10 17:08:29.898389795 +0100
-+++ maven-reporting-impl-3.1.0/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java	2022-03-10 17:09:12.654649105 +0100
-@@ -24,7 +24,8 @@
- 
- import junit.framework.Assert;
- import junit.framework.TestCase;
--import junitx.util.PrivateAccessor;
-+
-+import static org.apache.maven.reporting.AbstractMavenReportRenderer.applyPattern;
- 
- /**
-  * Test case for some public method in AbstractMavenReportRenderer.
-@@ -32,13 +33,6 @@
- public class AbstractMavenReportRendererTest
-     extends TestCase
- {
--    private static List<String> applyPattern( String pattern )
--        throws Throwable
--    {
--        return (List<String>) PrivateAccessor.invoke( AbstractMavenReportRenderer.class, "applyPattern",
--                                              new Class[] { String.class }, new Object[] { pattern } );
--    }
--
-     private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable
-     {
-         List<String> result = applyPattern( pattern );

LICENSE-2.0.txt

@@ -0,0 +1,202 @@
+
+                                 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

@@ -0,0 +1,15 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/apache/maven-reporting-impl.git</param>
+		<param name="revision">maven-reporting-impl-4.0.0</param>
+		<param name="match-tag">maven-reporting-impl-*</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionrewrite-pattern">maven-reporting-impl-(.*)</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-reporting-impl-3.1.0-source-release.zip

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

maven-reporting-impl-build.xml

@@ -10,27 +10,23 @@
 
   <property name="project.groupId" value="org.apache.maven.reporting"/>
   <property name="project.artifactId" value="maven-reporting-impl"/>
+  <property name="project.version" value="4.0.0"/>
+
+  <property name="spec.version" value="4.0"/>
+
+  <property name="project.organization.name" value="The Apache Software Foundation"/>
   <property name="project.name" value="Apache Maven Reporting Implementation"/>
-  <property name="project.version" value="3.1.0"/>
 
-  <property name="spec.version" value="3.1"/>
+  <property name="compiler.release" value="8"/>
-
+  <property name="compiler.source" value="1.${compiler.release}"/>
-  <property name="project.organization.name"
-            value="The Apache Software Foundation"/>
-
-  <property name="compiler.source" value="1.7"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
-  <property name="build.finalName"
+  <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
-            value="${project.artifactId}-${project.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
   <property name="build.resourceDir" value="src/main/resources"/>
-  <property name="build.testOutputDir" value="${build.dir}/test-classes"/>
+
-  <property name="build.testDir" value="src/test/java"/>
-  <property name="build.testResourceDir" value="src/test/resources"/>
-  <property name="test.reports" value="${build.dir}/test-reports"/>
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
   <!-- ====================================================================== -->
@@ -42,11 +38,6 @@
       <include name="**/*.jar"/>
     </fileset>
   </path>
-  <path id="build.test.classpath">
-    <fileset dir="lib">
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
 
   <!-- ====================================================================== -->
   <!-- Cleaning up target                                                     -->
@@ -65,12 +56,13 @@
     <javac destdir="${build.outputDir}"
            nowarn="false"
            debug="true"
-           encoding="UTF-8"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
+           encoding="utf-8"
            source="${compiler.source}">
       <src>
         <pathelement location="${build.srcDir}"/>
@@ -79,96 +71,6 @@
     </javac>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests"
-          depends="compile"
-          description="Compile the test code"
-          unless="test.skip">
-    <mkdir dir="${build.testOutputDir}"/>
-    <javac destdir="${build.testOutputDir}"
-           nowarn="false"
-           debug="true"
-           encoding="UTF-8"
-           optimize="false"
-           deprecation="true"
-           target="${compiler.target}"
-           verbose="false"
-           fork="false"
-           source="${compiler.source}">
-      <src>
-        <pathelement location="${build.testDir}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test"
-          depends="compile-tests, junit-missing"
-          unless="junit.skipped"
-          description="Run the test cases">
-    <mkdir dir="${test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${build.outputDir}"/>
-        <pathelement location="${build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${test.reports}" unless="test">
-        <fileset dir="${build.testDir}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${test.reports}" if="test">
-        <fileset dir="${build.testDir}">
-          <include name="**/${test}.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
-  </target>
-
-  <target name="test-junit-status"
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing"
-          depends="test-junit-status"
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
   <!-- ====================================================================== -->
   <!-- Javadoc target                                                         -->
   <!-- ====================================================================== -->
@@ -178,8 +80,8 @@
              packagenames="*"
              destdir="${reporting.outputDirectory}/apidocs"
              access="protected"
-             source="${compiler.source}"
              verbose="false"
+             locale="en"
              version="true"
              use="true"
              author="true"
@@ -191,7 +93,7 @@
              nohelp="false"
              nonavbar="false"
              serialwarn="false"
-             encoding="UTF-8"
+             encoding="utf-8"
              linksource="false"
              breakiterator="false">
       <classpath refid="build.classpath"/>
@@ -202,7 +104,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile,test" description="Package the application">
+  <target name="package" depends="compile" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"
@@ -210,7 +112,6 @@
          excludes="**/package.html">
       <manifest>
         <attribute name="Implementation-Title" value="${project.name}"/>
-        <attribute name="Implementation-URL" value="https://maven.apache.org/shared/${project.artifactId}/"/>
         <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
         <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
         <attribute name="Implementation-Version" value="${project.version}"/>

maven-reporting-impl.changes

@@ -1,3 +1,78 @@
+-------------------------------------------------------------------
+Sat Oct 12 20:38:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 4.0.0
+  * Bug
+    + MSHARED-1275: MavenReport#canGenerateReport() is invoked twice
+  * New Feature
+    + MSHARED-390: Add startSection method
+      AbstractMavenReportRenderer where anchor != name
+    + MSHARED-1168: Add support for markup output
+    + MSHARED-1185: Introduce
+      AbstractMavenReportRenderer#verbatimSource()
+  * Improvement
+    + MSHARED-480: Use maven-site-plugin's site.xml to use site's
+      skin instead of default when run as mojo
+    + MSHARED-1099: Render with a skin when report is run in
+      standalone mode
+    + MSHARED-1106: Improve and simplify section handling
+    + MSHARED-1174: Don't wrap elements in anchors
+    + MSHARED-1181: Populate SiteRenderingContext#getPublishDate()
+      with ${project.build.outputTimestamp}
+    + MSHARED-1182: Drop incorrect usage of
+      SinkEventAttributeSet#BOXED
+    + MSHARED-1183: Don't pass implied args to
+      AbstractMavenReportRenderer#startTable()
+    + MSHARED-1184: Drop unnecessary use of type attribute with
+      JavaScript
+    + MSHARED-1232: Properly populate
+      DocumentRenderingContext#generator when run in standalone mode
+    + MSHARED-1295: Have ${project.build.outputTimestamp} injected
+      as @Parameter
+    + MSHARED-1314: mark execute() final to avoid users extending
+      reporting-impl implementation
+    + MSHARED-1327: Change default value of output directory in
+      AbstractMavenReport
+    + MSHARED-1328: Consistently log when skipping report goal
+      execution
+    + MSHARED-1343: Make parameter outputDirectory read/write in
+      AbstractMavenReport
+    + MSHARED-1438: Provide protected methods for XRef location
+      construction
+  * Task
+    + MSHARED-1055: Upgrade to Java 8
+    + MSHARED-1326: Improve MavenReport interface /
+      AbstractMavenReport class API
+- Fetch sources using source service from Github
+- Removed patch:
+  * 0001-Remove-dependency-on-junit-addons.patch
+    + not needed with this version
+
+-------------------------------------------------------------------
+Wed Feb 21 06:01:37 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Sun Sep 24 01:58:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 3.2.0
+  * Improvement:
+    + MSHARED-1099 - Render with a skin when report is run in
+      standalone mode
+  * Dependency upgrades:
+    + MSHARED-1120 - Upgrade Maven Reporting API to 3.1.1
+    + MSHARED-1121 - Upgrade plugins and components in project and
+      ITs
+- Modified patch:
+  * 0001-Remove-dependency-on-junit-addons.patch
+    + rediff
+
+-------------------------------------------------------------------
+Wed Sep  6 22:31:19 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Remove unnecessary dependency on xmvn tools and parent pom
+
 -------------------------------------------------------------------
 Fri Mar 11 07:02:31 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

maven-reporting-impl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven-reporting-impl
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,39 +16,32 @@
 #
 
 
-%bcond_with tests
 Name:           maven-reporting-impl
-Version:        3.1.0
+Version:        4.0.0
 Release:        0
 Summary:        Abstract classes to manage report generation
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/shared/%{name}
+URL:            https://maven.apache.org/shared/%{name}
-Source0:        https://dlcdn.apache.org/maven/reporting/%{name}-%{version}-source-release.zip
+Source0:        %{name}-%{version}.tar.xz
-Source1:        %{name}-build.xml
+Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0:         0001-Remove-dependency-on-junit-addons.patch
+Source2:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
+BuildRequires:  maven-archiver
 BuildRequires:  maven-doxia-core
-BuildRequires:  maven-doxia-logging-api
-BuildRequires:  maven-doxia-module-xhtml
 BuildRequires:  maven-doxia-module-xhtml5
 BuildRequires:  maven-doxia-sink-api
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  maven-lib
 BuildRequires:  maven-plugin-annotations
-BuildRequires:  maven-reporting-api
+BuildRequires:  maven-reporting-api >= 4
+BuildRequires:  maven-resolver-api
 BuildRequires:  maven-shared-utils
 BuildRequires:  plexus-utils
-BuildRequires:  unzip
+BuildRequires:  sisu-plexus
-BuildRequires:  xmvn-install
-BuildRequires:  xmvn-resolve
-BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
 BuildArch:      noarch
-%if %{with tests}
-BuildRequires:  ant-junit
-%endif
 
 %description
 Abstract classes to manage report generation, which can be run both:
@@ -67,10 +60,8 @@ API documentation for %{name}.
 
 %prep
 %setup -q
-cp %{SOURCE1} build.xml
+cp %{SOURCE1} LICENSE.txt
-%patch0 -p1
+cp %{SOURCE2} build.xml
-
-%pom_remove_parent
 
 # integration tests try to download stuff from the internet
 # and therefore they don't work in Build Service
@@ -79,38 +70,45 @@ cp %{SOURCE1} build.xml
 %build
 mkdir -p lib
 build-jar-repository -s lib \
-	maven-doxia/doxia-core \
+    maven-archiver/maven-archiver \
-	maven-doxia/doxia-logging-api \
+    maven-doxia/doxia-core \
-	maven-doxia/doxia-module-xhtml \
+    maven-doxia/doxia-module-xhtml5 \
-	maven-doxia/doxia-module-xhtml5 \
+    maven-doxia/doxia-sink-api \
-	maven-doxia/doxia-sink-api \
+    maven-doxia-sitetools/doxia-integration-tools \
-	maven-doxia-sitetools/doxia-decoration-model \
+    maven-doxia-sitetools/doxia-site-model \
-	maven-doxia-sitetools/doxia-site-renderer \
+    maven-doxia-sitetools/doxia-site-renderer \
-	maven/maven-core \
+    maven/maven-artifact \
-	maven/maven-plugin-api \
+    maven/maven-core \
-	maven-plugin-tools/maven-plugin-annotations \
+    maven/maven-model \
-	maven-reporting-api/maven-reporting-api \
+    maven/maven-plugin-api \
-	maven-shared-utils/maven-shared-utils \
+    maven-plugin-tools/maven-plugin-annotations \
-	plexus/utils
+    maven-reporting-api/maven-reporting-api \
+    maven-resolver/maven-resolver-api \
+    maven-shared-utils/maven-shared-utils \
+    org.eclipse.sisu.plexus \
+    plexus/utils
 
-%{ant} \
+ant jar javadoc
-%if %{without tests}
-	-Dtest.skip=true \
-%endif
-	jar javadoc
-
-%{mvn_artifact} pom.xml target/%{name}-%{version}.jar
 
 %install
-%mvn_install
+# jar
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
-%license LICENSE
+%license LICENSE.txt
-%doc NOTICE
+%doc README.md
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc
-%license LICENSE
+%{_javadocdir}/%{name}
-%doc NOTICE
+%license LICENSE.txt
 
 %changelog