Repository: maven-integration-testing Updated Branches: refs/heads/master 9667faeaa -> 3743ceb54
MSHARED-410 updated to Verifier 1.6 Signed-off-by: Igor Fedorenko <ifedore...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/cbbcadd4 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/cbbcadd4 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/cbbcadd4 Branch: refs/heads/master Commit: cbbcadd464cbc39dc743410e2bf34f9d887adb9f Parents: 9667fae Author: Igor Fedorenko <ifedore...@apache.org> Authored: Thu Feb 26 10:44:37 2015 -0500 Committer: Igor Fedorenko <ifedore...@apache.org> Committed: Thu Feb 26 10:44:37 2015 -0500 ---------------------------------------------------------------------- .../it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java | 2 +- .../java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java | 2 +- .../org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java | 2 +- .../org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java | 3 ++- pom.xml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cbbcadd4/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java index abafe5f..b56597d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java @@ -75,7 +75,7 @@ public class MavenITmng2276ProfileActivationBySettingsPropertyTest verifier.deleteDirectory( "target" ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); - verifier.setSystemProperty( "settingsProperty", "cli" ); + verifier.addCliOption( "-DsettingsProperty=cli" ); verifier.setLogFileName( "log-2.txt" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cbbcadd4/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java index 89a44fc..e16ce11 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java @@ -54,7 +54,7 @@ public class MavenITmng3951AbsolutePathsTest * Cut off anything before the first file separator from the local repo path. This is harmless on a Unix-like * filesystem but will make the path drive-relative on Windows so we can check how Maven handles it. */ - String repoDir = new File( verifier.localRepo ).getAbsolutePath(); + String repoDir = new File( verifier.getLocalRepository() ).getAbsolutePath(); if ( getRoot( new File( repoDir ) ).equals( getRoot( testDir ) ) ) { // NOTE: We can only test the local repo if it resides on the same drive as the test http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cbbcadd4/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java index 21fd877..a5f4801 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java @@ -62,7 +62,7 @@ public class MavenITmng3955EffectiveSettingsTest Properties props = verifier.loadProperties( "target/settings.properties" ); assertEquals( "true", props.getProperty( "settings.offline" ) ); assertEquals( "false", props.getProperty( "settings.interactiveMode" ) ); - assertEquals( new File( verifier.localRepo ).getAbsoluteFile(), + assertEquals( new File( verifier.getLocalRepository() ).getAbsoluteFile(), new File( props.getProperty( "settings.localRepository" ) ).getAbsoluteFile() ); } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cbbcadd4/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java index d9a4a31..fa4b2f7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java @@ -58,7 +58,8 @@ public class MavenITmng4305LocalRepoBasedirTest Properties props = verifier.loadProperties( "target/basedir.properties" ); // NOTE: This deliberately compares the paths on the String level, not via File.equals() - assertEquals( new File( verifier.localRepo ).getAbsolutePath(), props.getProperty( "localRepository.basedir" ) ); + assertEquals( new File( verifier.getLocalRepository() ).getAbsolutePath(), + props.getProperty( "localRepository.basedir" ) ); } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cbbcadd4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5e46786..b6d0f92 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ under the License. <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-verifier</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </dependency> </dependencies> </dependencyManagement>
