diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index f3b0bd6..b2287c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -/results_* -/*.src.rpm - -/plexus-build-api-0.0.6.tar.gz -/sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz -/LICENSE-2.0.txt -/plexus-build-api-0.0.7.tar.gz +SOURCES/plexus-build-api-0.0.7.tar.gz diff --git a/.plexus-build-api0.metadata b/.plexus-build-api0.metadata new file mode 100644 index 0000000..2e71625 --- /dev/null +++ b/.plexus-build-api0.metadata @@ -0,0 +1 @@ +2ad12167b86793277579149c67620b618b21ce1a SOURCES/plexus-build-api-0.0.7.tar.gz diff --git a/0000-Port-to-plexus-utils-3.3.0.patch b/SOURCES/0000-Port-to-plexus-utils-3.3.0.patch similarity index 100% rename from 0000-Port-to-plexus-utils-3.3.0.patch rename to SOURCES/0000-Port-to-plexus-utils-3.3.0.patch diff --git a/SOURCES/LICENSE-2.0.txt b/SOURCES/LICENSE-2.0.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/SOURCES/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/plexus-build-api0-migration-to-component-metadata.patch b/SOURCES/plexus-build-api0-migration-to-component-metadata.patch similarity index 100% rename from plexus-build-api0-migration-to-component-metadata.patch rename to SOURCES/plexus-build-api0-migration-to-component-metadata.patch diff --git a/plexus-build-api0.spec b/SPECS/plexus-build-api0.spec similarity index 90% rename from plexus-build-api0.spec rename to SPECS/plexus-build-api0.spec index 5bf9f92..663ff20 100644 --- a/plexus-build-api0.spec +++ b/SPECS/plexus-build-api0.spec @@ -2,7 +2,7 @@ Name: plexus-build-api0 Version: 0.0.7 -Release: 46%{?dist} +Release: 49%{?dist} Summary: Plexus Build API License: Apache-2.0 URL: https://github.com/codehaus-plexus/plexus-build-api @@ -13,8 +13,8 @@ Source0: https://github.com/codehaus-plexus/plexus-build-api/archive/refs Source1: http://www.apache.org/licenses/LICENSE-2.0.txt # Forwarded upstream: https://github.com/sonatype/sisu-build-api/pull/2 -Patch0: %{name}-migration-to-component-metadata.patch -Patch1: 0000-Port-to-plexus-utils-3.3.0.patch +Patch: %{name}-migration-to-component-metadata.patch +Patch: 0000-Port-to-plexus-utils-3.3.0.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -29,17 +29,15 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-utils) Plexus Build API %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc API documentation for %{name}. %prep -%setup -q -n plexus-build-api-plexus-build-api-0.0.7 +%autosetup -p1 -n plexus-build-api-plexus-build-api-%{version} cp -p %{SOURCE1} . -%patch0 -p1 -%patch1 -p1 %pom_remove_parent # From upstream commit: https://github.com/codehaus-plexus/plexus-build-api/commit/6566292a7d85e275b824857bdf92d6504bc4824e @@ -57,21 +55,26 @@ cp -p %{SOURCE1} . %mvn_install %files -f .mfiles -%doc LICENSE-2.0.txt +%license LICENSE-2.0.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE-2.0.txt +%license LICENSE-2.0.txt %changelog -* Tue Oct 29 2024 Troy Dawson - 0.0.7-46 -- Bump release for October 2024 mass rebuild: - Resolves: RHEL-64018 +* Fri Nov 29 2024 Mikolaj Izdebski - 0.0.7-48 +- Update javapackages test plan to f42 -* Thu Aug 01 2024 Troy Dawson - 0.0.7-45 -- Bump release for Aug 2024 java mass rebuild +* Wed Jul 24 2024 Mikolaj Izdebski - 0.0.7-47 +- Install license files in licensedir instead of docdir -* Mon Jun 24 2024 Troy Dawson - 0.0.7-44 -- Bump release for June 2024 mass rebuild +* Fri Jul 19 2024 Fedora Release Engineering - 0.0.7-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 0.0.7-45 +- Switch to a newer patch macro syntax + +* Fri Feb 23 2024 Jiri Vanek - 0.0.7-44 +- bump of release for for java-21-openjdk as system jdk * Thu Jan 25 2024 Fedora Release Engineering - 0.0.7-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 9512778..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !Policy -product_versions: - - rhel-10 -decision_contexts: - - osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index f37b73f..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://src.fedoraproject.org/tests/javapackages - ref: c10s -execute: - how: tmt diff --git a/sources b/sources deleted file mode 100644 index 58b56b9..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (plexus-build-api-0.0.7.tar.gz) = dde7b2be1d993e2be6aaaefeafdb6108198a49c021298857ece2a6c82f1b112c4af6c204409e9efd7e11b07ed94235f5e9f9e643133d8a57507d7860ad70d94a -SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8