From 3f1cbbff748e7497e98e225f62a9eb53f76ff184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Oct 2020 00:08:51 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/exec-maven-plugin#d9800b61cbc2d46ffc8b5cc8f9209022879d1aa7 --- .gitignore | 8 + exec-maven-plugin-1.6.0-Port-to-Maven-3.patch | 56 ++++++ exec-maven-plugin.spec | 183 ++++++++++++++++++ sources | 1 + 4 files changed, 248 insertions(+) create mode 100644 exec-maven-plugin-1.6.0-Port-to-Maven-3.patch create mode 100644 exec-maven-plugin.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..06373ac 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,8 @@ +/exec-maven-plugin-1.2.1-source-release.zip +/LICENSE-2.0.txt +/exec-maven-plugin-1.3-source-release.zip +/exec-maven-plugin-1.3.1-source-release.zip +/exec-maven-plugin-1.3.2-source-release.zip +/exec-maven-plugin-1.4.0-source-release.zip +/exec-maven-plugin-1.5.0-source-release.zip +/exec-maven-plugin-1.6.0-source-release.zip diff --git a/exec-maven-plugin-1.6.0-Port-to-Maven-3.patch b/exec-maven-plugin-1.6.0-Port-to-Maven-3.patch new file mode 100644 index 0000000..4732574 --- /dev/null +++ b/exec-maven-plugin-1.6.0-Port-to-Maven-3.patch @@ -0,0 +1,56 @@ +From 53f761ccbe3411dbbe430d3af93ad4502d09fe10 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Thu, 20 Sep 2018 15:28:48 +0200 +Subject: [PATCH] Port to Maven 3 + +--- + src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java | 4 ++-- + src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java | 2 +- + src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java b/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java +index 4746aa2..f9a93ad 100644 +--- a/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java ++++ b/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java +@@ -704,9 +704,9 @@ public class ExecJavaMojo + // resolve all dependencies transitively to obtain a comprehensive list of assemblies + ArtifactResolutionResult result = + artifactResolver.resolveTransitively( dependencyArtifacts, executablePomArtifact, +- Collections.emptyMap(), this.localRepository, ++ (java.util.Map) Collections.emptyMap(), this.localRepository, + this.remoteRepositories, metadataSource, null, +- Collections.emptyList() ); ++ (java.util.List) Collections.emptyList() ); + executableDependencies = result.getArtifacts(); + } + catch ( Exception ex ) +diff --git a/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java b/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java +index 0e5afbb..4894bb3 100644 +--- a/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java ++++ b/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java +@@ -277,7 +277,7 @@ public class ExecJavaMojoTest + private void setUpProject( File pomFile, AbstractMojo mojo ) + throws Exception + { +- MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE ); ++ MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.class ); + + ArtifactRepositoryLayout localRepositoryLayout = + (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" ); +diff --git a/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java b/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java +index 2821954..29c274c 100644 +--- a/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java ++++ b/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java +@@ -233,7 +233,7 @@ public class ExecMojoTest + private void setUpProject( File pomFile, ExecMojo mojo ) + throws Exception + { +- MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE ); ++ MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.class ); + + ArtifactRepositoryLayout localRepositoryLayout = + (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" ); +-- +2.17.1 + diff --git a/exec-maven-plugin.spec b/exec-maven-plugin.spec new file mode 100644 index 0000000..127760f --- /dev/null +++ b/exec-maven-plugin.spec @@ -0,0 +1,183 @@ +Name: exec-maven-plugin +Version: 1.6.0 +Release: 10%{?dist} +Summary: Exec Maven Plugin + +License: ASL 2.0 +URL: http://www.mojohaus.org/exec-maven-plugin/ +Source0: http://repo1.maven.org/maven2/org/codehaus/mojo/exec-maven-plugin/%{version}/exec-maven-plugin-%{version}-source-release.zip + +Patch1: exec-maven-plugin-1.6.0-Port-to-Maven-3.patch + +BuildArch: noarch + +BuildRequires: maven-local +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-exec) +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-model) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness) +BuildRequires: mvn(org.codehaus.mojo:mojo-parent:pom:) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) + +Obsoletes: maven-plugin-exec < %{version}-%{release} +Provides: maven-plugin-exec = %{version}-%{release} + +%description +A plugin to allow execution of system and Java programs. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +API documentation for %{name}. + +%prep +%setup -q -n exec-maven-plugin-%{version} + +sed -i 's/\r$//' LICENSE.txt +find . -name *.jar -delete + +%pom_remove_dep :maven-project +%pom_remove_dep :maven-toolchain +%pom_remove_dep :maven-artifact-manager + +%pom_add_dep org.apache.maven:maven-compat +%pom_add_dep junit:junit::test + +%pom_remove_plugin :animal-sniffer-maven-plugin + +%patch1 -p1 + +%build +%mvn_build -- -DmavenVersion=3 + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE.txt +%dir %{_javadir}/%{name} + +%files javadoc -f .mfiles-javadoc +%doc LICENSE.txt + +%changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.6.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.6.0-9 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.6.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.6.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Sep 20 2018 Marian Koncek - 1.6.0-5 +- Port to Maven 3 to enable tests. +- Resolves: rhbz#1095077 + +* Fri Jul 13 2018 Fedora Release Engineering - 1.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Mar 28 2017 Michael Simacek - 1.6.0-1 +- Update to upstream version 1.6.0 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jun 23 2016 Michael Simacek - 1.5.0-1 +- Update to upstream version 1.5.0 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 26 2015 Mikolaj Izdebski - 1.4.0-1 +- Update to upstream version 1.4.0 + +* Wed Jul 30 2014 Mikolaj Izdebski - 1.3.2-1 +- Update to upstream version 1.3.2 + +* Mon Jun 09 2014 Michal Srb - 1.3.1-1 +- Update to upstream version 1.3.1 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 09 2014 Michal Srb - 1.3-2 +- Fix license tag + +* Wed May 07 2014 Michal Srb - 1.3-1 +- Update to upstream version 1.3 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.2.1-13 +- Use Requires: java-headless rebuild (#1067528) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jun 5 2013 Stanislav Ochotnicky - 1.2.1-11 +- Clean up BuildRequires + +* Thu Feb 14 2013 Michal Srb - 1.2.1-10 +- Disable animal-sniffer plugin + +* Wed Feb 13 2013 Fedora Release Engineering - 1.2.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.2.1-8 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Fri Jan 11 2013 Michal Srb - 1.2.1-7 +- Fixed rpmlint warnings +- Remove bundled JAR files before building the package + +* Wed Jan 09 2013 Michal Srb - 1.2.1-6 +- maven-plugin-exec renamed (Resolves: #893451) +- Migrated to xmvn + +* Wed Nov 28 2012 Mikolaj Izdebski - 1.2.1-5 +- Fix license tag +- Install license files +- Resolves: rhbz#880290 + +* Wed Nov 28 2012 Tomas Radej - 1.2.1-4 +- Removed (B)R on plexus-container-default + +* Thu Jul 19 2012 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 6 2011 Alexander Kurtakov 1.2.1-1 +- Update to latest upstream. + +* Tue Feb 08 2011 Fedora Release Engineering - 1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Sep 11 2009 Alexander Kurtakov 1.1-1 +- Initial package. diff --git a/sources b/sources new file mode 100644 index 0000000..0e300df --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (exec-maven-plugin-1.6.0-source-release.zip) = 0effd46b26816a1f6c20db6bea6f072cfdbbf6d5e6c3cda59f78cb7264804efb648a50a8170dd56c1e7f99fda6fae732a8009419efabe7591c9f738dcbab6ca6