updated code to match MessageBuilder API change Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5fb4bc9a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5fb4bc9a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5fb4bc9a
Branch: refs/heads/jigsaw Commit: 5fb4bc9a237ad2c19c5851b89d0ed810d2eff02d Parents: 7fa6ce7 Author: Hervé Boutemy <hbout...@apache.org> Authored: Mon Jul 18 00:42:00 2016 +0200 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Mon Jul 18 00:42:00 2016 +0200 ---------------------------------------------------------------------- .../lifecycle/LifecycleExecutionException.java | 9 +++-- .../java/org/apache/maven/cli/CLIManager.java | 8 ++--- .../java/org/apache/maven/cli/MavenCli.java | 16 ++++----- .../maven/cli/event/ExecutionEventLogger.java | 37 ++++++++++---------- .../cli/logging/impl/gossip/ColorRenderer.java | 8 ++--- 5 files changed, 38 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/5fb4bc9a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java index 0578cd1..62ae269 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java @@ -23,7 +23,7 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; import org.apache.maven.plugin.MojoExecution; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.utils.logging.MessageBuffer; +import org.apache.maven.shared.utils.logging.MessageBuilder; /** * @author <a href="mailto:ja...@maven.org";>Jason van Zyl</a> @@ -78,16 +78,15 @@ public class LifecycleExecutionException private static String createMessage( MojoExecution execution, MavenProject project, Throwable cause ) { - MessageBuffer buffer = buffer( 256 ); + MessageBuilder buffer = buffer( 256 ); buffer.a( "Failed to execute goal" ); if ( execution != null ) { buffer.a( ' ' ).a( execution.getGroupId() ).a( ':' ); - buffer.mojo().a( execution.getArtifactId() ).a( ':' ); - buffer.a( execution.getVersion() ).a( ':' ).a( execution.getGoal() ).reset(); - buffer.strong().a( " (" ).a( execution.getExecutionId() ).a( ')' ).reset(); + buffer.mojo( execution.getArtifactId() + ':' + execution.getVersion() + ':' + execution.getGoal() ); + buffer.a( ' ' ).strong( '(' + execution.getExecutionId() + ')' ); } if ( project != null ) http://git-wip-us.apache.org/repos/asf/maven/blob/5fb4bc9a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index f461835..f86f48b 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -108,7 +108,7 @@ public class CLIManager { options = new Options(); options.addOption( OptionBuilder.withLongOpt( "help" ).withDescription( "Display help information" ).create( HELP ) ); - options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription( "Force the use of an alternate POM file (or directory with pom.xml)." ).create( ALTERNATE_POM_FILE ) ); + options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription( "Force the use of an alternate POM file (or directory with pom.xml)" ).create( ALTERNATE_POM_FILE ) ); options.addOption( OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create( SET_SYSTEM_PROPERTY ) ); options.addOption( OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) ); options.addOption( OptionBuilder.withLongOpt( "version" ).withDescription( "Display version information" ).create( VERSION ) ); @@ -118,7 +118,7 @@ public class CLIManager options.addOption( OptionBuilder.withLongOpt( "non-recursive" ).withDescription( "Do not recurse into sub-projects" ).create( NON_RECURSIVE ) ); options.addOption( OptionBuilder.withLongOpt( "update-snapshots" ).withDescription( "Forces a check for missing releases and updated snapshots on remote repositories" ).create( UPDATE_SNAPSHOTS ) ); options.addOption( OptionBuilder.withLongOpt( "activate-profiles" ).withDescription( "Comma-delimited list of profiles to activate" ).hasArg().create( ACTIVATE_PROFILES ) ); - options.addOption( OptionBuilder.withLongOpt( "batch-mode" ).withDescription( "Run in non-interactive (batch) mode" ).create( BATCH_MODE ) ); + options.addOption( OptionBuilder.withLongOpt( "batch-mode" ).withDescription( "Run in non-interactive (batch) mode (disables output color)" ).create( BATCH_MODE ) ); options.addOption( OptionBuilder.withLongOpt( "no-snapshot-updates" ).withDescription( "Suppress SNAPSHOT updates" ).create( SUPRESS_SNAPSHOT_UPDATES ) ); options.addOption( OptionBuilder.withLongOpt( "strict-checksums" ).withDescription( "Fail the build if checksums don't match" ).create( CHECKSUM_FAILURE_POLICY ) ); options.addOption( OptionBuilder.withLongOpt( "lax-checksums" ).withDescription( "Warn if checksums don't match" ).create( CHECKSUM_WARNING_POLICY ) ); @@ -133,13 +133,13 @@ public class CLIManager options.addOption( OptionBuilder.withLongOpt( "projects" ).withDescription( "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path." ).hasArg().create( PROJECT_LIST ) ); options.addOption( OptionBuilder.withLongOpt( "also-make" ).withDescription( "If project list is specified, also build projects required by the list" ).create( ALSO_MAKE ) ); options.addOption( OptionBuilder.withLongOpt( "also-make-dependents" ).withDescription( "If project list is specified, also build projects that depend on projects on the list" ).create( ALSO_MAKE_DEPENDENTS ) ); - options.addOption( OptionBuilder.withLongOpt( "log-file" ).hasArg().withDescription( "Log file where all build output will go." ).create( LOG_FILE ) ); + options.addOption( OptionBuilder.withLongOpt( "log-file" ).hasArg().withDescription( "Log file where all build output will go" ).create( LOG_FILE ) ); options.addOption( OptionBuilder.withLongOpt( "show-version" ).withDescription( "Display version information WITHOUT stopping build" ).create( SHOW_VERSION ) ); options.addOption( OptionBuilder.withLongOpt( "encrypt-master-password" ).hasOptionalArg().withDescription( "Encrypt master security password" ).create( ENCRYPT_MASTER_PASSWORD ) ); options.addOption( OptionBuilder.withLongOpt( "encrypt-password" ).hasOptionalArg().withDescription( "Encrypt server password" ).create( ENCRYPT_PASSWORD ) ); options.addOption( OptionBuilder.withLongOpt( "threads" ).hasArg().withDescription( "Thread count, for instance 2.0C where C is core multiplied" ).create( THREADS ) ); options.addOption( OptionBuilder.withLongOpt( "legacy-local-repository" ).withDescription( "Use Maven 2 Legacy Local Repository behaviour, ie no use of _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) ); - options.addOption( OptionBuilder.withLongOpt( "builder" ).hasArg().withDescription( "The id of the build strategy to use." ).create( BUILDER ) ); + options.addOption( OptionBuilder.withLongOpt( "builder" ).hasArg().withDescription( "The id of the build strategy to use" ).create( BUILDER ) ); // Adding this back in for compatibility with the verifier that hard codes this option. options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npr" ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/5fb4bc9a/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 b0cd1cd..6b482aa 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 @@ -91,7 +91,7 @@ import org.apache.maven.model.profile.ProfileSelector; import org.apache.maven.project.MavenProject; import org.apache.maven.properties.internal.EnvironmentUtils; import org.apache.maven.properties.internal.SystemProperties; -import org.apache.maven.shared.utils.logging.MessageBuffer; +import org.apache.maven.shared.utils.logging.MessageBuilder; import org.apache.maven.shared.utils.logging.MessageUtils; import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest; import org.apache.maven.toolchain.building.ToolchainsBuilder; @@ -536,12 +536,12 @@ public class MavenCli slf4jLogger.debug( "Message scheme: " + ( MessageUtils.isColorEnabled() ? "color" : "plain" ) ); if ( MessageUtils.isColorEnabled() ) { - MessageBuffer buff = MessageUtils.buffer(); + MessageBuilder buff = MessageUtils.buffer(); buff.a( "Message styles: " ); - buff.debug().a( "debug" ).reset().a( ' ' ); - buff.info().a( "info" ).reset().a( ' ' ); - buff.warning().a( "warning" ).reset().a( ' ' ); - buff.error().a( "error" ).reset().a( ' ' ); + buff.debug( "debug" ).a( ' ' ); + buff.info( "info" ).a( ' ' ); + buff.warning( "warning" ).a( ' ' ); + buff.error( "error" ).a( ' ' ); buff.success( "success" ).a( ' ' ); buff.failure( "failure" ).a( ' ' ); buff.strong( "strong" ).a( ' ' ); @@ -1065,8 +1065,8 @@ public class MavenCli { slf4jLogger.error( "" ); slf4jLogger.error( "After correcting the problems, you can resume the build with the command" ); - slf4jLogger.error( buffer().strong().a( " mvn <goals> -rf :" ) - .a( project.getArtifactId() ).reset().toString() ); + slf4jLogger.error( buffer().a( " " ).strong( "mvn <goals> -rf :" + + project.getArtifactId() ).toString() ); } if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals( cliRequest.request.getReactorFailureBehavior() ) ) http://git-wip-us.apache.org/repos/asf/maven/blob/5fb4bc9a/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 2c2e4c2..2f4cfd8 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 @@ -34,7 +34,7 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.MojoExecution; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.utils.logging.MessageBuffer; +import org.apache.maven.shared.utils.logging.MessageBuilder; import org.codehaus.plexus.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -197,7 +197,7 @@ public class ExecutionEventLogger private void logResult( MavenSession session ) { infoLine( '-' ); - MessageBuffer buffer = buffer(); + MessageBuilder buffer = buffer(); if ( session.getResult().hasExceptions() ) { @@ -282,7 +282,7 @@ public class ExecutionEventLogger { logger.info( "" ); - MessageBuffer buffer = buffer().strong( "--- " ); + MessageBuilder buffer = buffer().strong( "--- " ); append( buffer, event.getMojoExecution() ); append( buffer, event.getProject() ); buffer.strong( " ---" ); @@ -302,7 +302,7 @@ public class ExecutionEventLogger { logger.info( "" ); - MessageBuffer buffer = buffer().strong( ">>> " ); + MessageBuilder buffer = buffer().strong( ">>> " ); append( buffer, event.getMojoExecution() ); buffer.strong( " > " ); appendForkInfo( buffer, event.getMojoExecution().getMojoDescriptor() ); @@ -326,7 +326,7 @@ public class ExecutionEventLogger { logger.info( "" ); - MessageBuffer buffer = buffer().strong( "<<< " ); + MessageBuilder buffer = buffer().strong( "<<< " ); append( buffer, event.getMojoExecution() ); buffer.strong( " < " ); appendForkInfo( buffer, event.getMojoExecution().getMojoDescriptor() ); @@ -337,40 +337,39 @@ public class ExecutionEventLogger } } - private void append( MessageBuffer buffer, MojoExecution me ) + private void append( MessageBuilder buffer, MojoExecution me ) { - buffer.mojo().a( me.getArtifactId() ).a( ':' ).a( me.getVersion() ); - buffer.a( ':' ).a( me.getGoal() ).reset(); + buffer.mojo( me.getArtifactId() + ':' + me.getVersion() + ':' + me.getGoal() ); if ( me.getExecutionId() != null ) { - buffer.strong().a( " (" ).a( me.getExecutionId() ).a( ')' ).reset(); + buffer.a( ' ' ).strong( '(' + me.getExecutionId() + ')' ); } } - private void appendForkInfo( MessageBuffer buffer, MojoDescriptor md ) + private void appendForkInfo( MessageBuilder buffer, MojoDescriptor md ) { - buffer.strong(); + StringBuilder buff = new StringBuilder(); if ( StringUtils.isNotEmpty( md.getExecutePhase() ) ) { // forked phase if ( StringUtils.isNotEmpty( md.getExecuteLifecycle() ) ) { - buffer.a( '[' ); - buffer.a( md.getExecuteLifecycle() ); - buffer.a( ']' ); + buff.append( '[' ); + buff.append( md.getExecuteLifecycle() ); + buff.append( ']' ); } - buffer.a( md.getExecutePhase() ); + buff.append( md.getExecutePhase() ); } else { // forked goal - buffer.a( ':' ); - buffer.a( md.getExecuteGoal() ); + buff.append( ':' ); + buff.append( md.getExecuteGoal() ); } - buffer.reset(); + buffer.strong( buff.toString() ); } - private void append( MessageBuffer buffer, MavenProject project ) + private void append( MessageBuilder buffer, MavenProject project ) { buffer.a( " @ " ).project( project.getArtifactId() ); } http://git-wip-us.apache.org/repos/asf/maven/blob/5fb4bc9a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java index a21d89d..18fd08b 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java @@ -46,20 +46,20 @@ extends com.planet57.gossip.render.PatternRenderer { case TRACE: case DEBUG: - buff.append( buffer().debug().a( level.name() ).reset() ); + buff.append( buffer().debug( level.name() ) ); break; case INFO: - buff.append( buffer().info().a( level.name() ).reset() ); + buff.append( buffer().info( level.name() ) ); break; case WARN: // Maven uses WARNING instead of WARN - buff.append( buffer().warning().a( WARNING ).reset() ); + buff.append( buffer().warning( WARNING ) ); break; case ERROR: - buff.append( buffer().error().a( level.name() ).reset() ); + buff.append( buffer().error( level.name() ) ); break; default:
