You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2016/05/27 01:45:13 UTC
[1/2] maven-scm git commit: Revert "[SCM-824] Upgrade of
'plexus-utils' to 3.0.23."
Repository: maven-scm
Updated Branches:
refs/heads/master 8b404a9ac -> 860a2eeae
Revert "[SCM-824] Upgrade of 'plexus-utils' to 3.0.23."
This reverts commit ace95979ff879f7515c939b3a0b5ddedcabbc7dc.
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/2ed8f5ee
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/2ed8f5ee
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/2ed8f5ee
Branch: refs/heads/master
Commit: 2ed8f5ee521e776ead3f8b6a54685f059bac27b8
Parents: 8b404a9
Author: olivier lamy <ol...@apache.org>
Authored: Fri May 27 11:41:09 2016 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Fri May 27 11:41:09 2016 +1000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2ed8f5ee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 921cfcd..c5821ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.23</version>
+ <version>3.0.15</version>
</dependency>
<dependency>
[2/2] maven-scm git commit: Revert "[SCM-824] Upgrade of
'plexus-utils' to 3.0.23."
Posted by ol...@apache.org.
Revert "[SCM-824] Upgrade of 'plexus-utils' to 3.0.23."
This reverts commit 9f30e46c6e72edf7ef72683289ab5b5722d2f8e7.
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/860a2eea
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/860a2eea
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/860a2eea
Branch: refs/heads/master
Commit: 860a2eeae26254bd330fc43ffd920bbc2e55a281
Parents: 2ed8f5e
Author: olivier lamy <ol...@apache.org>
Authored: Fri May 27 11:41:24 2016 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Fri May 27 11:41:24 2016 +1000
----------------------------------------------------------------------
.../local/metadata/LocalScmMetadataUtils.java | 10 ++----
.../checkout/LocalCheckOutCommandTckTest.java | 16 +++++-----
.../update/LocalUpdateCommandTckTest.java | 17 +++++-----
.../perforce/command/PerforceInfoCommand.java | 13 ++++----
.../perforce/command/PerforceWhereCommand.java | 33 +++++++++-----------
.../checkout/PerforceCheckOutCommand.java | 27 ++++++++--------
.../command/tag/PerforceTagCommand.java | 33 ++++++++++----------
.../commands/status/VssStatusConsumerTest.java | 22 ++++++-------
.../java/org/apache/maven/scm/ScmTestCase.java | 6 +---
.../command/branch/BranchCommandTckTest.java | 5 +--
.../command/checkin/CheckInCommandTckTest.java | 29 +++++++++--------
.../scm/tck/command/tag/TagCommandTckTest.java | 4 +--
12 files changed, 94 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java
index e66fe0b..9446b9d 100644
--- a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java
+++ b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java
@@ -83,13 +83,10 @@ public class LocalScmMetadataUtils
{
File metadataFile = new File( destinationDir, FILENAME );
metadataFile.createNewFile();
- Writer writer = null;
+ Writer writer = WriterFactory.newXmlWriter( metadataFile );
try
{
- writer = WriterFactory.newXmlWriter( metadataFile );
new LocalScmMetadataXpp3Writer().write( writer, metadata );
- writer.close();
- writer = null;
}
finally
{
@@ -116,9 +113,6 @@ public class LocalScmMetadataUtils
{
reader = ReaderFactory.newXmlReader( metadataFile );
result = new LocalScmMetadataXpp3Reader().read( reader );
- reader.close();
- reader = null;
- return result;
}
catch ( XmlPullParserException e )
{
@@ -134,12 +128,12 @@ public class LocalScmMetadataUtils
{
logger.warn( "Could not Read .maven-scm-local - ignoring", e );
}
- return null;
}
finally
{
IOUtil.close( reader );
}
+ return result;
}
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java
index ab91b01..0515533 100644
--- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java
@@ -84,21 +84,19 @@ public class LocalCheckOutCommandTckTest
// ----------------------------------------------------------------------
File metadataFile = new File( getWorkingCopy(), ".maven-scm-local" );
assertTrue( "Expected metadata file .maven-scm-local does not exist", metadataFile.exists() );
- Reader reader = null;
+ Reader reader = new FileReader( metadataFile );
+ LocalScmMetadata metadata;
try
{
- reader = new FileReader( metadataFile );
- final LocalScmMetadata metadata = new LocalScmMetadataXpp3Reader().read( reader );
- reader.close();
- reader = null;
- final File root = new File( getRepositoryRoot() + "/" + module );
- @SuppressWarnings( "unchecked" )
- final List<String> fileNames = FileUtils.getFileNames( root, "**", null, false );
- assertEquals( fileNames, metadata.getRepositoryFileNames() );
+ metadata = new LocalScmMetadataXpp3Reader().read( reader );
}
finally
{
IOUtil.close( reader );
}
+ File root = new File( getRepositoryRoot() + "/" + module );
+ @SuppressWarnings( "unchecked" )
+ List<String> fileNames = FileUtils.getFileNames( root, "**", null, false );
+ assertEquals( fileNames, metadata.getRepositoryFileNames() );
}
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java
index 2518d55..722809c 100644
--- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java
@@ -133,22 +133,21 @@ public class LocalUpdateCommandTckTest
// ----------------------------------------------------------------------
File metadataFile = new File( getUpdatingCopy(), ".maven-scm-local" );
assertTrue( "Expected metadata file .maven-scm-local does not exist", metadataFile.exists() );
- Reader reader = null;
+ Reader reader = new FileReader( metadataFile );
+ LocalScmMetadata metadata;
try
{
- reader = new FileReader( metadataFile );
- final LocalScmMetadata metadata = new LocalScmMetadataXpp3Reader().read( reader );
- reader.close();
- reader = null;
- final File root = new File( getRepositoryRoot() + "/" + moduleName );
- @SuppressWarnings( "unchecked" )
- List<String> fileNames = FileUtils.getFileNames( root, "**", null, false );
- assertEquals( fileNames, metadata.getRepositoryFileNames() );
+ metadata = new LocalScmMetadataXpp3Reader().read( reader );
}
finally
{
IOUtil.close( reader );
}
+ File root = new File( getRepositoryRoot() + "/" + moduleName );
+ @SuppressWarnings( "unchecked" )
+ List<String> fileNames = FileUtils.getFileNames( root, "**", null, false );
+ assertEquals( fileNames, metadata.getRepositoryFileNames() );
+
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
index 3794dfc..3e3089b 100644
--- a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
+++ b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
@@ -116,7 +116,7 @@ public class PerforceInfoCommand
{
return null;
}
- BufferedReader reader = null;
+ InputStreamReader isReader = null;
try
{
Commandline command = PerforceScmProvider.createP4Command( (PerforceScmProviderRepository) repo, null );
@@ -126,9 +126,11 @@ public class PerforceInfoCommand
getLogger().debug( PerforceScmProvider.clean( "Executing: " + command.toString() ) );
}
Process proc = command.execute();
- reader = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
+ isReader = new InputStreamReader( proc.getInputStream() );
+ BufferedReader br = new BufferedReader( isReader );
+ String line;
entries = new HashMap<String, String>();
- for ( String line = reader.readLine(); line != null; line = reader.readLine() )
+ while ( ( line = br.readLine() ) != null )
{
int idx = line.indexOf( ':' );
if ( idx == -1 )
@@ -151,9 +153,6 @@ public class PerforceInfoCommand
entries.put( key, value );
}
}
-
- reader.close();
- reader = null;
}
catch ( CommandLineException e )
{
@@ -165,7 +164,7 @@ public class PerforceInfoCommand
}
finally
{
- IOUtil.close( reader );
+ IOUtil.close( isReader );
}
return null;
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java
index 75a131e..f7612bc 100644
--- a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java
+++ b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java
@@ -74,8 +74,8 @@ public class PerforceWhereCommand
return null;
}
- BufferedReader outReader = null;
- BufferedReader errReader = null;
+ InputStreamReader isReader = null;
+ InputStreamReader isReaderErr = null;
try
{
Commandline command = PerforceScmProvider.createP4Command( repo, null );
@@ -86,12 +86,15 @@ public class PerforceWhereCommand
logger.debug( PerforceScmProvider.clean( "Executing: " + command.toString() ) );
}
Process proc = command.execute();
- outReader = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
- errReader = new BufferedReader( new InputStreamReader( proc.getErrorStream() ) );
+ isReader = new InputStreamReader( proc.getInputStream() );
+ isReaderErr = new InputStreamReader( proc.getErrorStream() );
+ BufferedReader br = new BufferedReader( isReader );
+ BufferedReader brErr = new BufferedReader( isReaderErr );
+ String line;
String path = null;
- for ( String line = outReader.readLine(); line != null; line = outReader.readLine() )
+ while ( ( line = br.readLine() ) != null )
{
- if ( line.contains( "not in client view" ) )
+ if ( line.indexOf( "not in client view" ) != -1 )
{
// uh oh, something bad is happening
if ( logger.isErrorEnabled() )
@@ -100,7 +103,7 @@ public class PerforceWhereCommand
}
return null;
}
- if ( line.contains( "is not under" ) )
+ if ( line.indexOf( "is not under" ) != -1 )
{
// uh oh, something bad is happening
if ( logger.isErrorEnabled() )
@@ -118,9 +121,9 @@ public class PerforceWhereCommand
path = line.substring( 0, line.lastIndexOf( "//" ) - 1 );
}
// Check for errors
- for ( String line = errReader.readLine(); line != null; line = errReader.readLine() )
+ while ( ( line = brErr.readLine() ) != null )
{
- if ( line.contains( "not in client view" ) )
+ if ( line.indexOf( "not in client view" ) != -1 )
{
// uh oh, something bad is happening
if ( logger.isErrorEnabled() )
@@ -129,7 +132,7 @@ public class PerforceWhereCommand
}
return null;
}
- if ( line.contains( "is not under" ) )
+ if ( line.indexOf( "is not under" ) != -1 )
{
// uh oh, something bad is happening
if ( logger.isErrorEnabled() )
@@ -145,12 +148,6 @@ public class PerforceWhereCommand
}
}
- outReader.close();
- outReader = null;
-
- errReader.close();
- errReader = null;
-
return path;
}
catch ( CommandLineException e )
@@ -171,8 +168,8 @@ public class PerforceWhereCommand
}
finally
{
- IOUtil.close( outReader );
- IOUtil.close( errReader );
+ IOUtil.close( isReader );
+ IOUtil.close( isReaderErr );
}
}
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
index 47e113d..a64a487 100644
--- a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
+++ b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
@@ -202,8 +202,8 @@ public class PerforceCheckOutCommand
if ( clientspecExists && !prepo.isPersistCheckout() )
{
// Delete the clientspec
- BufferedReader outReader = null;
- BufferedReader errReader = null;
+ InputStreamReader isReader = null;
+ InputStreamReader isReaderErr = null;
try
{
cl = PerforceScmProvider.createP4Command( prepo, workingDirectory );
@@ -215,9 +215,10 @@ public class PerforceCheckOutCommand
getLogger().info( "Executing: " + PerforceScmProvider.clean( cl.toString() ) );
}
Process proc = cl.execute();
- outReader = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
- errReader = new BufferedReader( new InputStreamReader( proc.getErrorStream() ) );
- for ( String line = outReader.readLine(); line != null; line = outReader.readLine() )
+ isReader = new InputStreamReader( proc.getInputStream() );
+ BufferedReader br = new BufferedReader( isReader );
+ String line;
+ while ( ( line = br.readLine() ) != null )
{
if ( getLogger().isDebugEnabled() )
{
@@ -225,8 +226,11 @@ public class PerforceCheckOutCommand
}
consumer.consumeLine( line );
}
+ br.close();
// Read errors from STDERR
- for ( String line = errReader.readLine(); line != null; line = errReader.readLine() )
+ isReaderErr = new InputStreamReader( proc.getErrorStream() );
+ BufferedReader brErr = new BufferedReader( isReaderErr );
+ while ( ( line = brErr.readLine() ) != null )
{
if ( getLogger().isDebugEnabled() )
{
@@ -234,12 +238,7 @@ public class PerforceCheckOutCommand
}
consumer.consumeLine( line );
}
-
- outReader.close();
- outReader = null;
-
- errReader.close();
- errReader = null;
+ brErr.close();
}
catch ( CommandLineException e )
{
@@ -257,8 +256,8 @@ public class PerforceCheckOutCommand
}
finally
{
- IOUtil.close( outReader );
- IOUtil.close( errReader );
+ IOUtil.close( isReader );
+ IOUtil.close( isReaderErr );
}
}
else if ( clientspecExists )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
index 4b5651e..8126f84 100644
--- a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
+++ b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
@@ -40,6 +40,7 @@ import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.util.List;
/**
@@ -139,8 +140,8 @@ public class PerforceTagCommand
{
Commandline cl = createLabelCommandLine( (PerforceScmProviderRepository) repo, files.getBasedir() );
DataOutputStream dos = null;
- BufferedReader outReader = null;
- BufferedReader errReader = null;
+ InputStreamReader isReader = null;
+ InputStreamReader isReaderErr = null;
try
{
if ( getLogger().isDebugEnabled() )
@@ -148,7 +149,8 @@ public class PerforceTagCommand
getLogger().debug( PerforceScmProvider.clean( "Executing: " + cl.toString() ) );
}
Process proc = cl.execute();
- dos = new DataOutputStream( proc.getOutputStream() );
+ OutputStream out = proc.getOutputStream();
+ dos = new DataOutputStream( out );
String label = createLabelSpecification( (PerforceScmProviderRepository) repo, tag, lock );
if ( getLogger().isDebugEnabled() )
{
@@ -156,11 +158,14 @@ public class PerforceTagCommand
}
dos.write( label.getBytes() );
dos.close();
- dos = null;
+ out.close();
// TODO find & use a less naive InputStream multiplexer
- outReader = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
- errReader = new BufferedReader( new InputStreamReader( proc.getErrorStream() ) );
- for ( String line = outReader.readLine(); line != null; line = outReader.readLine() )
+ isReader = new InputStreamReader( proc.getInputStream() );
+ isReaderErr = new InputStreamReader( proc.getErrorStream() );
+ BufferedReader stdout = new BufferedReader( isReader );
+ BufferedReader stderr = new BufferedReader( isReaderErr );
+ String line;
+ while ( ( line = stdout.readLine() ) != null )
{
if ( getLogger().isDebugEnabled() )
{
@@ -168,7 +173,7 @@ public class PerforceTagCommand
}
consumer.consumeLine( line );
}
- for ( String line = errReader.readLine(); line != null; line = errReader.readLine() )
+ while ( ( line = stderr.readLine() ) != null )
{
if ( getLogger().isDebugEnabled() )
{
@@ -176,12 +181,8 @@ public class PerforceTagCommand
}
consumer.consumeLine( line );
}
-
- outReader.close();
- outReader = null;
-
- errReader.close();
- errReader = null;
+ stderr.close();
+ stdout.close();
}
catch ( CommandLineException e )
{
@@ -200,8 +201,8 @@ public class PerforceTagCommand
finally
{
IOUtil.close( dos );
- IOUtil.close( outReader );
- IOUtil.close( errReader );
+ IOUtil.close( isReader );
+ IOUtil.close( isReaderErr );
}
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java
index af7e58c..dbedbaf 100644
--- a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java
+++ b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java
@@ -56,27 +56,23 @@ public class VssStatusConsumerTest
public void testConsumeLine()
throws ScmRepositoryException, NoSuchScmProviderException, IOException
{
- BufferedReader reader = null;
+ BufferedReader reader = new BufferedReader( new InputStreamReader( this.getResourceAsStream( "/test.txt" ),
+ "UTF-8" ) );
try
{
- reader = new BufferedReader( new InputStreamReader( this.getResourceAsStream( "/test.txt" ), "UTF-8" ) );
- ScmRepository repository = scmManager.makeScmRepository(
- "scm:vss|username|password@C:/Program File/Visual Source Safe|D:/myProject" );
-
+ ScmRepository repository = scmManager
+ .makeScmRepository( "scm:vss|username|password@C:/Program File/Visual Source Safe|D:/myProject" );
ScmFileSet fileSet = new ScmFileSet( getTestFile( "target" ) );
- VssStatusConsumer consumer =
- new VssStatusConsumer( (VssScmProviderRepository) repository.getProviderRepository(),
- new PlexusLogger( logger ), fileSet );
+ VssStatusConsumer consumer = new VssStatusConsumer( (VssScmProviderRepository) repository
+ .getProviderRepository(), new PlexusLogger( logger ), fileSet );
-
- for ( String line = reader.readLine(); line != null; line = reader.readLine() )
+ String line = reader.readLine();
+ while ( line != null )
{
consumer.consumeLine( line );
+ line = reader.readLine();
}
-
- reader.close();
- reader = null;
}
finally
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
----------------------------------------------------------------------
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
index 3190f9b..bb87c31 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
@@ -33,7 +33,6 @@ import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.Writer;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -314,13 +313,10 @@ public abstract class ScmTestCase
assertTrue( parent.mkdirs() );
}
- Writer writer = null;
+ FileWriter writer = new FileWriter( file );
try
{
- writer = new FileWriter( file );
writer.write( contents );
- writer.close();
- writer = null;
}
finally
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
index 01bd934..62e657b 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java
@@ -98,13 +98,10 @@ public abstract class BranchCommandTckTest
private void changeReadmeTxt( File readmeTxt )
throws Exception
{
- FileWriter output = null;
+ FileWriter output = new FileWriter( readmeTxt );
try
{
- output = new FileWriter( readmeTxt );
output.write( "changed file" );
- output.close();
- output = null;
}
finally
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
index 6e2f703..da7fd4b 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java
@@ -183,26 +183,25 @@ public abstract class CheckInCommandTckTest
private void createFooJava( File fooJava )
throws Exception
{
- PrintWriter writer = null;
+ FileWriter output = new FileWriter( fooJava );
+
+ PrintWriter printer = new PrintWriter( output );
try
{
- writer = new PrintWriter( new FileWriter( fooJava ) );
- writer.println( "public class Foo" );
- writer.println( "{" );
-
- writer.println( " public void foo()" );
- writer.println( " {" );
- writer.println( " int i = 10;" );
- writer.println( " }" );
+ printer.println( "public class Foo" );
+ printer.println( "{" );
- writer.println( "}" );
+ printer.println( " public void foo()" );
+ printer.println( " {" );
+ printer.println( " int i = 10;" );
+ printer.println( " }" );
- writer.close();
- writer = null;
+ printer.println( "}" );
}
finally
{
- IOUtil.close( writer );
+ IOUtil.close( output );
+ IOUtil.close( printer );
}
}
@@ -232,12 +231,12 @@ public abstract class CheckInCommandTckTest
throws Exception
{
FileWriter output = null;
+
try
{
output = new FileWriter( readmeTxt );
+
output.write( "changed file" );
- output.close();
- output = null;
}
finally
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/860a2eea/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
index f9f099f..3692cf0 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java
@@ -98,12 +98,10 @@ public abstract class TagCommandTckTest
private void changeReadmeTxt( File readmeTxt )
throws Exception
{
- FileWriter output = null;
+ FileWriter output = new FileWriter( readmeTxt );
try
{
- output = new FileWriter( readmeTxt );
output.write( "changed file" );
- output.close();
}
finally
{