You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/09/11 07:59:13 UTC

[maven-scm] branch master updated: Collapse Identical catch sections in a single try statement

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git


The following commit(s) were added to refs/heads/master by this push:
     new f3fa0fd  Collapse Identical catch sections in a single try statement
f3fa0fd is described below

commit f3fa0fde821d895bd61a304b2e636c105bfe2564
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Sep 2 07:08:23 2021 +0200

    Collapse Identical catch sections in a single try statement
    
    This closes #125
---
 .../src/main/java/org/apache/maven/scm/plugin/AddMojo.java     |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/BranchMojo.java  |  6 +-----
 .../main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java   |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/DiffMojo.java    |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/EditMojo.java    |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/ListMojo.java    |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java  |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/StatusMojo.java  |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/TagMojo.java     |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java  |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/UntagMojo.java   |  6 +-----
 .../src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java  |  6 +-----
 .../org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java     |  6 +-----
 .../clearcase/repository/ClearCaseScmProviderRepository.java   | 10 +---------
 .../maven/scm/provider/clearcase/util/ClearCaseUtil.java       |  4 ----
 .../maven/scm/provider/perforce/PerforceScmProvider.java       |  6 +-----
 .../scm/provider/perforce/command/PerforceInfoCommand.java     |  6 +-----
 .../scm/provider/perforce/command/PerforceWhereCommand.java    | 10 +---------
 .../perforce/command/checkout/PerforceCheckOutCommand.java     |  6 +-----
 .../apache/maven/scm/provider/starteam/util/StarteamUtil.java  |  4 ----
 .../synergy/repository/SynergyScmProviderRepository.java       | 10 +---------
 .../maven/scm/provider/vss/commands/VssCommandLineUtils.java   |  4 ----
 .../org/apache/maven/scm/provider/cvslib/util/CvsUtil.java     |  4 ----
 .../java/org/apache/maven/scm/provider/git/util/GitUtil.java   |  4 ----
 .../java/org/apache/maven/scm/provider/svn/util/SvnUtil.java   |  4 ----
 26 files changed, 20 insertions(+), 136 deletions(-)

diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java
index dad82bd..b96e046 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java
@@ -53,11 +53,7 @@ public class AddMojo
             getLog().info( "" + result.getAddedFiles().size() + " files successfully added." );
 
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run add command : ", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run add command : ", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java
index 38448eb..e3c0957 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java
@@ -93,11 +93,7 @@ public class BranchMojo
 
             checkResult( result );
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run branch command", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run branch command", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
index f033ae2..1123023 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
@@ -207,11 +207,7 @@ public class ChangeLogMojo
             }
 
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run changelog command : ", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run changelog command : ", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java
index cb0381c..3eec84c 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java
@@ -78,11 +78,7 @@ public class CheckinMojo
 
             checkResult( result );
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run checkin command : ", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run checkin command : ", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java
index c8c515c..3ff53e7 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java
@@ -99,11 +99,7 @@ public class DiffMojo
                 throw new MojoExecutionException( "Can't write patch file.", e );
             }
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run diff command : ", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run diff command : ", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java
index eb19df9..9ad6be4 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java
@@ -50,11 +50,7 @@ public class EditMojo
 
             checkResult( result );
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run edit command : ", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run edit command : ", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java
index f012111..2d8c9ac 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java
@@ -80,11 +80,7 @@ public class ListMojo
                 }
             }
         }
-        catch ( ScmException e )
-        {
-            throw new MojoExecutionException( "Cannot run list command : ", e );
-        }
-        catch ( IOException e )
+        catch ( ScmException | IOException e )
         {
             throw new MojoExecutionException( "Cannot run list command : ", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
index 3f9adfa..f50a566 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/RemoveMojo.java
@@ -57,11 +57,7 @@ public class RemoveMojo
             RemoveScmResult result = getScmManager().remove( repository, getFileSet(), message );
             checkResult( result );
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run remove command : " + e.getMessage(), e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run remove command : " + e.getMessage(), e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java
index e994945..166b5d1 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java
@@ -72,11 +72,7 @@ public class StatusMojo
                                    + getRelativePath( baseDir, file.getPath() ) );
             }
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run status command : ", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run status command : ", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java
index 2b7c893..5f64dd0 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java
@@ -159,11 +159,7 @@ public class TagMojo
 
             checkResult( result );
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run tag command : ", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run tag command : ", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java
index a602963..a98be2a 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java
@@ -50,11 +50,7 @@ public class UnEditMojo
 
             checkResult( result );
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run unedit command : ", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run unedit command : ", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UntagMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UntagMojo.java
index ed915fe..f8371e6 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UntagMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UntagMojo.java
@@ -71,11 +71,7 @@ public class UntagMojo
 
             checkResult( result );
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run untag command", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run untag command", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java
index e720c44..520ab5a 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java
@@ -99,11 +99,7 @@ public class UpdateMojo
                 getLog().info( "Project at revision " + revision );
             }
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run update command : ", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run update command : ", e );
         }
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java
index b034bb2..8531625 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java
@@ -87,11 +87,7 @@ public class UpdateSubprojectsMojo
                 }
             }
         }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "Cannot run update command : ", e );
-        }
-        catch ( ScmException e )
+        catch ( IOException | ScmException e )
         {
             throw new MojoExecutionException( "Cannot run update command : ", e );
         }
diff --git a/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java b/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
index bb9522e..9512f2a 100644
--- a/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
+++ b/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
@@ -116,15 +116,7 @@ public class ClearCaseScmProviderRepository
         {
             parseUrl( url );
         }
