Updated Branches: refs/heads/master e084ff3b8 -> 8009c099a
prefer DuplicatProjectException in same package and explicit package for org.apache.maven.project.DuplicatProjectException Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8009c099 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8009c099 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8009c099 Branch: refs/heads/master Commit: 8009c099a007f37f1a88d3891494395ba28ce2f5 Parents: e084ff3 Author: Hervé Boutemy <hbout...@apache.org> Authored: Sat Jul 27 19:16:52 2013 +0200 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Sat Jul 27 19:16:52 2013 +0200 ---------------------------------------------------------------------- maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/8009c099/maven-core/src/main/java/org/apache/maven/DefaultMaven.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index aaddef0..68e4011 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -53,7 +53,6 @@ import org.apache.maven.model.building.ModelProblemUtils; import org.apache.maven.model.building.ModelSource; import org.apache.maven.model.building.UrlModelSource; import org.apache.maven.plugin.LegacySupport; -import org.apache.maven.project.DuplicateProjectException; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingException; @@ -255,7 +254,7 @@ public class DefaultMaven repoSession.setWorkspaceReader( ChainedWorkspaceReader.newInstance( reactorRepository, repoSession.getWorkspaceReader() ) ); } - catch ( org.apache.maven.DuplicateProjectException e ) + catch ( DuplicateProjectException e ) { return addExceptionToResult( result, e ); } @@ -299,7 +298,7 @@ public class DefaultMaven return addExceptionToResult( result, error ); } - catch ( DuplicateProjectException e ) + catch ( org.apache.maven.project.DuplicateProjectException e ) { return addExceptionToResult( result, e ); } @@ -589,7 +588,7 @@ public class DefaultMaven } private Map<String, MavenProject> getProjectMap( List<MavenProject> projects ) - throws org.apache.maven.DuplicateProjectException + throws DuplicateProjectException { Map<String, MavenProject> index = new LinkedHashMap<String, MavenProject>(); Map<String, List<File>> collisions = new LinkedHashMap<String, List<File>>(); @@ -622,7 +621,7 @@ public class DefaultMaven if ( !collisions.isEmpty() ) { - throw new org.apache.maven.DuplicateProjectException( "Two or more projects in the reactor" + throw new DuplicateProjectException( "Two or more projects in the reactor" + " have the same identifier, please make sure that <groupId>:<artifactId>:<version>" + " is unique for each project: " + collisions, collisions ); }
