From commits-return-73335-archive-asf-public=cust-asf.ponee.io@maven.apache.org Fri May 18 22:48:28 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 22C4F180648 for ; Fri, 18 May 2018 22:48:27 +0200 (CEST) Received: (qmail 52777 invoked by uid 500); 18 May 2018 20:48:27 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 52768 invoked by uid 99); 18 May 2018 20:48:27 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 May 2018 20:48:27 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A4A1B86303; Fri, 18 May 2018 20:48:26 +0000 (UTC) Date: Fri, 18 May 2018 20:48:26 +0000 To: "commits@maven.apache.org" Subject: [maven] branch master updated: [MNG-6411] Improve readability of project list returned when --resume-from option value is invalid MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152667650661.32426.9078784557830585551@gitbox.apache.org> From: michaelo@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: maven X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3c3a5901f35783289d502b67bfc520b8e6936ed8 X-Git-Newrev: 454a4e7954deb94e8d10f916405a6a5f6137c0fc X-Git-Rev: 454a4e7954deb94e8d10f916405a6a5f6137c0fc X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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.git The following commit(s) were added to refs/heads/master by this push: new 454a4e7 [MNG-6411] Improve readability of project list returned when --resume-from option value is invalid 454a4e7 is described below commit 454a4e7954deb94e8d10f916405a6a5f6137c0fc Author: Łukasz Dywicki AuthorDate: Fri May 11 15:38:04 2018 +0200 [MNG-6411] Improve readability of project list returned when --resume-from option value is invalid This closes #164 --- .../org/apache/maven/graph/DefaultGraphBuilder.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java index ec72e8d..fb7a9f4 100644 --- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -311,13 +312,29 @@ public class DefaultGraphBuilder if ( !resumed ) { throw new MavenExecutionException( "Could not find project to resume reactor build from: " + selector - + " vs " + projects, request.getPom() ); + + " vs " + formatProjects( projects ), request.getPom() ); } } return result; } + private String formatProjects( List projects ) + { + StringBuilder projectNames = new StringBuilder(); + Iterator iterator = projects.iterator(); + while ( iterator.hasNext() ) + { + MavenProject project = iterator.next(); + projectNames.append( project.getGroupId() ).append( ":" ).append( project.getArtifactId() ); + if ( iterator.hasNext() ) + { + projectNames.append( ", " ); + } + } + return projectNames.toString(); + } + private boolean isMatchingProject( MavenProject project, String selector, File reactorDirectory ) { // [groupId]:artifactId -- To stop receiving notification emails like this one, please contact michaelo@apache.org.