Update to maven-shared-utils 0.3

This commit is contained in:
Mikolaj Izdebski 2013-04-19 09:15:42 +02:00
parent 7eda0c72f9
commit e8267edced
2 changed files with 55 additions and 1 deletions

View File

@ -0,0 +1,48 @@
From 5dc17bc88ca67a2bbd918d84deef066df8d804bc Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
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 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>0.2</version>
+ <version>0.3</version>
</dependency>
<dependency>
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

View File

@ -1,10 +1,12 @@
Name: maven-verifier
Version: 1.4
Release: 3%{?dist}
Release: 4%{?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
@ -31,6 +33,7 @@ API documentation for %{name}.
%prep
%setup -q
%patch1 -p1
%build
%mvn_build
@ -46,6 +49,9 @@ API documentation for %{name}.
%changelog
* Fri Apr 19 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-4
- Update to maven-shared-utils 0.3
* Fri Feb 08 2013 Tomas Radej <tradej@redhat.com> - 1.4-3
- Building the new way