.gitignore

@@ -1 +1 @@
-SOURCES/plexus-compiler-2.8.8.tar.gz
+SOURCES/plexus-compiler-2.14.2.tar.gz

.plexus-compiler.metadata

@@ -1 +1 @@
-5decacf482c321a0df362ff4b160ba73468417a4 SOURCES/plexus-compiler-2.8.8.tar.gz
+7f0ed92141d4032d6cef88dd1c2c190fb67e4c83 SOURCES/plexus-compiler-2.14.2.tar.gz

SPECS/plexus-compiler.spec

@@ -1,27 +1,30 @@
 %bcond_with bootstrap
 
 Name:           plexus-compiler
-Version:    2.8.8
-Release:    6%{?dist}
+Version:        2.14.2
+Release:        4%{?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
+# 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:        https://www.apache.org/licenses/LICENSE-2.0.txt
 Source2:        LICENSE.MIT
 
-BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-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:  maven-local
+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
@@ -31,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
@@ -47,7 +50,7 @@ This package provides %{summary}.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-License:        MIT and ASL 2.0 and ASL 1.1
+License:        MIT AND Apache-2.0 AND Apache-1.1
 
 %description javadoc
 API documentation for %{name}.
@@ -60,6 +63,8 @@ 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
@@ -68,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
@@ -79,10 +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
@@ -92,26 +98,69 @@ 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
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.8.8-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.14.2-4
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.8-5
-- Rebuild to workaround DistroBaker issue
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.14.2-3
+- Rebuilt for MSVSphere 10
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.8-4
-- Non-bootstrap build
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.14.2-3
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.14.2-2
+- Bump release for June 2024 mass rebuild
+
+* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.14.2-1
+- Update to upstream version 2.14.2
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 18 2023 Marian Koncek <mkoncek@redhat.com> - 2.14.1-1
+- Update to upstream version 2.14.1
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.13.0-2
+- Convert License tag to SPDX format
+
+* Thu Aug 17 2023 Marian Koncek <mkoncek@redhat.com> - 2.13.0-1
+- Update to upstream version 2.13.0
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Sep 05 2022 Marian Koncek <mkoncek@redhat.com> - 2.12.1-1
+- Update to upstream version 2.12.1
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.11.1-1
+- Update to upstream version 2.11.1
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.8.8-5
+- Rebuilt for java-17-openjdk as system jdk
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.8-3
-- Bootstrap Maven for CentOS Stream 9
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.8-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.8.8-2
 - Bootstrap build