diff --git a/0001-Remove-dependency-on-junit-addons.patch b/0001-Remove-dependency-on-junit-addons.patch deleted file mode 100644 index 72e7e2f..0000000 --- a/0001-Remove-dependency-on-junit-addons.patch +++ /dev/null @@ -1,71 +0,0 @@ -From b087582c8bbe88ac8fd3a59c129d4bd7953a720f Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Wed, 9 Feb 2022 14:37:18 -0700 -Subject: [PATCH] Remove dependency on junit-addons - ---- - pom.xml | 6 ------ - .../maven/reporting/AbstractMavenReportRenderer.java | 2 +- - .../reporting/AbstractMavenReportRendererTest.java | 10 ++-------- - 3 files changed, 3 insertions(+), 15 deletions(-) - -diff --git a/pom.xml b/pom.xml -index d46a817..6b6295c 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -151,12 +151,6 @@ - 4.13.2 - test - -- -- junit-addons -- junit-addons -- 1.4 -- test -- - - - -diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java -index 4c9a07c..4693e1d 100644 ---- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java -+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java -@@ -599,7 +599,7 @@ public abstract class AbstractMavenRepor - * @param text a text with or without the pattern {text, url} - * @return a map of text/href - */ -- private static List applyPattern( String text ) -+ static List applyPattern( String text ) - { - if ( StringUtils.isEmpty( text ) ) - { -diff --git a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java -index cdb9299..e8dce8f 100644 ---- a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java -+++ b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java -@@ -24,7 +24,8 @@ import java.util.List; - - 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 @@ import junitx.util.PrivateAccessor; - public class AbstractMavenReportRendererTest - extends TestCase - { -- private static List applyPattern( String pattern ) -- throws Throwable -- { -- return (List) PrivateAccessor.invoke( AbstractMavenReportRenderer.class, "applyPattern", -- new Class[] { String.class }, new Object[] { pattern } ); -- } -- - private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable - { - List result = applyPattern( pattern ); --- -2.34.1 diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt new file mode 100644 index 0000000..81fbaf6 --- /dev/null +++ b/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. diff --git a/_service b/_service new file mode 100644 index 0000000..0743cea --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + git + https://github.com/apache/maven-reporting-impl.git + maven-reporting-impl-4.0.0 + maven-reporting-impl-* + @PARENT_TAG@ + maven-reporting-impl-(.*) + + + *.tar + xz + + + diff --git a/maven-reporting-impl-3.2.0-source-release.zip b/maven-reporting-impl-3.2.0-source-release.zip deleted file mode 100644 index 9953b83..0000000 --- a/maven-reporting-impl-3.2.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6513b8e90e051504f44029e723fa0fe6bdce26b9b5cbb4d7f4bd36606c5b3ae -size 47349 diff --git a/maven-reporting-impl-4.0.0.tar.xz b/maven-reporting-impl-4.0.0.tar.xz new file mode 100644 index 0000000..96f3e36 --- /dev/null +++ b/maven-reporting-impl-4.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8896b36a9669d22f1db210d330556812b74d76ae3742d01275fbc8d89885db8f +size 18564 diff --git a/maven-reporting-impl-build.xml b/maven-reporting-impl-build.xml index 798e843..fc9b465 100644 --- a/maven-reporting-impl-build.xml +++ b/maven-reporting-impl-build.xml @@ -10,20 +10,18 @@ + + + + + - - - - - - + @@ -58,13 +56,13 @@ @@ -82,8 +80,8 @@ packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" - source="${compiler.source}" verbose="false" + locale="en" version="true" use="true" author="true" @@ -95,7 +93,7 @@ nohelp="false" nonavbar="false" serialwarn="false" - encoding="UTF-8" + encoding="utf-8" linksource="false" breakiterator="false"> @@ -114,7 +112,6 @@ excludes="**/package.html"> - diff --git a/maven-reporting-impl.changes b/maven-reporting-impl.changes index 879dc1e..6254c4c 100644 --- a/maven-reporting-impl.changes +++ b/maven-reporting-impl.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Sat Oct 12 20:38:06 UTC 2024 - Fridrich Strba + +- 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 diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec index 545f3ad..5cf398e 100644 --- a/maven-reporting-impl.spec +++ b/maven-reporting-impl.spec @@ -17,30 +17,30 @@ Name: maven-reporting-impl -Version: 3.2.0 +Version: 4.0.0 Release: 0 Summary: Abstract classes to manage report generation License: Apache-2.0 Group: Development/Libraries/Java URL: https://maven.apache.org/shared/%{name} -Source0: http://archive.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip -Source1: %{name}-build.xml -Patch0: 0001-Remove-dependency-on-junit-addons.patch +Source0: %{name}-%{version}.tar.xz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source2: %{name}-build.xml BuildRequires: ant BuildRequires: fdupes 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 >= 3.1.1 +BuildRequires: maven-reporting-api >= 4 +BuildRequires: maven-resolver-api BuildRequires: maven-shared-utils BuildRequires: plexus-utils -BuildRequires: unzip +BuildRequires: sisu-plexus BuildArch: noarch %description @@ -60,8 +60,8 @@ API documentation for %{name}. %prep %setup -q -cp %{SOURCE1} build.xml -%patch -P 0 -p1 +cp %{SOURCE1} LICENSE.txt +cp %{SOURCE2} build.xml # integration tests try to download stuff from the internet # and therefore they don't work in Build Service @@ -70,25 +70,25 @@ cp %{SOURCE1} build.xml %build mkdir -p lib build-jar-repository -s lib \ + maven-archiver/maven-archiver \ maven-doxia/doxia-core \ - maven-doxia/doxia-logging-api \ - maven-doxia/doxia-module-xhtml \ maven-doxia/doxia-module-xhtml5 \ maven-doxia/doxia-sink-api \ - maven-doxia-sitetools/doxia-decoration-model \ maven-doxia-sitetools/doxia-integration-tools \ + maven-doxia-sitetools/doxia-site-model \ maven-doxia-sitetools/doxia-site-renderer \ maven/maven-artifact \ - maven/maven-compat \ maven/maven-core \ + maven/maven-model \ maven/maven-plugin-api \ maven-plugin-tools/maven-plugin-annotations \ maven-reporting-api/maven-reporting-api \ + maven-resolver/maven-resolver-api \ maven-shared-utils/maven-shared-utils \ + org.eclipse.sisu.plexus \ plexus/utils -%{ant} \ - jar javadoc +ant jar javadoc %install # jar @@ -104,10 +104,11 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles -%license LICENSE NOTICE +%license LICENSE.txt +%doc README.md %files javadoc %{_javadocdir}/%{name} -%license LICENSE NOTICE +%license LICENSE.txt %changelog