You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/12/19 03:14:15 UTC
[1/2] git commit: Revert "o Temporarily reverted to the boring
verifier 1.3 to allow release now"
Updated Branches:
refs/heads/master cd35301a0 -> 349cff263
Revert "o Temporarily reverted to the boring verifier 1.3 to allow release now"
Reverting wasnt as easy as I thought, just wait for verifier 1.4 to pass vote.
This reverts commit cd35301a0affe10ee73acd37f3704cae901fe3eb.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/349cff26
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/349cff26
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/349cff26
Branch: refs/heads/master
Commit: 349cff26392b425e2d1753b3e036efd593feb989
Parents: 02d0964
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Wed Dec 19 03:13:07 2012 +0100
Committer: Kristian Rosenvold <kr...@apache.org>
Committed: Wed Dec 19 03:13:07 2012 +0100
----------------------------------------------------------------------
surefire-integration-tests/pom.xml | 2 +-
.../maven/surefire/its/fixture/MavenLauncher.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/349cff26/surefire-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
index a0ab513..55191dd 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/349cff26/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index dd6f587..bbf910c 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -404,7 +404,7 @@ public class MavenLauncher
try
{
FileUtils.deleteDirectory( testDir );
- File file = ResourceExtractor.extractResourcePath( cl, resourcePath, tempDir, true );
+ File file = ResourceExtractor.extractResourceToDestination( cl, resourcePath, tempDir, true );
return file.getCanonicalFile();
}
catch ( IOException e )