You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/04/04 12:16:40 UTC
[maven-artifact-transfer] branch MSHARED-864 updated: Continued.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHARED-864
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git
The following commit(s) were added to refs/heads/MSHARED-864 by this push:
new ca56cef Continued.
ca56cef is described below
commit ca56cef28151f0d0781300d658fdc84c5d056f6e
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Apr 4 14:16:30 2020 +0200
Continued.
---
.../maven/plugin/artifact/installer/ArtifactInstallerMojo.java | 8 ++------
.../transfer/artifact/resolve/internal/Maven30ArtifactResult.java | 8 +++-----
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/it/maven-artifact-installer-plugin/src/main/java/org/apache/maven/plugin/artifact/installer/ArtifactInstallerMojo.java b/src/it/maven-artifact-installer-plugin/src/main/java/org/apache/maven/plugin/artifact/installer/ArtifactInstallerMojo.java
index f9f1496..3f7d5a1 100644
--- a/src/it/maven-artifact-installer-plugin/src/main/java/org/apache/maven/plugin/artifact/installer/ArtifactInstallerMojo.java
+++ b/src/it/maven-artifact-installer-plugin/src/main/java/org/apache/maven/plugin/artifact/installer/ArtifactInstallerMojo.java
@@ -127,13 +127,9 @@ public class ArtifactInstallerMojo
installer.install( session.getProjectBuildingRequest(), mavenArtifacts );
}
- catch ( ArtifactInstallerException e )
+ catch ( ArtifactInstallerException | IOException e )
{
- throw new MojoExecutionException( "ArtifactInstallerException", e );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "IOException", e );
+ throw new MojoExecutionException( e.getClass().getName(), e );
}
}
diff --git a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java
index d4d1cbe..3bbea28 100644
--- a/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java
@@ -26,12 +26,11 @@ import org.sonatype.aether.resolution.ArtifactResult;
/**
* {@link org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult} wrapper for {@link ArtifactResult}
- *
+ *
* @author Robert Scholte
* @since 3.0
*/
-class Maven30ArtifactResult
- implements org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult
+class Maven30ArtifactResult implements org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult
{
private final ArtifactResult artifactResult;
@@ -48,8 +47,7 @@ class Maven30ArtifactResult
{
try
{
- return Invoker.invoke( RepositoryUtils.class, "toArtifact",
- Artifact.class, artifactResult.getArtifact() );
+ return Invoker.invoke( RepositoryUtils.class, "toArtifact", Artifact.class, artifactResult.getArtifact() );
}
catch ( ArtifactResolverException e )
{