From 8d7b04b1c333d9c9d89a3b3e7e674fd5399d0320 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 31 2016 08:53:08 +0000 Subject: import rh-maven33-maven-verifier-1.4-6.13.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9e67e7f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-verifier-1.4-source-release.zip diff --git a/.rh-maven33-maven-verifier.metadata b/.rh-maven33-maven-verifier.metadata new file mode 100644 index 0000000..c46910d --- /dev/null +++ b/.rh-maven33-maven-verifier.metadata @@ -0,0 +1 @@ +23a7b6855d191dd2452b61a9631323d8cf12c3dd SOURCES/maven-verifier-1.4-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/0001-Update-to-maven-shared-utils-0.3.patch b/SOURCES/0001-Update-to-maven-shared-utils-0.3.patch new file mode 100644 index 0000000..3431145 --- /dev/null +++ b/SOURCES/0001-Update-to-maven-shared-utils-0.3.patch @@ -0,0 +1,48 @@ +From 5dc17bc88ca67a2bbd918d84deef066df8d804bc Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 19 Apr 2013 09:09:33 +0200 +Subject: [PATCH] Update to maven-shared-utils 0.3 + +--- + pom.xml | 2 +- + src/main/java/org/apache/maven/it/Verifier.java | 11 ++--------- + 2 files changed, 3 insertions(+), 10 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 5f0b6f3..3715976 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -47,7 +47,7 @@ + + org.apache.maven.shared + maven-shared-utils +- 0.2 ++ 0.3 + + + +diff --git a/src/main/java/org/apache/maven/it/Verifier.java b/src/main/java/org/apache/maven/it/Verifier.java +index c065072..ee7be43 100644 +--- a/src/main/java/org/apache/maven/it/Verifier.java ++++ b/src/main/java/org/apache/maven/it/Verifier.java +@@ -182,15 +182,8 @@ public class Verifier + + if ( defaultMavenHome == null ) + { +- try +- { +- Properties envVars = CommandLineUtils.getSystemEnvVars(); +- defaultMavenHome = envVars.getProperty( "M2_HOME" ); +- } +- catch ( IOException e ) +- { +- throw new VerificationException( "Cannot read system environment variables.", e ); +- } ++ Properties envVars = CommandLineUtils.getSystemEnvVars(); ++ defaultMavenHome = envVars.getProperty( "M2_HOME" ); + } + + if ( defaultMavenHome == null ) +-- +1.8.1.4 + diff --git a/SPECS/maven-verifier.spec b/SPECS/maven-verifier.spec new file mode 100644 index 0000000..5da3e15 --- /dev/null +++ b/SPECS/maven-verifier.spec @@ -0,0 +1,121 @@ +%global pkg_name maven-verifier +%{?scl:%scl_package %{pkg_name}} +%{?maven_find_provides_and_requires} + +Name: %{?scl_prefix}%{pkg_name} +Version: 1.4 +Release: 6.13%{?dist} +Summary: Maven verifier +License: ASL 2.0 +URL: http://maven.apache.org/shared/maven-verifier +Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip +# Forwarded upstream, see MSHARED-284 +Patch1: 0001-Update-to-maven-shared-utils-0.3.patch + +BuildArch: noarch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}maven-surefire-provider-junit +BuildRequires: %{?scl_prefix}maven-shared +BuildRequires: %{?scl_prefix}maven-shared-utils + + +%description +Provides a test harness for Maven integration tests. + +This is a replacement package for maven-shared-verifier + +%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 +%patch1 -p1 +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_build +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_install +%{?scl:EOF} + +%files -f .mfiles +%{_javadir}/%{pkg_name} +%dir %{_mavenpomdir}/%{pkg_name} +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + + +%changelog +* Mon Feb 08 2016 Michal Srb - 1.4-6.13 +- Fix BR on maven-local & co. + +* Mon Jan 11 2016 Michal Srb - 1.4-6.12 +- maven33 rebuild #2 + +* Sat Jan 09 2016 Michal Srb - 1.4-6.11 +- maven33 rebuild + +* Thu Jan 15 2015 Mikolaj Izdebski - 1.4-6.10 +- Add directory ownership on %%{_mavenpomdir} subdir + +* Tue Jan 13 2015 Michael Simacek - 1.4-6.9 +- Mass rebuild 2015-01-13 + +* Tue Jan 06 2015 Michael Simacek - 1.4-6.8 +- Mass rebuild 2015-01-06 + +* Mon May 26 2014 Mikolaj Izdebski - 1.4-6.7 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 1.4-6.6 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 1.4-6.5 +- Mass rebuild 2014-02-18 + +* Tue Feb 18 2014 Mikolaj Izdebski - 1.4-6.4 +- Add missing BR: maven-shared + +* Mon Feb 17 2014 Michal Srb - 1.4-7.2 +- SCL-ize BR + +* Thu Feb 13 2014 Mikolaj Izdebski - 1.4-6.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 1.4-6.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 1.4-6 +- Mass rebuild 2013-12-27 + +* Fri Jun 28 2013 Mikolaj Izdebski - 1.4-5 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Fri Apr 19 2013 Mikolaj Izdebski - 1.4-4 +- Update to maven-shared-utils 0.3 + +* Fri Feb 08 2013 Tomas Radej - 1.4-3 +- Building the new way + +* Thu Jan 24 2013 Tomas Radej - 1.4-2 +- Added BuildRequires on maven-shared-utils + +* Wed Jan 16 2013 Tomas Radej - 1.4-1 +- Initial version +