From 0904e3871b628f60ae630d1095a545998f4181b2 Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Tue, 19 Oct 2021 23:40:06 +0700 Subject: [PATCH] Update to version 2.0 --- .gitignore | 1 + LICENSE-2.0.txt | 202 ++++++++++++++++++++++++++++++++ plexus-sec-dispatcher-pom.patch | 32 ----- plexus-sec-dispatcher.spec | 30 +++-- sources | 3 +- 5 files changed, 218 insertions(+), 50 deletions(-) create mode 100644 LICENSE-2.0.txt delete mode 100644 plexus-sec-dispatcher-pom.patch diff --git a/.gitignore b/.gitignore index bf01c47..c094c56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ plexus-sec-dispatcher-1.4.tar.bz2 /LICENSE-2.0.txt +/plexus-sec-dispatcher-2.0.tar.gz diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt new file mode 100644 index 0000000..d645695 --- /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/plexus-sec-dispatcher-pom.patch b/plexus-sec-dispatcher-pom.patch deleted file mode 100644 index 9cdcb1c..0000000 --- a/plexus-sec-dispatcher-pom.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 1eb2158..7e7ac5d 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -25,25 +25,17 @@ - - - org.codehaus.plexus -- plexus-maven-plugin -+ plexus-component-metadata - 1.3.5 - - - -- descriptor -+ generate-metadata - - - - - -- maven-compiler-plugin -- -- -- 1.4 -- 1.4 -- -- -- - org.codehaus.modello - modello-maven-plugin - diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index 02d06b0..fc4d5c1 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -1,29 +1,22 @@ %bcond_with bootstrap Name: plexus-sec-dispatcher -Version: 1.4 -Release: 34%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: Plexus Security Dispatcher Component License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-sec-dispatcher BuildArch: noarch -# svn export http://svn.sonatype.org/spice/tags/plexus-sec-dispatcher-1.4/ -# tar jcf plexus-sec-dispatcher-1.4.tar.bz2 plexus-sec-dispatcher-1.4/ -Source0: %{name}-%{version}.tar.bz2 -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt - -# Removed maven-compiler-plugin configuration version in the pom as annotations isn't available in version 1.4. -Patch0: %{name}-pom.patch +Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: maven-local-openjdk8 %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils) BuildRequires: %{?module_prefix}mvn(org.sonatype.plexus:plexus-cipher) %endif @@ -35,18 +28,20 @@ Plexus Security Dispatcher Component %{?javadoc_package} %prep -%setup -q -%patch0 -p1 +%autosetup -n %{name}-%{name}-%{version} cp %{SOURCE1} . %pom_remove_parent -%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "test" + +%pom_xpath_inject 'pom:project' 'org.codehaus.plexus' %mvn_file : plexus/%{name} +%mvn_alias org.codehaus.plexus: org.sonatype.plexus: + %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -55,6 +50,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Tue Oct 19 2021 Didik Supriadi - 2.0-1 +- Update to version 2.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.4-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 0bcf791..849eb1d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (plexus-sec-dispatcher-1.4.tar.bz2) = 4aaebb01d2f053819f2c736bbc0a1038825ba2ddc21f2dc7a833ff3f1dbabd5a18cae88ed5fc74527c38271704b798f927036626e2e3a09a5e803276a90e2108 -SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 +SHA512 (plexus-sec-dispatcher-2.0.tar.gz) = 004f9728436aac614b1e4db66b81f17e35484a1908a486be7ceb67ad66692dbdea4b50ee0150a25d940d0965338bac823209ab4740607c5b876ecff0e90c2183