diff --git a/.gitignore b/.gitignore index 4f25016..440620f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/maven-compiler-plugin-3.8.1-source-release.zip +SOURCES/maven-compiler-plugin-3.12.1-source-release.zip diff --git a/.maven-compiler-plugin.metadata b/.maven-compiler-plugin.metadata index 1b4c745..9d43f6b 100644 --- a/.maven-compiler-plugin.metadata +++ b/.maven-compiler-plugin.metadata @@ -1 +1 @@ -3ad7798b797cb02318552983106941db1e239548 SOURCES/maven-compiler-plugin-3.8.1-source-release.zip +562ae18a47b496d1e7019fd77a2b727e9aa29544 SOURCES/maven-compiler-plugin-3.12.1-source-release.zip diff --git a/SPECS/maven-compiler-plugin.spec b/SPECS/maven-compiler-plugin.spec index 9e0282e..1369c00 100644 --- a/SPECS/maven-compiler-plugin.spec +++ b/SPECS/maven-compiler-plugin.spec @@ -1,42 +1,58 @@ +%bcond_with bootstrap + Name: maven-compiler-plugin -Version: 3.8.1 -Release: 2%{?dist} +Version: 3.12.1 +Release: 9%{?dist} Summary: Maven Compiler Plugin -License: ASL 2.0 -URL: http://maven.apache.org/plugins/maven-compiler-plugin +License: Apache-2.0 +URL: https://maven.apache.org/plugins/maven-compiler-plugin BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip +Source0: https://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.shared:maven-shared-incremental) BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-compat) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-manager) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-java) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus-xml) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.mockito:mockito-core) +%endif %description The Compiler Plugin is used to compile the sources of your project. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc API documentation for %{name}. %prep -%setup -q +%autosetup -p1 + +# Replace path to junit in a test case with the system wide .jar +sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar junit || find-jar javapackages-bootstrap/junit)"|' src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java %build -%mvn_build -f +%mvn_build %install %mvn_install @@ -48,9 +64,85 @@ API documentation for %{name}. %license LICENSE NOTICE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.12.1-8 +- Update javapackages test plan to f42 + +* Thu Jul 18 2024 Fedora Release Engineering - 3.12.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.12.1-3 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 3.12.1-2 +- bump of release for for java-21-openjdk as system jdk + +* Thu Feb 01 2024 Mikolaj Izdebski - 3.12.1-1 +- Update to upstream version 3.12.1 + +* Thu Jan 25 2024 Fedora Release Engineering - 3.11.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.11.0-2 +- Rebuild + +* Tue Aug 15 2023 Marian Koncek - 3.11.0-1 +- Update to upstream version 3.11.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.10.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 24 2022 Mikolaj Izdebski - 3.10.1-1 +- Update to upstream version 3.10.1 + +* Sat Feb 05 2022 Jiri Vanek - 3.8.1-12 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.8.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.8.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.8.1-9 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 3.8.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.8.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 20 2020 Mat Booth - 3.8.1-6 +- Add patch for NPE during testCompile + +* Fri Jul 10 2020 Jiri Vanek - 3.8.1-5 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 3.8.1-2 - Mass rebuild for javapackages-tools 201902 +* Tue Oct 15 2019 Fabio Valentini - 3.8.1-3 +- Port to plexus-languages 1.0. + +* Thu Jul 25 2019 Fedora Release Engineering - 3.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jun 08 2019 Fabio Valentini - 3.8.1-1 +- Update to version 3.8.1. + * Tue Jun 04 2019 Marian Koncek - 3.8.1-1 - Update to upstream version 3.8.1 @@ -60,6 +152,15 @@ API documentation for %{name}. * Fri May 24 2019 Mikolaj Izdebski - 3.7.0-3 - Mass rebuild for javapackages-tools 201901 +* Fri Feb 01 2019 Fedora Release Engineering - 3.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Aug 06 2018 Michael Simacek - 3.8.0-1 +- Update to upstream version 3.8.0 + +* Fri Jul 13 2018 Fedora Release Engineering - 3.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 3.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild