8 changed files with 14 additions and 149 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,21 +1 @@
-/results_*
-/*.src.rpm
-
-/maven-compiler-plugin-2.0.2.tar.xz
-/maven-compiler-plugin-2.3.2.tar.xz
-/maven-compiler-plugin-2.4.tar.xz
-/maven-compiler-plugin-2.5.1-source-release.zip
-/maven-compiler-plugin-3.0-source-release.zip
-/maven-compiler-plugin-3.1-source-release.zip
-/maven-compiler-plugin-3.2-source-release.zip
-/maven-compiler-plugin-3.3-source-release.zip
-/maven-compiler-plugin-3.5-source-release.zip
-/maven-compiler-plugin-3.5.1-source-release.zip
-/maven-compiler-plugin-3.6.0-source-release.zip
-/maven-compiler-plugin-3.6.1-source-release.zip
-/maven-compiler-plugin-3.7.0-source-release.zip
-/maven-compiler-plugin-3.8.0-source-release.zip
-/maven-compiler-plugin-3.8.1-source-release.zip
-/maven-compiler-plugin-3.10.1-source-release.zip
-/maven-compiler-plugin-3.11.0-source-release.zip
-/maven-compiler-plugin-3.12.1-source-release.zip
+SOURCES/maven-compiler-plugin-3.8.1-source-release.zip
--- a/.maven-compiler-plugin.metadata
+++ b/.maven-compiler-plugin.metadata
@ -0,0 +1 @@
+3ad7798b797cb02318552983106941db1e239548 SOURCES/maven-compiler-plugin-3.8.1-source-release.zip
--- a/SPECS/maven-compiler-plugin.spec
+++ b/SPECS/maven-compiler-plugin.spec
@ -1,40 +1,27 @@
-%bcond_with bootstrap
-
 Name:           maven-compiler-plugin
-Version:        3.12.1
-Release:        4%{?dist}
+Version:        3.8.1
+Release:        2%{?dist}
 Summary:        Maven Compiler Plugin
-License:        Apache-2.0
-URL:            https://maven.apache.org/plugins/maven-compiler-plugin
+License:        ASL 2.0
+URL:            http://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
+Source0:        http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip

-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 BuildRequires:  maven-local
-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.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.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.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.
@ -48,11 +35,8 @@ API documentation for %{name}.
 %prep
 %setup -q

-# 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
+%mvn_build -f

 %install
 %mvn_install
@ -64,83 +48,9 @@ sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar juni
 %license LICENSE NOTICE

 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.12.1-4
- Bump release for October 2024 mass rebuild:
-  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
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-10
- 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
- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 20 2020 Mat Booth <mat.booth@redhat.com> - 3.8.1-6
- Add patch for NPE during testCompile
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.8.1-5
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-2
 - Mass rebuild for javapackages-tools 201902

-* Tue Oct 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-3
- Port to plexus-languages 1.0.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Jun 08 2019 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-1
- Update to version 3.8.1.
-
 * Tue Jun 04 2019 Marian Koncek <mkoncek@redhat.com> - 3.8.1-1
 - Update to upstream version 3.8.1

@ -150,15 +60,6 @@ sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar juni
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.7.0-3
 - Mass rebuild for javapackages-tools 201901

-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Aug 06 2018 Michael Simacek <msimacek@redhat.com> - 3.8.0-1
- Update to upstream version 3.8.0
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

--- a/ci.fmf
+++ b/ci.fmf
@ -1 +0,0 @@
-resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -1,7 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-10
-decision_contexts:
-  - osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
-  how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: c10s
-execute:
-  how: tmt
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (maven-compiler-plugin-3.12.1-source-release.zip) = 8aba1fcb580110119422b5e323d36af6179fcefc485d3354189cfecad987825ca168a61687d52c2a6561559d14387946f6f46606649cc3980cb67136d7dbc8eb
				`@ -0,0 +1 @@`
				`3ad7798b797cb02318552983106941db1e239548 SOURCES/maven-compiler-plugin-3.8.1-source-release.zip`
				`@ -1 +0,0 @@`
				`SHA512 (maven-compiler-plugin-3.12.1-source-release.zip) = 8aba1fcb580110119422b5e323d36af6179fcefc485d3354189cfecad987825ca168a61687d52c2a6561559d14387946f6f46606649cc3980cb67136d7dbc8eb`