Repository: maven Updated Branches: refs/heads/master f75008743 -> 4f05b59de
[MNG-5754] Toolchains should be read during initialization No need to wrap ToolchainsBuildingException with MisconfiguredToolchainException. The latter was required when using ToolchainManagerPrivate Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4f05b59d Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4f05b59d Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4f05b59d Branch: refs/heads/master Commit: 4f05b59de9ff8582ccd3bc4067a7ba72aad7b8cd Parents: f750087 Author: Robert Scholte <rfscho...@codehaus.org> Authored: Sat Jan 17 16:27:55 2015 +0100 Committer: Robert Scholte <rfscho...@codehaus.org> Committed: Sat Jan 17 16:27:55 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/maven/cli/MavenCli.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/4f05b59d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 13108f2..5b7bd7f 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -68,10 +68,8 @@ import org.apache.maven.settings.building.SettingsBuilder; import org.apache.maven.settings.building.SettingsBuildingRequest; import org.apache.maven.settings.building.SettingsBuildingResult; import org.apache.maven.settings.building.SettingsProblem; -import org.apache.maven.toolchain.MisconfiguredToolchainException; import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest; import org.apache.maven.toolchain.building.ToolchainsBuilder; -import org.apache.maven.toolchain.building.ToolchainsBuildingException; import org.apache.maven.toolchain.building.ToolchainsBuildingResult; import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.DefaultContainerConfiguration; @@ -863,15 +861,7 @@ public class MavenCli slf4jLogger.debug( "Reading user toolchains from " + getLocation( toolchainsRequest.getUserToolchainsSource(), userToolchainsFile ) ); - ToolchainsBuildingResult toolchainsResult; - try - { - toolchainsResult = toolchainsBuilder.build( toolchainsRequest ); - } - catch ( ToolchainsBuildingException e ) - { - throw new MisconfiguredToolchainException( e.getMessage(), e ); - } + ToolchainsBuildingResult toolchainsResult = toolchainsBuilder.build( toolchainsRequest ); eventSpyDispatcher.onEvent( toolchainsRequest );
