diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d574a3f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/plexus-compiler-2.8.1.tar.gz diff --git a/.rh-maven35-plexus-compiler.metadata b/.rh-maven35-plexus-compiler.metadata new file mode 100644 index 0000000..ba4db44 --- /dev/null +++ b/.rh-maven35-plexus-compiler.metadata @@ -0,0 +1 @@ +b934c8eb889fd938d246066e270d8c0c3c853d67 SOURCES/plexus-compiler-2.8.1.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Copy-input-map-in-setCustomCompilerArguments-AsMap.patch b/SOURCES/0001-Copy-input-map-in-setCustomCompilerArguments-AsMap.patch new file mode 100644 index 0000000..eb3ce04 --- /dev/null +++ b/SOURCES/0001-Copy-input-map-in-setCustomCompilerArguments-AsMap.patch @@ -0,0 +1,49 @@ +From 3a9c9a0bea7794c04ddbb8ac0520839c0f3d1cd0 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 1 Nov 2016 11:17:02 +0100 +Subject: [PATCH] Copy input map in setCustomCompilerArguments[AsMap] + +--- + .../plexus/compiler/CompilerConfiguration.java | 18 ++++-------------- + 1 file changed, 4 insertions(+), 14 deletions(-) + +diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java +index 69fc810..d4c4c03 100644 +--- a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java ++++ b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java +@@ -426,14 +426,7 @@ public class CompilerConfiguration + @Deprecated + public void setCustomCompilerArguments( LinkedHashMap customCompilerArguments ) + { +- if ( customCompilerArguments == null ) +- { +- this.customCompilerArguments = new ArrayList>(); +- } +- else +- { +- this.customCompilerArguments = customCompilerArguments.entrySet(); +- } ++ setCustomCompilerArgumentsAsMap( customCompilerArguments ); + } + + /** +@@ -454,13 +447,10 @@ public class CompilerConfiguration + + public void setCustomCompilerArgumentsAsMap( Map customCompilerArguments ) + { +- if ( customCompilerArguments == null ) +- { +- this.customCompilerArguments = new ArrayList>(); +- } +- else ++ this.customCompilerArguments = new ArrayList>(); ++ if ( customCompilerArguments != null ) + { +- this.customCompilerArguments = customCompilerArguments.entrySet(); ++ this.customCompilerArguments.addAll( customCompilerArguments.entrySet() ); + } + } + +-- +2.7.4 + 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/SOURCES/LICENSE.MIT b/SOURCES/LICENSE.MIT new file mode 100644 index 0000000..cc7519b --- /dev/null +++ b/SOURCES/LICENSE.MIT @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2005, The Codehaus + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/SPECS/plexus-compiler.spec b/SPECS/plexus-compiler.spec new file mode 100644 index 0000000..95153f0 --- /dev/null +++ b/SPECS/plexus-compiler.spec @@ -0,0 +1,253 @@ +%{?scl:%scl_package plexus-compiler} +%{!?scl:%global pkg_name %{name}} + +%bcond_without eclipse + +Name: %{?scl_prefix}plexus-compiler +Epoch: 0 +Version: 2.8.1 +Release: 4.2%{?dist} +Summary: Compiler call initiators for Plexus +# extras subpackage has a bit different licensing +# parts of compiler-api are ASL2.0/MIT +License: MIT and ASL 2.0 +URL: https://github.com/codehaus-plexus/plexus-compiler +BuildArch: noarch + +Source0: https://github.com/codehaus-plexus/%{pkg_name}/archive/%{pkg_name}-%{version}.tar.gz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source2: LICENSE.MIT + +# https://github.com/codehaus-plexus/plexus-compiler/pull/25 +Patch0: 0001-Copy-input-map-in-setCustomCompilerArguments-AsMap.patch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-components:pom:) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-utils) +%if %{with eclipse} +BuildRequires: mvn(org.eclipse.tycho:org.eclipse.jdt.core) +%endif + +%description +Plexus Compiler adds support for using various compilers from a +unified api. Support for javac is available in main package. For +additional compilers see %{pkg_name}-extras package. + +%package extras +Summary: Extra compiler support for %{pkg_name} +# ASL 2.0: src/main/java/org/codehaus/plexus/compiler/util/scan/ +# ...codehaus/plexus/compiler/csharp/CSharpCompiler.java +# ASL 1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java +License: MIT and ASL 2.0 and ASL 1.1 + +%description extras +Additional support for csharp, eclipse and jikes compilers + +%package pom +Summary: Maven POM files for %{pkg_name} + +%description pom +This package provides %{summary}. + +%package javadoc +Summary: Javadoc for %{pkg_name} +License: MIT and ASL 2.0 and ASL 1.1 + +%description javadoc +API documentation for %{pkg_name}. + +%prep +%setup -q -n %{pkg_name}-%{pkg_name}-%{version} + +%patch0 -p1 + +cp %{SOURCE1} LICENSE +cp %{SOURCE2} LICENSE.MIT + +%pom_disable_module plexus-compiler-aspectj plexus-compilers +# missing com.google.errorprone:error_prone_core +%pom_disable_module plexus-compiler-javac-errorprone plexus-compilers + +%if %{without eclipse} +%pom_disable_module plexus-compiler-eclipse plexus-compilers +%endif + +# don't build/install compiler-test module, it needs maven2 test harness +%pom_disable_module plexus-compiler-test + +# don't install sources jars +%mvn_package ":*::sources:" __noinstall + +%mvn_package ":plexus-compiler{,s}" pom +%mvn_package ":*{csharp,eclipse,jikes}*" extras + +# don't generate requires on test dependency (see #1007498) +%pom_xpath_remove "pom:dependency[pom:artifactId[text()='plexus-compiler-test']]" plexus-compilers + +%pom_remove_plugin :maven-site-plugin + +%build +# Tests are skipped because of unavailable plexus-compiler-test artifact +%mvn_build -f + +%install +%mvn_install + +%files -f .mfiles +%dir %{_javadir}/%{pkg_name} +%doc LICENSE LICENSE.MIT + +%files extras -f .mfiles-extras + +%files pom -f .mfiles-pom + +%files javadoc -f .mfiles-javadoc +%doc LICENSE LICENSE.MIT + +%changelog +* Thu Jun 22 2017 Michael Simacek - 0:2.8.1-4.2 +- Mass rebuild 2017-06-22 + +* Wed Jun 21 2017 Java Maintainers - 0:2.8.1-4.1 +- Automated package import and SCL-ization + +* Thu May 25 2017 Mikolaj Izdebski - 0:2.8.1-4 +- Add eclipse build-conditional + +* Sat Feb 11 2017 Fedora Release Engineering - 0:2.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Nov 02 2016 Michael Simacek - 0:2.8.1-2 +- Add patch to fix tycho compatibility + +* Mon Oct 31 2016 Michael Simacek - 0:2.8.1-1 +- Update to upstream version 2.8.1 + +* Fri Jul 8 2016 Mikolaj Izdebski - 0:2.7-3 +- Remove unneeded build-requires + +* Thu Feb 04 2016 Fedora Release Engineering - 0:2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 25 2016 Mikolaj Izdebski - 0:2.7-1 +- Update to upstream version 2.7 + +* Thu Jun 18 2015 Fedora Release Engineering - 0:2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 1 2015 Mikolaj Izdebski - 0:2.4-2 +- Update upstream URL + +* Mon Oct 13 2014 Mikolaj Izdebski - 0:2.4-1 +- Update to upstream version 2.4 + +* Mon Aug 4 2014 Mikolaj Izdebski - 0:2.3-6 +- Fix build-requires on POM packages + +* Sat Jun 07 2014 Fedora Release Engineering - 0:2.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 28 2014 Mikolaj Izdebski - 0:2.3-4 +- Rebuild to regenerate Maven auto-requires + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:2.3-3 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 0:2.3-2 +- Fix unowned directory +- Regenerate build-requires + +* Fri Sep 13 2013 Michal Srb - 0:2.3-1 +- Update to upstream version 2.3 + +* Sun Aug 04 2013 Fedora Release Engineering - 0:2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 15 2013 Mikolaj Izdebski - 0:2.2-4 +- Fix license tag +- Install MIT license file + +* Wed Apr 10 2013 Mikolaj Izdebski - 0:2.2-3 +- Remove auxiliary aliases + +* Wed Apr 10 2013 Mikolaj Izdebski - 0:2.2-2 +- Add auxiliary aliases + +* Tue Mar 05 2013 Michal Srb - 0:2.2-1 +- Update to upstream version 2.2 +- Add license file (Resolves: #903268) + +* Tue Mar 05 2013 Michal Srb - 0:2.1-3 +- Remove auxiliary aliases + +* Tue Mar 05 2013 Michal Srb - 0:2.1-2 +- Build with original POM files + +* Wed Jan 23 2013 Mikolaj Izdebski - 0:2.1-1 +- Update to upstream version 2.1 +- Build with xmvn + +* Wed Dec 5 2012 Michal Srb - 0:1.9.2-3 +- Replaced dependency to plexus-container-default with plexus-containers-container-default + +* Tue Nov 13 2012 Stanislav Ochotnicky - 0:1.9.2-2 +- Fix up licensing properly + +* Mon Oct 29 2012 Mikolaj Izdebski - 0:1.9.2-1 +- Update to upstream version 1.9.2 + +* Wed Aug 8 2012 Stanislav Ochotnicky - 0:1.9.1-3 +- Fix FTBFS by adding ignoreOptionalProblems function +- Use new pom_ macros instead of patches + +* Sat Jul 21 2012 Fedora Release Engineering - 0:1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 19 2012 Stanislav Ochotnicky - 0:1.9.1-1 +- Update to upstream 1.9.1 release + +* Fri Jan 13 2012 Alexander Kurtakov 0:1.8.3-1 +- Update to upstream 1.8.3 release. +- For some reason junit is strong (not test) dependency. + +* Thu Dec 1 2011 Stanislav Ochotnicky - 0:1.8-3 +- Build with maven 3 +- Don't install compiler-test module (nothing should use it anyway) +- Fixes accoding to current guidelines +- Install depmaps into extras separately + +* Wed Feb 09 2011 Fedora Release Engineering - 0:1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jan 20 2011 Stanislav Ochotnicky - 0:1.8-1 +- Update to latest version (1.8) +- Create extras subpackage with optional compilers +- Provide maven depmaps +- Versionless jars & javadocs + +* Sun Jul 26 2009 Fedora Release Engineering - 0:1.5.2-4.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0:1.5.2-3.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.5.2-2.3 +- drop repotag + +* Thu Mar 15 2007 Deepak Bhole - 0:1.5.2-2jpp.2 +- Fix bug in spec that prevented unversioned symlink creation + +* Thu Mar 08 2007 Deepak Bhole - 0:1.5.2-2jpp.1 +- Fix license +- Disable aspectj compiler until we can put that into Fedora +- Remove vendor and distribution tags +- Removed javadoc post and postuns, with dirs being marked %%doc now +- Fix buildroot per Fedora spec + +* Fri Jun 02 2006 Ralph Apel - 0:1.5.2-2jpp +- Fix jar naming to previous plexus conventions + +* Tue May 30 2006 Ralph Apel - 0:1.5.2-1jpp +- First JPackage build