|
|
8d7b04 |
From 5dc17bc88ca67a2bbd918d84deef066df8d804bc Mon Sep 17 00:00:00 2001
|
|
|
8d7b04 |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
8d7b04 |
Date: Fri, 19 Apr 2013 09:09:33 +0200
|
|
|
8d7b04 |
Subject: [PATCH] Update to maven-shared-utils 0.3
|
|
|
8d7b04 |
|
|
|
8d7b04 |
---
|
|
|
8d7b04 |
pom.xml | 2 +-
|
|
|
8d7b04 |
src/main/java/org/apache/maven/it/Verifier.java | 11 ++---------
|
|
|
8d7b04 |
2 files changed, 3 insertions(+), 10 deletions(-)
|
|
|
8d7b04 |
|
|
|
8d7b04 |
diff --git a/pom.xml b/pom.xml
|
|
|
8d7b04 |
index 5f0b6f3..3715976 100644
|
|
|
8d7b04 |
--- a/pom.xml
|
|
|
8d7b04 |
+++ b/pom.xml
|
|
|
8d7b04 |
@@ -47,7 +47,7 @@
|
|
|
8d7b04 |
<dependency>
|
|
|
8d7b04 |
<groupId>org.apache.maven.shared</groupId>
|
|
|
8d7b04 |
<artifactId>maven-shared-utils</artifactId>
|
|
|
8d7b04 |
- <version>0.2</version>
|
|
|
8d7b04 |
+ <version>0.3</version>
|
|
|
8d7b04 |
</dependency>
|
|
|
8d7b04 |
|
|
|
8d7b04 |
<dependency>
|
|
|
8d7b04 |
diff --git a/src/main/java/org/apache/maven/it/Verifier.java b/src/main/java/org/apache/maven/it/Verifier.java
|
|
|
8d7b04 |
index c065072..ee7be43 100644
|
|
|
8d7b04 |
--- a/src/main/java/org/apache/maven/it/Verifier.java
|
|
|
8d7b04 |
+++ b/src/main/java/org/apache/maven/it/Verifier.java
|
|
|
8d7b04 |
@@ -182,15 +182,8 @@ public class Verifier
|
|
|
8d7b04 |
|
|
|
8d7b04 |
if ( defaultMavenHome == null )
|
|
|
8d7b04 |
{
|
|
|
8d7b04 |
- try
|
|
|
8d7b04 |
- {
|
|
|
8d7b04 |
- Properties envVars = CommandLineUtils.getSystemEnvVars();
|
|
|
8d7b04 |
- defaultMavenHome = envVars.getProperty( "M2_HOME" );
|
|
|
8d7b04 |
- }
|
|
|
8d7b04 |
- catch ( IOException e )
|
|
|
8d7b04 |
- {
|
|
|
8d7b04 |
- throw new VerificationException( "Cannot read system environment variables.", e );
|
|
|
8d7b04 |
- }
|
|
|
8d7b04 |
+ Properties envVars = CommandLineUtils.getSystemEnvVars();
|
|
|
8d7b04 |
+ defaultMavenHome = envVars.getProperty( "M2_HOME" );
|
|
|
8d7b04 |
}
|
|
|
8d7b04 |
|
|
|
8d7b04 |
if ( defaultMavenHome == null )
|
|
|
8d7b04 |
--
|
|
|
8d7b04 |
1.8.1.4
|
|
|
8d7b04 |
|