You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2017/12/22 14:27:12 UTC
maven git commit: [MNG-6308] split groupId/artifactId in header and
packaging in footer
Repository: maven
Updated Branches:
refs/heads/MNG-6308_display_packaging bfe51a99e -> 899f45252
[MNG-6308] split groupId/artifactId in header and packaging in footer
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/899f4525
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/899f4525
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/899f4525
Branch: refs/heads/MNG-6308_display_packaging
Commit: 899f452522ab811872e09d2f863b3b05d58ae173
Parents: bfe51a9
Author: Hervé Boutemy <hb...@apache.org>
Authored: Fri Dec 22 15:27:04 2017 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Fri Dec 22 15:27:04 2017 +0100
----------------------------------------------------------------------
.../maven/cli/event/ExecutionEventLogger.java | 31 ++++++++++----------
.../cli/event/ExecutionEventLoggerTest.java | 10 +++----
2 files changed, 20 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/899f4525/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 8ea3585..5378f1a 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -267,26 +267,22 @@ public class ExecutionEventLogger
logger.info( "" );
- StringBuilder projectKey = new StringBuilder();
- projectKey.append( project.getGroupId() )
- .append( ':' )
- .append( project.getArtifactId() )
- .append( ':' )
- .append( project.getPackaging() );
+ // -------< groupId:artifactId >-------
+ String projectKey = project.getGroupId() + ':' + project.getArtifactId();
- final String preHeader = "-< ";
- final String postHeader = " >-";
-
- String prefix =
- chars( '-',
- Math.max( 0, ( LINE_LENGTH - projectKey.length() - preHeader.length() - postHeader.length() )
- / 2 ) )
- + preHeader;
+ final String preHeader = "--< ";
+ final String postHeader = " >--";
+
+ final int headerLen = preHeader.length() + projectKey.length() + postHeader.length();
+
+ String prefix = chars( '-', Math.max( 0, ( LINE_LENGTH - headerLen ) / 2 ) ) + preHeader;
+
String suffix = postHeader
- + chars( '-', Math.max( 0, LINE_LENGTH - projectKey.length() - prefix.length() - preHeader.length() ) );
+ + chars( '-', Math.max( 0, LINE_LENGTH - headerLen - prefix.length() + preHeader.length() ) );
logger.info( buffer().strong( prefix ).project( projectKey ).strong( suffix ).toString() );
+ // Building Project Name Version [i/n]
String building = "Building " + event.getProject().getName() + " " + event.getProject().getVersion();
if ( totalProjects <= 1 )
@@ -308,7 +304,10 @@ public class ExecutionEventLogger
infoMain( building + ( ( pad > 0 ) ? chars( ' ', pad ) : "" ) + progress );
}
- infoMain( chars( '-', LINE_LENGTH ) );
+ // ----------[packaging]----------
+ prefix = chars( '-', Math.max( 0, ( LINE_LENGTH - project.getPackaging().length() - 2 ) / 2 ) );
+ suffix = chars( '-', Math.max( 0, LINE_LENGTH - project.getPackaging().length() - 2 - prefix.length() ) );
+ infoMain( prefix + '[' + project.getPackaging() + ']' + suffix );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/899f4525/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
index 662a8cc..e6d4e5a 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
@@ -71,9 +71,9 @@ public class ExecutionEventLoggerTest
// verify
InOrder inOrder = inOrder( logger );
inOrder.verify( logger ).info( "" );
- inOrder.verify( logger ).info( "----------------< org.apache.maven:maven-embedder:jar >-----------------" );
+ inOrder.verify( logger ).info( "------------------< org.apache.maven:maven-embedder >-------------------" );
inOrder.verify( logger ).info( "Building Apache Maven Embedder 3.5.4-SNAPSHOT" );
- inOrder.verify( logger ).info( "------------------------------------------------------------------------" );
+ inOrder.verify( logger ).info( "---------------------------------[jar]----------------------------------" );
}
@Test
@@ -86,7 +86,7 @@ public class ExecutionEventLoggerTest
ExecutionEvent event = mock( ExecutionEvent.class );
MavenProject project = mock( MavenProject.class );
- when( project.getGroupId() ).thenReturn( "org.apache.maven.plugins" );
+ when( project.getGroupId() ).thenReturn( "org.apache.maven.plugins.overflow" );
when( project.getArtifactId() ).thenReturn( "maven-project-info-reports-plugin" );
when( project.getPackaging() ).thenReturn( "maven-plugin" );
when( project.getName() ).thenReturn( "Apache Maven Project Info Reports Plugin" );
@@ -99,8 +99,8 @@ public class ExecutionEventLoggerTest
// verify
InOrder inOrder = inOrder( logger );
inOrder.verify( logger ).info( "" );
- inOrder.verify( logger ).info( "-< org.apache.maven.plugins:maven-project-info-reports-plugin:maven-plugin >-" );
+ inOrder.verify( logger ).info( "--< org.apache.maven.plugins.overflow:maven-project-info-reports-plugin >--" );
inOrder.verify( logger ).info( "Building Apache Maven Project Info Reports Plugin 3.0.0-SNAPSHOT" );
- inOrder.verify( logger ).info( "------------------------------------------------------------------------" );
+ inOrder.verify( logger ).info( "-----------------------------[maven-plugin]-----------------------------" );
}
}