From a7d31bb3f4d9504e7b2a6fce62c392d2c5905da3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 31 2016 08:29:27 +0000 Subject: import rh-maven33-maven-invoker-2.1.1-9.12.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f32c5d7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-invoker-2.1.1-source-release.zip diff --git a/.rh-maven33-maven-invoker.metadata b/.rh-maven33-maven-invoker.metadata new file mode 100644 index 0000000..88d63a7 --- /dev/null +++ b/.rh-maven33-maven-invoker.metadata @@ -0,0 +1 @@ +1013ceef7e8d3d1e78d0c7bd7f2f94922caaab21 SOURCES/maven-invoker-2.1.1-source-release.zip diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/maven-invoker-MSHARED-278.patch b/SOURCES/maven-invoker-MSHARED-278.patch new file mode 100644 index 0000000..ff23678 --- /dev/null +++ b/SOURCES/maven-invoker-MSHARED-278.patch @@ -0,0 +1,26 @@ +From fb1bfb61d31abcdfaac0256648f42257520ce3c9 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 13 Mar 2013 13:35:39 +0100 +Subject: [PATCH 1/2] Fix MSHARED-278 + +See: http://jira.codehaus.org/browse/MSHARED-278 +--- + .../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 f8a22a5..35ab16b 100644 +--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java ++++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java +@@ -542,7 +542,7 @@ public class MavenCommandLineBuilder + if ( !mavenHome.isDirectory() ) + { + File binDir = mavenHome.getParentFile(); +- if ( "bin".equals( binDir.getName() ) ) ++ if ( binDir != null && "bin".equals( binDir.getName() ) ) + { + // ah, they specified the mvn + // executable instead... +-- +1.8.1.4 + diff --git a/SOURCES/maven-invoker-MSHARED-279.patch b/SOURCES/maven-invoker-MSHARED-279.patch new file mode 100644 index 0000000..e3e1eae --- /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 +@@ -536,7 +536,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..f514a26 --- /dev/null +++ b/SPECS/maven-invoker.spec @@ -0,0 +1,137 @@ +%global pkg_name maven-invoker +%{?scl:%scl_package %{pkg_name}} +%{?maven_find_provides_and_requires} + +Name: %{?scl_prefix}%{pkg_name} +Version: 2.1.1 +Release: 9.12%{?dist} +Summary: Fires a maven build in a clean environment +License: ASL 2.0 +URL: http://maven.apache.org/shared/maven-invoker/ +Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip +Patch0: %{pkg_name}-MSHARED-278.patch +Patch1: %{pkg_name}-MSHARED-279.patch + +BuildArch: noarch + +BuildRequires: %{?scl_prefix_java_common}javapackages-tools +BuildRequires: %{?scl_prefix_java_common}junit +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}maven-surefire-provider-junit +BuildRequires: %{?scl_prefix}maven-shared + + +%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 -q -n %{pkg_name}-%{version} +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%patch0 -p1 +%patch1 -p1 + +%mvn_file : %{pkg_name} +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_build -f +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_install +%{?scl:EOF} + +%files -f .mfiles +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + + +%changelog +* Mon Feb 08 2016 Michal Srb - 2.1.1-9.12 +- Fix BR on maven-local & co. + +* Mon Jan 11 2016 Michal Srb - 2.1.1-9.11 +- maven33 rebuild #2 + +* Sat Jan 09 2016 Michal Srb - 2.1.1-9.10 +- maven33 rebuild + +* Tue Jan 13 2015 Michael Simacek - 2.1.1-9.9 +- Mass rebuild 2015-01-13 + +* Tue Jan 06 2015 Michael Simacek - 2.1.1-9.8 +- Mass rebuild 2015-01-06 + +* Mon May 26 2014 Mikolaj Izdebski - 2.1.1-9.7 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 2.1.1-9.6 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 2.1.1-9.5 +- Mass rebuild 2014-02-18 + +* Tue Feb 18 2014 Mikolaj Izdebski - 2.1.1-9.4 +- Remove requires on java + +* Mon Feb 17 2014 Mikolaj Izdebski - 2.1.1-9.3 +- SCL-ize build-requires + +* Thu Feb 13 2014 Mikolaj Izdebski - 2.1.1-9.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 2.1.1-9.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 2.1.1-9 +- Mass rebuild 2013-12-27 + +* Mon Aug 26 2013 Michal Srb - 2.1.1-8 +- Migrate away from mvn-rpmbuild (Resolves: #997507) + +* Fri Jun 28 2013 Mikolaj Izdebski - 2.1.1-7 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* 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 +