Author: olamy
Date: Sat Nov 13 16:09:34 2010
New Revision: 1034792
URL: http://svn.apache.org/viewvc?rev=1034792&view=rev
Log:
fix junits (oups)
upgrade to last parent version
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
maven/scm/trunk/pom.xml
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java?rev=1034792&r1=1034791&r2=1034792&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java
Sat Nov 13 16:09:34 2010
@@ -104,5 +104,6 @@ public class ClearCaseUtil
public static void setSettingsDirectory( File directory )
{
settingsDirectory = directory;
+ settings = readSettings();
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java?rev=1034792&r1=1034791&r2=1034792&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
Sat Nov 13 16:09:34 2010
@@ -171,6 +171,7 @@ public class VssCommandLineUtils
protected static final void setScmConfDir( File directory )
{
scmConfDir = directory;
+ settings = readSettings();
}
public static final String getSsDir()
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java?rev=1034792&r1=1034791&r2=1034792&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
Sat Nov 13 16:09:34 2010
@@ -104,6 +104,7 @@ public class VssCommandLineUtilsTest
* Validate that setting is overridden by system property
*/
System.setProperty( VSS_DIRECTORY_PROPERTY, vssInstallPathAlt );
+ VssCommandLineUtils.setScmConfDir( new File( vssInstallPathAlt ) );
assertEquals( vssInstallPathAlt,
VssCommandLineUtils.getSettings().getVssDirectory() );
/*
@@ -140,22 +141,27 @@ public class VssCommandLineUtilsTest
// Windows style test
System.setProperty( VSS_DIRECTORY_PROPERTY, vssInstallPathWindowsStyle
);
+ VssCommandLineUtils.setScmConfDir( new File(
vssInstallPathWindowsStyle ) );
assertEquals( targetValue, VssCommandLineUtils.getSsDir() );
// Unix style test
System.setProperty( VSS_DIRECTORY_PROPERTY, vssInstallPathUnixStyle );
+ VssCommandLineUtils.setScmConfDir( new File( vssInstallPathUnixStyle )
);
assertEquals( targetValue, VssCommandLineUtils.getSsDir() );
// Windows style with folder indicator
System.setProperty( VSS_DIRECTORY_PROPERTY, vssInstallPathWindowsStyle
+ "\\" );
+ VssCommandLineUtils.setScmConfDir( new File(
vssInstallPathWindowsStyle ) );
assertEquals( targetValue, VssCommandLineUtils.getSsDir() );
// Unix style with folder indicator
System.setProperty( VSS_DIRECTORY_PROPERTY, vssInstallPathUnixStyle +
"/" );
+ VssCommandLineUtils.setScmConfDir( new File( vssInstallPathUnixStyle )
);
assertEquals( targetValue, VssCommandLineUtils.getSsDir() );
// Unix style with Windows style folder indicator
System.setProperty( VSS_DIRECTORY_PROPERTY, vssInstallPathUnixStyle +
"\\" );
+ VssCommandLineUtils.setScmConfDir( new File( vssInstallPathUnixStyle )
);
assertEquals( targetValue, VssCommandLineUtils.getSsDir() );
}
Modified: maven/scm/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/pom.xml?rev=1034792&r1=1034791&r2=1034792&view=diff
==============================================================================
--- maven/scm/trunk/pom.xml (original)
+++ maven/scm/trunk/pom.xml Sat Nov 13 16:09:34 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>16</version>
+ <version>17</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
