diff --git a/.gitignore b/.gitignore index 0dd9599..0cb0af5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -javacc-maven-plugin-2.6.tar.bz2 -/LICENSE-2.0.txt +/javacc-maven-plugin-*.tar.bz2 +/javacc-maven-plugin-*.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/javacc-maven-plugin-pom.patch b/javacc-maven-plugin-pom.patch deleted file mode 100644 index 1d89ede..0000000 --- a/javacc-maven-plugin-pom.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- pom.xml.sav 2009-09-30 01:25:34.000000000 +0300 -+++ pom.xml 2010-03-23 23:37:07.136383912 +0200 -@@ -85,15 +85,6 @@ under the License. - 1.5.6 - - -- edu.ucla.cs.compilers -- jtb -- 1.3.2 -- -- runtime -- -- - org.apache.maven.reporting - maven-reporting-api - 2.0.4 -@@ -127,60 +118,5 @@ under the License. - - - -- -- -- run-its -- -- -- maven.test.skip -- !true -- -- -- -- 2.0.1 -- -- -- -- -- org.apache.maven.plugins -- maven-invoker-plugin -- 1.4 -- -- src/it -- ${project.build.directory}/it -- -- */pom.xml -- -- verify.bsh -- src/it/settings.xml -- ${project.build.directory}/local-repo -- true -- -- -- -- integration-test -- -- install -- run -- -- -- -- -- -- -- -- -- maven-3 -- -- -- -- ${basedir} -- -- -- -- 3.0-beta-1-SNAPSHOT -- -- -- - - diff --git a/javacc-maven-plugin.spec b/javacc-maven-plugin.spec index 41278fa..8b79d94 100644 --- a/javacc-maven-plugin.spec +++ b/javacc-maven-plugin.spec @@ -1,18 +1,14 @@ Name: javacc-maven-plugin -Version: 2.6 -Release: 38%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: JavaCC Maven Plugin -License: ASL 2.0 -URL: https://github.com/mojohaus/javacc-maven-plugin + +License: Apache-2.0 BuildArch: noarch ExclusiveArch: %{java_arches} noarch - -#svn export http://svn.codehaus.org/mojo/tags/javacc-maven-plugin-2.6 -#tar cjf javacc-maven-plugin-2.6.tar.bz2 javacc-maven-plugin-2.6 -Source0: javacc-maven-plugin-2.6.tar.bz2 -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt - -Patch0: javacc-maven-plugin-pom.patch +URL: https://github.com/mojohaus/javacc-maven-plugin +Source0: %{url}/archive/%{name}-%{version}.tar.gz +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: maven-local BuildRequires: mvn(junit:junit) @@ -21,27 +17,33 @@ BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) BuildRequires: mvn(org.codehaus.mojo:mojo-parent:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) %description Maven Plugin for processing JavaCC grammar files. -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. +%javadoc_package %prep -%setup -q -%patch0 -b .sav +%autosetup -n %{name}-%{name}-%{version} cp -p %{SOURCE1} . +# Do not use jtb, which is unmaintained. It accessed only via reflection to +# avoid depending on Java 1.5 for compilation. +%pom_remove_dep edu.ucla.cs.compilers:jtb + +# Disable integration tests +%pom_remove_plugin org.apache.maven.plugins:maven-invoker-plugin +rm -fr src/it + +# Disable building the web site +rm -fr src/site + %build %mvn_build @@ -49,12 +51,13 @@ cp -p %{SOURCE1} . %mvn_install %files -f .mfiles -%doc LICENSE-2.0.txt src/main/resources/NOTICE - -%files javadoc -f .mfiles-javadoc -%doc LICENSE-2.0.txt src/main/resources/NOTICE +%license LICENSE-2.0.txt src/main/resources/NOTICE %changelog +* Wed Mar 29 2023 Jerry James - 3.0.1-1 +- Version 3.0.1 +- Convert License tag to SPDX + * Thu Jan 19 2023 Fedora Release Engineering - 2.6-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 424a394..aedbb14 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -cb4d47b4b35bf3148b9a11bf67642159 javacc-maven-plugin-2.6.tar.bz2 -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +SHA512 (javacc-maven-plugin-3.0.1.tar.gz) = 683717c4ef79e7594caeabd3a1de883bfd1ca8d8a8dbd39232eb49ee356eedf1eb91eb98198a45832308391bb4e83a945df86090d0b18da8cd9848c8d98e7e16