svn commit: r1753019 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/logging/ site/apt/
Author: hboutemy
Date: Sun Jul 17 07:32:56 2016
New Revision: 1753019
URL: http://svn.apache.org/viewvc?rev=1753019&view=rev
Log:
[MSHARED-562] improved documentation
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java
maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt.vm
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java?rev=1753019&r1=1753018&r2=1753019&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
Sun Jul 17 07:32:56 2016
@@ -22,8 +22,8 @@ package org.apache.maven.shared.utils.lo
import org.fusesource.jansi.Ansi;
/**
- * Message buffer implementation that supports ANSI colors through JAnsi with
configurable
- * styles through {@link Style}.
+ * Message buffer implementation that supports ANSI colors through http://fusesource.github.io/jansi/";>Jansi
+ * with configurable styles through {@link Style}.
*/
class AnsiMessageBuffer
implements MessageBuffer
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java?rev=1753019&r1=1753018&r2=1753019&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java
Sun Jul 17 07:32:56 2016
@@ -110,21 +110,46 @@ public interface MessageBuffer
MessageBuffer project( Object message );
//
-// message building methods (modelled after Ansi methods)
+// message building methods modelled after Ansi methods
//
+/**
+ * Reset to default style.
+ */
MessageBuffer reset();
+/**
+ * Append content to the buffer.
+ */
MessageBuffer a( char[] value, int offset, int len );
+/**
+ * Append content to the buffer.
+ */
MessageBuffer a( char[] value );
+/**
+ * Append content to the buffer.
+ */
MessageBuffer a( CharSequence value, int start, int end );
+/**
+ * Append content to the buffer.
+ */
MessageBuffer a( CharSequence value );
+/**
+ * Append content to the buffer.
+ */
MessageBuffer a( Object value );
+/**
+ * Append a newline to the buffer.
+ */
MessageBuffer newline();
+/**
+ * Append formatted content to the buffer.
+ * @see String#format(String, Object...)
+ */
MessageBuffer format( String pattern, Object... args );
}
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java?rev=1753019&r1=1753018&r2=1753019&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
Sun Jul 17 07:32:56 2016
@@ -23,8 +23,11 @@ import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.AnsiConsole;
/**
- * Colored message utils, to manage colors colors consistently across plugins
(only if Maven version is at least 3.4).
- * For Maven version before 3.4, message built with this util will never add
color.
+ * Colored message utils, to manage colors colors consistently across plugins
(only if Maven version is at least 3.4.0).
+ * For Maven version before 3.4.0, message built with this util will never add
color.
+ *
+ * Internally, http://fusesource.github.io/jansi/";>Jansi is used
to render
+ * https://en.wikipedia.org/wiki/ANSI_escape_code#Colors";>ANSI
colors on any platform.
*/
public class MessageUtils
{
@@ -47,6 +50,7 @@
svn commit: r1753021 - /maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt.vm
Author: hboutemy
Date: Sun Jul 17 07:53:46 2016
New Revision: 1753021
URL: http://svn.apache.org/viewvc?rev=1753021&view=rev
Log:
[MSHARED-562] fixed typo for link
Modified:
maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt.vm
Modified: maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt.vm?rev=1753021&r1=1753020&r2=1753021&view=diff
==
--- maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt.vm (original)
+++ maven/shared/trunk/maven-shared-utils/src/site/apt/index.apt.vm Sun Jul 17
07:53:46 2016
@@ -36,7 +36,7 @@ ${project.name}
lots of methods got cleaned up, generics got added and we dropped a lot of
unused code.
Then there are additions, like
-
{{{apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled
message API}}.
+
{{{./apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled
message API}}.
Why?
svn commit: r1753045 - /maven/plugins/trunk/maven-clean-plugin/pom.xml
Author: khmarbaise Date: Sun Jul 17 10:01:59 2016 New Revision: 1753045 URL: http://svn.apache.org/viewvc?rev=1753045&view=rev Log: [MCLEAN-75] Upgrade maven-plugins to version 30 Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=1753045&r1=1753044&r2=1753045&view=diff == --- maven/plugins/trunk/maven-clean-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-clean-plugin/pom.xml Sun Jul 17 10:01:59 2016 @@ -25,7 +25,7 @@ under the License. org.apache.maven.plugins maven-plugins -28 +30 ../../pom/maven/maven-plugins/pom.xml
svn commit: r1753049 - /maven/plugins/trunk/maven-jar-plugin/src/site/apt/index.apt.vm
Author: khmarbaise
Date: Sun Jul 17 10:17:01 2016
New Revision: 1753049
URL: http://svn.apache.org/viewvc?rev=1753049&view=rev
Log:
[MJAR-221] Link to wiki page should be removed now that Codehaus is shut down
Modified:
maven/plugins/trunk/maven-jar-plugin/src/site/apt/index.apt.vm
Modified: maven/plugins/trunk/maven-jar-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/site/apt/index.apt.vm?rev=1753049&r1=1753048&r2=1753049&view=diff
==
--- maven/plugins/trunk/maven-jar-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/site/apt/index.apt.vm Sun Jul 17
10:17:01 2016
@@ -75,9 +75,7 @@ ${project.name}
* Usage
General instructions on how to use the JAR Plugin can be found on the
{{{./usage.html}usage page}}. Some more
- specific use cases are described in the examples given below. Last but not
least, users occasionally contribute
- additional examples, tips or errata to the
- {{{http://docs.codehaus.org/display/MAVENUSER/JAR+Plugin}plugin's wiki
page}}.
+ specific use cases are described in the examples given below.
In case you still have questions regarding the plugin's usage, please have a
look at the {{{./faq.html}FAQ}} and feel
free to contact the {{{./mail-lists.html}user mailing list}}. The posts to
the mailing list are archived and could
maven-archetype git commit: Fix import order in ArchetypeConfiuration
Repository: maven-archetype
Updated Branches:
refs/heads/master 9acadc167 -> 32091e6d6
Fix import order in ArchetypeConfiuration
This closes #10
Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/32091e6d
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/32091e6d
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/32091e6d
Branch: refs/heads/master
Commit: 32091e6d644c2963e5a444860262c2c6150751c0
Parents: 9acadc1
Author: Manuel Ryan
Authored: Wed Jun 1 13:30:28 2016 +0200
Committer: Michael Osipov
Committed: Sun Jul 17 12:09:30 2016 +0200
--
.../org/apache/maven/archetype/ui/ArchetypeConfiguration.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/32091e6d/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeConfiguration.java
--
diff --git
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeConfiguration.java
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeConfiguration.java
index a17935f..9899cd3 100644
---
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeConfiguration.java
+++
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeConfiguration.java
@@ -19,6 +19,9 @@ package org.apache.maven.archetype.ui;
* under the License.
*/
+import org.apache.maven.archetype.common.Constants;
+import org.codehaus.plexus.util.StringUtils;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -26,9 +29,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.regex.Pattern;
-import org.apache.maven.archetype.common.Constants;
-import org.codehaus.plexus.util.StringUtils;
-
public class ArchetypeConfiguration
{
private String groupId;
svn commit: r1753082 - in /maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples: multimodule/module-source-inclusion-simple.apt.vm single/filtering-some-distribution-files.apt.vm single/usi
Author: gboue
Date: Sun Jul 17 15:11:06 2016
New Revision: 1753082
URL: http://svn.apache.org/viewvc?rev=1753082&view=rev
Log:
[MASSEMBLY-823] Documentation refers to deprecated goals
Documentation is updated to only to refer to the "single" goal. This requires
the example code for the "Include Module Sources" to be adapted, mainly by
adding the "useAllReactorProjects" parameter and fixing a deprecation warning
about fileSet inclusions.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm?rev=1753082&r1=1753081&r2=1753082&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
Sun Jul 17 15:11:06 2016
@@ -54,11 +54,20 @@ Including Module Sources
false
+ true
org.test:child1
-sources/${artifactId}
+false
+
+
+sources/${module.artifactId}
+
+ ${project.build.directory}/**
+
+
+
@@ -75,11 +84,18 @@ Including Module Sources
sources should be contained within the directory structure
<<>> for this module, since the outputDirectory expression
will be interpolated on a module-by-module basis.
+
+ By default, the Assembly Plugin will add the sources under a folder named
with the artifactId
+ of each module; this can be disabled by setting <<>>
to <<>>.
+
+ Note that the build directory (<<>> by default) will be included, so
it is explicitly excluded
+ since this is a temporary storage for files produced during the build and it
should not contain any
+ project sources.
* The POM
Now, let's review the POM configuration necessary to enable the building of
- this assembly via the goal:
+ this assembly via the goal:
+---+
@@ -125,7 +141,7 @@ Including Module Sources
To build the assembly, we issue the following command:
+---+
-mvn clean assembly:directory
+mvn clean assembly:single
+---+
This will ensure that the output directory (normally, <<>>), is
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm?rev=1753082&r1=1753081&r2=1753082&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
Sun Jul 17 15:11:06 2016
@@ -182,5 +182,5 @@ variable2=value2
To generate the distribution assembly, we then use:
+-
-mvn assembly:assembly
+mvn clean assembly:single
+-
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm?rev=1753082&r1=1753081&r2=1753082&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
Sun Jul 17 15:11:06 2016
@@ -95,7 +95,7 @@ Using Repositories
The assembly archive is then created using:
+-
-mvn assembly:assembly
+mvn clean assembly:single
+-
The generated archive can be extracted to an internal repository so users of
svn commit: r1753088 - in /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging: MessageUtils.java Style.java package-info.java
Author: hboutemy
Date: Sun Jul 17 17:06:27 2016
New Revision: 1753088
URL: http://svn.apache.org/viewvc?rev=1753088&view=rev
Log:
[MSHARED-562] applied updates proposed by Michael
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java?rev=1753088&r1=1753087&r2=1753088&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
Sun Jul 17 17:06:27 2016
@@ -23,7 +23,7 @@ import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.AnsiConsole;
/**
- * Colored message utils, to manage colors colors consistently across plugins
(only if Maven version is at least 3.4.0).
+ * Colored message utils, to manage colors consistently across plugins (only
if Maven version is at least 3.4.0).
* For Maven version before 3.4.0, message built with this util will never add
color.
*
* Internally, http://fusesource.github.io/jansi/";>Jansi is used
to render
@@ -60,6 +60,11 @@ public class MessageUtils
}
}
+/**
+ * Undo a previous {@link #systemInstall()}. If {@link #systemInstall()}
was called
+ * multiple times, {@link #systemUninstall()} must be called call the same
number of times before
+ * it is actually uninstalled.
+ */
public static void systemUninstall()
{
if ( JANSI )
@@ -69,10 +74,10 @@ public class MessageUtils
}
/**
- * Activates message color (if JAnsi is available).
+ * Enables message color (if JAnsi is available).
* @param flag
*/
-public static void setColor( boolean flag )
+public static void setColorEnabled( boolean flag )
{
if ( JANSI )
{
@@ -81,9 +86,9 @@ public class MessageUtils
}
/**
- * Is message color active: requires JAnsi available (through Maven) and
the color has not been disabled.
+ * Is message color enabled: requires JAnsi available (through Maven) and
the color has not been disabled.
*/
-public static boolean isColor()
+public static boolean isColorEnabled()
{
return JANSI ? Ansi.isEnabled() : false;
}
@@ -116,11 +121,11 @@ public class MessageUtils
}
/**
- * Remove any ANSI code from a message
+ * Remove any ANSI code from a message (colors or other escape sequences).
* @param msg message eventually containing ANSI codes
* @return the message with ANSI codes removed
*/
-public static String stripAnsi( String msg )
+public static String stripAnsiCodes( String msg )
{
return msg.replaceAll( "\u001B\\[[;\\d]*[ -/]*[@-~]", "" );
}
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java?rev=1753088&r1=1753087&r2=1753088&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java
Sun Jul 17 17:06:27 2016
@@ -144,7 +144,7 @@ enum Style
{
return name();
}
-StringBuilder sb = new StringBuilder();
+StringBuilder sb = new StringBuilder( name() + '=' );
if ( bold )
{
sb.append( "bold" );
@@ -174,7 +174,7 @@ enum Style
}
sb.append( bgColor.name() );
}
-return name() + '=' + sb;
+return sb.toString();
}
}
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java?rev=1753088&r1=1753087&r2=1753088&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/ma
maven git commit: updated code to match API change after Michael's feedback
Repository: maven
Updated Branches:
refs/heads/master 14182b82f -> 7fa6ce717
updated code to match API change after Michael's feedback
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7fa6ce71
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7fa6ce71
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7fa6ce71
Branch: refs/heads/master
Commit: 7fa6ce7175b285b0c4eea8acf05435bb5001acfd
Parents: 14182b8
Author: Hervé Boutemy
Authored: Sun Jul 17 19:08:21 2016 +0200
Committer: Hervé Boutemy
Committed: Sun Jul 17 19:08:21 2016 +0200
--
.../src/main/java/org/apache/maven/cli/MavenCli.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/7fa6ce71/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 79f5819..b0cd1cd 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
@@ -476,7 +476,7 @@ public class MavenCli
if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE ) )
{
-MessageUtils.setColor( false );
+MessageUtils.setColorEnabled( false );
}
if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
@@ -484,7 +484,7 @@ public class MavenCli
File logFile = new File( cliRequest.commandLine.getOptionValue(
CLIManager.LOG_FILE ) );
logFile = resolveFile( logFile, cliRequest.workingDirectory );
-MessageUtils.setColor( false );
+MessageUtils.setColorEnabled( false );
// redirect stdout and stderr to file
try
@@ -533,8 +533,8 @@ public class MavenCli
if ( slf4jLogger.isDebugEnabled() )
{
-slf4jLogger.debug( "Message scheme: " + ( MessageUtils.isColor() ?
"color" : "plain" ) );
-if ( MessageUtils.isColor() )
+slf4jLogger.debug( "Message scheme: " + (
MessageUtils.isColorEnabled() ? "color" : "plain" ) );
+if ( MessageUtils.isColorEnabled() )
{
MessageBuffer buff = MessageUtils.buffer();
buff.a( "Message styles: " );
svn commit: r1753089 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
Author: hboutemy
Date: Sun Jul 17 17:09:32 2016
New Revision: 1753089
URL: http://svn.apache.org/viewvc?rev=1753089&view=rev
Log:
fixed error reported by Checkstyle...
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java?rev=1753089&r1=1753088&r2=1753089&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
Sun Jul 17 17:09:32 2016
@@ -22,8 +22,8 @@ package org.apache.maven.shared.utils.lo
import org.fusesource.jansi.Ansi;
/**
- * Message buffer implementation that supports ANSI colors through http://fusesource.github.io/jansi/";>Jansi
- * with configurable styles through {@link Style}.
+ * Message buffer implementation that supports ANSI colors through
+ * http://fusesource.github.io/jansi/";>Jansi with configurable
styles through {@link Style}.
*/
class AnsiMessageBuffer
implements MessageBuffer
svn commit: r1753099 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features: simple-dir-format/ this & that/
Author: gboue Date: Sun Jul 17 18:34:01 2016 New Revision: 1753099 URL: http://svn.apache.org/viewvc?rev=1753099&view=rev Log: Renamed "this & that" IT test folder to "simple-dir-format", as this breaks the ITs when run on Windows: the '&' gets interpreted and Windows tries to launch the "that" program. Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/simple-dir-format/ - copied from r1753098, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this & that/ Removed: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this & that/
svn commit: r1753102 - /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Author: khmarbaise Date: Sun Jul 17 18:52:28 2016 New Revision: 1753102 URL: http://svn.apache.org/viewvc?rev=1753102&view=rev Log: [MINVOKER-208] Documentation about invoker properties related to usage of options/parameters should be improved o Taken the suggestions of Abel Salgado Romero. Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1753102&r1=1753101&r2=1753102&view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Sun Jul 17 18:52:28 2016 @@ -458,8 +458,9 @@ public abstract class AbstractInvokerMoj * * * # A comma or space separated list of goals/phases to execute, may - * # specify an empty list to execute the default goal of the IT project - * invoker.goals = clean install + * # specify an empty list to execute the default goal of the IT project. + * # Environment variables used by maven plugins can be added here + * invoker.goals = clean install -Dplugin.variable=value * * # Or you can give things like this if you need. * invoker.goals = -T2 clean verify
svn commit: r1753133 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/logging/ test/java/org/apache/maven/shared/utils/logging/
Author: hboutemy
Date: Sun Jul 17 22:26:17 2016
New Revision: 1753133
URL: http://svn.apache.org/viewvc?rev=1753133&view=rev
Log:
[MSHARED-562] API simplification
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/Style.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java?rev=1753133&r1=1753132&r2=1753133&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
Sun Jul 17 22:26:17 2016
@@ -50,93 +50,57 @@ class AnsiMessageBuffer
this.ansi = ansi;
}
-public AnsiMessageBuffer debug()
+public AnsiMessageBuffer debug( Object message )
{
-Style.DEBUG.apply( ansi );
+Style.DEBUG.apply( ansi ).a( message ).reset();
return this;
}
-public AnsiMessageBuffer info()
+public AnsiMessageBuffer info( Object message )
{
-Style.INFO.apply( ansi );
-return this;
-}
-
-public AnsiMessageBuffer warning()
-{
-Style.WARNING.apply( ansi );
+Style.INFO.apply( ansi ).a( message ).reset();
return this;
}
public AnsiMessageBuffer warning( Object message )
{
-return warning().a( message ).reset();
-}
-
-public AnsiMessageBuffer error()
-{
-Style.ERROR.apply( ansi );
+Style.WARNING.apply( ansi ).a( message ).reset();
return this;
}
-public AnsiMessageBuffer success()
+public AnsiMessageBuffer error( Object message )
{
-Style.SUCCESS.apply( ansi );
+Style.ERROR.apply( ansi ).a( message ).reset();
return this;
}
public AnsiMessageBuffer success( Object message )
{
-return success().a( message ).reset();
-}
-
-public AnsiMessageBuffer failure()
-{
-Style.FAILURE.apply( ansi );
+Style.SUCCESS.apply( ansi ).a( message ).reset();
return this;
}
public AnsiMessageBuffer failure( Object message )
{
-return failure().a( message ).reset();
-}
-
-public AnsiMessageBuffer strong()
-{
-Style.STRONG.apply( ansi );
+Style.FAILURE.apply( ansi ).a( message ).reset();
return this;
}
public AnsiMessageBuffer strong( Object message )
{
-return strong().a( message ).reset();
-}
-
-public AnsiMessageBuffer mojo()
-{
-Style.MOJO.apply( ansi );
+Style.STRONG.apply( ansi ).a( message ).reset();
return this;
}
public AnsiMessageBuffer mojo( Object message )
{
-return mojo().a( message ).reset();
-}
-
-
-public AnsiMessageBuffer project()
-{
-Style.PROJECT.apply( ansi );
+Style.MOJO.apply( ansi ).a( message ).reset();
return this;
}
public AnsiMessageBuffer project( Object message )
{
-return project().a( message ).reset();
-}
-public AnsiMessageBuffer reset()
-{
-ansi.reset();
+Style.PROJECT.apply( ansi ).a( message ).reset();
return this;
}
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java?rev=1753133&r1=1753132&r2=1753133&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java
Sun Jul 17 22:26:17 2016
@@ -26,124 +26,89 @@ package org.apache.maven.shared.utils.lo
public interface MessageBuffer
{
/**
- * Insert color for DEBUG level display.
+ * Append message content for DEBUG level.
* By default, bold cyan
*/
-MessageBuffer debug();
+MessageBuffer debug( Object message );
/**
-
svn commit: r1753134 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/logging/ test/java/org/apache/maven/shared/utils/logging/
Author: hboutemy
Date: Sun Jul 17 22:38:57 2016
New Revision: 1753134
URL: http://svn.apache.org/viewvc?rev=1753134&view=rev
Log:
[MSHARED-562] renamed MessageBuffer to MessageBuilder
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
- copied, changed from r1753133,
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
- copied, changed from r1753133,
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
- copied, changed from r1753133,
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java
- copied, changed from r1753133,
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java
Removed:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuffer.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/package-info.java
Copied:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
(from r1753133,
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java?p2=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java&p1=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java&r1=1753133&r2=1753134&rev=1753134&view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
Sun Jul 17 22:38:57 2016
@@ -22,125 +22,125 @@ package org.apache.maven.shared.utils.lo
import org.fusesource.jansi.Ansi;
/**
- * Message buffer implementation that supports ANSI colors through
+ * Message builder implementation that supports ANSI colors through
* http://fusesource.github.io/jansi/";>Jansi with configurable
styles through {@link Style}.
*/
-class AnsiMessageBuffer
-implements MessageBuffer
+class AnsiMessageBuilder
+implements MessageBuilder
{
private Ansi ansi;
-AnsiMessageBuffer()
+AnsiMessageBuilder()
{
this( Ansi.ansi() );
}
-AnsiMessageBuffer( StringBuilder builder )
+AnsiMessageBuilder( StringBuilder builder )
{
this( Ansi.ansi( builder ) );
}
-AnsiMessageBuffer( int size )
+AnsiMessageBuilder( int size )
{
this( Ansi.ansi( size ) );
}
-AnsiMessageBuffer( Ansi ansi )
+AnsiMessageBuilder( Ansi ansi )
{
this.ansi = ansi;
}
-public AnsiMessageBuffer debug( Object message )
+public AnsiMessageBuilder debug( Object message )
{
Style.DEBUG.apply( ansi ).a( message ).reset();
return this;
}
-public AnsiMessageBuffer info( Object message )
+public AnsiMessageBuilder info( Object message )
{
Style.INFO.apply( ansi ).a( message ).reset();
return this;
}
-public AnsiMessageBuffer warning( Object message )
+public AnsiMessageBuilder warning( Object message )
{
Style.WARNING.apply( ansi ).a( message ).reset();
return this;
}
-public AnsiMessageBuffer error( Object message )
+public AnsiMessageBuilder error( Object message )
{
Style.ERROR.apply( ansi ).a( message ).reset();
return this;
}
-public AnsiMessageBuffer success( Object message )
+public AnsiMessageBuilder success( Object message )
{
Style.SUCCESS.apply( ansi ).a( message ).r
maven git commit: updated code to match MessageBuilder API change
Repository: maven
Updated Branches:
refs/heads/master 7fa6ce717 -> 5fb4bc9a2
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/master
Commit: 5fb4bc9a237ad2c19c5851b89d0ed810d2eff02d
Parents: 7fa6ce7
Author: Hervé Boutemy
Authored: Mon Jul 18 00:42:00 2016 +0200
Committer: Hervé Boutemy
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 mailto:ja...@maven.org";>Jason van Zyl
@@ -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 ) );
svn commit: r1753135 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features: simple-dir-format/ space & special char/
Author: gboue Date: Sun Jul 17 23:19:50 2016 New Revision: 1753135 URL: http://svn.apache.org/viewvc?rev=1753135&view=rev Log: Revert r1753099: this IT test is used to check for spaces and other special chars. Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/space & special char/ - copied from r1753098, maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this & that/ Removed: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/simple-dir-format/