-        catch ( MalformedURLException e )
-        {
-            throw new ScmRepositoryException( "Illegal URL: " + url + "(" + e.getMessage() + ")" );
-        }
-        catch ( URISyntaxException e )
-        {
-            throw new ScmRepositoryException( "Illegal URL: " + url + "(" + e.getMessage() + ")" );
-        }
-        catch ( UnknownHostException e )
+        catch ( MalformedURLException | UnknownHostException | URISyntaxException e )
         {
             throw new ScmRepositoryException( "Illegal URL: " + url + "(" + e.getMessage() + ")" );
         }
diff --git a/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java b/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java
index 812b08a..e81fc00 100644
--- a/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java
+++ b/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/util/ClearCaseUtil.java
@@ -83,10 +83,6 @@ public final class ClearCaseUtil
             {
                 return reader.read( ReaderFactory.newXmlReader( settingsFile ) );
             }
-            catch ( FileNotFoundException e )
-            {
-                // nop
-            }
             catch ( IOException e )
             {
                 // nop
diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
index 5f62cea..78b2a78 100644
--- a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
+++ b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
@@ -434,13 +434,9 @@ public class PerforceScmProvider
             // [SCM-370][SCM-351] client specs cannot contain forward slashes, spaces and ~; "-" is okay
             path = workDir.getCanonicalPath().replaceAll( "[/ ~]", "-" );
         }
-        catch ( UnknownHostException e )
-        {
-            // Should never happen
-            throw new RuntimeException( e );
-        }
         catch ( IOException e )
         {
+            // Should never happen
             throw new RuntimeException( e );
         }
         return username + "-" + hostname + "-MavenSCM-" + path;
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 7159434..73d517f 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
@@ -153,11 +153,7 @@ public class PerforceInfoCommand
                 }
             }
         }
-        catch ( CommandLineException e )
-        {
-            throw new ScmException( e.getLocalizedMessage() );
-        }
-        catch ( IOException e )
+        catch ( CommandLineException | IOException e )
         {
             throw new ScmException( e.getLocalizedMessage() );
         }
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 5048f2a..11358b6 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
@@ -149,15 +149,7 @@ public class PerforceWhereCommand
 
             return path;
         }
-        catch ( CommandLineException e )
-        {
-            if ( logger.isErrorEnabled() )
-            {
-                logger.error( e );
-            }
-            throw new RuntimeException( e.getLocalizedMessage() );
-        }
-        catch ( IOException e )
+        catch ( CommandLineException | IOException e )
         {
             if ( logger.isErrorEnabled() )
             {
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 e555196..42a4803 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
@@ -341,11 +341,7 @@ public class PerforceCheckOutCommand
                 getLogger().debug( "Could not parse changelist from line " + line );
             }
         }
-        catch ( IOException e )
-        {
-            getLogger().error( e );
-        }
-        catch ( CommandLineException e )
+        catch ( IOException | CommandLineException e )
         {
             getLogger().error( e );
         }
diff --git a/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/util/StarteamUtil.java b/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/util/StarteamUtil.java
index b5bc97c..0af3a97 100644
--- a/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/util/StarteamUtil.java
+++ b/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/util/StarteamUtil.java
@@ -66,10 +66,6 @@ public final class StarteamUtil
             {
                 return reader.read( ReaderFactory.newXmlReader( settingsFile ) );
             }
-            catch ( FileNotFoundException e )
-            {
-                // nop
-            }
             catch ( IOException e )
             {
                 // nop
diff --git a/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java b/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java
index 1650fe6..991f54a 100644
--- a/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java
+++ b/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/repository/SynergyScmProviderRepository.java
@@ -60,15 +60,7 @@ public class SynergyScmProviderRepository
         {
             parseUrl( url );
         }
-        catch ( MalformedURLException e )
-        {
-            throw new ScmRepositoryException( "Illegal URL: " + url + "(" + e.getMessage() + ")" );
-        }
-        catch ( URISyntaxException e )
-        {
-            throw new ScmRepositoryException( "Illegal URL: " + url + "(" + e.getMessage() + ")" );
-        }
-        catch ( UnknownHostException e )
+        catch ( MalformedURLException | UnknownHostException | URISyntaxException e )
         {
             throw new ScmRepositoryException( "Illegal URL: " + url + "(" + e.getMessage() + ")" );
         }
diff --git a/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java b/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
index 7f6f90f..55cf61c 100644
--- a/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
+++ b/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtils.java
@@ -139,10 +139,6 @@ public final class VssCommandLineUtils
             {
                 settings = reader.read( ReaderFactory.newXmlReader( settingsFile ) );
             }
-            catch ( FileNotFoundException e )
-            {
-                // nop
-            }
             catch ( IOException e )
             {
                 // nop
diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/util/CvsUtil.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/util/CvsUtil.java
index cf33354..6dc82bb 100644
--- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/util/CvsUtil.java
+++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/util/CvsUtil.java
@@ -68,10 +68,6 @@ public class CvsUtil
             {
                 return reader.read( ReaderFactory.newXmlReader( settingsFile ) );
             }
-            catch ( FileNotFoundException e )
-            {
-                // skip error 
-            }
             catch ( IOException e )
             {
                 // skip error
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java
index 6e8d0bf..3da92d6 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java
@@ -67,10 +67,6 @@ public class GitUtil
             {
                 return reader.read( ReaderFactory.newXmlReader( settingsFile ) );
             }
-            catch ( FileNotFoundException e )
-            {
-                //Nothing to do
-            }
             catch ( IOException e )
             {
                 //Nothing to do
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java
index ae20417..75935bf 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java
@@ -66,10 +66,6 @@ public class SvnUtil
             {
                 return reader.read( ReaderFactory.newXmlReader( settingsFile ) );
             }
-            catch ( FileNotFoundException e )
-            {
-                //Nothing to do
-            }
             catch ( IOException e )
             {
                 //Nothing to do