.gitignore

@@ -1 +1 @@
-SOURCES/maven-compiler-plugin-3.8.1-source-release.zip
+SOURCES/maven-compiler-plugin-3.12.1-source-release.zip

.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

SOURCES/0001-plexus-languages-1.0.patch

@@ -1,25 +0,0 @@
-From fd5749e9b8d47cf350527c4831a4ee53cefc60aa Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Mon, 20 Jul 2020 22:51:52 +0100
-Subject: [PATCH 1/2] plexus languages 1.0
-
----
- .../java/org/apache/maven/plugin/compiler/CompilerMojo.java     | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
-index 8bc437b..326f9f9 100644
---- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
-+++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
-@@ -50,7 +50,7 @@ import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor;
- import org.codehaus.plexus.languages.java.jpms.LocationManager;
- import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest;
- import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult;
--import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult.ModuleNameSource;
-+import org.codehaus.plexus.languages.java.jpms.ModuleNameSource;
- 
- /**
-  * Compiles application sources
--- 
-2.26.2
-

SOURCES/0002-MCOMPILER-359-Fix-for-NPE.patch

@@ -1,25 +0,0 @@
-From 8ef296b291e7ef1e1e4ab4fa4b520a80bde48a9f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <hohwille@users.noreply.github.com>
-Date: Tue, 17 Dec 2019 19:05:57 +0100
-Subject: [PATCH 2/2] MCOMPILER-359: Fix for NPE
-
----
- .../java/org/apache/maven/plugin/compiler/TestCompilerMojo.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
-index f8b9ba1..203dd07 100644
---- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
-+++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
-@@ -250,7 +250,7 @@ public class TestCompilerMojo
-                 
-                 for ( Entry<String, Exception> pathException : result.getPathExceptions().entrySet() )
-                 {
--                    Throwable cause = pathException.getValue().getCause();
-+                    Throwable cause = pathException.getValue();
-                     while ( cause.getCause() != null )
-                     {
-                         cause = cause.getCause();
--- 
-2.26.2
-

SPECS/maven-compiler-plugin.spec

@@ -1,41 +1,38 @@
 %bcond_with bootstrap
 
 Name:           maven-compiler-plugin
-Version:        3.8.1
+Version:        3.12.1
-Release:        12%{?dist}
+Release:        4%{?dist}
 Summary:        Maven Compiler Plugin
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://maven.apache.org/plugins/maven-compiler-plugin
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip
 
-# port to plexus-languages 1.0.3
-Patch0:         0001-plexus-languages-1.0.patch
-
-# Taken from upstream commit: https://github.com/apache/maven-compiler-plugin/commit/116b98153ef5ce7b13c0275324baa28bca8bc887
-Patch1:         0002-MCOMPILER-359-Fix-for-NPE.patch
-
-BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
-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.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
 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.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
 
@@ -50,8 +47,6 @@ API documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -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
@@ -69,15 +64,51 @@ sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar juni
 %license LICENSE NOTICE
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.8.1-12
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.12.1-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for October 2024 mass rebuild:
-  Related: rhbz#1991688
+  Resolves: RHEL-64018
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.12.1-3
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.12.1-2
+- Bump release for June 2024 mass rebuild
+
+* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12.1-1
+- Update to upstream version 3.12.1
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.0-2
+- Rebuild
+
+* Tue Aug 15 2023 Marian Koncek <mkoncek@redhat.com> - 3.11.0-1
+- Update to upstream version 3.11.0
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.10.1-1
+- Update to upstream version 3.10.1
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.8.1-12
+- Rebuilt for java-17-openjdk as system jdk
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-11
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-11
-- Rebuild to workaround DistroBaker issue
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-10
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-10
-- Bootstrap Maven for CentOS Stream 9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-9
 - Bootstrap build