From bb49838e0e2a731f944c3992eee63126f6f99b00 Mon Sep 17 00:00:00 2001 From: James Antill Date: Mon, 8 Aug 2022 12:34:55 -0400 Subject: [PATCH] Import rpm: 29015a2496630c46d630e37289ff68f38e3b5145 --- .gitignore | 1 + 0001-plexus-languages-1.0.patch | 25 ++++ 0002-MCOMPILER-359-Fix-for-NPE.patch | 25 ++++ gating.yaml | 8 ++ maven-compiler-plugin.spec | 163 +++++++++++++++++++++++++++ sources | 1 + 6 files changed, 223 insertions(+) create mode 100644 .gitignore create mode 100644 0001-plexus-languages-1.0.patch create mode 100644 0002-MCOMPILER-359-Fix-for-NPE.patch create mode 100644 gating.yaml create mode 100644 maven-compiler-plugin.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c01544c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-compiler-plugin-3.7.0-source-release.zip diff --git a/0001-plexus-languages-1.0.patch b/0001-plexus-languages-1.0.patch new file mode 100644 index 0000000..e7ebcf4 --- /dev/null +++ b/0001-plexus-languages-1.0.patch @@ -0,0 +1,25 @@ +From fd5749e9b8d47cf350527c4831a4ee53cefc60aa Mon Sep 17 00:00:00 2001 +From: Mat Booth +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 + diff --git a/0002-MCOMPILER-359-Fix-for-NPE.patch b/0002-MCOMPILER-359-Fix-for-NPE.patch new file mode 100644 index 0000000..db0443e --- /dev/null +++ b/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?= +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 pathException : result.getPathExceptions().entrySet() ) + { +- Throwable cause = pathException.getValue().getCause(); ++ Throwable cause = pathException.getValue(); + while ( cause.getCause() != null ) + { + cause = cause.getCause(); +-- +2.26.2 + diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..d6b7694 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - rhel-9 +decision_contexts: + - osci_compose_gate +rules: + # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test + - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap} diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec new file mode 100644 index 0000000..3c6e94e --- /dev/null +++ b/maven-compiler-plugin.spec @@ -0,0 +1,163 @@ +Name: maven-compiler-plugin +Version: 3.7.0 +Release: 2%{?dist} +Summary: Maven Compiler Plugin +License: ASL 2.0 +URL: http://maven.apache.org/plugins/maven-compiler-plugin +BuildArch: noarch + +Source0: http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip + +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(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) + + +%description +The Compiler Plugin is used to compile the sources of your project. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +API documentation for %{name}. + +%prep +%setup -q + +%build +%mvn_build -f + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* Thu Feb 08 2018 Fedora Release Engineering - 3.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 11 2017 Mikolaj Izdebski - 3.7.0-1 +- Update to upstream version 3.7.0 + +* Wed Jul 26 2017 Fedora Release Engineering - 3.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 17 2017 Michael Simacek - 3.6.1-1 +- Update to upstream version 3.6.1 + +* Tue Nov 08 2016 Michael Simacek - 3.6.0-2 +- Add upstream patch for broken test skipping + +* Mon Oct 31 2016 Michael Simacek - 3.6.0-1 +- Update to upstream version 3.6.0 + +* Fri Jul 15 2016 Mikolaj Izdebski - 3.5.1-4 +- Remove dependency on Maven 2 toolchain + +* Fri Jul 15 2016 Mikolaj Izdebski - 3.5.1-3 +- Add missing BR on maven-plugin-plugin + +* Fri Jul 8 2016 Mikolaj Izdebski - 3.5.1-2 +- Remove unneeded build-requires + +* Tue Feb 16 2016 Mikolaj Izdebski - 3.5.1-1 +- Update to upstream version 3.5.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 25 2016 Mikolaj Izdebski - 3.5-1 +- Update to upstream version 3.5 + +* Wed Jun 17 2015 Fedora Release Engineering - 3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 26 2015 Mikolaj Izdebski - 3.3-1 +- Update to upstream version 3.3 + +* Tue Oct 14 2014 Mikolaj Izdebski - 3.2-2 +- Remove legacy Obsoletes/Provides for maven2 plugin + +* Tue Oct 14 2014 Mikolaj Izdebski - 3.2-1 +- Update to upstream version 3.2 + +* Sat Jun 07 2014 Fedora Release Engineering - 3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 3.1-5 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 3.1-4 +- Fix unowned directory + +* Sat Aug 03 2013 Fedora Release Engineering - 3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Apr 24 2013 Michal Srb - 3.1-2 +- Build against proper maven-shared-incremental artifactId + +* Wed Apr 24 2013 Michal Srb - 3.1-1 +- Update to upstream version 3.1 + +* Tue Mar 05 2013 Michal Srb - 3.0-2 +- Build against proper plexus-compiler + +* Tue Jan 15 2013 Mikolaj Izdebski - 3.0-1 +- Update to upstream version 3.0 +- Build with xmvn +- Install license files, resolves: rhbz#895544 + +* Thu Jul 19 2012 Fedora Release Engineering - 2.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 19 2012 Stanislav Ochotnicky - 2.5.1-1 +- Updated to latest upstream version (2.5.1) + +* Wed May 23 2012 Tomas Radej - 2.4-1 +- Updated to latest upstream version +- Guidelines fixes + Removed RPM workaround + +* Fri Jan 13 2012 Fedora Release Engineering - 2.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jun 27 2011 Stanislav Ochotnicky - 2.3.2-4 +- Add few missing (Build)requires +- Remove post(un) scriptlets with update_maven_depmap +- Use new add_maven_depmap macro + +* Fri Jun 3 2011 Alexander Kurtakov 2.3.2-3 +- Do not require maven2. +- Guidelines fixes. + +* Tue Feb 08 2011 Fedora Release Engineering - 2.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jan 19 2011 Stanislav Ochotnicky - 2.3.2-1 +- Update to latest version (2.3.2) +- Modifications according to new guidelines +- Build with maven 3 + +* Wed May 12 2010 Alexander Kurtakov 2.0.2-2 +- Add missing requires. + +* Tue May 11 2010 Alexander Kurtakov 2.0.2-1 +- Initial package. diff --git a/sources b/sources new file mode 100644 index 0000000..d1fe51a --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA1 (maven-compiler-plugin-3.7.0-source-release.zip) = 1148d8a1f89e6900afb0ca1dbf74f64932402cfd