diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b7590d7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-invoker-3.0.1-source-release.zip diff --git a/.rh-maven36-maven-invoker.metadata b/.rh-maven36-maven-invoker.metadata new file mode 100644 index 0000000..adacd7f --- /dev/null +++ b/.rh-maven36-maven-invoker.metadata @@ -0,0 +1 @@ +40c8d12afe72ef2ee971cc3b24fbb15039dfb7a0 SOURCES/maven-invoker-3.0.1-source-release.zip diff --git a/SOURCES/maven-invoker-MSHARED-279.patch b/SOURCES/maven-invoker-MSHARED-279.patch new file mode 100644 index 0000000..8ca886e --- /dev/null +++ b/SOURCES/maven-invoker-MSHARED-279.patch @@ -0,0 +1,26 @@ +From 97b2ceb3544c035459341278d45cef2e44c21c7b Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 13 Mar 2013 13:36:26 +0100 +Subject: [PATCH 2/2] Fix MSHARED-279 + +See: http://jira.codehaus.org/browse/MSHARED-279 +--- + .../java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java +index 35ab16b..082c988 100644 +--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java ++++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java +@@ -524,7 +524,7 @@ public class MavenCommandLineBuilder + if ( mavenHome == null ) + { + String mavenHomeProperty = System.getProperty( "maven.home" ); +- if ( mavenHomeProperty != null ) ++ if ( StringUtils.isNotEmpty( mavenHomeProperty ) ) + { + mavenHome = new File( mavenHomeProperty ); + if ( !mavenHome.isDirectory() ) +-- +1.8.1.4 + diff --git a/SPECS/maven-invoker.spec b/SPECS/maven-invoker.spec new file mode 100644 index 0000000..68b48db --- /dev/null +++ b/SPECS/maven-invoker.spec @@ -0,0 +1,129 @@ +%{?scl:%scl_package maven-invoker} +%{!?scl:%global pkg_name %{name}} + +Name: %{?scl_prefix}maven-invoker +Version: 3.0.1 +Release: 1.2%{?dist} +Summary: Fires a maven build in a clean environment +License: ASL 2.0 +URL: http://maven.apache.org/shared/maven-invoker/ +BuildArch: noarch + +Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip + +# Patch rejected upstream +Patch1: %{pkg_name}-MSHARED-279.patch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(junit:junit) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-component-metadata) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-utils) +# Required by tests +BuildRequires: %{?scl_prefix}maven-antrun-plugin +BuildRequires: %{?scl_prefix}maven-clean-plugin + +%description +This API is concerned with firing a Maven build in a new JVM. It accomplishes +its task by building up a conventional Maven command line from options given in +the current request, along with those global options specified in the invoker +itself. Once it has the command line, the invoker will execute it, and capture +the resulting exit code or any exception thrown to signal a failure to execute. +Input/output control can be specified using an InputStream and up to two +InvocationOutputHandlers. + +This is a replacement package for maven-shared-invoker + +%package javadoc +Summary: Javadoc for %{pkg_name} + + +%description javadoc +API documentation for %{pkg_name}. + +%prep +%setup -n %{pkg_name}-%{version} -q +%patch1 -p1 + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* Wed Sep 4 2019 Mikolaj Izdebski - 3.0.1-1.2 +- Mass rebuild 2019-09-04 + +* Tue Sep 3 2019 Java Maintainers - 3.0.1-1.1 +- Automated package import and SCL-ization + +* Wed May 29 2019 Marian Koncek - 3.0.1-1 +- Update to upstream version 3.0.1 + +* Fri May 24 2019 Mikolaj Izdebski - 2.2-8 +- Mass rebuild for javapackages-tools 201901 + +* Thu Feb 08 2018 Fedora Release Engineering - 2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jun 15 2016 Mikolaj Izdebski - 2.2-4 +- Regenerate build-requires +- Remove old obsoletes/provides + +* Thu Feb 04 2016 Fedora Release Engineering - 2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Mar 25 2015 Mikolaj Izdebski - 2.2-1 +- Update to upstream version 2.2 + +* Sat Jun 07 2014 Fedora Release Engineering - 2.1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Sep 23 2013 Mikolaj Izdebski - 2.1.1-10 +- Fix failing tests + +* Mon Sep 23 2013 Michal Srb - 2.1.1-9 +- Remove some tests which fail on koji + +* Mon Sep 23 2013 Michal Srb - 2.1.1-8 +- Migrate to XMvn + +* Sat Aug 03 2013 Fedora Release Engineering - 2.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 13 2013 Mikolaj Izdebski - 2.1.1-6 +- Add patch for MSHARED-278, resolves rhbz#921068 +- Add patch for MSHARED-279, resolves rhbz#921067 + +* Wed Feb 20 2013 Tomas Radej - 2.1.1-5 +- Added B/R on maven-shared + +* Thu Feb 14 2013 Fedora Release Engineering - 2.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 2.1.1-3 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Mon Jan 14 2013 Tomas Radej - 2.1.1-2 +- Disabled tests + +* Fri Jan 11 2013 Tomas Radej - 2.1.1-1 +- Initial version