From 66ac31fcf454ecc6eb033a9aa235a0fc2906bd5a877c4cf81d6b944f1fea7ed4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 1 Oct 2024 22:38:24 +0000 Subject: [PATCH 1/3] move out of test OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-reporting-api?expand=0&rev=15 --- .gitattributes | 23 +++ .gitignore | 1 + LICENSE-2.0.txt | 202 +++++++++++++++++++ _service | 16 ++ maven-reporting-api-3.1.1-source-release.zip | 3 + maven-reporting-api-4.0.0~M12.tar.xz | 3 + maven-reporting-api-build.xml | 135 +++++++++++++ maven-reporting-api.changes | 31 +++ maven-reporting-api.spec | 81 ++++++++ 9 files changed, 495 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 LICENSE-2.0.txt create mode 100644 _service create mode 100644 maven-reporting-api-3.1.1-source-release.zip create mode 100644 maven-reporting-api-4.0.0~M12.tar.xz create mode 100644 maven-reporting-api-build.xml create mode 100644 maven-reporting-api.changes create mode 100644 maven-reporting-api.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc 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..750a249 --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + git + https://github.com/apache/maven-reporting-api.git + maven-reporting-api-4.0.0-M12 + maven-reporting-api-* + @PARENT_TAG@ + maven-reporting-api-(\d+).(\d+).(\d+)-(.*) + \1.\2.\3~\4 + + + *.tar + xz + + + diff --git a/maven-reporting-api-3.1.1-source-release.zip b/maven-reporting-api-3.1.1-source-release.zip new file mode 100644 index 0000000..9e20a36 --- /dev/null +++ b/maven-reporting-api-3.1.1-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ce3604002dd5f4698ed4068ea74254f95e2988007486f4e05cecd5ae55dd586 +size 23323 diff --git a/maven-reporting-api-4.0.0~M12.tar.xz b/maven-reporting-api-4.0.0~M12.tar.xz new file mode 100644 index 0000000..bf73afc --- /dev/null +++ b/maven-reporting-api-4.0.0~M12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f013bf4f10b69f66a174b7d608fee44aad44355448a62791630b71c69136216 +size 7392 diff --git a/maven-reporting-api-build.xml b/maven-reporting-api-build.xml new file mode 100644 index 0000000..8a6270a --- /dev/null +++ b/maven-reporting-api-build.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maven-reporting-api.changes b/maven-reporting-api.changes new file mode 100644 index 0000000..c8b52f7 --- /dev/null +++ b/maven-reporting-api.changes @@ -0,0 +1,31 @@ +------------------------------------------------------------------- +Sun Sep 24 01:57:03 UTC 2023 - Fridrich Strba + +- Upgrade to upstream version 3.1.1 + * Task: + + MSHARED-1118 - Restore binary compat for MavenReport + (partially revert MSHARED-1024) + +------------------------------------------------------------------- +Sun Mar 20 20:11:02 UTC 2022 - Fridrich Strba + +- Build with source and target levels 8 + +------------------------------------------------------------------- +Fri Mar 11 06:57:17 UTC 2022 - Fridrich Strba + +- Upgrade to upstream version 3.1.0 + * Improvements: + + [MSHARED-812] – Require Java 7 + + [MSHARED-879] – make build Reproducible + * Task: + + [MSHARED-1024] – Replace deprecated code + * Dependency upgrade: + + [MSHARED-844] – Upgrade to Doxia 1.11.1 + * needed for a new maven-javadoc-plugin + +------------------------------------------------------------------- +Thu Mar 28 18:24:34 UTC 2019 - Fridrich Strba + +- Initial packaging of maven-reporting-api 3.0 +- Generate and customize ant build.xml file diff --git a/maven-reporting-api.spec b/maven-reporting-api.spec new file mode 100644 index 0000000..6a977cd --- /dev/null +++ b/maven-reporting-api.spec @@ -0,0 +1,81 @@ +# +# spec file for package maven-reporting-api +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global pom_version 4.0.0-M12 +Name: maven-reporting-api +Version: 4.0.0~M12 +Release: 0 +Summary: API to manage report generation +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://maven.apache.org/shared/maven-reporting-api +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-doxia-sink-api >= 2.0 +BuildArch: noarch + +%description +API to manage report generation. Maven-reporting-api is included in Maven 2.x +core distribution, but moved to shared components to achieve report decoupling +from Maven 3 core. + +This is a replacement package for maven-shared-reporting-api + +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Libraries/Java + +%description javadoc +API documentation for %{name}. + +%prep +%setup -q +cp %{SOURCE1} LICENSE.txt +cp %{SOURCE2} build.xml + +%build +mkdir -p lib +build-jar-repository -s lib \ + maven-doxia/doxia-sink-api +ant jar javadoc + +%install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%pom_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 -a org.apache.maven.shared:maven-reporting-api +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE.txt + +%files javadoc +%{_javadocdir}/%{name} +%license LICENSE.txt + +%changelog From e5c017b411f825a62853e767df6978d709ab86bcbbe65ce0d498543048ace965 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 1 Oct 2024 22:53:06 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-reporting-api?expand=0&rev=16 --- _service | 5 ++--- maven-reporting-api-4.0.0.tar.xz | 3 +++ maven-reporting-api-4.0.0~M12.tar.xz | 3 --- maven-reporting-api-build.xml | 2 +- maven-reporting-api.spec | 5 ++--- 5 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 maven-reporting-api-4.0.0.tar.xz delete mode 100644 maven-reporting-api-4.0.0~M12.tar.xz diff --git a/_service b/_service index 750a249..0459786 100644 --- a/_service +++ b/_service @@ -2,11 +2,10 @@ git https://github.com/apache/maven-reporting-api.git - maven-reporting-api-4.0.0-M12 + maven-reporting-api-4.0.0 maven-reporting-api-* @PARENT_TAG@ - maven-reporting-api-(\d+).(\d+).(\d+)-(.*) - \1.\2.\3~\4 + maven-reporting-api-(.*) *.tar diff --git a/maven-reporting-api-4.0.0.tar.xz b/maven-reporting-api-4.0.0.tar.xz new file mode 100644 index 0000000..d57219f --- /dev/null +++ b/maven-reporting-api-4.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b64f60c29f71f77b451e7e70513d4acfb932c55d5c43f5f576a14b596f272324 +size 7376 diff --git a/maven-reporting-api-4.0.0~M12.tar.xz b/maven-reporting-api-4.0.0~M12.tar.xz deleted file mode 100644 index bf73afc..0000000 --- a/maven-reporting-api-4.0.0~M12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f013bf4f10b69f66a174b7d608fee44aad44355448a62791630b71c69136216 -size 7392 diff --git a/maven-reporting-api-build.xml b/maven-reporting-api-build.xml index 8a6270a..5e950f1 100644 --- a/maven-reporting-api-build.xml +++ b/maven-reporting-api-build.xml @@ -10,7 +10,7 @@ - + diff --git a/maven-reporting-api.spec b/maven-reporting-api.spec index 6a977cd..2c12c1d 100644 --- a/maven-reporting-api.spec +++ b/maven-reporting-api.spec @@ -16,9 +16,8 @@ # -%global pom_version 4.0.0-M12 Name: maven-reporting-api -Version: 4.0.0~M12 +Version: 4.0.0 Release: 0 Summary: API to manage report generation License: Apache-2.0 @@ -61,7 +60,7 @@ ant jar javadoc %install # jar install -dm 0755 %{buildroot}%{_javadir}/%{name} -install -pm 0644 target/%{name}-%pom_version.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +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 From 077218e0a99b7f8737c0976aaa57c378114df27b0f78400f0c2bae9deb6ee0c5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 3 Oct 2024 22:07:39 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-reporting-api?expand=0&rev=17 --- maven-reporting-api.changes | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/maven-reporting-api.changes b/maven-reporting-api.changes index c8b52f7..c5cb851 100644 --- a/maven-reporting-api.changes +++ b/maven-reporting-api.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Oct 3 22:04:11 UTC 2024 - Fridrich Strba + +- Upgrade to upstream version 4.0.0 + * Improvement + + MSHARED-193: API change: let MavenReportRenderer#render() + throw an exception + + MSHARED-1032: API change: let MavenReport#canGenerateReport() + throw an exception + * Task + + MSHARED-1159: Require locale to be not null + + MSHARED-1231: Remove unused default-report.xml file + + MSHARED-1326: Improve MavenReport interface and + AbstractMavenReport class API +- Fetch sources by source service from Github + ------------------------------------------------------------------- Sun Sep 24 01:57:03 UTC 2023 - Fridrich Strba