diff --git a/.gitignore b/.gitignore index f93a1e7..d3a900b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/plexus-compiler-2.8.5.tar.gz +SOURCES/plexus-compiler-2.15.0.tar.gz diff --git a/.plexus-compiler.metadata b/.plexus-compiler.metadata index 97abb6a..e469c88 100644 --- a/.plexus-compiler.metadata +++ b/.plexus-compiler.metadata @@ -1 +1 @@ -9ef34d4e2595fd2568f4c01f0beac79d2f48ed8a SOURCES/plexus-compiler-2.8.5.tar.gz +39396f99f52c3e47db7bb5f9e13fe9fb71ac4ce7 SOURCES/plexus-compiler-2.15.0.tar.gz diff --git a/SPECS/plexus-compiler.spec b/SPECS/plexus-compiler.spec index 7f3d6e2..587e282 100644 --- a/SPECS/plexus-compiler.spec +++ b/SPECS/plexus-compiler.spec @@ -1,23 +1,31 @@ -Name: plexus-compiler -Version: 2.8.5 -Release: 3%{?dist} -Summary: Compiler call initiators for Plexus +%bcond_with bootstrap + +Name: plexus-compiler +Version: 2.15.0 +Release: 9%{?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 +# parts of compiler-api are Apache-2.0/MIT +License: MIT AND Apache-2.0 +URL: https://github.com/codehaus-plexus/plexus-compiler +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -Source2: LICENSE.MIT +Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt +Source2: LICENSE.MIT +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) - +BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.slf4j:slf4j-api) +%endif %description Plexus Compiler adds support for using various compilers from a @@ -26,10 +34,10 @@ additional compilers see %{name}-extras package. %package extras Summary: Extra compiler support for %{name} -# ASL 2.0: src/main/java/org/codehaus/plexus/compiler/util/scan/ +# Apache-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 +# Apache-1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java +License: MIT AND Apache-2.0 AND Apache-1.1 %description extras Additional support for csharp, eclipse and jikes compilers @@ -41,18 +49,22 @@ Summary: Maven POM files for %{name} This package provides %{summary}. %package javadoc -Summary: Javadoc for %{name} -License: MIT and ASL 2.0 and ASL 1.1 +Summary: API documentation for %{name} +License: MIT AND Apache-2.0 AND Apache-1.1 %description javadoc API documentation for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} +%autosetup -p1 -n %{name}-%{name}-%{version} + +find -name '.class' -delete cp %{SOURCE1} LICENSE cp %{SOURCE2} LICENSE.MIT +%pom_remove_dep :junit-bom + %pom_disable_module plexus-compiler-aspectj plexus-compilers # missing com.google.errorprone:error_prone_core %pom_disable_module plexus-compiler-javac-errorprone plexus-compilers @@ -61,6 +73,7 @@ cp %{SOURCE2} LICENSE.MIT # don't build/install compiler-test module, it needs maven2 test harness %pom_disable_module plexus-compiler-test +%pom_disable_module plexus-compiler-its # don't install sources jars %mvn_package ":*::sources:" __noinstall @@ -72,7 +85,10 @@ cp %{SOURCE2} LICENSE.MIT %pom_xpath_remove "pom:dependency[pom:artifactId[text()='plexus-compiler-test']]" plexus-compilers %pom_remove_plugin :maven-site-plugin -%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin + +%pom_remove_dep -r org.codehaus.plexus:plexus-compiler-javac-errorprone +%pom_remove_dep org.codehaus.plexus:plexus-xml plexus-compiler-manager %build # Tests are skipped because of unavailable plexus-compiler-test artifact @@ -82,23 +98,126 @@ cp %{SOURCE2} LICENSE.MIT %mvn_install %files -f .mfiles -%doc LICENSE LICENSE.MIT +%license LICENSE LICENSE.MIT + %files extras -f .mfiles-extras + %files pom -f .mfiles-pom %files javadoc -f .mfiles-javadoc -%doc LICENSE LICENSE.MIT +%license LICENSE LICENSE.MIT %changelog +* Sat Jan 18 2025 Marián Konček - 2.15.0-9 +- Bump release + +* Fri Nov 29 2024 Mikolaj Izdebski - 2.15.0-6 +- Update javapackages test plan to f42 + +* Fri Jul 19 2024 Fedora Release Engineering - 2.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Apr 08 2024 Marian Koncek - 2.15.0-1 +- Update to upstream version 2.15.0 + +* Tue Feb 27 2024 Jiri Vanek - 2.14.2-3 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.14.2-2 +- bump of release for for java-21-openjdk as system jdk + +* Thu Feb 01 2024 Mikolaj Izdebski - 2.14.2-1 +- Update to upstream version 2.14.2 + +* Thu Jan 25 2024 Fedora Release Engineering - 2.14.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 18 2023 Marian Koncek - 2.14.1-1 +- Update to upstream version 2.14.1 + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.13.0-2 +- Convert License tag to SPDX format + +* Thu Aug 17 2023 Marian Koncek - 2.13.0-1 +- Update to upstream version 2.13.0 + +* Fri Jul 21 2023 Fedora Release Engineering - 2.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 2.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Sep 05 2022 Marian Koncek - 2.12.1-1 +- Update to upstream version 2.12.1 + +* Fri Jul 22 2022 Fedora Release Engineering - 2.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 24 2022 Mikolaj Izdebski - 2.11.1-1 +- Update to upstream version 2.11.1 + +* Sat Feb 05 2022 Jiri Vanek - 2.8.8-5 +- Rebuilt for java-17-openjdk as system jdk + +* Fri Jan 21 2022 Fedora Release Engineering - 2.8.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jul 27 2021 Fedora Release Engineering - 2.8.8-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 2.8.8-2 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 0:2.8.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Sep 11 2020 Marian Koncek - 2.8.8-1 +- Update to upstream version 2.8.8 + +* Fri Aug 28 2020 Fabio Valentini - 0:2.8.8-1 +- Update to version 2.8.8. + +* Sun Aug 16 2020 Fabio Valentini - 0:2.8.7-1 +- Update to version 2.8.7. + +* Tue Jul 28 2020 Fedora Release Engineering - 0:2.8.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 0:2.8.6-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Feb 17 2020 Alexander Scheel - 0:2.8.6-1 +- Update to version 2.8.6 + +* Thu Jan 30 2020 Fedora Release Engineering - 0:2.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 2.8.5-3 - Mass rebuild for javapackages-tools 201902 +* Tue Aug 20 2019 Fabio Valentini - 0:2.8.5-1 +- Update to version 2.8.5. + +* Fri Jul 26 2019 Fedora Release Engineering - 0:2.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 2.8.5-2 - Mass rebuild for javapackages-tools 201901 * Mon May 13 2019 Mikolaj Izdebski - 2.8.5-1 - Update to upstream version 2.8.5 +* Sat Feb 02 2019 Fedora Release Engineering - 0:2.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0:2.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0:2.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild