.gitignore

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

.maven-compiler-plugin.metadata

@@ -1 +1 @@
-40238ef90b32af03866c1e6d8a92e40436daace0 SOURCES/maven-compiler-plugin-3.10.1-source-release.zip
+3ad7798b797cb02318552983106941db1e239548 SOURCES/maven-compiler-plugin-3.8.1-source-release.zip

SOURCES/0001-plexus-languages-1.0.patch

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,25 @@
+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,20 +1,25 @@
 %bcond_with bootstrap
 
 Name:           maven-compiler-plugin
-Version:        3.10.1
+Version:        3.8.1
-Release:        3%{?dist}
+Release:        12%{?dist}
 Summary:        Maven Compiler Plugin
 License:        ASL 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)
@@ -45,6 +50,8 @@ 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
@@ -62,23 +69,15 @@ sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar juni
 %license LICENSE NOTICE
 
 %changelog
-* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.10.1-3
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.8.1-12
-- Rebuild to regenerate auto-requires
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-
+  Related: rhbz#1991688
-* 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
 
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-11
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+- Rebuild to workaround DistroBaker issue
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-10
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Bootstrap Maven for CentOS Stream 9
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-9
 - Bootstrap build