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 2018/04/11 18:02:44 UTC
[maven] branch MNG-6391 updated (4a7a580 -> 95c3856)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MNG-6391
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 4a7a580 [MNG-6391] - Printout version of last built module in reactor build
new 95c3856 [MNG-6391] - Printout version of last built module in reactor build
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4a7a580)
\
N -- N -- N refs/heads/MNG-6391 (95c3856)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/maven/cli/event/ExecutionEventLogger.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
Re: [maven] 01/01: [MNG-6391] - Printout version of last built module
in reactor build
Posted by Robert Scholte <rf...@apache.org>.
See below...
On Wed, 11 Apr 2018 20:02:45 +0200, <kh...@apache.org> wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> khmarbaise pushed a commit to branch MNG-6391
> in repository https://gitbox.apache.org/repos/asf/maven.git
>
> commit 95c3856eec104b6badc9b4848129eef32722a354
> Author: Karl Heinz Marbaise <kh...@apache.org>
> AuthorDate: Wed Apr 11 19:42:38 2018 +0200
>
> [MNG-6391] - Printout version of last built module in reactor build
> ---
> .../maven/cli/event/ExecutionEventLogger.java | 32
> ++++++++++++++++++----
> 1 file changed, 27 insertions(+), 5 deletions(-)
>
> 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 51d00b7..88f30a1 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
> @@ -141,6 +141,23 @@ public class ExecutionEventLogger
> }
> }
> + private boolean isSingleVersionedReactor( MavenSession session )
> + {
> + boolean result = true;
> +
> + MavenProject topProject = session.getTopLevelProject();
> + List<MavenProject> sortedProjects =
> session.getProjectDependencyGraph().getSortedProjects();
> + for ( MavenProject mavenProject : sortedProjects )
> + {
> + if ( !topProject.getVersion().equals(
> mavenProject.getVersion() ) )
> + {
> + result = false;
please add a break here, no need for further looping.
thanks,
Robert
> + }
> + }
> +
> + return result;
> + }
> +
> private void logReactorSummary( MavenSession session )
> {
> infoLine( '-' );
> @@ -152,9 +169,8 @@ public class ExecutionEventLogger
> MavenExecutionResult result = session.getResult();
> List<MavenProject> projects = session.getProjects();
> - MavenProject lastProject = projects.get( projects.size() - 1 );
> - MavenProject topProject = session.getTopLevelProject();
> + boolean isSingleVersion = isSingleVersionedReactor( session );
> for ( MavenProject project : projects )
> {
> StringBuilder buffer = new StringBuilder( 128 );
> @@ -162,8 +178,7 @@ public class ExecutionEventLogger
> buffer.append( project.getName() );
> buffer.append( ' ' );
> - if ( topProject.equals( project ) || lastProject.equals(
> project )
> - || !topProject.getVersion().equals(
> project.getVersion() ) )
> + if ( !isSingleVersion )
> {
> buffer.append( project.getVersion() );
> buffer.append( ' ' );
> @@ -241,7 +256,14 @@ public class ExecutionEventLogger
> String wallClock = session.getRequest().getDegreeOfConcurrency()
> > 1 ? " (Wall Clock)" : "";
> - logger.info( "Total time: " + formatDuration( time ) +
> wallClock );
> + boolean isSingleVersion = isSingleVersionedReactor( session );
> +
> + if ( isSingleVersion )
> + {
> + logger.info( "Version: " +
> session.getTopLevelProject().getVersion() );
> + }
> +
> + logger.info( "Total time: " + formatDuration( time ) +
> wallClock );
> logger.info( "Finished at: " + formatTimestamp( finish ) );
> }
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
[maven] 01/01: [MNG-6391] - Printout version of last built module
in reactor build
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-6391
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 95c3856eec104b6badc9b4848129eef32722a354
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed Apr 11 19:42:38 2018 +0200
[MNG-6391] - Printout version of last built module in reactor build
---
.../maven/cli/event/ExecutionEventLogger.java | 32 ++++++++++++++++++----
1 file changed, 27 insertions(+), 5 deletions(-)
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 51d00b7..88f30a1 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
@@ -141,6 +141,23 @@ public class ExecutionEventLogger
}
}
+ private boolean isSingleVersionedReactor( MavenSession session )
+ {
+ boolean result = true;
+
+ MavenProject topProject = session.getTopLevelProject();
+ List<MavenProject> sortedProjects = session.getProjectDependencyGraph().getSortedProjects();
+ for ( MavenProject mavenProject : sortedProjects )
+ {
+ if ( !topProject.getVersion().equals( mavenProject.getVersion() ) )
+ {
+ result = false;
+ }
+ }
+
+ return result;
+ }
+
private void logReactorSummary( MavenSession session )
{
infoLine( '-' );
@@ -152,9 +169,8 @@ public class ExecutionEventLogger
MavenExecutionResult result = session.getResult();
List<MavenProject> projects = session.getProjects();
- MavenProject lastProject = projects.get( projects.size() - 1 );
- MavenProject topProject = session.getTopLevelProject();
+ boolean isSingleVersion = isSingleVersionedReactor( session );
for ( MavenProject project : projects )
{
StringBuilder buffer = new StringBuilder( 128 );
@@ -162,8 +178,7 @@ public class ExecutionEventLogger
buffer.append( project.getName() );
buffer.append( ' ' );
- if ( topProject.equals( project ) || lastProject.equals( project )
- || !topProject.getVersion().equals( project.getVersion() ) )
+ if ( !isSingleVersion )
{
buffer.append( project.getVersion() );
buffer.append( ' ' );
@@ -241,7 +256,14 @@ public class ExecutionEventLogger
String wallClock = session.getRequest().getDegreeOfConcurrency() > 1 ? " (Wall Clock)" : "";
- logger.info( "Total time: " + formatDuration( time ) + wallClock );
+ boolean isSingleVersion = isSingleVersionedReactor( session );
+
+ if ( isSingleVersion )
+ {
+ logger.info( "Version: " + session.getTopLevelProject().getVersion() );
+ }
+
+ logger.info( "Total time: " + formatDuration( time ) + wallClock );
logger.info( "Finished at: " + formatTimestamp( finish ) );
}
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.