diff --git a/.gitignore b/.gitignore index e3a433b..c3b27a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /maven-verifier-1.4-source-release.zip +/maven-verifier-1.5-source-release.zip diff --git a/0001-Update-to-maven-shared-utils-0.3.patch b/0001-Update-to-maven-shared-utils-0.3.patch deleted file mode 100644 index 3431145..0000000 --- a/0001-Update-to-maven-shared-utils-0.3.patch +++ /dev/null @@ -1,48 +0,0 @@ -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/maven-verifier.spec b/maven-verifier.spec index 5b715e2..909a0db 100644 --- a/maven-verifier.spec +++ b/maven-verifier.spec @@ -1,17 +1,16 @@ Name: maven-verifier -Version: 1.4 -Release: 6%{?dist} +Version: 1.5 +Release: 1%{?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/%{name}/%{version}/%{name}-%{version}-source-release.zip -# Forwarded upstream, see MSHARED-284 -Patch1: 0001-Update-to-maven-shared-utils-0.3.patch BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) Obsoletes: maven-shared-verifier < %{version}-%{release} @@ -32,7 +31,6 @@ API documentation for %{name}. %prep %setup -q -%patch1 -p1 %build %mvn_build @@ -48,6 +46,9 @@ API documentation for %{name}. %changelog +* Mon Dec 09 2013 Michal Srb - 1.5-1 +- Update to upstream version 1.5 + * Thu Oct 3 2013 Mikolaj Izdebski - 1.4-6 - Add missing BR: maven-shared diff --git a/sources b/sources index 8a13234..042f4b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da707c318616d07eae1ef4ffc50ec435 maven-verifier-1.4-source-release.zip +023c4254d06ef543dd84d5e409380ee0 maven-verifier-1.5-source-release.zip