You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/01/15 21:18:53 UTC
[maven-release] 02/03: Apply multi-catch
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit de5c863786e1ceb0c19e350417f7128d5b738e8d
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Jan 15 21:22:36 2018 +0100
Apply multi-catch
---
.../config/PropertiesReleaseDescriptorStore.java | 20 ++-------------
.../shared/release/exec/AbstractMavenExecutor.java | 30 +++-------------------
.../phase/CheckDependencySnapshotsPhase.java | 6 +----
.../shared/release/phase/MapVersionsPhase.java | 6 +----
.../release/transform/jdom/JDomModelETL.java | 6 +----
5 files changed, 8 insertions(+), 60 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
index 673ca9b..7256ce3 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
@@ -144,15 +144,7 @@ public class PropertiesReleaseDescriptorStore
{
password = encryptAndDecorate( password );
}
- catch ( IllegalStateException e )
- {
- getLogger().debug( e.getMessage() );
- }
- catch ( SecDispatcherException e )
- {
- getLogger().debug( e.getMessage() );
- }
- catch ( PlexusCipherException e )
+ catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e )
{
getLogger().debug( e.getMessage() );
}
@@ -169,15 +161,7 @@ public class PropertiesReleaseDescriptorStore
{
passPhrase = encryptAndDecorate( passPhrase );
}
- catch ( IllegalStateException e )
- {
- getLogger().debug( e.getMessage() );
- }
- catch ( SecDispatcherException e )
- {
- getLogger().debug( e.getMessage() );
- }
- catch ( PlexusCipherException e )
+ catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e )
{
getLogger().debug( e.getMessage() );
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
index 2f5a954..3ad1ce7 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
@@ -147,15 +147,7 @@ public abstract class AbstractMavenExecutor
{
server.setPassword( encryptAndDecorate( password ) );
}
- catch ( IllegalStateException e )
- {
- // ignore
- }
- catch ( SecDispatcherException e )
- {
- // ignore
- }
- catch ( PlexusCipherException e )
+ catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e )
{
// ignore
}
@@ -168,15 +160,7 @@ public abstract class AbstractMavenExecutor
{
server.setPassphrase( encryptAndDecorate( passphrase ) );
}
- catch ( IllegalStateException e )
- {
- // ignore
- }
- catch ( SecDispatcherException e )
- {
- // ignore
- }
- catch ( PlexusCipherException e )
+ catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e )
{
// ignore
}
@@ -192,15 +176,7 @@ public abstract class AbstractMavenExecutor
{
proxy.setPassword( encryptAndDecorate( password ) );
}
- catch ( IllegalStateException e )
- {
- // ignore
- }
- catch ( SecDispatcherException e )
- {
- // ignore
- }
- catch ( PlexusCipherException e )
+ catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e )
{
// ignore
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
index 36fc403..8f90cdf 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
@@ -402,11 +402,7 @@ public class CheckDependencySnapshotsPhase
releaseDescriptor.getResolvedSnapshotDependencies().putAll( resolvedSnapshots );
}
}
- catch ( PrompterException e )
- {
- throw new ReleaseExecutionException( e.getMessage(), e );
- }
- catch ( VersionParseException e )
+ catch ( PrompterException | VersionParseException e )
{
throw new ReleaseExecutionException( e.getMessage(), e );
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
index 443d9fd..eedf50a 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
@@ -283,11 +283,7 @@ public class MapVersionsPhase
}
}
}
- catch ( PolicyException e )
- {
- throw new ReleaseExecutionException( e.getMessage(), e );
- }
- catch ( VersionParseException e )
+ catch ( PolicyException | VersionParseException e )
{
throw new ReleaseExecutionException( e.getMessage(), e );
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
index a40d03d..68063a5 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
@@ -141,11 +141,7 @@ public class JDomModelETL implements ModelETL
}
}
}
- catch ( JDOMException e )
- {
- throw new ReleaseExecutionException( "Error reading POM: " + e.getMessage(), e );
- }
- catch ( IOException e )
+ catch ( JDOMException | IOException e )
{
throw new ReleaseExecutionException( "Error reading POM: " + e.getMessage(), e );
}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.