From 130e5bc69f3f9b293b0ff026fd000d45766f7ff6 Mon Sep 17 00:00:00 2001 From: Tibor Digana Date: Thu, 17 Sep 2015 19:16:51 +0000 Subject: [PATCH 001/265] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1703671 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index fd58e5b2..a18187bb 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 0.9 + 0.10-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies @@ -38,10 +38,10 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.9 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-0.9 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-0.9 + http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils jira From c609803ed83cab782f9d095397cc4bf0cae0ca3e Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Wed, 30 Sep 2015 09:02:55 +0000 Subject: [PATCH 002/265] [MSHARED-439] Upgrade to Maven 3.0 dependencies and JDK6 - Upgraded commons-io to 2.4 - Upgraded commons-lang3 to 3.4 - Upgraded maven-plugin-testing-harness to 2.1 - Upgraded maven-shade-plugin explicitly to 2.4.1 - Upgraded maven-checkstyle-plugin explicitly to 2.15 git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1705988 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index a18187bb..8d43d07c 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ Shared utils without any further dependencies - 2.2.1 + ${mavenVersion} @@ -56,6 +56,10 @@ RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder + + 3.0 + 1.6 + 1.6 @@ -74,15 +78,13 @@ commons-io commons-io - 2.2 - + 2.4 true org.apache.commons commons-lang3 - 3.1 - + 3.4 test @@ -98,9 +100,9 @@ provided - org.apache.maven.shared + org.apache.maven.plugin-testing maven-plugin-testing-harness - 1.1 + 2.1 test @@ -110,7 +112,10 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + + 2.4.1 package @@ -140,6 +145,14 @@ maven-assembly-plugin 2.5.5 + + org.apache.maven.plugins + maven-checkstyle-plugin + + 2.15 + org.codehaus.mojo findbugs-maven-plugin @@ -177,7 +190,10 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.13 + + 2.15 From 16a1c70097350ab1bff029bb9d2a7073e37693bf Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 1 Oct 2015 16:01:49 +0000 Subject: [PATCH 003/265] [MSHARED-439] Upgrade to Maven 3.0 dependencies and JDK6 Changed to use maven-core for toolchain. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706279 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 7 +++---- .../utils/introspection/ReflectionValueExtractorTest.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 8d43d07c..52ba3a6d 100644 --- a/pom.xml +++ b/pom.xml @@ -92,12 +92,11 @@ jsr305 2.0.1 - + org.apache.maven - maven-toolchain - 2.2.1 - provided + maven-core + ${mavenVersion} org.apache.maven.plugin-testing diff --git a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java index 1543ef5e..92a1466e 100644 --- a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java +++ b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java @@ -24,10 +24,10 @@ import java.util.List; import java.util.Map; +import org.apache.maven.plugin.testing.stubs.MavenProjectStub; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.maven.plugin.testing.stubs.MavenProjectStub; /** * @author Jason van Zyl From 9bd447773f2c08c15b18c94e2da8fcbfb3c62a1a Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 1 Oct 2015 16:05:33 +0000 Subject: [PATCH 004/265] [MSHARED-440] Bump version to 3.0.0. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706280 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52ba3a6d..4455db5f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 0.10-SNAPSHOT + 3.0.0-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies From 7a911b4a8ed785fb0efd7a11c5ade6f5e9f2fd3f Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 1 Oct 2015 17:25:22 +0000 Subject: [PATCH 005/265] Cleaning up some checkstyle reported errors/warnings. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706295 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/shared/utils/Os.java | 16 ++++++++ .../maven/shared/utils/PropertyUtils.java | 21 +++++++++-- .../maven/shared/utils/StringUtils.java | 5 +-- .../apache/maven/shared/utils/cli/Arg.java | 9 +++++ .../shared/utils/cli/CommandLineCallable.java | 3 ++ .../utils/cli/CommandLineException.java | 12 ++++++ .../maven/shared/utils/io/FileUtils.java | 14 +++---- .../apache/maven/shared/utils/io/IOUtil.java | 37 +++++++++++++++++++ .../maven/shared/utils/io/Java7Support.java | 4 +- .../shared/utils/xml/Xpp3DomBuilder.java | 24 ++++++++++++ .../maven/shared/utils/xml/Xpp3DomUtils.java | 21 +++++++++++ .../maven/shared/utils/xml/Xpp3DomWriter.java | 17 +++++++++ .../xml/pull/XmlPullParserException.java | 14 +++++++ 13 files changed, 182 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/Os.java b/src/main/java/org/apache/maven/shared/utils/Os.java index f6514fc3..8f87d7b8 100644 --- a/src/main/java/org/apache/maven/shared/utils/Os.java +++ b/src/main/java/org/apache/maven/shared/utils/Os.java @@ -44,12 +44,24 @@ */ public class Os { + /** + * The OS Name. + */ public static final String OS_NAME = System.getProperty( "os.name" ).toLowerCase( Locale.ENGLISH ); + /** + * The OA architecture. + */ public static final String OS_ARCH = System.getProperty( "os.arch" ).toLowerCase( Locale.ENGLISH ); + /** + * The OS version. + */ public static final String OS_VERSION = System.getProperty( "os.version" ).toLowerCase( Locale.ENGLISH ); + /** + * The path separator. + */ public static final String PATH_SEP = System.getProperty( "path.separator" ); /** @@ -57,6 +69,9 @@ public class Os */ public static final String LINE_SEP = System.getProperty( "line.separator" ); + /** + * OS Family + */ public static final String OS_FAMILY = getOsFamily(); // store the valid families @@ -140,6 +155,7 @@ public class Os /** * The set of valid families. This methods initializes the set until * VALID_FAMILIES constant is set. + * @return The set of families. */ public static Set getValidFamilies() { diff --git a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java index 6bdfdf3d..f50157d7 100644 --- a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java @@ -19,14 +19,17 @@ * under the License. */ +import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.Properties; -import org.apache.maven.shared.utils.io.IOUtil; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.maven.shared.utils.io.IOUtil; + /** * */ @@ -38,6 +41,10 @@ public PropertyUtils() // should throw new IllegalAccessError( "Utility class" ); } + /** + * @param url + * @return The loaded properties. + */ public static java.util.Properties loadProperties( @Nonnull java.net.URL url ) { try @@ -51,7 +58,11 @@ public static java.util.Properties loadProperties( @Nonnull java.net.URL url ) return null; } - public static java.util.Properties loadProperties( @Nonnull java.io.File file ) + /** + * @param file + * @return The loaded properties. + */ + public static Properties loadProperties( @Nonnull File file ) { try { @@ -64,7 +75,11 @@ public static java.util.Properties loadProperties( @Nonnull java.io.File file ) return null; } - public static java.util.Properties loadProperties( @Nullable java.io.InputStream is ) + /** + * @param is {@link InputStream} + * @return The loaded properties. + */ + public static Properties loadProperties( @Nullable InputStream is ) { try { diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index a88b47ca..193f2f8a 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -1999,7 +1999,8 @@ private static void reverseArray( @Nonnull String... array ) * character in the result, or the first * character following the ellipses, but it will appear somewhere in the result. * In no case will it return a string of length greater than maxWidth. - * + * + * @param s String to abbreviate. * @param offset left edge of source string * @param maxWidth maximum length of result string */ @@ -2286,7 +2287,6 @@ public static String quoteAndEscape( @Nullable String source, char quoteChar, * @param escapeChar * @param force * @return the String quoted and escaped - * */ public static String quoteAndEscape( @Nullable String source, char quoteChar, @Nonnull final char[] escapedChars, @Nonnull final char[] quotingTriggers, char escapeChar, boolean force ) @@ -2338,7 +2338,6 @@ else if ( !escaped.equals( source ) ) * @param escapedChars * @param escapeChar * @return the String escaped - * */ public static String escape( @Nullable String source, @Nonnull final char[] escapedChars, char escapeChar ) { diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Arg.java b/src/main/java/org/apache/maven/shared/utils/cli/Arg.java index 4e6041d8..1e65a97d 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/Arg.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/Arg.java @@ -26,10 +26,19 @@ */ public interface Arg { + /** + * @param value Set the value. + */ void setValue( String value ); + /** + * @param line + */ void setLine( String line ); + /** + * @param value + */ void setFile( File value ); /** diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java index 1b338e5c..cf5c62c1 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java @@ -29,6 +29,9 @@ public interface CommandLineCallable extends Callable { + /* (non-Javadoc) + * @see java.util.concurrent.Callable#call() + */ Integer call() throws CommandLineException; } diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java index f51c2c9e..aa4ac052 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java @@ -26,11 +26,23 @@ public class CommandLineException extends Exception { + /** + * + */ + private static final long serialVersionUID = 1344773066470228441L; + + /** + * @param message + */ public CommandLineException( String message ) { super( message ); } + /** + * @param message + * @param cause + */ public CommandLineException( String message, Throwable cause ) { super( message, cause ); diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java index de8480ec..41719238 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java @@ -657,7 +657,7 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F * @return The equivalent File object, or null if the URL's protocol * is not file */ - public @Nullable static File toFile( final @Nullable URL url ) + @Nullable public static File toFile( final @Nullable URL url ) { if ( url == null || !url.getProtocol().equalsIgnoreCase( "file" ) ) { @@ -942,7 +942,7 @@ public static void copyURLToFile( @Nonnull final URL source, @Nonnull final File *
  • an IO error occurs during copying
    • * */ - private static void copyStreamToFile( @Nonnull final @WillClose InputStream source, + private static void copyStreamToFile( @Nonnull @WillClose final InputStream source, @Nonnull final File destination ) throws IOException { @@ -991,7 +991,7 @@ private static void copyStreamToFile( @Nonnull final @WillClose InputStream sour * @param path the path to normalize * @return the normalized String, or null if too many ..'s. */ - public static @Nonnull String normalize( @Nonnull final String path ) + @Nonnull public static String normalize( @Nonnull final String path ) { String normalized = path; // Resolve occurrences of "//" in the normalized path @@ -1046,7 +1046,7 @@ private static void copyStreamToFile( @Nonnull final @WillClose InputStream sour * @param filename Absolute or relative file path to resolve. * @return The canonical File of filename. */ - public static @Nonnull File resolveFile( final File baseFile, @Nonnull String filename ) + @Nonnull public static File resolveFile( final File baseFile, @Nonnull String filename ) { String filenm = filename; if ( '/' != File.separatorChar ) @@ -2014,7 +2014,7 @@ private static boolean isValidWindowsFileName( @Nonnull File f ) * @param file the file to check * */ - public static boolean isSymbolicLink( final @Nonnull File file ) + public static boolean isSymbolicLink( @Nonnull final File file ) throws IOException { if ( Java7Support.isAtLeastJava7() ) @@ -2032,7 +2032,7 @@ public static boolean isSymbolicLink( final @Nonnull File file ) * always return false for java versions prior to 1.7. * */ - public static boolean isSymbolicLinkForSure( final @Nonnull File file ) + public static boolean isSymbolicLinkForSure( @Nonnull final File file ) throws IOException { return Java7Support.isAtLeastJava7() && Java7Support.isSymLink( file ); @@ -2056,7 +2056,7 @@ public static boolean isSymbolicLinkForSure( final @Nonnull File file ) * @return true if the file is a symbolic link or if we're on some crappy os. * false if the file is not a symlink or we're not able to detect it. */ - static boolean isSymbolicLinkLegacy( final @Nonnull File file ) + static boolean isSymbolicLinkLegacy( @Nonnull final File file ) throws IOException { final File canonical = new File( file.getCanonicalPath() ); diff --git a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java index 04801702..f7ec295f 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java +++ b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java @@ -133,6 +133,7 @@ private IOUtil() /** * Copy bytes from an InputStream to an OutputStream. + * @throws IOException */ public static void copy( @Nonnull final InputStream input, @Nonnull final OutputStream output ) throws IOException @@ -144,6 +145,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Output * Copy bytes from an InputStream to an OutputStream. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ public static void copy( @Nonnull final InputStream input, @Nonnull final OutputStream output, final int bufferSize ) @@ -159,6 +161,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Output /** * Copy chars from a Reader to a Writer. + * @throws IOException */ public static void copy( @Nonnull final Reader input, @Nonnull final Writer output ) throws IOException @@ -170,6 +173,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final Writer outp * Copy chars from a Reader to a Writer. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ public static void copy( @Nonnull final Reader input, @Nonnull final Writer output, final int bufferSize ) throws IOException @@ -195,6 +199,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final Writer outp * Copy and convert bytes from an InputStream to chars on a * Writer. * The platform's default encoding is used for the byte-to-char conversion. + * @throws IOException */ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output ) throws IOException @@ -208,6 +213,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * The platform's default encoding is used for the byte-to-char conversion. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output, final int bufferSize ) throws IOException @@ -223,6 +229,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. + * @throws IOException */ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output, @Nonnull final String encoding ) @@ -240,6 +247,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * IANA * Charset Registry for a list of valid encoding types. * @param bufferSize Size of internal buffer to use. + * @throws IOException */ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output, @Nonnull final String encoding, final int bufferSize ) @@ -255,6 +263,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a String. * The platform's default encoding is used for the byte-to-char conversion. + * @throws IOException */ @Nonnull public static String toString( @Nonnull final InputStream input ) throws IOException @@ -267,6 +276,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * The platform's default encoding is used for the byte-to-char conversion. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ @Nonnull public static String toString( @Nonnull final InputStream input, final int bufferSize ) throws IOException @@ -282,6 +292,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. + * @throws IOException */ @Nonnull public static String toString( @Nonnull final InputStream input, @Nonnull final String encoding ) throws IOException @@ -296,6 +307,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * IANA * Charset Registry for a list of valid encoding types. * @param bufferSize Size of internal buffer to use. + * @throws IOException */ @Nonnull public static String toString( @Nonnull final InputStream input, @Nonnull final String encoding, final int bufferSize ) @@ -311,6 +323,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a byte[]. + * @throws IOException */ @Nonnull public static byte[] toByteArray( @Nonnull final InputStream input ) throws IOException @@ -322,6 +335,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * Get the contents of an InputStream as a byte[]. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ @Nonnull public static byte[] toByteArray( @Nonnull final InputStream input, final int bufferSize ) throws IOException @@ -342,6 +356,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Serialize chars from a Reader to bytes on an OutputStream, and * flush the OutputStream. + * @throws IOException */ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStream output ) throws IOException @@ -354,6 +369,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea * flush the OutputStream. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStream output, final int bufferSize ) throws IOException @@ -370,6 +386,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a String. + * @throws IOException */ @Nonnull public static String toString( @Nonnull final Reader input ) throws IOException @@ -381,6 +398,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea * Get the contents of a Reader as a String. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ @Nonnull public static String toString( @Nonnull final Reader input, final int bufferSize ) throws IOException @@ -395,6 +413,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a byte[]. + * @throws IOException */ @Nonnull public static byte[] toByteArray( @Nonnull final Reader input ) throws IOException @@ -406,6 +425,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea * Get the contents of a Reader as a byte[]. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ @Nonnull public static byte[] toByteArray( @Nonnull final Reader input, final int bufferSize ) throws IOException @@ -426,6 +446,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Serialize chars from a String to bytes on an OutputStream, and * flush the OutputStream. + * @throws IOException */ public static void copy( @Nonnull final String input, @Nonnull final OutputStream output ) throws IOException @@ -438,6 +459,7 @@ public static void copy( @Nonnull final String input, @Nonnull final OutputStrea * flush the OutputStream. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ public static void copy( @Nonnull final String input, @Nonnull final OutputStream output, final int bufferSize ) throws IOException @@ -455,6 +477,9 @@ public static void copy( @Nonnull final String input, @Nonnull final OutputStrea /** * Copy chars from a String to a Writer. + * @param input + * @param output + * @throws IOException */ public static void copy( @Nonnull final String input, @Nonnull final Writer output ) throws IOException @@ -467,6 +492,7 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp /** * Get the contents of a String as a byte[]. + * @throws IOException */ @Nonnull public static byte[] toByteArray( @Nonnull final String input ) throws IOException @@ -478,6 +504,7 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp * Get the contents of a String as a byte[]. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ @Nonnull public static byte[] toByteArray( @Nonnull final String input, final int bufferSize ) throws IOException @@ -499,6 +526,7 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp * Copy and convert bytes from a byte[] to chars on a * Writer. * The platform's default encoding is used for the byte-to-char conversion. + * @throws IOException */ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output ) throws IOException @@ -512,6 +540,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * The platform's default encoding is used for the byte-to-char conversion. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output, final int bufferSize ) throws IOException @@ -527,6 +556,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. + * @throws IOException */ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output, final String encoding ) throws IOException @@ -543,6 +573,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * IANA * Charset Registry for a list of valid encoding types. * @param bufferSize Size of internal buffer to use. + * @throws IOException */ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output, @Nonnull final String encoding, final int bufferSize ) @@ -558,6 +589,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp /** * Get the contents of a byte[] as a String. * The platform's default encoding is used for the byte-to-char conversion. + * @throws IOException */ @Nonnull public static String toString( @Nonnull final byte[] input ) throws IOException @@ -570,6 +602,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * The platform's default encoding is used for the byte-to-char conversion. * * @param bufferSize Size of internal buffer to use. + * @throws IOException */ @Nonnull public static String toString( @Nonnull final byte[] input, final int bufferSize ) throws IOException @@ -585,6 +618,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. + * @throws IOException */ @Nonnull public static String toString( @Nonnull final byte[] input, @Nonnull final String encoding ) throws IOException @@ -599,6 +633,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * IANA * Charset Registry for a list of valid encoding types. * @param bufferSize Size of internal buffer to use. + * @throws IOException */ @Nonnull public static String toString( @Nonnull final byte[] input, @Nonnull final String encoding, final int bufferSize ) @@ -614,6 +649,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp /** * Copy bytes from a byte[] to an OutputStream. + * @throws IOException */ public static void copy( @Nonnull final byte[] input, @Nonnull final OutputStream output ) throws IOException @@ -627,6 +663,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final OutputStrea * @param input1 the first stream * @param input2 the second stream * @return true if the content of the streams are equal or they both don't exist, false otherwise + * @throws IOException */ public static boolean contentEquals( @Nonnull final InputStream input1, @Nonnull final InputStream input2 ) throws IOException diff --git a/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java b/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java index 6d16aeed..a08ac66d 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java +++ b/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java @@ -105,7 +105,7 @@ public static boolean isSymLink( @Nonnull File file ) } - public static @Nonnull File readSymbolicLink( @Nonnull File symlink ) + @Nonnull public static File readSymbolicLink( @Nonnull File symlink ) throws IOException { try @@ -145,7 +145,7 @@ public static boolean exists( @Nonnull File file ) } - public static @Nonnull File createSymbolicLink( @Nonnull File symlink, @Nonnull File target ) + @Nonnull public static File createSymbolicLink( @Nonnull File symlink, @Nonnull File target ) throws IOException { try diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java index 78fa4f69..212b6c4c 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java @@ -46,18 +46,36 @@ public class Xpp3DomBuilder { private static final boolean DEFAULT_TRIM = true; + /** + * @param reader {@link Reader} + * @return the built dom. + * @throws XmlPullParserException + */ public static Xpp3Dom build( @WillClose @Nonnull Reader reader ) throws XmlPullParserException { return build( reader, DEFAULT_TRIM ); } + /** + * @param is {@link InputStream} + * @param encoding + * @return the built dom. + * @throws XmlPullParserException + */ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding ) throws XmlPullParserException { return build( is, encoding, DEFAULT_TRIM ); } + /** + * @param is {@link InputStream} + * @param encoding The encoding. + * @param trim true/false. + * @return the built dom. + * @throws XmlPullParserException + */ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding, boolean trim ) throws XmlPullParserException { @@ -72,6 +90,12 @@ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding } } + /** + * @param reader {@link Reader} + * @param trim true/false. + * @return the built dom. + * @throws XmlPullParserException + */ public static Xpp3Dom build( @WillClose Reader reader, boolean trim ) throws XmlPullParserException { diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java index 6627a958..1b10dc8c 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java @@ -29,16 +29,33 @@ */ public class Xpp3DomUtils { + /** + * @param dominant {@link Xpp3Dom} + * @param recessive {@link Xpp3Dom} + * @param childMergeOverride true/false. + * @return Merged dom. + */ public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMergeOverride ) { return dominant != null ? merge( dominant, recessive, childMergeOverride ) : recessive; } + /** + * @param dominant {@link Xpp3Dom} + * @param recessive {@link Xpp3Dom} + * @return Merged dom. + */ public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive ) { return dominant != null ? merge( dominant, recessive, null ) : recessive; } + /** + * @param dominant {@link Xpp3Dom} + * @param recessive {@link Xpp3Dom} + * @param childMergeOverride true/false. + * @return Merged dom. + */ public static Xpp3Dom merge( Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMergeOverride ) { if ( recessive == null || isCombineSelfOverride( dominant ) ) @@ -130,6 +147,10 @@ private static boolean isMergeChildren( Xpp3Dom dominant ) dominant.getAttribute( Xpp3Dom.CHILDREN_COMBINATION_MODE_ATTRIBUTE ) ); } + /** + * @param str The string to be checked. + * @return true in case string is empty false otherwise. + */ public static boolean isEmpty( String str ) { return str == null || str.trim().length() == 0; diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java index 293814a9..9acf23c4 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java @@ -27,21 +27,38 @@ */ public class Xpp3DomWriter { + /** + * @param writer {@link Writer} + * @param dom {@link Xpp3Dom} + */ public static void write( Writer writer, Xpp3Dom dom ) { write( new PrettyPrintXMLWriter( writer ), dom ); } + /** + * @param writer {@link PrintWriter} + * @param dom {@link Xpp3Dom} + */ public static void write( PrintWriter writer, Xpp3Dom dom ) { write( new PrettyPrintXMLWriter( writer ), dom ); } + /** + * @param xmlWriter {@link XMLWriter} + * @param dom {@link Xpp3Dom} + */ public static void write( XMLWriter xmlWriter, Xpp3Dom dom ) { write( xmlWriter, dom, true ); } + /** + * @param xmlWriter {@link XMLWriter} + * @param dom {@link Xpp3Dom} + * @param escape true/false. + */ public static void write( XMLWriter xmlWriter, Xpp3Dom dom, boolean escape ) { xmlWriter.startElement( dom.getName() ); diff --git a/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java b/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java index 5d6d2c3b..3858a902 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java @@ -30,16 +30,30 @@ public class XmlPullParserException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = 117075811816936575L; + + /** + * @param e IOException. + */ public XmlPullParserException( IOException e ) { super( e ); } + /** + * @param e The exception. + */ public XmlPullParserException( SAXException e ) { super( e ); } + /** + * @param message The message. + */ public XmlPullParserException( String message ) { super( message ); From b281989451fdf81f4f7e9143864182d39047ce6e Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 1 Oct 2015 17:39:35 +0000 Subject: [PATCH 006/265] Changed from deprecated method File.toURL() into File.toURI().toURL() which results in changing a unit test which formerly did not expect having escaped characters but now it works like this. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706297 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 4 +--- .../java/org/apache/maven/shared/utils/io/FileUtilsTest.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java index 41719238..c52680cf 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java @@ -692,9 +692,7 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F for ( int i = 0; i < urls.length; i++ ) { - // Although this method is deprecated, it is still the most solid way to translate a File to URL - //noinspection deprecation - urls[i] = files[i].toURL(); + urls[i] = files[i].toURI().toURL(); } return urls; diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java index a7af3c2c..c583b798 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java @@ -246,7 +246,7 @@ public void toURLs1() // Test escaped char assertThat( urls[2].toExternalForm().startsWith( "file:" ), is( true ) ); - assertThat( urls[2].toExternalForm(), not( containsString( "test%20file.txt" ) ) ); + assertThat( urls[2].toExternalForm(), containsString( "test%20file.txt" ) ); } // @Test public void toURLs2() throws Exception { From 2f019065ac6ed5b49c3bb4354a4b77b1eede7753 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 1 Oct 2015 17:41:18 +0000 Subject: [PATCH 007/265] Cleaned up code warnings and removed unused code. Fixed name of _staticDefaultEncoding into staticDefaultEncoding to fullfil checkstyle. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706298 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/utils/StringUtils.java | 3 --- .../cli/CommandLineTimeOutException.java | 5 +++++ .../shared/utils/cli/CommandLineUtils.java | 4 ---- .../maven/shared/utils/xml/XMLEncode.java | 21 ------------------- .../shared/utils/xml/XmlReaderException.java | 5 +++++ .../shared/utils/xml/XmlStreamReader.java | 13 ++++++------ .../utils/xml/XmlStreamReaderException.java | 5 +++++ .../maven/shared/utils/xml/Xpp3Dom.java | 1 - 8 files changed, 21 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 193f2f8a..9759a72d 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -52,7 +52,6 @@ * @version $Id$ * */ -@SuppressWarnings( "JavaDoc" ) public class StringUtils { /** @@ -796,7 +795,6 @@ public static String replace( @Nullable String text, @Nullable String repl, @Nul * @return String with overlayed text * @throws NullPointerException if text or overlay is null */ - @SuppressWarnings( "ConstantConditions" ) @Nonnull public static String overlayString( @Nonnull String text, @Nonnull String overlay, int start, int end ) { if ( overlay == null ) @@ -2480,7 +2478,6 @@ else if ( s.charAt( i ) == '\n' ) * false if not or null string input * */ - @SuppressWarnings( "ConstantConditions" ) public static boolean contains( @Nullable String str, char searchChar ) { return !isEmpty( str ) && str.indexOf( searchChar ) >= 0; diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java index 0cd9777a..fa9deeb4 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java @@ -28,6 +28,11 @@ public class CommandLineTimeOutException extends CommandLineException { + /** + * + */ + private static final long serialVersionUID = 7322428741683224481L; + /** * @param message * @param cause diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java index ac5a108f..764d5d2c 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java @@ -44,7 +44,6 @@ public abstract class CommandLineUtils /** * */ - @SuppressWarnings( "UnusedDeclaration" ) public static class StringStreamConsumer implements StreamConsumer { @@ -82,14 +81,12 @@ public void run() } - @SuppressWarnings( "UnusedDeclaration" ) public static int executeCommandLine( @Nonnull Commandline cl, StreamConsumer systemOut, StreamConsumer systemErr ) throws CommandLineException { return executeCommandLine( cl, null, systemOut, systemErr, 0 ); } - @SuppressWarnings( "UnusedDeclaration" ) public static int executeCommandLine( @Nonnull Commandline cl, StreamConsumer systemOut, StreamConsumer systemErr, int timeoutInSeconds ) throws CommandLineException @@ -97,7 +94,6 @@ public static int executeCommandLine( @Nonnull Commandline cl, StreamConsumer sy return executeCommandLine( cl, null, systemOut, systemErr, timeoutInSeconds ); } - @SuppressWarnings( "UnusedDeclaration" ) public static int executeCommandLine( @Nonnull Commandline cl, InputStream systemIn, StreamConsumer systemOut, StreamConsumer systemErr ) throws CommandLineException diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java b/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java index 8d8c9f67..0d6ecd16 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java @@ -375,25 +375,4 @@ private static char lookAhead( int la, int offset, String data ) } } - // combine multiple checks in one methods for speed - private static boolean contains( String text, char[] chars ) - { - if ( text == null || chars == null || chars.length == 0 ) - { - return false; - } - for ( int i = 0; i < text.length(); i++ ) - { - char c = text.charAt( i ); - for ( char aChar : chars ) - { - if ( aChar == c ) - { - return true; - } - } - } - return false; - } - } diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java index ecced002..f1bc0c6f 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java @@ -36,6 +36,11 @@ class XmlReaderException extends IOException { + /** + * + */ + private static final long serialVersionUID = 5044326391409597950L; + private final String bomEncoding; private final String xmlGuessEncoding; diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java index f5da0400..a05f17b4 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java @@ -36,17 +36,16 @@ public class XmlStreamReader { private final org.apache.commons.io.input.XmlStreamReader reader; - @SuppressWarnings( "checkstyle:staticvariablename" ) - private static String _staticDefaultEncoding = null; + private static String staticDefaultEncoding = null; public static void setDefaultEncoding( String encoding ) { - _staticDefaultEncoding = encoding; + staticDefaultEncoding = encoding; } public static String getDefaultEncoding() { - return _staticDefaultEncoding; + return staticDefaultEncoding; } public XmlStreamReader( File file ) @@ -64,7 +63,7 @@ public XmlStreamReader( InputStream is ) public XmlStreamReader( InputStream is, boolean lenient ) throws IOException, XmlStreamReaderException { - reader = new org.apache.commons.io.input.XmlStreamReader( is, lenient, _staticDefaultEncoding ); + reader = new org.apache.commons.io.input.XmlStreamReader( is, lenient, staticDefaultEncoding ); } public XmlStreamReader( URL url ) @@ -76,7 +75,7 @@ public XmlStreamReader( URL url ) public XmlStreamReader( URLConnection conn ) throws IOException { - reader = new org.apache.commons.io.input.XmlStreamReader( conn, _staticDefaultEncoding ); + reader = new org.apache.commons.io.input.XmlStreamReader( conn, staticDefaultEncoding ); } public XmlStreamReader( InputStream is, String httpContentType ) @@ -90,7 +89,7 @@ public XmlStreamReader( InputStream is, String httpContentType, boolean lenient, { reader = new org.apache.commons.io.input.XmlStreamReader( is, httpContentType, lenient, ( defaultEncoding == null ) - ? _staticDefaultEncoding + ? staticDefaultEncoding : defaultEncoding ); } diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java index 65251d5c..f1fbb1a3 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java @@ -37,6 +37,11 @@ class XmlStreamReaderException extends XmlReaderException { + /** + * + */ + private static final long serialVersionUID = 1007947701939672080L; + /** * Creates an exception instance if the charset encoding could not be determined. *

    diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java index aef182b7..5cb63233 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java @@ -37,7 +37,6 @@ public class Xpp3Dom implements Iterable { - @SuppressWarnings( "UnusedDeclaration" ) private static final long serialVersionUID = 2567894443061173996L; private String name; // plexus: protected From 0d51215faa896baf4b5054f6896969c740c39018 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Fri, 2 Oct 2015 08:10:55 +0000 Subject: [PATCH 008/265] [MSHARED-439] Followup changed scope to provided. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706354 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 4455db5f..3ebc2c7f 100644 --- a/pom.xml +++ b/pom.xml @@ -97,6 +97,7 @@ org.apache.maven maven-core ${mavenVersion} + provided org.apache.maven.plugin-testing From 5902ef6ed686bc161385e5f8b3e023fd71332cfb Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sat, 3 Oct 2015 18:52:34 +0000 Subject: [PATCH 009/265] Cleanup code. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706618 13f79535-47bb-0310-9956-ffa450edef68 --- .../introspection/IntrospectionException.java | 5 ++ .../shared/utils/introspection/MethodMap.java | 2 + .../utils/cli/CommandLineUtilsTest.java | 2 - .../ReflectionValueExtractorTest.java | 67 +++++++++---------- .../shared/utils/io/DirectoryScannerTest.java | 2 + .../maven/shared/utils/io/FileUtilsTest.java | 51 +++++++------- .../utils/reflection/ReflectorTest.java | 2 +- .../utils/reflection/ReflectorTestHelper.java | 11 ++- 8 files changed, 73 insertions(+), 69 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java b/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java index 18ffe383..56200a4c 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java @@ -23,6 +23,11 @@ class IntrospectionException extends Exception { + /** + * + */ + private static final long serialVersionUID = -6090771282553728784L; + public IntrospectionException( String message ) { super( message ); diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java b/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java index 4d2521a9..16df95c4 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java @@ -143,6 +143,8 @@ Method find( String methodName, Object... args ) static class AmbiguousException extends Exception { + + private static final long serialVersionUID = 751688436639650618L; } diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java index 10c58841..0f8b7998 100644 --- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java @@ -28,12 +28,10 @@ import junit.framework.TestCase; -@SuppressWarnings( { "JavaDoc", "deprecation" } ) public class CommandLineUtilsTest extends TestCase { - /** * Tests that case-insensitive environment variables are normalized to upper case. */ diff --git a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java index 92a1466e..e082617e 100644 --- a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java +++ b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java @@ -26,7 +26,6 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub; -import junit.framework.Assert; import junit.framework.TestCase; /** @@ -93,11 +92,11 @@ public void testValueExtraction() // Dependencies // ---------------------------------------------------------------------- - List dependencies = (List) ReflectionValueExtractor.evaluate( "project.dependencies", project ); + List dependencies = (List) ReflectionValueExtractor.evaluate( "project.dependencies", project ); - Assert.assertNotNull( dependencies ); + assertNotNull( dependencies ); - Assert.assertEquals( 2, dependencies.size() ); + assertEquals( 2, dependencies.size() ); // ---------------------------------------------------------------------- // Dependencies - using index notation @@ -106,37 +105,37 @@ public void testValueExtraction() // List Dependency dependency = (Dependency) ReflectionValueExtractor.evaluate( "project.dependencies[0]", project ); - Assert.assertNotNull( dependency ); + assertNotNull( dependency ); - Assert.assertTrue( "dep1".equals( dependency.getArtifactId() ) ); + assertTrue( "dep1".equals( dependency.getArtifactId() ) ); String artifactId = (String) ReflectionValueExtractor.evaluate( "project.dependencies[1].artifactId", project ); - Assert.assertTrue( "dep2".equals( artifactId ) ); + assertTrue( "dep2".equals( artifactId ) ); // Array dependency = (Dependency) ReflectionValueExtractor.evaluate( "project.dependenciesAsArray[0]", project ); - Assert.assertNotNull( dependency ); + assertNotNull( dependency ); - Assert.assertTrue( "dep1".equals( dependency.getArtifactId() ) ); + assertTrue( "dep1".equals( dependency.getArtifactId() ) ); artifactId = (String) ReflectionValueExtractor.evaluate( "project.dependenciesAsArray[1].artifactId", project ); - Assert.assertTrue( "dep2".equals( artifactId ) ); + assertTrue( "dep2".equals( artifactId ) ); // Map dependency = (Dependency) ReflectionValueExtractor.evaluate( "project.dependenciesAsMap(dep1)", project ); - Assert.assertNotNull( dependency ); + assertNotNull( dependency ); - Assert.assertTrue( "dep1".equals( dependency.getArtifactId() ) ); + assertTrue( "dep1".equals( dependency.getArtifactId() ) ); artifactId = (String) ReflectionValueExtractor.evaluate( "project.dependenciesAsMap(dep2).artifactId", project ); - Assert.assertTrue( "dep2".equals( artifactId ) ); + assertTrue( "dep2".equals( artifactId ) ); // ---------------------------------------------------------------------- // Build @@ -144,15 +143,15 @@ public void testValueExtraction() Build build = (Build) ReflectionValueExtractor.evaluate( "project.build", project ); - Assert.assertNotNull( build ); + assertNotNull( build ); } public void testValueExtractorWithAInvalidExpression() throws Exception { - Assert.assertNull( ReflectionValueExtractor.evaluate( "project.foo", project ) ); - Assert.assertNull( ReflectionValueExtractor.evaluate( "project.dependencies[10]", project ) ); - Assert.assertNull( ReflectionValueExtractor.evaluate( "project.dependencies[0].foo", project ) ); + assertNull( ReflectionValueExtractor.evaluate( "project.foo", project ) ); + assertNull( ReflectionValueExtractor.evaluate( "project.dependencies[10]", project ) ); + assertNull( ReflectionValueExtractor.evaluate( "project.dependencies[0].foo", project ) ); } public void testMappedDottedKey() @@ -161,7 +160,7 @@ public void testMappedDottedKey() Map map = new HashMap(); map.put( "a.b", "a.b-value" ); - Assert.assertEquals( "a.b-value", ReflectionValueExtractor.evaluate("h.value(a.b)", new ValueHolder(map)) ); + assertEquals( "a.b-value", ReflectionValueExtractor.evaluate("h.value(a.b)", new ValueHolder(map)) ); } public void testIndexedMapped() @@ -172,7 +171,7 @@ public void testIndexedMapped() List list = new ArrayList(); list.add( map ); - Assert.assertEquals( "a-value", ReflectionValueExtractor.evaluate("h.value[0](a)", new ValueHolder(list)) ); + assertEquals( "a-value", ReflectionValueExtractor.evaluate("h.value[0](a)", new ValueHolder(list)) ); } public void testMappedIndexed() @@ -182,7 +181,7 @@ public void testMappedIndexed() list.add( "a-value" ); Map map = new HashMap(); map.put( "a", list ); - Assert.assertEquals( "a-value", ReflectionValueExtractor.evaluate("h.value(a)[0]", new ValueHolder(map)) ); + assertEquals( "a-value", ReflectionValueExtractor.evaluate("h.value(a)[0]", new ValueHolder(map)) ); } public void testMappedMissingDot() @@ -190,7 +189,7 @@ public void testMappedMissingDot() { Map map = new HashMap(); map.put( "a", new ValueHolder( "a-value" ) ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value(a)value", new ValueHolder(map)) ); + assertNull( ReflectionValueExtractor.evaluate("h.value(a)value", new ValueHolder(map)) ); } public void testIndexedMissingDot() @@ -198,13 +197,13 @@ public void testIndexedMissingDot() { List list = new ArrayList(); list.add( new ValueHolder( "a-value" ) ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value[0]value", new ValueHolder(list)) ); + assertNull( ReflectionValueExtractor.evaluate("h.value[0]value", new ValueHolder(list)) ); } public void testDotDot() throws Exception { - Assert.assertNull( ReflectionValueExtractor.evaluate("h..value", new ValueHolder("value")) ); + assertNull( ReflectionValueExtractor.evaluate("h..value", new ValueHolder("value")) ); } public void testBadIndexedSyntax() @@ -214,12 +213,12 @@ public void testBadIndexedSyntax() list.add( "a-value" ); Object value = new ValueHolder( list ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value[", value) ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value[]", value) ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value[a]", value) ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value[0", value) ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value[0)", value) ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value[-1]", value) ); + assertNull( ReflectionValueExtractor.evaluate("h.value[", value) ); + assertNull( ReflectionValueExtractor.evaluate("h.value[]", value) ); + assertNull( ReflectionValueExtractor.evaluate("h.value[a]", value) ); + assertNull( ReflectionValueExtractor.evaluate("h.value[0", value) ); + assertNull( ReflectionValueExtractor.evaluate("h.value[0)", value) ); + assertNull( ReflectionValueExtractor.evaluate("h.value[-1]", value) ); } public void testBadMappedSyntax() @@ -229,10 +228,10 @@ public void testBadMappedSyntax() map.put( "a", "a-value" ); Object value = new ValueHolder( map ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value(", value) ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value()", value) ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value(a", value) ); - Assert.assertNull( ReflectionValueExtractor.evaluate("h.value(a]", value) ); + assertNull( ReflectionValueExtractor.evaluate("h.value(", value) ); + assertNull( ReflectionValueExtractor.evaluate("h.value()", value) ); + assertNull( ReflectionValueExtractor.evaluate("h.value(a", value) ); + assertNull( ReflectionValueExtractor.evaluate("h.value(a]", value) ); } public void testIllegalIndexedType() @@ -264,7 +263,7 @@ public void testIllegalMappedType() public void testTrimRootToken() throws Exception { - Assert.assertNull( ReflectionValueExtractor.evaluate("project", project, true) ); + assertNull( ReflectionValueExtractor.evaluate("project", project, true) ); } public void testArtifactMap() diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index d5f7663a..e331db9d 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -131,6 +131,8 @@ public void checkSymlinkBehaviour() ds.scan(); String[] includedDirectories = ds.getIncludedDirectories(); String[] files = ds.getIncludedFiles(); + + //FIXME: This should be changed to some kind of assert...WhatEver()... System.out.println( "files = " + files ); diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java index c583b798..57e3033c 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java @@ -1,5 +1,30 @@ package org.apache.maven.shared.utils.io; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeThat; +import static org.junit.Assume.assumeTrue; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URL; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -29,31 +54,6 @@ import org.junit.rules.TemporaryFolder; import org.junit.rules.TestName; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; -import static org.junit.Assume.assumeThat; -import static org.junit.Assume.assumeTrue; -import static org.junit.matchers.JUnitMatchers.containsString; -import static org.junit.matchers.JUnitMatchers.hasItems; - /** * This is used to test FileUtils for correctness. * @@ -1050,7 +1050,6 @@ public void write_WithAppendOptionTrue_ShouldNotDeletePreviousFileLines() assertThat( actual, is( expected ) ); } - @SuppressWarnings("ConstantConditions") @Test( expected = NullPointerException.class ) public void blowUpOnNull() throws IOException diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java index ddb6a94e..ef99a039 100644 --- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java +++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java @@ -1128,7 +1128,7 @@ public void getMethodNullNullEmpty() public void getMethodObjectNullNull() throws Exception { - reflector.getMethod( Object.class, null, null ); + reflector.getMethod( Object.class, (String)null, (Class)null ); } @Test( expected = NullPointerException.class ) diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java index 0cd6445b..544df298 100644 --- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java +++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java @@ -24,7 +24,6 @@ */ class ReflectorTestHelper { - private static String PRIVATE_STATIC_STRING = "private static string"; static String PACKAGE_STATIC_STRING = "package static string"; protected static String PROTECTED_STATIC_STRING = "protected static string"; public static String PUBLIC_STATIC_STRING = "public static string"; @@ -57,11 +56,6 @@ public ReflectorTestHelper( String throwMessage ) } } - private static ReflectorTestHelper getInstance() - { - return new ReflectorTestHelper(); - } - static ReflectorTestHelper getInstance( Boolean throwSomething ) { if ( Boolean.TRUE.equals( throwSomething ) ) @@ -97,6 +91,11 @@ public ReflectorTestHelper getInstance( String aString, Boolean aBoolean ) public static class HelperException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = -3395757415194358525L; + public HelperException() { super(); //To change body of overridden methods use File | Settings | File Templates. From 97f7c57095895239649a9e614d6a90ba29020a98 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 4 Oct 2015 12:48:12 +0000 Subject: [PATCH 010/265] Improved hint by adding explicit version git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706671 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3ebc2c7f..0b9eb6bb 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ org.apache.maven.plugins maven-shade-plugin 2.4.1 @@ -149,7 +149,7 @@ org.apache.maven.plugins maven-checkstyle-plugin 2.15 @@ -191,7 +191,7 @@ org.apache.maven.plugins maven-checkstyle-plugin 2.15 From 16c52c2c33afc0298aa82e62cc593c875b9bc6c6 Mon Sep 17 00:00:00 2001 From: Robert Scholte Date: Sun, 4 Oct 2015 12:49:34 +0000 Subject: [PATCH 011/265] append rat configuration git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706672 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 0b9eb6bb..a686955a 100644 --- a/pom.xml +++ b/pom.xml @@ -164,18 +164,9 @@ org.apache.rat apache-rat-plugin - - .git/**/* - .idea/**/* - **/.svn/**/* - **/*.iml - **/*.ipr - **/*.iws - **/*.versionsBackup - .gitignore + src/test/resources/directorywalker/**/* src/test/resources/symlinks/**/* - dependency-reduced-pom.xml From ed9742a8362ae97c0a9cf4562f52eb7547d235ff Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 4 Oct 2015 12:56:48 +0000 Subject: [PATCH 012/265] Improved comment about using maven-core in provided scope. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706673 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index a686955a..8ecdc92f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,23 +1,27 @@ - + 4.0.0 @@ -92,7 +96,10 @@ jsr305 2.0.1 - + org.apache.maven maven-core @@ -114,7 +121,7 @@ maven-shade-plugin + --> 2.4.1 @@ -150,7 +157,7 @@ maven-checkstyle-plugin + --> 2.15 @@ -183,7 +190,7 @@ maven-checkstyle-plugin + --> 2.15 From efe721920f4707b16c3cf75fae766fa60f738744 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 4 Oct 2015 13:37:29 +0000 Subject: [PATCH 013/265] Fixed CI build. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706677 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 8ecdc92f..96896280 100644 --- a/pom.xml +++ b/pom.xml @@ -174,6 +174,8 @@ src/test/resources/directorywalker/**/* src/test/resources/symlinks/**/* + + dependency-reduced-pom.xml From 7111e7de1979d2184df0752d5679d6bbd1257ba1 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 4 Oct 2015 17:35:19 +0000 Subject: [PATCH 014/265] Cleaned up checkstyle reported issues. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706704 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/utils/PropertyUtils.java | 7 +- .../maven/shared/utils/StringUtils.java | 60 +++++++------ .../apache/maven/shared/utils/cli/Arg.java | 4 +- .../shared/utils/cli/CommandLineCallable.java | 4 +- .../utils/cli/CommandLineException.java | 6 +- .../cli/CommandLineTimeOutException.java | 4 +- .../shared/utils/cli/CommandLineUtils.java | 45 ++++++++-- .../maven/shared/utils/cli/Commandline.java | 35 +++++++- .../shared/utils/cli/DefaultConsumer.java | 1 + .../shared/utils/cli/ShutdownHookUtils.java | 6 ++ .../shared/utils/cli/StreamConsumer.java | 1 + .../maven/shared/utils/cli/StreamPumper.java | 30 ++++++- .../shared/utils/io/DirectoryScanner.java | 87 +++++++++++-------- .../maven/shared/utils/io/FileUtils.java | 31 +++++-- .../apache/maven/shared/utils/io/IOUtil.java | 70 +++++++-------- 15 files changed, 264 insertions(+), 127 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java index f50157d7..ff7eab3c 100644 --- a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java @@ -36,13 +36,16 @@ public class PropertyUtils { + /** + * The constructor. + */ public PropertyUtils() { // should throw new IllegalAccessError( "Utility class" ); } /** - * @param url + * @param url The URL which should be used to load the properties. * @return The loaded properties. */ public static java.util.Properties loadProperties( @Nonnull java.net.URL url ) @@ -59,7 +62,7 @@ public static java.util.Properties loadProperties( @Nonnull java.net.URL url ) } /** - * @param file + * @param file The file from which the properties will be loaded. * @return The loaded properties. */ public static Properties loadProperties( @Nonnull File file ) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 9759a72d..58bf8be0 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -517,6 +517,9 @@ public static String mid( String str, int pos, int len ) } /** + * @param text The text to be split. + * @param separator The separator at which the text will be split. + * @return The resulting array. * @see #split(String, String, int) */ @Nonnull public static String[] split( @Nonnull String text, @Nullable String separator ) @@ -1981,8 +1984,10 @@ private static void reverseArray( @Nonnull String... array ) * Else abbreviate it to (substring(str, 0, max-3) + "..."). * If maxWidth is less than 3, throw an IllegalArgumentException. * In no case will it return a string of length greater than maxWidth. - * + * + * @param s The string to be abbreviated. * @param maxWidth maximum length of result string + * @return The abbreviated string. */ @Nonnull public static String abbreviate( @Nonnull String s, int maxWidth ) { @@ -2001,6 +2006,7 @@ private static void reverseArray( @Nonnull String... array ) * @param s String to abbreviate. * @param offset left edge of source string * @param maxWidth maximum length of result string + * @return The abbreviated string. */ @Nonnull public static String abbreviate( @Nonnull String s, int offset, int maxWidth ) { @@ -2045,6 +2051,8 @@ private static void reverseArray( @Nonnull String... array ) *

    * E.g. strdiff("i am a machine", "i am a robot") -> "robot" * + * @param s1 The first string. + * @param s2 The second string. * @return the portion of s2 where it differs from s1; returns the empty string ("") if they are equal */ public static String difference( @Nonnull String s1, @Nonnull String s2 ) @@ -2063,6 +2071,8 @@ public static String difference( @Nonnull String s1, @Nonnull String s2 ) * E.g. strdiff("i am a machine", "i am a robot") -> 7 *

    * + * @param s1 The first string. + * @param s2 The second string. * @return the index where s2 and s1 begin to differ; -1 if they are equal */ public static int differenceAt( @Nonnull String s1, @Nonnull String s2 ) @@ -2087,8 +2097,8 @@ public static int differenceAt( @Nonnull String s1, @Nonnull String s2 ) * Any text looking like '${key}' will get replaced by the value stored * in the namespace map under the 'key'. * - * @param text - * @param namespace + * @param text The text where replacements will be searched for. + * @param namespace The namespace which contains the replacements. * @return the interpolated text. */ public static String interpolate( String text, @Nonnull Map namespace ) @@ -2125,8 +2135,8 @@ public static String interpolate( String text, @Nonnull Map namespace ) * * will become 'ThisIsIt'. * - * @param data - * @param replaceThis + * @param data The data. + * @param replaceThis The things which should be replaced. * @return humped String */ @Nonnull public static String removeAndHump( @Nonnull String data, @Nonnull String replaceThis ) @@ -2203,7 +2213,7 @@ public static String interpolate( String text, @Nonnull Map namespace ) *

    * 'ThisIsIt' will become 'this-is-it'. * - * @param view + * @param view The view. * @return deHumped String */ @Nonnull public static String addAndDeHump( @Nonnull String view ) @@ -2234,8 +2244,8 @@ public static String interpolate( String text, @Nonnull Map namespace ) * StringUtils.quoteAndEscape("a\"bc", '\'') = 'a\"bc' * * - * @param source - * @param quoteChar + * @param source The source. + * @param quoteChar The quote character. * @return the String quoted and escaped * @see #quoteAndEscape(String, char, char[], char[], char, boolean) * @see #quoteAndEscape(String, char, char[], char[], char, boolean) @@ -2249,9 +2259,9 @@ public static String quoteAndEscape( @Nullable String source, char quoteChar ) /** *

    Quote and escape a String with the given character, handling null.

    * - * @param source - * @param quoteChar - * @param quotingTriggers + * @param source The source. + * @param quoteChar The quote character. + * @param quotingTriggers The quoting trigger. * @return the String quoted and escaped * @see #quoteAndEscape(String, char, char[], char[], char, boolean) * @@ -2262,11 +2272,11 @@ public static String quoteAndEscape( @Nullable String source, char quoteChar, @N } /** - * @param source - * @param quoteChar - * @param escapedChars - * @param escapeChar - * @param force + * @param source The source. + * @param quoteChar The quote character. + * @param escapedChars The escaped characters. + * @param escapeChar The escape character. + * @param force true/false. * @return the String quoted and escaped * @see #quoteAndEscape(String, char, char[], char[], char, boolean) * @@ -2278,12 +2288,12 @@ public static String quoteAndEscape( @Nullable String source, char quoteChar, } /** - * @param source - * @param quoteChar - * @param escapedChars - * @param quotingTriggers - * @param escapeChar - * @param force + * @param source The source. + * @param quoteChar The quote character. + * @param escapedChars The escaped characters. + * @param quotingTriggers The quoting trigger. + * @param escapeChar The escape character. + * @param force true/false. * @return the String quoted and escaped */ public static String quoteAndEscape( @Nullable String source, char quoteChar, @Nonnull final char[] escapedChars, @@ -2332,9 +2342,9 @@ else if ( !escaped.equals( source ) ) } /** - * @param source - * @param escapedChars - * @param escapeChar + * @param source The source. + * @param escapedChars escape characters. + * @param escapeChar escape character. * @return the String escaped */ public static String escape( @Nullable String source, @Nonnull final char[] escapedChars, char escapeChar ) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Arg.java b/src/main/java/org/apache/maven/shared/utils/cli/Arg.java index 1e65a97d..bd1fa084 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/Arg.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/Arg.java @@ -32,12 +32,12 @@ public interface Arg void setValue( String value ); /** - * @param line + * @param line The line of arguments. */ void setLine( String line ); /** - * @param value + * @param value The file to be set. */ void setFile( File value ); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java index cf5c62c1..b4e45864 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineCallable.java @@ -29,8 +29,8 @@ public interface CommandLineCallable extends Callable { - /* (non-Javadoc) - * @see java.util.concurrent.Callable#call() + /** + * {@inheritDoc} */ Integer call() throws CommandLineException; diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java index aa4ac052..77a50ee7 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java @@ -32,7 +32,7 @@ public class CommandLineException private static final long serialVersionUID = 1344773066470228441L; /** - * @param message + * @param message The message of the exception. */ public CommandLineException( String message ) { @@ -40,8 +40,8 @@ public CommandLineException( String message ) } /** - * @param message - * @param cause + * @param message The message of the exception. + * @param cause The problem which caused the exception. */ public CommandLineException( String message, Throwable cause ) { diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java index fa9deeb4..5d834948 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java @@ -34,8 +34,8 @@ public class CommandLineTimeOutException private static final long serialVersionUID = 7322428741683224481L; /** - * @param message - * @param cause + * @param message The message of the exception. + * @param cause The cause of the exception. */ public CommandLineTimeOutException( String message, Throwable cause ) { diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java index 764d5d2c..c39ec695 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java @@ -51,11 +51,15 @@ public static class StringStreamConsumer private static final String LS = System.getProperty( "line.separator" ); + /** {@inheritDoc} */ public void consumeLine( String line ) { string.append( line ).append( LS ); } + /** + * @return The output. + */ public String getOutput() { return string.toString(); @@ -74,6 +78,7 @@ private ProcessHook( Process process ) this.setContextClassLoader( null ); } + /** {@inheritDoc} */ public void run() { process.destroy(); @@ -81,12 +86,27 @@ public void run() } + /** + * @param cl The command line {@link Commandline} + * @param systemOut {@link StreamConsumer} + * @param systemErr {@link StreamConsumer} + * @return return code. + * @throws CommandLineException in case of a problem. + */ public static int executeCommandLine( @Nonnull Commandline cl, StreamConsumer systemOut, StreamConsumer systemErr ) throws CommandLineException { return executeCommandLine( cl, null, systemOut, systemErr, 0 ); } + /** + * @param cl The command line {@link Commandline} + * @param systemOut {@link StreamConsumer} + * @param systemErr {@link StreamConsumer} + * @param timeoutInSeconds The timeout. + * @return return code. + * @throws CommandLineException in case of a problem. + */ public static int executeCommandLine( @Nonnull Commandline cl, StreamConsumer systemOut, StreamConsumer systemErr, int timeoutInSeconds ) throws CommandLineException @@ -94,6 +114,14 @@ public static int executeCommandLine( @Nonnull Commandline cl, StreamConsumer sy return executeCommandLine( cl, null, systemOut, systemErr, timeoutInSeconds ); } + /** + * @param cl The command line {@link Commandline} + * @param systemIn {@link StreamConsumer} + * @param systemOut {@link StreamConsumer} + * @param systemErr {@link StreamConsumer} + * @return return code. + * @throws CommandLineException in case of a problem. + */ public static int executeCommandLine( @Nonnull Commandline cl, InputStream systemIn, StreamConsumer systemOut, StreamConsumer systemErr ) throws CommandLineException @@ -109,7 +137,6 @@ public static int executeCommandLine( @Nonnull Commandline cl, InputStream syste * @param timeoutInSeconds Positive integer to specify timeout, zero and negative integers for no timeout. * @return A return value, see {@link Process#exitValue()} * @throws CommandLineException or CommandLineTimeOutException if time out occurs - * @noinspection ThrowableResultOfMethodCallIgnored */ public static int executeCommandLine( @Nonnull Commandline cl, InputStream systemIn, StreamConsumer systemOut, StreamConsumer systemErr, int timeoutInSeconds ) @@ -128,7 +155,6 @@ public static int executeCommandLine( @Nonnull Commandline cl, InputStream syste * exceeded, but before waiting on the stream feeder and pumpers to finish. * @return A return value, see {@link Process#exitValue()} * @throws CommandLineException or CommandLineTimeOutException if time out occurs - * @noinspection ThrowableResultOfMethodCallIgnored */ public static int executeCommandLine( @Nonnull Commandline cl, InputStream systemIn, StreamConsumer systemOut, StreamConsumer systemErr, int timeoutInSeconds, @@ -150,7 +176,6 @@ public static int executeCommandLine( @Nonnull Commandline cl, InputStream syste * @param streamCharset Charset to use for reading streams * @return A return value, see {@link Process#exitValue()} * @throws CommandLineException or CommandLineTimeOutException if time out occurs - * @noinspection ThrowableResultOfMethodCallIgnored */ public static int executeCommandLine( @Nonnull Commandline cl, InputStream systemIn, StreamConsumer systemOut, StreamConsumer systemErr, int timeoutInSeconds, @@ -177,7 +202,6 @@ public static int executeCommandLine( @Nonnull Commandline cl, InputStream syste * must be called on this to be sure the forked process has terminated, no guarantees is made about * any internal state before after the completion of the call statements * @throws CommandLineException or CommandLineTimeOutException if time out occurs - * @noinspection ThrowableResultOfMethodCallIgnored */ public static CommandLineCallable executeCommandLineAsCallable( @Nonnull final Commandline cl, @Nullable final InputStream systemIn, @@ -205,7 +229,6 @@ public static CommandLineCallable executeCommandLineAsCallable( @Nonnull final C * must be called on this to be sure the forked process has terminated, no guarantees is made about * any internal state before after the completion of the call statements * @throws CommandLineException or CommandLineTimeOutException if time out occurs - * @noinspection ThrowableResultOfMethodCallIgnored */ public static CommandLineCallable executeCommandLineAsCallable( @Nonnull final Commandline cl, @Nullable final InputStream systemIn, @@ -384,8 +407,12 @@ private static boolean isAlive( Process p ) } } - public static String[] translateCommandline( String toProcess ) - throws Exception + /** + * @param toProcess The command line to translate. + * @return The array of translated parts. + * @throws CommandLineException in case of unbalanced quotes. + */ + public static String[] translateCommandline( String toProcess ) throws CommandLineException { if ( ( toProcess == null ) || ( toProcess.length() == 0 ) ) { @@ -465,6 +492,10 @@ else if ( " ".equals( nextTok ) ) return tokens.toArray( new String[tokens.size()] ); } + /** + * @param line The line + * @return The concatenate lines. + */ public static String toString( String... line ) { // empty path return empty string diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java index 043a3691..94fbdccb 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java @@ -79,6 +79,7 @@ public class Commandline /** * Create a new command line object. * Shell is autodetected from operating system + * @param shell The shell instance. */ public Commandline( Shell shell ) { @@ -168,6 +169,7 @@ public Arg createArg() * * @param insertAtStart if true, the argument is inserted at the * beginning of the list of args, otherwise it is appended. + * @return The arguments. */ public Arg createArg( boolean insertAtStart ) { @@ -185,18 +187,25 @@ public Arg createArg( boolean insertAtStart ) /** * Sets the executable to run. + * @param executable The executable. */ public void setExecutable( String executable ) { shell.setExecutable( executable ); } + /** + * @return The executable. + */ public String getExecutable() { return shell.getExecutable(); } + /** + * @param line The arguments. + */ public void addArguments( String... line ) { for ( String aLine : line ) @@ -207,6 +216,8 @@ public void addArguments( String... line ) /** * Add an environment variable + * @param name The name of the environment variable. + * @param value The appropriate value. */ public void addEnvironment( String name, String value ) { @@ -233,6 +244,7 @@ public void addSystemEnvironment() /** * Return the list of environment variables + * @return an array of all environment variables. */ public String[] getEnvironmentVariables() { @@ -250,6 +262,7 @@ public String[] getEnvironmentVariables() /** * Returns the executable and all defined arguments. + * @return an array of all arguments incl. executable. */ public String[] getCommandline() { @@ -288,6 +301,7 @@ private String[] getShellCommandline( boolean mask ) /** * Returns all arguments defined by addLine, * addValue or the argument object. + * @return an array of arguments. */ public String[] getArguments() { @@ -299,6 +313,7 @@ public String[] getArguments() * addValue or the argument object. * * @param mask flag to mask any arguments (having his {@code mask} field to {@code true}). + * @return an array of arguments. */ public String[] getArguments( boolean mask ) { @@ -328,12 +343,16 @@ public String[] getArguments( boolean mask ) return result.toArray( new String[result.size()] ); } + /** {@inheritDoc} + */ public String toString() { return StringUtils.join( getShellCommandline( true ), " " ); } + /** {@inheritDoc} + */ public Object clone() { throw new RuntimeException( "Do we ever clone a commandline?" ); @@ -343,7 +362,8 @@ public Object clone() } /** - * Sets execution directory. + * Sets working directory. + * @param path The to be set as working directory. */ public void setWorkingDirectory( String path ) { @@ -352,12 +372,16 @@ public void setWorkingDirectory( String path ) /** * Sets execution directory. + * @param workingDirectory The working directory. */ public void setWorkingDirectory( File workingDirectory ) { shell.setWorkingDirectory( workingDirectory ); } + /** + * @return The working directory. + */ public File getWorkingDirectory() { return shell.getWorkingDirectory(); @@ -373,6 +397,8 @@ public void clearArgs() /** * Executes the command. + * @return The process. + * @throws CommandLineException in case of errors. */ public Process execute() throws CommandLineException @@ -427,6 +453,7 @@ void setShell( Shell shell ) /** * Get the shell to be used in this command line. + * @return the shell. */ public Shell getShell() { @@ -489,11 +516,17 @@ public void setMask( boolean mask ) this.mask = mask; } + /** + * @return The parts. + */ private String[] getParts() { return parts; } + /** + * @return true/false + */ public boolean isMask() { return mask; diff --git a/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java b/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java index db75f534..040b8adf 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java @@ -26,6 +26,7 @@ public class DefaultConsumer implements StreamConsumer { + /** {@inheritDoc} */ public void consumeLine( String line ) { System.out.println( line ); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/ShutdownHookUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/ShutdownHookUtils.java index 9ce64657..d1ea5686 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/ShutdownHookUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/ShutdownHookUtils.java @@ -32,6 +32,9 @@ public class ShutdownHookUtils { + /** + * @param hook The thread hook. + */ public static void addShutDownHook( Thread hook ) { try @@ -48,6 +51,9 @@ public static void addShutDownHook( Thread hook ) } } + /** + * @param hook The hook which should be removed. + */ public static void removeShutdownHook( Thread hook ) { try diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java index c460ad9f..dc6802b8 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java @@ -34,6 +34,7 @@ public interface StreamConsumer { /** * Called when the StreamPumper pumps a line from the Stream. + * @param line The line to be consumed. */ void consumeLine( String line ); } diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java index 3118a642..5bed568c 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java @@ -32,12 +32,10 @@ import org.apache.maven.shared.utils.io.IOUtil; /** - * Class to pump the error stream during Process's runtime. Copied from the Ant - * built-in task. + * Class to pump the error stream during Process's runtime. Copied from the Ant built-in task. * * @author Florin Vancea * @author Paul Julius - * */ public class StreamPumper extends AbstractStreamHandler @@ -52,16 +50,30 @@ public class StreamPumper private static final int SIZE = 1024; + /** + * @param in {@link InputStream} + * @param consumer {@link StreamConsumer} + */ public StreamPumper( InputStream in, StreamConsumer consumer ) { this( new InputStreamReader( in ), null, consumer ); } - public StreamPumper( InputStream in, StreamConsumer consumer, @Nullable Charset charset ) + /** + * @param in {@link InputStream} + * @param consumer {@link StreamConsumer} + * @param charset {@link Charset} + */ + public StreamPumper( InputStream in, StreamConsumer consumer, @Nullable Charset charset ) { this( null == charset ? new InputStreamReader( in ) : new InputStreamReader( in, charset ), null, consumer ); } + /** + * @param in {@link Writer} + * @param writer {@link PrintWriter} + * @param consumer {@link StreamConsumer} + */ private StreamPumper( Reader in, PrintWriter writer, StreamConsumer consumer ) { this.in = new BufferedReader( in, SIZE ); @@ -69,6 +81,7 @@ private StreamPumper( Reader in, PrintWriter writer, StreamConsumer consumer ) this.consumer = consumer; } + /** run it. */ public void run() { try @@ -113,6 +126,9 @@ public void run() } } + /** + * flush. + */ public void flush() { if ( out != null ) @@ -121,11 +137,17 @@ public void flush() } } + /** + * Close it. + */ public void close() { IOUtil.close( out ); } + /** + * @return {@link Exception} + */ public Exception getException() { return exception; diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java index 91415bcc..748466e0 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java @@ -281,11 +281,11 @@ public File getBasedir() /** * Sets whether or not the file system should be regarded as case sensitive. * - * @param isCaseSensitive whether or not the file system should be regarded as a case sensitive one + * @param isCaseSensitiveParameter whether or not the file system should be regarded as a case sensitive one */ - public void setCaseSensitive( final boolean isCaseSensitive ) + public void setCaseSensitive( final boolean isCaseSensitiveParameter ) { - this.isCaseSensitive = isCaseSensitive; + this.isCaseSensitive = isCaseSensitiveParameter; } /** @@ -360,6 +360,9 @@ public void setExcludes( final String... excludes ) } } + /** + * @param scanConductor {@link #scanConductor} + */ public void setScanConductor( final ScanConductor scanConductor ) { this.scanConductor = scanConductor; @@ -443,6 +446,7 @@ public void scan() * {@link DirectoryScanResult#getFilesAdded()} and {@link DirectoryScanResult#getFilesRemoved()} * * @param oldFiles the list of previously captured files names. + * @return the result of the directory scan. */ public DirectoryScanResult diffIncludedFiles( String... oldFiles ) { @@ -455,6 +459,11 @@ public DirectoryScanResult diffIncludedFiles( String... oldFiles ) return diffFiles( oldFiles, filesIncluded.toArray( new String[filesIncluded.size()] ) ); } + /** + * @param oldFiles array of old files. + * @param newFiles array of new files. + * @return calculated differerence. + */ public static DirectoryScanResult diffFiles( @Nullable String[] oldFiles, @Nullable String[] newFiles ) { Set oldFileSet = arrayAsHashSet( oldFiles ); @@ -583,39 +592,7 @@ void scandir( @Nonnull final File dir, @Nonnull final String vpath, final boolea if ( !followSymlinks ) { - final List noLinks = new ArrayList(); - for ( final String newfile : newfiles ) - { - try - { - if ( isSymbolicLink( dir, newfile ) ) - { - final String name = vpath + newfile; - final File file = new File( dir, newfile ); - if ( file.isDirectory() ) - { - dirsExcluded.add( name ); - } - else - { - filesExcluded.add( name ); - } - } - else - { - noLinks.add( newfile ); - } - } - catch ( final IOException ioe ) - { - final String msg = - "IOException caught while checking " + "for links, couldn't get cannonical path!"; - // will be caught and redirected to Ant's logging system - System.err.println( msg ); - noLinks.add( newfile ); - } - } - newfiles = noLinks.toArray( new String[noLinks.size()] ); + newfiles = doNotFollowSymbolicLinks( dir, vpath, newfiles ); } for ( final String newfile : newfiles ) @@ -738,6 +715,44 @@ else if ( file.isFile() ) } } + private String[] doNotFollowSymbolicLinks( final File dir, final String vpath, String[] newfiles ) + { + final List noLinks = new ArrayList(); + for ( final String newfile : newfiles ) + { + try + { + if ( isSymbolicLink( dir, newfile ) ) + { + final String name = vpath + newfile; + final File file = new File( dir, newfile ); + if ( file.isDirectory() ) + { + dirsExcluded.add( name ); + } + else + { + filesExcluded.add( name ); + } + } + else + { + noLinks.add( newfile ); + } + } + catch ( final IOException ioe ) + { + final String msg = + "IOException caught while checking " + "for links, couldn't get cannonical path!"; + // will be caught and redirected to Ant's logging system + System.err.println( msg ); + noLinks.add( newfile ); + } + } + newfiles = noLinks.toArray( new String[noLinks.size()] ); + return newfiles; + } + /** * Tests whether or not a name matches against at least one include pattern. * diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java index c52680cf..5f12cff3 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java @@ -87,6 +87,9 @@ */ public class FileUtils { + /** + * protected constructor. + */ protected FileUtils() { // This is a utility class. Normally dont instantiate @@ -304,7 +307,7 @@ public static boolean fileExists( @Nonnull String fileName ) * @param file the file path * @return the file content lines as String[] using the systems default encoding. * An empty List if the file didn't exist. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String[] fileReadArray( @Nonnull File file ) throws IOException @@ -657,7 +660,7 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F * @return The equivalent File object, or null if the URL's protocol * is not file */ - @Nullable public static File toFile( final @Nullable URL url ) + @Nullable public static File toFile( @Nullable final URL url ) { if ( url == null || !url.getProtocol().equalsIgnoreCase( "file" ) ) { @@ -1179,6 +1182,10 @@ public static void delete( @Nonnull File file ) } } + /** + * @param file The file. + * @return true / false + */ public static boolean deleteLegacyStyle( @Nonnull File file ) { if ( Java7Support.isAtLeastJava7() ) @@ -1428,7 +1435,7 @@ public static long sizeOfDirectory( @Nonnull final File directory ) * @param includes the includes pattern, comma separated * @param excludes the excludes pattern, comma separated * @return a list of File objects - * @throws IOException + * @throws IOException in case of failure. * @see #getFileNames(File, String, String, boolean) */ @Nonnull @@ -1446,7 +1453,7 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc * @param excludes the excludes pattern, comma separated * @param includeBasedir true to include the base dir in each file * @return a list of File objects - * @throws IOException + * @throws IOException in case of failure. * @see #getFileNames(File, String, String, boolean) */ @Nonnull @@ -1475,7 +1482,7 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc * @param excludes the excludes pattern, comma separated * @param includeBasedir true to include the base dir in each String of file * @return a list of files as String - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static List getFileNames( @Nonnull File directory, @Nullable String includes, @Nullable String excludes, boolean includeBasedir ) @@ -1512,7 +1519,7 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc * @param excludes the excludes pattern, comma separated * @param includeBasedir true to include the base dir in each String of file * @return a list of directories as String - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static List getDirectoryNames( @Nonnull File directory, @Nullable String includes, @Nullable String excludes, boolean includeBasedir ) @@ -1530,7 +1537,7 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc * @param includeBasedir true to include the base dir in each String of file * @param isCaseSensitive true if case sensitive * @return a list of directories as String - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static List getDirectoryNames( @Nonnull File directory, @Nullable String includes, @Nullable String excludes, boolean includeBasedir, @@ -1860,10 +1867,15 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str } /** - * + * Wrapper class for Filter. + * */ public abstract static class FilterWrapper { + /** + * @param fileReader {@link Reader} + * @return The Reader instance. + */ public abstract Reader getReader( Reader fileReader ); } @@ -2010,6 +2022,8 @@ private static boolean isValidWindowsFileName( @Nonnull File f ) *

    * * @param file the file to check + * @throws IOException in case of failure. + * @return true if symbolic link false otherwise. * */ public static boolean isSymbolicLink( @Nonnull final File file ) @@ -2029,6 +2043,7 @@ public static boolean isSymbolicLink( @Nonnull final File file ) * @return true if and only if we reliably can say this is a symlink. This will * always return false for java versions prior to 1.7. * + * @throws IOException in case of failure. */ public static boolean isSymbolicLinkForSure( @Nonnull final File file ) throws IOException diff --git a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java index f7ec295f..b1105a45 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java +++ b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java @@ -161,7 +161,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Output /** * Copy chars from a Reader to a Writer. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final Reader input, @Nonnull final Writer output ) throws IOException @@ -173,7 +173,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final Writer outp * Copy chars from a Reader to a Writer. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final Reader input, @Nonnull final Writer output, final int bufferSize ) throws IOException @@ -199,7 +199,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final Writer outp * Copy and convert bytes from an InputStream to chars on a * Writer. * The platform's default encoding is used for the byte-to-char conversion. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output ) throws IOException @@ -213,7 +213,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * The platform's default encoding is used for the byte-to-char conversion. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output, final int bufferSize ) throws IOException @@ -229,7 +229,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output, @Nonnull final String encoding ) @@ -247,7 +247,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * IANA * Charset Registry for a list of valid encoding types. * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output, @Nonnull final String encoding, final int bufferSize ) @@ -263,7 +263,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a String. * The platform's default encoding is used for the byte-to-char conversion. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final InputStream input ) throws IOException @@ -276,7 +276,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * The platform's default encoding is used for the byte-to-char conversion. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final InputStream input, final int bufferSize ) throws IOException @@ -292,7 +292,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final InputStream input, @Nonnull final String encoding ) throws IOException @@ -307,7 +307,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * IANA * Charset Registry for a list of valid encoding types. * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final InputStream input, @Nonnull final String encoding, final int bufferSize ) @@ -323,7 +323,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a byte[]. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final InputStream input ) throws IOException @@ -335,7 +335,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * Get the contents of an InputStream as a byte[]. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final InputStream input, final int bufferSize ) throws IOException @@ -356,7 +356,7 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Serialize chars from a Reader to bytes on an OutputStream, and * flush the OutputStream. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStream output ) throws IOException @@ -369,7 +369,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea * flush the OutputStream. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStream output, final int bufferSize ) throws IOException @@ -386,7 +386,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a String. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final Reader input ) throws IOException @@ -398,7 +398,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea * Get the contents of a Reader as a String. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final Reader input, final int bufferSize ) throws IOException @@ -413,7 +413,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a byte[]. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final Reader input ) throws IOException @@ -425,7 +425,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea * Get the contents of a Reader as a byte[]. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final Reader input, final int bufferSize ) throws IOException @@ -446,7 +446,7 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Serialize chars from a String to bytes on an OutputStream, and * flush the OutputStream. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final String input, @Nonnull final OutputStream output ) throws IOException @@ -459,7 +459,7 @@ public static void copy( @Nonnull final String input, @Nonnull final OutputStrea * flush the OutputStream. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final String input, @Nonnull final OutputStream output, final int bufferSize ) throws IOException @@ -477,9 +477,9 @@ public static void copy( @Nonnull final String input, @Nonnull final OutputStrea /** * Copy chars from a String to a Writer. - * @param input - * @param output - * @throws IOException + * @param input Input string. + * @param output resulting output {@link Writer} + * @throws IOException in case of failure. */ public static void copy( @Nonnull final String input, @Nonnull final Writer output ) throws IOException @@ -492,7 +492,7 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp /** * Get the contents of a String as a byte[]. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final String input ) throws IOException @@ -504,7 +504,7 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp * Get the contents of a String as a byte[]. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final String input, final int bufferSize ) throws IOException @@ -526,7 +526,7 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp * Copy and convert bytes from a byte[] to chars on a * Writer. * The platform's default encoding is used for the byte-to-char conversion. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output ) throws IOException @@ -540,7 +540,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * The platform's default encoding is used for the byte-to-char conversion. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output, final int bufferSize ) throws IOException @@ -556,7 +556,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output, final String encoding ) throws IOException @@ -573,7 +573,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * IANA * Charset Registry for a list of valid encoding types. * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output, @Nonnull final String encoding, final int bufferSize ) @@ -589,7 +589,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp /** * Get the contents of a byte[] as a String. * The platform's default encoding is used for the byte-to-char conversion. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final byte[] input ) throws IOException @@ -602,7 +602,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * The platform's default encoding is used for the byte-to-char conversion. * * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final byte[] input, final int bufferSize ) throws IOException @@ -618,7 +618,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final byte[] input, @Nonnull final String encoding ) throws IOException @@ -633,7 +633,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * IANA * Charset Registry for a list of valid encoding types. * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final byte[] input, @Nonnull final String encoding, final int bufferSize ) @@ -649,7 +649,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp /** * Copy bytes from a byte[] to an OutputStream. - * @throws IOException + * @throws IOException in case of failure. */ public static void copy( @Nonnull final byte[] input, @Nonnull final OutputStream output ) throws IOException @@ -663,7 +663,7 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final OutputStrea * @param input1 the first stream * @param input2 the second stream * @return true if the content of the streams are equal or they both don't exist, false otherwise - * @throws IOException + * @throws IOException in case of failure. */ public static boolean contentEquals( @Nonnull final InputStream input1, @Nonnull final InputStream input2 ) throws IOException From df6023b60f6117554b07d82500546c186deb621e Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 4 Oct 2015 17:42:00 +0000 Subject: [PATCH 015/265] Cleaned up code. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706705 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/utils/cli/shell/BourneShellTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java index 741f81ce..cfca54b4 100644 --- a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java +++ b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java @@ -1,5 +1,7 @@ package org.apache.maven.shared.utils.cli.shell; +import java.util.List; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -22,9 +24,6 @@ import org.apache.maven.shared.utils.StringUtils; import org.apache.maven.shared.utils.cli.Commandline; -import java.util.Arrays; -import java.util.List; - import junit.framework.TestCase; public class BourneShellTest @@ -141,7 +140,7 @@ public void testArgumentsWithsemicolon() commandline.createArg().setValue( "--password" ); commandline.createArg().setValue( ";password" ); lines = commandline.getShell().getShellCommandLine( commandline.getArguments() ); - System.out.println( Arrays.asList( lines ) ); + System.out.println( lines ); assertEquals( "/bin/sh", lines.get( 0) ); assertEquals( "-c", lines.get( 1 ) ); @@ -152,7 +151,7 @@ public void testArgumentsWithsemicolon() commandline.createArg().setValue( "--password" ); commandline.createArg().setValue( ";password" ); lines = commandline.getShell().getShellCommandLine( commandline.getArguments() ); - System.out.println( Arrays.asList( lines ) ); + System.out.println( lines ); assertEquals( "cmd.exe", lines.get( 0 ) ); assertEquals( "/X", lines.get( 1 ) ); From 4b5bd904a847864b34d7621cac5dd59436f81f06 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 4 Oct 2015 17:56:07 +0000 Subject: [PATCH 016/265] [MSHARED-442] Remove shading of artifact instead of using simple jar Removed shading of artifact and commons-io which is defined as optional dependency. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706708 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/pom.xml b/pom.xml index 96896280..c4e4a80a 100644 --- a/pom.xml +++ b/pom.xml @@ -116,37 +116,6 @@ - - org.apache.maven.plugins - maven-shade-plugin - - 2.4.1 - - - package - - shade - - - true - true - - - commons-io:commons-io - - - - - org.apache.commons.io - org.apache.maven.internal.commons.io - - - - - - org.apache.maven.plugins maven-assembly-plugin From 52320274297734601cd18f1eb19486626fac2a40 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 4 Oct 2015 18:30:03 +0000 Subject: [PATCH 017/265] Cleaned up checkstyle reported issues. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706713 13f79535-47bb-0310-9956-ffa450edef68 --- .../utils/cli/WriterStreamConsumer.java | 5 +++ .../utils/cli/javatool/AbstractJavaTool.java | 17 +++++++-- .../utils/cli/javatool/JavaToolException.java | 7 ++++ .../shared/utils/cli/shell/BourneShell.java | 7 ++++ .../shared/utils/cli/shell/CmdShell.java | 4 ++ .../maven/shared/utils/cli/shell/Shell.java | 38 +++++++++++++++++-- 6 files changed, 70 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java b/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java index d8a48531..b95a81f8 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java @@ -32,11 +32,16 @@ public class WriterStreamConsumer private final PrintWriter writer; + /** + * @param writer {@link Writer} + */ public WriterStreamConsumer( Writer writer ) { this.writer = new PrintWriter( writer ); } + /** {@inheritDoc} + */ public void consumeLine( String line ) { writer.println( line ); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java index bdfdf5d6..d26aa0dc 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java @@ -59,20 +59,23 @@ public abstract class AbstractJavaTool */ private Toolchain toolchain; + /** + * @param javaToolName The name of the java tool. + */ protected AbstractJavaTool( String javaToolName ) { this.javaToolName = javaToolName; } /** - * Create the commandline object given the request. + * Create the command line object given the request. * * @param request User request on the java tool - * @param javaToolFile Location of the java tool file to use - * @return the commandline + * @param javaToolFileLocation Location of the java tool file to use + * @return the command line * @throws JavaToolException if could not create the command line from the request */ - protected abstract Commandline createCommandLine( Request request, String javaToolFile ) + protected abstract Commandline createCommandLine( Request request, String javaToolFileLocation ) throws JavaToolException; /** @@ -217,11 +220,17 @@ public void consumeLine( final String line ) return systemOut; } + /** + * @return The JavaToolResult. + */ protected JavaToolResult createResult() { return new JavaToolResult(); } + /** + * @return The location of the java tool executable. + */ protected String findJavaToolExecutable() { String command = javaToolName + ( Os.isFamily( Os.FAMILY_WINDOWS ) ? ".exe" : "" ); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java index 410dd011..6b6946c7 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java @@ -36,11 +36,18 @@ public class JavaToolException { private static final long serialVersionUID = 1L; + /** + * @param message The message of the exception. + */ public JavaToolException( String message ) { super( message ); } + /** + * @param message The message of the exception. + * @param cause The cause of the exception. + */ public JavaToolException( String message, Throwable cause ) { super( message, cause ); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java index 845e4a4d..81167075 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java @@ -34,6 +34,9 @@ public class BourneShell private static final char[] BASH_QUOTING_TRIGGER_CHARS = { ' ', '$', ';', '&', '|', '<', '>', '*', '?', '(', ')', '[', ']', '{', '}', '`' }; + /** + * Create instance of BournShell. + */ public BourneShell() { setShellCommand( "/bin/sh" ); @@ -57,6 +60,7 @@ public String getExecutable() return unifyQuotes( super.getExecutable() ); } + /** {@inheritDoc} */ public List getShellArgsList() { List shellArgs = new ArrayList(); @@ -72,6 +76,7 @@ public List getShellArgsList() return shellArgs; } + /** {@inheritDoc} */ public String[] getShellArgs() { String[] shellArgs = super.getShellArgs(); @@ -93,6 +98,7 @@ public String[] getShellArgs() return shellArgs; } + /** {@inheritDoc} */ protected String getExecutionPreamble() { if ( getWorkingDirectoryAsString() == null ) @@ -110,6 +116,7 @@ protected String getExecutionPreamble() return sb.toString(); } + /** {@inheritDoc} */ protected char[] getQuotingTriggerChars() { return BASH_QUOTING_TRIGGER_CHARS; diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java index aeb1efd6..0bb3d760 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java @@ -78,6 +78,10 @@ public CmdShell() * Always quoting the entire command line, regardless of these conditions * appears to make Windows processes invoke successfully. *

    + * + * @param executable The executable. + * @param arguments The arguments for the executable. + * @return The resulting command line. */ public List getCommandLine( String executable, String... arguments ) { diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java index 70dddd0d..b2dfe9fc 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java @@ -125,6 +125,11 @@ List getCommandLine( String executable, String... arguments ) return getRawCommandLine( executable, arguments ); } + /** + * @param executable Executable. + * @param arguments The arguments for the executable. + * @return The list on command line. + */ List getRawCommandLine( String executable, String... arguments ) { List commandLine = new ArrayList(); @@ -205,11 +210,17 @@ char[] getEscapeChars( boolean includeSingleQuote, boolean includeDoubleQuote ) return result; } + /** + * @return false in all cases. + */ protected boolean isDoubleQuotedArgumentEscaped() { return false; } + /** + * @return {@link #singleQuotedArgumentEscaped} + */ protected boolean isSingleQuotedArgumentEscaped() { return singleQuotedArgumentEscaped; @@ -225,6 +236,9 @@ boolean isSingleQuotedExecutableEscaped() return singleQuotedExecutableEscaped; } + /** + * @param argQuoteDelimiter {@link #argQuoteDelimiter} + */ void setArgumentQuoteDelimiter( char argQuoteDelimiter ) { this.argQuoteDelimiter = argQuoteDelimiter; @@ -235,6 +249,9 @@ char getArgumentQuoteDelimiter() return argQuoteDelimiter; } + /** + * @param exeQuoteDelimiter {@link #exeQuoteDelimiter} + */ void setExecutableQuoteDelimiter( char exeQuoteDelimiter ) { this.exeQuoteDelimiter = exeQuoteDelimiter; @@ -279,6 +296,9 @@ List getShellArgsList() return shellArgs; } + /** + * @param quotedArgumentsEnabled {@link #quotedArgumentsEnabled} + */ public void setQuotedArgumentsEnabled( boolean quotedArgumentsEnabled ) { this.quotedArgumentsEnabled = quotedArgumentsEnabled; @@ -301,6 +321,7 @@ boolean isQuotedExecutableEnabled() /** * Sets the executable to run. + * @param executable The executable. */ public void setExecutable( String executable ) { @@ -311,6 +332,9 @@ public void setExecutable( String executable ) this.executable = executable.replace( '/', File.separatorChar ).replace( '\\', File.separatorChar ); } + /** + * @return The executable. + */ public String getExecutable() { return executable; @@ -318,26 +342,31 @@ public String getExecutable() /** * Sets execution directory. + * @param path The path which should be used as working directory. */ public void setWorkingDirectory( String path ) { if ( path != null ) { - workingDir = path; + this.workingDir = path; } } /** * Sets execution directory. + * @param workingDirectory The working directory. */ - public void setWorkingDirectory( File workingDir ) + public void setWorkingDirectory( File workingDirectory ) { - if ( workingDir != null ) + if ( workingDirectory != null ) { - this.workingDir = workingDir.getAbsolutePath(); + this.workingDir = workingDirectory.getAbsolutePath(); } } + /** + * @return The working directory. + */ public File getWorkingDirectory() { return workingDir == null ? null : new File( workingDir ); @@ -348,6 +377,7 @@ String getWorkingDirectoryAsString() return workingDir; } + /** {@inheritDoc} */ public Object clone() { throw new RuntimeException( "Do we ever clone this?" ); From 522648c20a01646e52053697be81fafaa2996ec5 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 4 Oct 2015 19:37:01 +0000 Subject: [PATCH 018/265] Cleaned up checkstyle issues. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706718 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/shared/utils/Expand.java | 10 +- .../utils/cli/javatool/AbstractJavaTool.java | 16 +++ .../shared/utils/cli/shell/CmdShell.java | 3 + .../shared/utils/cli/shell/CommandShell.java | 3 + .../maven/shared/utils/cli/shell/Shell.java | 30 ++-- .../shared/utils/introspection/ClassMap.java | 5 + .../ReflectionValueExtractor.java | 1 + .../shared/utils/io/DirectoryScanResult.java | 4 + .../utils/io/DirectoryWalkListener.java | 3 + .../apache/maven/shared/utils/io/IOUtil.java | 70 +++++++++- .../maven/shared/utils/io/Java7Support.java | 28 +++- .../maven/shared/utils/io/MatchPattern.java | 21 +++ .../maven/shared/utils/io/MatchPatterns.java | 9 ++ .../maven/shared/utils/io/ScanConductor.java | 4 +- .../maven/shared/utils/io/SelectorUtils.java | 12 ++ .../maven/shared/utils/io/WalkCollector.java | 7 + .../utils/xml/PrettyPrintXMLWriter.java | 17 ++- .../maven/shared/utils/xml/XMLWriter.java | 10 +- .../shared/utils/xml/XmlStreamReader.java | 51 +++++++ .../shared/utils/xml/XmlStreamWriter.java | 7 + .../maven/shared/utils/xml/Xpp3Dom.java | 128 ++++++++++++++++-- .../shared/utils/xml/Xpp3DomBuilder.java | 10 +- 22 files changed, 399 insertions(+), 50 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/Expand.java b/src/main/java/org/apache/maven/shared/utils/Expand.java index b41c2931..cd3fd1e3 100644 --- a/src/main/java/org/apache/maven/shared/utils/Expand.java +++ b/src/main/java/org/apache/maven/shared/utils/Expand.java @@ -105,11 +105,11 @@ public void execute() *

    *

    Note: we kept this protected method for the sake of backward compatibility!

    * - * @param srcFile - * @param dest - * @throws Exception + * @param srcFile The source file. + * @param destination The destination. + * @throws Exception In case of failure. */ - void expandFile( File srcFile, File dest ) + void expandFile( File srcFile, File destination ) throws Exception { if ( source == null ) @@ -117,7 +117,7 @@ void expandFile( File srcFile, File dest ) throw new NullPointerException( "Source Archive must not be null!" ); } - File destDir = dest; + File destDir = destination; if ( destDir == null ) { destDir = new File( System.getProperty( "user.dir" ) ); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java index d26aa0dc..8c1c525a 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java @@ -126,6 +126,9 @@ public JavaToolResult execute( Request request ) return result; } + /** + * @return {@link InputStream} + */ protected InputStream createSystemInputStream() { InputStream systemIn = new InputStream() @@ -143,6 +146,11 @@ public int read() return systemIn; } + /** + * @param cli {@link Commandline} + * @param request {@link Request} + * @return {@link JavaToolRequest} + */ protected JavaToolResult executeCommandLine( Commandline cli, Request request ) { if ( getLogger().isDebugEnabled() ) @@ -174,6 +182,10 @@ protected JavaToolResult executeCommandLine( Commandline cli, Request request ) return result; } + /** + * @param request {@link Request} + * @return {@link StreamConsumer} + */ protected StreamConsumer createSystemErrorStreamConsumer( Request request ) { StreamConsumer systemErr = request.getSystemErrorStreamConsumer(); @@ -196,6 +208,10 @@ public void consumeLine( final String line ) return systemErr; } + /** + * @param request {@link Request} + * @return {@link StreamConsumer} + */ protected StreamConsumer createSystemOutStreamConsumer( Request request ) { StreamConsumer systemOut = request.getSystemOutStreamConsumer(); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java index 0bb3d760..7c27ac19 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java @@ -33,6 +33,9 @@ public class CmdShell extends Shell { + /** + * Create an instance of CmdShell. + */ public CmdShell() { setShellCommand( "cmd.exe" ); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java index a26e7dae..dcee0466 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java @@ -31,6 +31,9 @@ public class CommandShell extends Shell { + /** + * Create an instance. + */ public CommandShell() { setShellCommand( "command.com" ); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java index b2dfe9fc..58096109 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java @@ -116,26 +116,26 @@ String[] getShellArgs() /** * Get the command line for the provided executable and arguments in this shell * - * @param executable executable that the shell has to call - * @param arguments arguments for the executable, not the shell + * @param executableParameter executable that the shell has to call + * @param argumentsParameter arguments for the executable, not the shell * @return List with one String object with executable and arguments quoted as needed */ - List getCommandLine( String executable, String... arguments ) + List getCommandLine( String executableParameter, String... argumentsParameter ) { - return getRawCommandLine( executable, arguments ); + return getRawCommandLine( executableParameter, argumentsParameter ); } /** - * @param executable Executable. - * @param arguments The arguments for the executable. + * @param executableParameter Executable. + * @param argumentsParameter The arguments for the executable. * @return The list on command line. */ - List getRawCommandLine( String executable, String... arguments ) + List getRawCommandLine( String executableParameter, String... argumentsParameter ) { List commandLine = new ArrayList(); StringBuilder sb = new StringBuilder(); - if ( executable != null ) + if ( executableParameter != null ) { String preamble = getExecutionPreamble(); if ( preamble != null ) @@ -156,7 +156,7 @@ List getRawCommandLine( String executable, String... arguments ) sb.append( getExecutable() ); } } - for ( String argument : arguments ) + for ( String argument : argumentsParameter ) { if ( sb.length() > 0 ) { @@ -237,11 +237,11 @@ boolean isSingleQuotedExecutableEscaped() } /** - * @param argQuoteDelimiter {@link #argQuoteDelimiter} + * @param argQuoteDelimiterParameter {@link #argQuoteDelimiter} */ - void setArgumentQuoteDelimiter( char argQuoteDelimiter ) + void setArgumentQuoteDelimiter( char argQuoteDelimiterParameter ) { - this.argQuoteDelimiter = argQuoteDelimiter; + this.argQuoteDelimiter = argQuoteDelimiterParameter; } char getArgumentQuoteDelimiter() @@ -250,11 +250,11 @@ char getArgumentQuoteDelimiter() } /** - * @param exeQuoteDelimiter {@link #exeQuoteDelimiter} + * @param exeQuoteDelimiterParameter {@link #exeQuoteDelimiter} */ - void setExecutableQuoteDelimiter( char exeQuoteDelimiter ) + void setExecutableQuoteDelimiter( char exeQuoteDelimiterParameter ) { - this.exeQuoteDelimiter = exeQuoteDelimiter; + this.exeQuoteDelimiter = exeQuoteDelimiterParameter; } char getExecutableQuoteDelimiter() diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java b/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java index 252da22d..7d0120cf 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java @@ -62,6 +62,7 @@ private static final class CacheMiss /** * Standard constructor + * @param clazz The class. */ public ClassMap( Class clazz ) { @@ -88,6 +89,10 @@ Class getCachedClass() *

    * If nothing is found, then we must actually go * and introspect the method from the MethodMap. + * @param name Method name. + * @param params Method parameters. + * @return The found method. + * @throws MethodMap.AmbiguousException in case of duplicate methods. */ public Method findMethod( String name, Object... params ) throws MethodMap.AmbiguousException diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java index 555c81dd..3cf3a487 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java @@ -181,6 +181,7 @@ public static Object evaluate( @Nonnull String expression, @Nullable Object root * * @param expression not null expression * @param root not null object + * @param trimRootToken trim root token yes/no. * @return the object defined by the expression * @throws IntrospectionException if any */ diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java index 56a29247..42232f3d 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java @@ -30,6 +30,10 @@ public class DirectoryScanResult private final String[] filesRemoved; + /** + * @param filesAdded Added files. + * @param filesRemoved Removed files. + */ public DirectoryScanResult( String[] filesAdded, String[] filesRemoved ) { this.filesAdded = filesAdded; diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java index ba580a04..cf28080b 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java @@ -48,5 +48,8 @@ public interface DirectoryWalkListener */ void directoryWalkFinished(); + /** + * @param message The message for the debugging output. + */ void debug( String message ); } diff --git a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java index b1105a45..ba74ab31 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java +++ b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java @@ -133,7 +133,9 @@ private IOUtil() /** * Copy bytes from an InputStream to an OutputStream. - * @throws IOException + * @param input The input size. + * @param output The resulting output. + * @throws IOException in case of an error. */ public static void copy( @Nonnull final InputStream input, @Nonnull final OutputStream output ) throws IOException @@ -144,8 +146,10 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Output /** * Copy bytes from an InputStream to an OutputStream. * + * @param input The input size. + * @param output The resulting output. * @param bufferSize Size of internal buffer to use. - * @throws IOException + * @throws IOException in case of an error. */ public static void copy( @Nonnull final InputStream input, @Nonnull final OutputStream output, final int bufferSize ) @@ -161,6 +165,8 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Output /** * Copy chars from a Reader to a Writer. + * @param input The input size. + * @param output The resulting output. * @throws IOException in case of failure. */ public static void copy( @Nonnull final Reader input, @Nonnull final Writer output ) @@ -172,6 +178,8 @@ public static void copy( @Nonnull final Reader input, @Nonnull final Writer outp /** * Copy chars from a Reader to a Writer. * + * @param input The input size. + * @param output The resulting output. * @param bufferSize Size of internal buffer to use. * @throws IOException in case of failure. */ @@ -199,6 +207,8 @@ public static void copy( @Nonnull final Reader input, @Nonnull final Writer outp * Copy and convert bytes from an InputStream to chars on a * Writer. * The platform's default encoding is used for the byte-to-char conversion. + * @param input The input size. + * @param output The resulting output. * @throws IOException in case of failure. */ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output ) @@ -212,6 +222,8 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * Writer. * The platform's default encoding is used for the byte-to-char conversion. * + * @param input The input size. + * @param output The resulting output. * @param bufferSize Size of internal buffer to use. * @throws IOException in case of failure. */ @@ -226,6 +238,8 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * Copy and convert bytes from an InputStream to chars on a * Writer, using the specified encoding. * + * @param input The input size. + * @param output The resulting output. * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. @@ -246,6 +260,8 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. + * @param input The input size. + * @param output The resulting output. * @param bufferSize Size of internal buffer to use. * @throws IOException in case of failure. */ @@ -263,6 +279,8 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a String. * The platform's default encoding is used for the byte-to-char conversion. + * @param input The input size. + * @return The resulting string. * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final InputStream input ) @@ -275,7 +293,9 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * Get the contents of an InputStream as a String. * The platform's default encoding is used for the byte-to-char conversion. * + * @param input The input size. * @param bufferSize Size of internal buffer to use. + * @return the resulting string. * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final InputStream input, final int bufferSize ) @@ -289,9 +309,11 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a String. * + * @param input The input size. * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. + * @return the converted string. * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final InputStream input, @Nonnull final String encoding ) @@ -303,10 +325,12 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a String. * + * @param input The input size. * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. * @param bufferSize Size of internal buffer to use. + * @return The converted string. * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final InputStream input, @Nonnull final String encoding, @@ -323,6 +347,8 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a byte[]. + * @param input The input size. + * @return the resulting byte array. * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final InputStream input ) @@ -334,7 +360,9 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a byte[]. * + * @param input The input size. * @param bufferSize Size of internal buffer to use. + * @return the resulting byte array. * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final InputStream input, final int bufferSize ) @@ -356,6 +384,8 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Serialize chars from a Reader to bytes on an OutputStream, and * flush the OutputStream. + * @param input The input size. + * @param output The resulting output. * @throws IOException in case of failure. */ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStream output ) @@ -368,6 +398,8 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea * Serialize chars from a Reader to bytes on an OutputStream, and * flush the OutputStream. * + * @param input The input size. + * @param output The resulting output. * @param bufferSize Size of internal buffer to use. * @throws IOException in case of failure. */ @@ -386,6 +418,8 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a String. + * @param input The input size. + * @return The converted string. * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final Reader input ) @@ -397,7 +431,9 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a String. * + * @param input The input size. * @param bufferSize Size of internal buffer to use. + * @return the resulting byte array. * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final Reader input, final int bufferSize ) @@ -413,6 +449,8 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a byte[]. + * @param input The input size. + * @return the resulting byte array. * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final Reader input ) @@ -424,7 +462,9 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a byte[]. * + * @param input The input size. * @param bufferSize Size of internal buffer to use. + * @return the resulting byte array. * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final Reader input, final int bufferSize ) @@ -446,6 +486,8 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Serialize chars from a String to bytes on an OutputStream, and * flush the OutputStream. + * @param input The input size. + * @param output The resulting output. * @throws IOException in case of failure. */ public static void copy( @Nonnull final String input, @Nonnull final OutputStream output ) @@ -458,6 +500,8 @@ public static void copy( @Nonnull final String input, @Nonnull final OutputStrea * Serialize chars from a String to bytes on an OutputStream, and * flush the OutputStream. * + * @param input The input size. + * @param output The resulting output. * @param bufferSize Size of internal buffer to use. * @throws IOException in case of failure. */ @@ -492,6 +536,8 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp /** * Get the contents of a String as a byte[]. + * @param input The input size. + * @return The resulting byte array. * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final String input ) @@ -503,7 +549,9 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp /** * Get the contents of a String as a byte[]. * + * @param input The input size. * @param bufferSize Size of internal buffer to use. + * @return The resulting byte array. * @throws IOException in case of failure. */ @Nonnull public static byte[] toByteArray( @Nonnull final String input, final int bufferSize ) @@ -526,6 +574,8 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp * Copy and convert bytes from a byte[] to chars on a * Writer. * The platform's default encoding is used for the byte-to-char conversion. + * @param input The input size. + * @param output The resulting output. * @throws IOException in case of failure. */ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output ) @@ -539,6 +589,8 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * Writer. * The platform's default encoding is used for the byte-to-char conversion. * + * @param input The input size. + * @param output The resulting output. * @param bufferSize Size of internal buffer to use. * @throws IOException in case of failure. */ @@ -556,6 +608,8 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. + * @param input The input size. + * @param output The resulting output. * @throws IOException in case of failure. */ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output, final String encoding ) @@ -572,6 +626,8 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. + * @param input The input bytes. + * @param output The output buffer {@link Writer} * @param bufferSize Size of internal buffer to use. * @throws IOException in case of failure. */ @@ -589,6 +645,8 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp /** * Get the contents of a byte[] as a String. * The platform's default encoding is used for the byte-to-char conversion. + * @param input The input bytes. + * @return The resulting string. * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final byte[] input ) @@ -602,6 +660,8 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * The platform's default encoding is used for the byte-to-char conversion. * * @param bufferSize Size of internal buffer to use. + * @param input The input bytes. + * @return The created string. * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final byte[] input, final int bufferSize ) @@ -618,6 +678,8 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * @param encoding The name of a supported character encoding. See the * IANA * Charset Registry for a list of valid encoding types. + * @param input The input bytes. + * @return The resulting string. * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final byte[] input, @Nonnull final String encoding ) @@ -633,6 +695,8 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * IANA * Charset Registry for a list of valid encoding types. * @param bufferSize Size of internal buffer to use. + * @param input Input bytes. + * @return The resulting string. * @throws IOException in case of failure. */ @Nonnull public static String toString( @Nonnull final byte[] input, @Nonnull final String encoding, @@ -649,6 +713,8 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp /** * Copy bytes from a byte[] to an OutputStream. + * @param input Input byte array. + * @param output output stream {@link OutputStream} * @throws IOException in case of failure. */ public static void copy( @Nonnull final byte[] input, @Nonnull final OutputStream output ) diff --git a/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java b/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java index a08ac66d..550de2f4 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java +++ b/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java @@ -87,6 +87,10 @@ public class Java7Support IS_JAVA7 = isJava7x; } + /** + * @param file The file to check for being a symbolic link. + * @return true if the file is a symlink false otherwise. + */ public static boolean isSymLink( @Nonnull File file ) { try @@ -105,6 +109,11 @@ public static boolean isSymLink( @Nonnull File file ) } + /** + * @param symlink The sym link. + * @return The file. + * @throws IOException in case of error. + */ @Nonnull public static File readSymbolicLink( @Nonnull File symlink ) throws IOException { @@ -125,6 +134,11 @@ public static boolean isSymLink( @Nonnull File file ) } + /** + * @param file The file to check. + * @return true if exist false otherwise. + * @throws IOException in case of failure. + */ public static boolean exists( @Nonnull File file ) throws IOException { @@ -145,6 +159,12 @@ public static boolean exists( @Nonnull File file ) } + /** + * @param symlink The link name. + * @param target The target. + * @return The linked file. + * @throws IOException in case of an error. + */ @Nonnull public static File createSymbolicLink( @Nonnull File symlink, @Nonnull File target ) throws IOException { @@ -185,7 +205,7 @@ else if ( targetException instanceof RuntimeException ) /** * Performs a nio delete * @param file the file to delete - * @throws IOException + * @throws IOException in case of error. */ public static void delete( @Nonnull File file ) throws IOException @@ -205,11 +225,17 @@ public static void delete( @Nonnull File file ) } } + /** + * @return true in case of Java 7. + */ public static boolean isJava7() { return IS_JAVA7; } + /** + * @return true in case of Java7 or greater. + */ public static boolean isAtLeastJava7() { return IS_JAVA7; diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java index d5c2c21d..15ad1488 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java +++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java @@ -60,6 +60,11 @@ private MatchPattern( @Nonnull String source, @Nonnull String separator ) } + /** + * @param str The string to match for. + * @param isCaseSensitive case sensitive true false otherwise. + * @return true if matches false otherwise. + */ public boolean matchPath( String str, boolean isCaseSensitive ) { if ( regexPattern != null ) @@ -84,6 +89,11 @@ boolean matchPath( String str, String[] strDirs, boolean isCaseSensitive ) } } + /** + * @param str The string to check. + * @param isCaseSensitive Check case sensitive or not. + * @return true in case of matching pattern. + */ public boolean matchPatternStart( @Nonnull String str, boolean isCaseSensitive ) { if ( regexPattern != null ) @@ -101,12 +111,19 @@ public boolean matchPatternStart( @Nonnull String str, boolean isCaseSensitive ) } } + /** + * @return Tokenized string. + */ public String[] getTokenizedPathString() { return tokenized; } + /** + * @param string The part which will be checked to start with. + * @return true in case of starting with the string false otherwise. + */ public boolean startsWith( String string ) { return source.startsWith( string ); @@ -124,6 +141,10 @@ static String[] tokenizePathToString( @Nonnull String path, @Nonnull String sepa return ret.toArray( new String[ret.size()] ); } + /** + * @param source The source. + * @return The match pattern. + */ public static MatchPattern fromString( String source ) { return new MatchPattern( source, File.separator ); diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java b/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java index 4ebc699c..8e59f48f 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java +++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java @@ -59,6 +59,11 @@ public boolean matches( @Nonnull String name, boolean isCaseSensitive ) return false; } + /** + * @param name The name. + * @param isCaseSensitive being case sensetive. + * @return true if any of the supplied patterns match start. + */ public boolean matchesPatternStart( @Nonnull String name, boolean isCaseSensitive ) { for ( MatchPattern includesPattern : patterns ) @@ -71,6 +76,10 @@ public boolean matchesPatternStart( @Nonnull String name, boolean isCaseSensitiv return false; } + /** + * @param sources The sources + * @return Converted match patterns. + */ public static MatchPatterns from( @Nonnull String... sources ) { final int length = sources.length; diff --git a/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java b/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java index ec3c5c5a..61d74620 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java +++ b/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java @@ -71,7 +71,7 @@ public enum ScanAction * This method will get invoked for every detected directory. * * @param name the directory name (contains parent folders up to the pwd) - * @param directory + * @param directory The directory. * @return the ScanAction to control how to proceed with the scanning */ ScanAction visitDirectory( String name, File directory ); @@ -80,7 +80,7 @@ public enum ScanAction * This method will get invoked for every detected file. * * @param name the file name (contains parent folders up to the pwd) - * @param file + * @param file The file. * @return the ScanAction to control how to proceed with the scanning */ ScanAction visitFile( String name, File file ); diff --git a/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java b/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java index 2480ebcd..396ef6a3 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java @@ -43,12 +43,24 @@ public final class SelectorUtils { + /** + * Pattern handler prefix. + */ private static final String PATTERN_HANDLER_PREFIX = "["; + /** + * Pattern handler suffix. + */ public static final String PATTERN_HANDLER_SUFFIX = "]"; + /** + * Regex start pattern. + */ public static final String REGEX_HANDLER_PREFIX = "%regex" + PATTERN_HANDLER_PREFIX; + /** + * ANT pattern prefix. + */ public static final String ANT_HANDLER_PREFIX = "%ant" + PATTERN_HANDLER_PREFIX; /** diff --git a/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java b/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java index d5d35d33..5d48d4ac 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java +++ b/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java @@ -41,6 +41,9 @@ public class WalkCollector int percentageHigh; + /** + * Create an instance. + */ public WalkCollector() { steps = new ArrayList(); @@ -50,17 +53,20 @@ public WalkCollector() percentageHigh = 0; } + /** {@inheritDoc} */ public void debug( String message ) { // can be used to set some message } + /** {@inheritDoc} */ public void directoryWalkStarting( File basedir ) { startingDir = basedir; startCount++; } + /** {@inheritDoc} */ public void directoryWalkStep( int percentage, File file ) { steps.add( file ); @@ -68,6 +74,7 @@ public void directoryWalkStep( int percentage, File file ) percentageHigh = Math.max( percentageHigh, percentage ); } + /** {@inheritDoc} */ public void directoryWalkFinished() { finishCount++; diff --git a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java index d9ee8838..db729f8a 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java @@ -28,6 +28,10 @@ /** * XMLWriter with nice indentation */ +/** + * @author kama + * + */ public class PrettyPrintXMLWriter implements XMLWriter { @@ -165,6 +169,7 @@ private PrettyPrintXMLWriter( PrintWriter writer, char[] lineIndent, char[] line depth = 0; } + /** {@inheritDoc} */ public void addAttribute( String key, String value ) { if ( !processingElement ) @@ -178,6 +183,7 @@ public void addAttribute( String key, String value ) XMLEncode.xmlEncodeTextAsPCDATA( value, true, '"', writer ); } + /** {@inheritDoc} */ public void setEncoding( String encoding ) { if ( documentStarted ) @@ -188,6 +194,7 @@ public void setEncoding( String encoding ) this.encoding = encoding; } + /** {@inheritDoc} */ public void setDocType( String docType ) { if ( documentStarted ) @@ -198,6 +205,7 @@ public void setDocType( String docType ) this.docType = docType; } + /** {@inheritDoc} */ public void setLineSeparator( String lineSeparator ) { if ( documentStarted ) @@ -208,16 +216,18 @@ public void setLineSeparator( String lineSeparator ) this.lineSeparator = lineSeparator.toCharArray(); } - public void setLineIndenter( String lineIndent ) + /** {@inheritDoc} */ + public void setLineIndenter( String lineIndentParameter ) { if ( documentStarted ) { throw new IllegalStateException( "Document headers already written!" ); } - this.lineIndent = lineIndent.toCharArray(); + this.lineIndent = lineIndentParameter.toCharArray(); } + /** {@inheritDoc} */ public void startElement( String elementName ) { boolean firstLine = ensureDocumentStarted(); @@ -237,6 +247,7 @@ public void startElement( String elementName ) elementStack.add( depth++, elementName ); } + /** {@inheritDoc} */ public void writeText( String text ) { ensureDocumentStarted(); @@ -248,6 +259,7 @@ public void writeText( String text ) endOnSameLine = true; } + /** {@inheritDoc} */ public void writeMarkup( String markup ) { ensureDocumentStarted(); @@ -257,6 +269,7 @@ public void writeMarkup( String markup ) writer.write( markup ); } + /** {@inheritDoc} */ public void endElement() { String chars = elementStack.get( --depth ); diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java index 48b03bb0..a352c9c7 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java @@ -47,7 +47,7 @@ public interface XMLWriter /** * Start an XML Element tag. - * @param name + * @param name The name of the tag. */ void startElement( String name ); @@ -55,8 +55,8 @@ public interface XMLWriter /** * Add a XML attribute to the current XML Element. * This method must get called immediately after {@link #startElement(String)} - * @param key - * @param value + * @param key The key of the attribute. + * @param value The value of the attribute. * @throws IllegalStateException if no element tag is currently in process */ void addAttribute( String key, String value ); @@ -64,14 +64,14 @@ public interface XMLWriter /** * Add a value text to the current element tag * This will perform XML escaping to guarantee valid content - * @param text + * @param text The text which should be written. * @throws IllegalStateException if no element tag got started yet */ void writeText( String text ); /** * Add a preformatted markup to the current element tag - * @param text + * @param text The text which should be written. * @throws IllegalStateException if no element tag got started yet */ void writeMarkup( String text ); diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java index a05f17b4..74e333c1 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java @@ -38,52 +38,93 @@ public class XmlStreamReader private static String staticDefaultEncoding = null; + /** + * @param encoding define the default encoding. + */ public static void setDefaultEncoding( String encoding ) { staticDefaultEncoding = encoding; } + /** + * @return the default encoding. + */ public static String getDefaultEncoding() { return staticDefaultEncoding; } + /** + * @param file The file to create it from. + * @throws IOException in case of an error. + */ public XmlStreamReader( File file ) throws IOException { this( new FileInputStream( file ) ); } + /** + * @param is {@link InputStream} + * @throws IOException in case of an error. + */ public XmlStreamReader( InputStream is ) throws IOException { this( is, true ); } + /** + * @param is {@link InputStream} + * @param lenient yes/no + * @throws IOException in case of an error. + * @throws XmlStreamReaderException in case of an error. + */ public XmlStreamReader( InputStream is, boolean lenient ) throws IOException, XmlStreamReaderException { reader = new org.apache.commons.io.input.XmlStreamReader( is, lenient, staticDefaultEncoding ); } + /** + * @param url {@link URL} + * @throws IOException in case of error. + */ public XmlStreamReader( URL url ) throws IOException { this( url.openConnection() ); } + /** + * @param conn The URL connection {@link URLConnection}. + * @throws IOException in case of error. + */ public XmlStreamReader( URLConnection conn ) throws IOException { reader = new org.apache.commons.io.input.XmlStreamReader( conn, staticDefaultEncoding ); } + /** + * @param is {@link InputStream} + * @param httpContentType content type. + * @throws IOException in case of error. + */ public XmlStreamReader( InputStream is, String httpContentType ) throws IOException { this( is, httpContentType, true ); } + /** + * @param is {@link InputStream} + * @param httpContentType content type. + * @param lenient yes/no. + * @param defaultEncoding The default encoding. + * @throws IOException in case of error. + * @throws XmlStreamReaderException in case of error. + */ public XmlStreamReader( InputStream is, String httpContentType, boolean lenient, String defaultEncoding ) throws IOException, XmlStreamReaderException { @@ -93,23 +134,33 @@ public XmlStreamReader( InputStream is, String httpContentType, boolean lenient, : defaultEncoding ); } + /** + * @param is {@link InputStream} + * @param httpContentType content type. + * @param lenient yes/no. + * @throws IOException in case of error. + * @throws XmlStreamReaderException in case of error. + */ public XmlStreamReader( InputStream is, String httpContentType, boolean lenient ) throws IOException, XmlStreamReaderException { this( is, httpContentType, lenient, null ); } + /** {@inheritDoc} */ public String getEncoding() { return reader.getEncoding(); } + /** {@inheritDoc} */ public int read( char[] buf, int offset, int len ) throws IOException { return reader.read( buf, offset, len ); } + /** {@inheritDoc} */ public void close() throws IOException { diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamWriter.java index cc5f512e..2923faf5 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamWriter.java @@ -30,11 +30,18 @@ public class XmlStreamWriter extends org.apache.commons.io.output.XmlStreamWriter { + /** + * @param out {@link OutputStream} + */ public XmlStreamWriter( OutputStream out ) { super( out ); } + /** + * @param file The file to use. + * @throws FileNotFoundException in case of not found file. + */ public XmlStreamWriter( File file ) throws FileNotFoundException { diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java index 5cb63233..94d11c6e 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java @@ -51,19 +51,34 @@ public class Xpp3Dom private Xpp3Dom parent; // plexus: protected + /** + * The attribute which identifies merge/append. + */ public static final String CHILDREN_COMBINATION_MODE_ATTRIBUTE = "combine.children"; private static final String CHILDREN_COMBINATION_MERGE = "merge"; + /** + * The attribute append. + */ public static final String CHILDREN_COMBINATION_APPEND = "append"; @SuppressWarnings( "UnusedDeclaration" ) private static final String DEFAULT_CHILDREN_COMBINATION_MODE = CHILDREN_COMBINATION_MERGE; // plexus: public + /** + * The name of the attribute. + */ public static final String SELF_COMBINATION_MODE_ATTRIBUTE = "combine.self"; + /** + * The attributes which identifies override. + */ public static final String SELF_COMBINATION_OVERRIDE = "override"; // plexus: public + /** + * The attribute which identifies merge + */ public static final String SELF_COMBINATION_MERGE = "merge"; @SuppressWarnings( "UnusedDeclaration" ) @@ -72,6 +87,9 @@ public class Xpp3Dom private static final String[] EMPTY_STRING_ARRAY = new String[0]; private static final Xpp3Dom[] EMPTY_DOM_ARRAY = new Xpp3Dom[0]; + /** + * @param name The name of the instance. + */ public Xpp3Dom( String name ) { this.name = name; @@ -79,11 +97,20 @@ public Xpp3Dom( String name ) childMap = new HashMap(); } + /** + * Create instance. + * @param source The source. + */ public Xpp3Dom( Xpp3Dom source ) { this( source, source.getName() ); } + /** + * Create instance. + * @param src The source Dom. + * @param name The name of the Dom. + */ public Xpp3Dom( @Nonnull Xpp3Dom src, String name ) { this.name = name; @@ -105,22 +132,34 @@ public Xpp3Dom( @Nonnull Xpp3Dom src, String name ) } } + /** + * @return The current name. + */ public String getName() { return name; } + /** + * @return The current value. + */ @Nonnull public String getValue() { return value; } + /** + * @param value The value to be set. + */ public void setValue( @Nonnull String value ) { this.value = value; } + /** + * @return The array of attribute names. + */ public String[] getAttributeNames() { boolean isNothing = attributes == null || attributes.isEmpty(); @@ -128,19 +167,26 @@ public String[] getAttributeNames() } - public String getAttribute( String name ) + /** + * @param nameParameter The name of the attribute. + * @return The attribute value. + */ + public String getAttribute( String nameParameter ) { - return attributes != null ? attributes.get( name ) : null; + return this.attributes != null ? this.attributes.get( nameParameter ) : null; } - @SuppressWarnings( "ConstantConditions" ) - public void setAttribute( @Nonnull String name, @Nonnull String value ) + /** + * @param nameParameter The name of the attribute. + * @param valueParameter The value of the attribute. + */ + public void setAttribute( @Nonnull String nameParameter, @Nonnull String valueParameter ) { - if ( value == null ) + if ( valueParameter == null ) { throw new NullPointerException( "value can not be null" ); } - if ( name == null ) + if ( nameParameter == null ) { throw new NullPointerException( "name can not be null" ); } @@ -149,19 +195,30 @@ public void setAttribute( @Nonnull String name, @Nonnull String value ) attributes = new HashMap(); } - attributes.put( name, value ); + attributes.put( nameParameter, valueParameter ); } + /** + * @param i The index to be selected. + * @return The child selected by index. + */ public Xpp3Dom getChild( int i ) { return childList.get( i ); } - public Xpp3Dom getChild( String name ) + /** + * @param nameParameter The name of the child. + * @return The child selected by name. + */ + public Xpp3Dom getChild( String nameParameter ) { - return childMap.get( name ); + return childMap.get( nameParameter ); } + /** + * @param child The child to be added. + */ public void addChild( Xpp3Dom child ) { child.setParent( this ); @@ -169,6 +226,9 @@ public void addChild( Xpp3Dom child ) childMap.put( child.getName(), child ); } + /** + * @return The array of childs. + */ public Xpp3Dom[] getChildren() { boolean isNothing = childList == null || childList.isEmpty(); @@ -181,13 +241,17 @@ private List getChildrenList() return isNothing ? Collections.emptyList() : childList; } - public Xpp3Dom[] getChildren( String name ) + /** + * @param nameParameter The name of the child. + * @return The array of the Dom. + */ + public Xpp3Dom[] getChildren( String nameParameter ) { - List children = getChildrenList( name ); + List children = getChildrenList( nameParameter ); return children.toArray( new Xpp3Dom[children.size()] ); } - List getChildrenList( String name ) + List getChildrenList( String nameParameter ) { if ( childList == null ) { @@ -198,7 +262,7 @@ List getChildrenList( String name ) ArrayList children = new ArrayList(); for ( Xpp3Dom aChildList : childList ) { - if ( name.equals( aChildList.getName() ) ) + if ( nameParameter.equals( aChildList.getName() ) ) { children.add( aChildList ); } @@ -207,6 +271,9 @@ List getChildrenList( String name ) } } + /** + * @return The number of childs. + */ public int getChildCount() { if ( childList == null ) @@ -217,6 +284,9 @@ public int getChildCount() return childList.size(); } + /** + * @param i The child to be removed. + */ public void removeChild( int i ) { Xpp3Dom child = childList.remove( i ); @@ -224,11 +294,17 @@ public void removeChild( int i ) child.setParent( null ); } + /** + * @return The current parent. + */ public Xpp3Dom getParent() { return parent; } + /** + * @param parent Set the parent. + */ public void setParent( Xpp3Dom parent ) { this.parent = parent; @@ -243,16 +319,28 @@ private static Xpp3Dom merge( Xpp3Dom dominant, Xpp3Dom recessive, Boolean child return Xpp3DomUtils.merge( dominant, recessive, childMergeOverride ); } + /** + * @param dominant The dominant part. + * @param recessive The recessive part. + * @param childMergeOverride true if child merge will take precedence false otherwise. + * @return The merged Xpp3Dom. + */ public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMergeOverride ) { return Xpp3DomUtils.mergeXpp3Dom( dominant, recessive, childMergeOverride ); } + /** + * @param dominant The dominant part. + * @param recessive The recessive part. + * @return The merged Xpp3Dom. + */ public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive ) { return Xpp3DomUtils.mergeXpp3Dom( dominant, recessive ); } + /** {@inheritDoc} */ public boolean equals( Object obj ) { if ( obj == this ) @@ -273,6 +361,7 @@ public boolean equals( Object obj ) && !( childList == null ? dom.childList != null : !childList.equals( dom.childList ) ); } + /** {@inheritDoc} */ public int hashCode() { int result = 17; @@ -283,6 +372,7 @@ public int hashCode() return result; } + /** {@inheritDoc} */ public String toString() { StringWriter writer = new StringWriter(); @@ -291,6 +381,9 @@ public String toString() } + /** + * @return Unescaped string. + */ public String toUnescapedString() { StringWriter writer = new StringWriter(); @@ -303,16 +396,25 @@ private PrettyPrintXMLWriter getPrettyPrintXMLWriter( StringWriter writer ) return new PrettyPrintXMLWriter( writer, "UTF-8", null ); } + /** + * @param str The string to be checked. + * @return true if the string is not empty (length > 0) and not null. + */ public static boolean isNotEmpty( String str ) { return str != null && str.length() > 0; } + /** + * @param str The string to be checked. + * @return true if the string is empty or null. + */ public static boolean isEmpty( String str ) { return str == null || str.trim().length() == 0; } + /** {@inheritDoc} */ public Iterator iterator() { return getChildrenList().iterator(); diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java index 212b6c4c..c3cc6bab 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java @@ -49,7 +49,7 @@ public class Xpp3DomBuilder /** * @param reader {@link Reader} * @return the built dom. - * @throws XmlPullParserException + * @throws XmlPullParserException in case of an error. */ public static Xpp3Dom build( @WillClose @Nonnull Reader reader ) throws XmlPullParserException @@ -59,9 +59,9 @@ public static Xpp3Dom build( @WillClose @Nonnull Reader reader ) /** * @param is {@link InputStream} - * @param encoding + * @param encoding The encoding. * @return the built dom. - * @throws XmlPullParserException + * @throws XmlPullParserException in case of an error. */ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding ) throws XmlPullParserException @@ -74,7 +74,7 @@ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding * @param encoding The encoding. * @param trim true/false. * @return the built dom. - * @throws XmlPullParserException + * @throws XmlPullParserException in case of an error. */ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding, boolean trim ) throws XmlPullParserException @@ -94,7 +94,7 @@ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding * @param reader {@link Reader} * @param trim true/false. * @return the built dom. - * @throws XmlPullParserException + * @throws XmlPullParserException in case of an error. */ public static Xpp3Dom build( @WillClose Reader reader, boolean trim ) throws XmlPullParserException From f00f62b07d50c64e560a5efbb1b8bc5cc180aede Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 4 Oct 2015 19:44:43 +0000 Subject: [PATCH 019/265] [MSHARED-442] followup removed dependency-reduced-pom.xml from rat-plugin configuration. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706721 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index c4e4a80a..79f16a7c 100644 --- a/pom.xml +++ b/pom.xml @@ -143,8 +143,6 @@ src/test/resources/directorywalker/**/* src/test/resources/symlinks/**/* - - dependency-reduced-pom.xml From eba9b558548e2f3c2b87a3230a262f1fa745d91d Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 4 Oct 2015 20:32:01 +0000 Subject: [PATCH 020/265] Cleaned up warnings etc. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1706723 13f79535-47bb-0310-9956-ffa450edef68 --- .../utils/cli/javatool/AbstractJavaTool.java | 6 +- .../utils/xml/PrettyPrintXMLWriter.java | 8 ++- .../shared/utils/xml/XmlStreamReader.java | 4 +- .../apache/maven/shared/utils/ExpandTest.java | 2 +- .../utils/reflection/ReflectorTest.java | 66 ++++++++++++++----- 5 files changed, 61 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java index 8c1c525a..ab92bdf0 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java @@ -148,7 +148,7 @@ public int read() /** * @param cli {@link Commandline} - * @param request {@link Request} + * @param request The request. * @return {@link JavaToolRequest} */ protected JavaToolResult executeCommandLine( Commandline cli, Request request ) @@ -183,7 +183,7 @@ protected JavaToolResult executeCommandLine( Commandline cli, Request request ) } /** - * @param request {@link Request} + * @param request The request. * @return {@link StreamConsumer} */ protected StreamConsumer createSystemErrorStreamConsumer( Request request ) @@ -209,7 +209,7 @@ public void consumeLine( final String line ) } /** - * @param request {@link Request} + * @param request The request. * @return {@link StreamConsumer} */ protected StreamConsumer createSystemOutStreamConsumer( Request request ) diff --git a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java index db729f8a..4bbe4e9b 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java @@ -205,7 +205,9 @@ public void setDocType( String docType ) this.docType = docType; } - /** {@inheritDoc} */ + /** + * @param lineSeparator The line separator to be used. + */ public void setLineSeparator( String lineSeparator ) { if ( documentStarted ) @@ -216,7 +218,9 @@ public void setLineSeparator( String lineSeparator ) this.lineSeparator = lineSeparator.toCharArray(); } - /** {@inheritDoc} */ + /** + * @param lineIndentParameter The line indent parameter. + */ public void setLineIndenter( String lineIndentParameter ) { if ( documentStarted ) diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java index 74e333c1..11a57774 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java @@ -147,7 +147,9 @@ public XmlStreamReader( InputStream is, String httpContentType, boolean lenient this( is, httpContentType, lenient, null ); } - /** {@inheritDoc} */ + /** + * @return The current encoding. + */ public String getEncoding() { return reader.getEncoding(); diff --git a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java index b93f7cde..6718c830 100644 --- a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java +++ b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java @@ -70,7 +70,7 @@ private File getSourceFile() * Create a clean target directory for unzipping. * If it did exist, then clean it first. * - * @return + * @return The target folder. */ private File getTestTargetDir() throws Exception diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java index ef99a039..a3cceb2f 100644 --- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java +++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java @@ -43,7 +43,7 @@ public class ReflectorTest public void newInstanceNullNull() throws Exception { - reflector.newInstance( null, null ); + reflector.newInstance( (Class)null, (Object)null ); } @Test @@ -149,14 +149,14 @@ public void newInstancePublicConstructorThrowsSomething() public void getSingletonNullNull() throws Exception { - reflector.getSingleton( null, null ); + reflector.getSingleton( (Class)null, (Object)null ); } @Test( expected = NullPointerException.class ) public void getSingletonClassNull() throws Exception { - assertThat( reflector.getSingleton( Object.class, null ), is( Object.class ) ); + assertThat( reflector.getSingleton( (Class)Object.class, (Object)null ), is( Object.class ) ); } @Test( expected = NullPointerException.class ) @@ -188,7 +188,7 @@ public void getSingletonPrivateMethod() } @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) + // @ReproducesPlexusBug( "Looking up methods by signature has an unlabeled continue, so finds the wrong method" ) public void getSingletonPackageMethod() throws Exception { @@ -196,7 +196,7 @@ public void getSingletonPackageMethod() } @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) + // @ReproducesPlexusBug( "Looking up methods by signature has an unlabeled continue, so finds the wrong method" ) public void getSingletonPackageMethodThrowsSomething() throws Exception { @@ -204,7 +204,7 @@ public void getSingletonPackageMethodThrowsSomething() } @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) + // @ReproducesPlexusBug( "Looking up methods by signature has an unlabeled continue, so finds the wrong method" ) public void getSingletonProtectedMethod() throws Exception { @@ -212,7 +212,7 @@ public void getSingletonProtectedMethod() } @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) + // @ReproducesPlexusBug( "Looking up methods by signature has an unlabeled continue, so finds the wrong method" ) public void getSingletonProtectedMethodThrowsSomething() throws Exception { @@ -263,7 +263,7 @@ public void getSingletonNonStaticMethod() public void invokeNullNullNull() throws Exception { - reflector.invoke( null, null, null ); + reflector.invoke( (Object)null, (String)null, (Object)null ); } @Test( expected = NullPointerException.class ) @@ -277,7 +277,7 @@ public void invokeNullNullEmpty() public void invokeNullEmptyNull() throws Exception { - reflector.invoke( null, "", null ); + reflector.invoke( (Object)null, "", (Object)null ); } @Test( expected = NullPointerException.class ) @@ -291,7 +291,7 @@ public void invokeNullEmptyEmpty() public void invokeObjectNullNull() throws Exception { - reflector.invoke( new Object(), null, null ); + reflector.invoke( new Object(), (String)null, (Object)null ); } @Test( expected = NullPointerException.class ) @@ -345,6 +345,7 @@ public void invokePrivateMethod() { class CoT { + @SuppressWarnings( "unused" ) private Object doSomething() { return "Done"; @@ -359,6 +360,7 @@ public void invokePackageMethod() { class CoT { + @SuppressWarnings( "unused" ) Object doSomething() { return "Done"; @@ -373,6 +375,7 @@ public void invokeProtectedMethod() { class CoT { + @SuppressWarnings( "unused" ) protected Object doSomething() { return "Done"; @@ -387,6 +390,7 @@ public void invokePublicMethod() { class CoT { + @SuppressWarnings( "unused" ) public Object doSomething() { return "Done"; @@ -531,6 +535,7 @@ public void getFieldCoTValuePrivateField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) private String value = expected; } try @@ -551,6 +556,7 @@ public void getFieldCoTValuePackageField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) String value = expected; } assertThat( reflector.getField( new CoT(), "value" ), is( (Object) expected ) ); @@ -563,6 +569,7 @@ public void getFieldCoTValueProtectedField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) protected String value = expected; } assertThat( reflector.getField( new CoT(), "value" ), is( (Object) expected ) ); @@ -575,6 +582,7 @@ public void getFieldCoTValuePublicField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) public String value = expected; } assertThat( reflector.getField( new CoT(), "value" ), is( (Object) expected ) ); @@ -625,6 +633,7 @@ public void getFieldCoTValueFalsePrivateField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) private String value = expected; } try @@ -645,6 +654,7 @@ public void getFieldCoTValueFalsePackageField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) String value = expected; } assertThat( reflector.getField( new CoT(), "value", false ), is( (Object) expected ) ); @@ -657,6 +667,7 @@ public void getFieldCoTValueFalseProtectedField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) protected String value = expected; } assertThat( reflector.getField( new CoT(), "value", false ), is( (Object) expected ) ); @@ -669,6 +680,7 @@ public void getFieldCoTValueFalsePublicField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) public String value = expected; } assertThat( reflector.getField( new CoT(), "value", false ), is( (Object) expected ) ); @@ -717,6 +729,7 @@ public void getFieldCoTValueTruePrivateField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) private String value = expected; } assertThat( reflector.getField( new CoT(), "value", true ), is( (Object) expected ) ); @@ -729,6 +742,7 @@ public void getFieldCoTValueTruePackageField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) String value = expected; } assertThat( reflector.getField( new CoT(), "value", true ), is( (Object) expected ) ); @@ -741,6 +755,7 @@ public void getFieldCoTValueTrueProtectedField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) protected String value = expected; } assertThat( reflector.getField( new CoT(), "value", true ), is( (Object) expected ) ); @@ -753,6 +768,7 @@ public void getFieldCoTValueTruePublicField() final String expected = "gotIt"; class CoT { + @SuppressWarnings( "unused" ) public String value = expected; } assertThat( reflector.getField( new CoT(), "value", true ), is( (Object) expected ) ); @@ -764,14 +780,14 @@ class CoT public void invokeStaticNullNullNull() throws Exception { - reflector.invokeStatic( null, null, null ); + reflector.invokeStatic( (Class)null, (String)null, (Object)null ); } @Test( expected = NullPointerException.class ) public void invokeStaticClassNullNull() throws Exception { - assertThat( reflector.invokeStatic( Object.class, null, null ), is( Object.class ) ); + assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), is( Object.class ) ); } @Test( expected = NullPointerException.class ) @@ -792,7 +808,7 @@ public void invokeStaticClassNullEmptyArray() public void invokeStaticNullEmptyNull() throws Exception { - reflector.invokeStatic( null, "", null ); + reflector.invokeStatic( (Class)null, "", (Object)null ); } @Test( expected = ReflectorException.class ) @@ -908,7 +924,7 @@ public void invokeStaticNonStaticMethod() public void getConstructorNullNull() throws Exception { - reflector.getConstructor( null, null ); + reflector.getConstructor( (Class)null, (Class)null ); } @Test( expected = NullPointerException.class ) @@ -918,14 +934,16 @@ public void getConstructorNullEmpty() reflector.getConstructor( null, new Class[0] ); } + @SuppressWarnings( "rawtypes" ) @Test( expected = NullPointerException.class ) public void getConstructorObjectNull() throws Exception { - assertThat( reflector.getConstructor( Object.class, null ), + assertThat( reflector.getConstructor( Object.class, (Class)null ), is( (Constructor) Object.class.getDeclaredConstructor() ) ); } + @SuppressWarnings( "rawtypes" ) @Test public void getConstructorObjectEmpty() throws Exception @@ -934,6 +952,7 @@ public void getConstructorObjectEmpty() is( (Constructor) Object.class.getDeclaredConstructor() ) ); } + @SuppressWarnings( "rawtypes" ) @Test( expected = ReflectorException.class ) // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) public void getConstructorPrivate() @@ -943,6 +962,7 @@ public void getConstructorPrivate() is( (Constructor) ReflectorTestHelper.class.getDeclaredConstructor() ) ); } + @SuppressWarnings( "rawtypes" ) @Test public void getConstructorPackage() throws Exception @@ -951,6 +971,7 @@ public void getConstructorPackage() not( is( (Constructor) ReflectorTestHelper.class.getDeclaredConstructor( Boolean.class ) ) ) ); } + @SuppressWarnings( "rawtypes" ) @Test public void getConstructorProtected() throws Exception @@ -959,6 +980,7 @@ public void getConstructorProtected() not( is( (Constructor) ReflectorTestHelper.class.getDeclaredConstructor( Integer.class ) ) ) ); } + @SuppressWarnings( "rawtypes" ) @Test public void getConstructorPublic() throws Exception @@ -1004,6 +1026,7 @@ public void getObjectPropertyViaPrivateField() { class CoT { + @SuppressWarnings( "unused" ) private int value = 42; } assertThat( reflector.getObjectProperty( new CoT(), "value" ), is( (Object) 42 ) ); @@ -1016,6 +1039,7 @@ public void getObjectPropertyViaPackageField() { class CoT { + @SuppressWarnings( "unused" ) int value = 42; } assertThat( reflector.getObjectProperty( new CoT(), "value" ), is( (Object) 42 ) ); @@ -1028,6 +1052,7 @@ public void getObjectPropertyViaProtectedField() { class CoT { + @SuppressWarnings( "unused" ) protected int value = 42; } assertThat( reflector.getObjectProperty( new CoT(), "value" ), is( (Object) 42 ) ); @@ -1039,6 +1064,7 @@ public void getObjectPropertyViaPublicField() { class CoT { + @SuppressWarnings( "unused" ) public int value = 42; } assertThat( reflector.getObjectProperty( new CoT(), "value" ), is( (Object) 42 ) ); @@ -1052,6 +1078,7 @@ class CoT { private final int _value = 42; + @SuppressWarnings( "unused" ) private int getValue() { return _value; @@ -1068,6 +1095,7 @@ class CoT { private final int _value = 42; + @SuppressWarnings( "unused" ) int getValue() { return _value; @@ -1084,6 +1112,7 @@ class CoT { private final int _value = 42; + @SuppressWarnings( "unused" ) protected int getValue() { return _value; @@ -1100,6 +1129,7 @@ class CoT { private final int _value = 42; + @SuppressWarnings( "unused" ) public int getValue() { return _value; @@ -1114,7 +1144,7 @@ public int getValue() public void getMethodNullNullNull() throws Exception { - reflector.getMethod( null, null, null ); + reflector.getMethod( (Class)null, (String)null, (Class)null ); } @Test( expected = NullPointerException.class ) @@ -1142,7 +1172,7 @@ public void getMethodObjectNullEmpty() public void getMethodNullEmptyNull() throws Exception { - reflector.getMethod( null, "", null ); + reflector.getMethod( (Class)null, "", (Class)null ); } @Test( expected = NullPointerException.class ) @@ -1156,7 +1186,7 @@ public void getMethodNullEmptyEmpty() public void getMethodObjectEmptyNull() throws Exception { - reflector.getMethod( Object.class, "", null ); + reflector.getMethod( Object.class, "", (Class)null ); } @Test( expected = ReflectorException.class ) From dd74e0d6c2ee5536e05755ebe14de41605f1c3c1 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 8 Oct 2015 09:15:51 +0000 Subject: [PATCH 021/265] [MSHARED-443] Use fluido skin for site. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1707456 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/site/site.xml b/src/site/site.xml index 563b34ca..1dd5b72a 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -20,6 +20,32 @@ under the License. --> + + + http://maven.apache.org/images/apache-maven-project.png + http://www.apache.org/ + + + + http://maven.apache.org/images/maven-logo-black-on-white.png + http://maven.apache.org/ + + + org.apache.maven.skins + maven-fluido-skin + 1.4 + + + + + true + + + + + + +

    From 8f877f96287ae929e477be32324d75870ac546e0 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 8 Oct 2015 09:24:34 +0000 Subject: [PATCH 022/265] [maven-release-plugin] prepare release maven-shared-utils-3.0.0 git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1707459 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 79f16a7c..c2585081 100644 --- a/pom.xml +++ b/pom.xml @@ -17,11 +17,7 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 @@ -32,7 +28,7 @@ maven-shared-utils - 3.0.0-SNAPSHOT + 3.0.0 Apache Maven Shared Utils Shared utils without any further dependencies @@ -42,10 +38,10 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.0.0 + scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.0.0 - http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils + http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-3.0.0 jira From d61b49d5120da8af216c34d1a6de035ac8e71bf2 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 8 Oct 2015 09:24:52 +0000 Subject: [PATCH 023/265] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1707461 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c2585081..08b74bbe 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 3.0.0 + 3.0.1-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies @@ -38,10 +38,10 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.0.0 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.0.0 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-3.0.0 + http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils jira From 9cc6364d88b1bfa1c67948efe43d208db303c2e4 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 11 Oct 2015 19:54:00 +0000 Subject: [PATCH 024/265] [MSHARED-444] Make the optional dependency (commons-io) to a usual dependency git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1708015 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08b74bbe..35fb01ce 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,6 @@ commons-io commons-io 2.4 - true org.apache.commons From f53a9fc047bfd903501d1c4649ce534a05a9cc4c Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 11 Oct 2015 19:55:22 +0000 Subject: [PATCH 025/265] Respin Release 3.0.0 based on CANCELLED VOTE git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1708016 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35fb01ce..aa3a0c90 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 3.0.1-SNAPSHOT + 3.0.0-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies From fac2bd6b05a1680a6f6f5f4754fd81cd4dd0123f Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 11 Oct 2015 19:59:16 +0000 Subject: [PATCH 026/265] [maven-release-plugin] prepare release maven-shared-utils-3.0.0 git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1708017 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index aa3a0c90..d7dd6f16 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 3.0.0-SNAPSHOT + 3.0.0 Apache Maven Shared Utils Shared utils without any further dependencies @@ -38,10 +38,10 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.0.0 + scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.0.0 - http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils + http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-3.0.0 jira From 4628a02f06bc9553c37319f73c292bb5b778a9aa Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 11 Oct 2015 19:59:41 +0000 Subject: [PATCH 027/265] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1708019 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d7dd6f16..35fb01ce 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 3.0.0 + 3.0.1-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies @@ -38,10 +38,10 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.0.0 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.0.0 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-3.0.0 + http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils jira From 6fc936508b918d10a65de35c28d712ac97b1d940 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Tue, 17 Nov 2015 21:02:09 +0000 Subject: [PATCH 028/265] [MPOM-95] updated parent pom location git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714889 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35fb01ce..7caa36ae 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.shared maven-shared-components 21 - ../maven-shared-components/pom.xml + ../../pom/maven/maven-shared-components/pom.xml maven-shared-utils From 5b649998df251e5fed0720eab026355fff2c104b Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 27 Mar 2016 22:50:01 +0000 Subject: [PATCH 029/265] [MSHARED-503] Upgrade maven-shared-components parent to version 22 git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1736823 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7caa36ae..6605c7c1 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components - 21 + 22 ../../pom/maven/maven-shared-components/pom.xml From 60456ca13cf4cccafb418a2b3fcee331ad8a3f76 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 3 Apr 2016 11:34:45 +0000 Subject: [PATCH 030/265] [MSHARED-504] Remove System.gc() call git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1737573 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java index 5f12cff3..a3e61644 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java @@ -1227,7 +1227,6 @@ private static boolean deleteFile( @Nonnull File file ) if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) { file = file.getCanonicalFile(); - System.gc(); } try From ee5f50b5cf23671fedc4cfacfc83f8aea3fcd10e Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 15 May 2016 09:15:59 +0000 Subject: [PATCH 031/265] updated Jira url git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1743896 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/site.xml b/src/site/site.xml index 1dd5b72a..ffe11195 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -52,7 +52,7 @@ under the License. - + From 2978985eb8b8f53acbc547c5817a43ff52653558 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sat, 28 May 2016 20:17:19 +0000 Subject: [PATCH 032/265] [MSHARED-534] Upgrade com.google.code.findbugs:jsr305 to 3.0.0 git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1745930 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6605c7c1..50f432a5 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ com.google.code.findbugs jsr305 - 2.0.1 + 3.0.0 - 2.15 -     org.codehaus.mojo findbugs-maven-plugin @@ -137,21 +129,4 @@     - - - reporting - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - 2.15 - - - - -     From 4a8b8d111cbf6339a61a40b8ce35fc88dfa00083 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sat, 28 May 2016 21:14:00 +0000 Subject: [PATCH 038/265] Fixed issue in index.apt.vm file. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1745942 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/apt/index.apt.vm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index 76069f42..38e007cc 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -54,3 +54,5 @@ Relation to Commons-* This is the reason why any public API in maven-shared-utils must avoid to expose commons-io classes directly. Most times it's sufficient to just create an empty subclass and expose that instead. + + [] From 883c2516689f277700d684d3116d7c4539b03ad3 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sat, 28 May 2016 21:22:12 +0000 Subject: [PATCH 039/265] [MSHARED-534] Upgrade com.google.code.findbugs:jsr305 to 3.0.0 o Followup add scope provided. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1745945 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 61f3855c..3d622cf5 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,7 @@ com.google.code.findbugs jsr305 3.0.0 + provided org.apache.maven maven-core ${mavenVersion} + test + + + org.codehaus.plexus + plexus-container-default + 1.0-alpha-9-stable-1 provided diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java index ab92bdf0..09b33f0b 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java @@ -25,11 +25,12 @@ import org.apache.maven.shared.utils.cli.CommandLineUtils; import org.apache.maven.shared.utils.cli.Commandline; import org.apache.maven.shared.utils.cli.StreamConsumer; -import org.apache.maven.toolchain.Toolchain; import org.codehaus.plexus.logging.AbstractLogEnabled; import java.io.File; import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.Map; /** @@ -57,7 +58,7 @@ public abstract class AbstractJavaTool /** * Optional toolChain used to find java tool executable file. */ - private Toolchain toolchain; + private Object toolchain; /** * @param javaToolName The name of the java tool. @@ -89,7 +90,7 @@ public String getJavaToolName() /** * {@inheritDoc} */ - public void setToolchain( Toolchain toolchain ) + public void setToolchain( Object toolchain ) { this.toolchain = toolchain; } @@ -249,15 +250,15 @@ protected JavaToolResult createResult() */ protected String findJavaToolExecutable() { - String command = javaToolName + ( Os.isFamily( Os.FAMILY_WINDOWS ) ? ".exe" : "" ); - String executable = null; if ( toolchain != null ) { - executable = toolchain.findTool( javaToolName ); + executable = findToolchainExecutable(); } + String command = javaToolName + ( Os.isFamily( Os.FAMILY_WINDOWS ) ? ".exe" : "" ); + if ( executable == null ) { executable = findExecutable( command, System.getProperty( "java.home" ), "../bin", "bin", "../sh" ); @@ -288,6 +289,45 @@ protected String findJavaToolExecutable() return executable; } + /** + * Run toolchain.findTool( javaToolName ); through reflection to avoid compile dependency on + * Maven core. + */ + private String findToolchainExecutable() + { + try + { + Method m = toolchain.getClass().getMethod( "findTool", String.class ); + return (String) m.invoke( toolchain, javaToolName ); + } + catch ( NoSuchMethodException e ) + { + // should not happen if toolchain is really a Toolchain object + getLogger().warn( "unexpected NoSuchMethodException", e ); + } + catch ( SecurityException e ) + { + // should not happen + getLogger().warn( "unexpected SecurityException", e ); + } + catch ( IllegalAccessException e ) + { + // should not happen + getLogger().warn( "unexpected IllegalAccessException", e ); + } + catch ( IllegalArgumentException e ) + { + // should not happen: parameter is the right type + getLogger().warn( "unexpected IllegalArgumentException", e ); + } + catch ( InvocationTargetException e ) + { + // not expected... + getLogger().warn( "unexpected InvocationTargetException", e ); + } + return null; + } + /** * Finds the specified command in any of the given sub directories of the specified JDK/JRE home directory. * diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java index fe226f64..b4bc3a9a 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java @@ -19,8 +19,6 @@ * under the License. */ -import org.apache.maven.toolchain.Toolchain; - /** * Describes a java tool, means a executable available in the jdk. *

    @@ -51,8 +49,10 @@ public interface JavaTool * Set an optional tool chain to find out the java tool executable location. * * @param toolchain optional tool chain to find out the java tool executable location. + * To avoid direct dependency on Maven core, this parameter is an Object that will be + * used as Toolchain through reflection */ - void setToolchain( Toolchain toolchain ); + void setToolchain( Object toolchain ); /** * Execute the input request and then returns the result of the execution. From efc7016b3c1f3dfe120b88b21bf1726280ceaaa8 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 9 Jul 2016 13:46:11 +0000 Subject: [PATCH 054/265] =?UTF-8?q?[MSHARED-562]=20unit=20test=20AnsiMessa?= =?UTF-8?q?geBuffer=20Submitted=20by:=20S=C3=A9bastian=20Le=20Merdy=20this?= =?UTF-8?q?=20closes=20#15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1752005 13f79535-47bb-0310-9956-ffa450edef68 --- .../utils/logging/AnsiMessageBufferTest.java | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java diff --git a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java new file mode 100644 index 00000000..4bcedec6 --- /dev/null +++ b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java @@ -0,0 +1,159 @@ +package org.apache.maven.shared.utils.logging; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + +public class AnsiMessageBufferTest +{ + + private AnsiMessageBuffer ansiMessageBuffer; + + @Before + public void initializeAnsiMessageBuffer() + { + this.ansiMessageBuffer = new AnsiMessageBuffer(); + } + + @Test + public void should_color_debug() + { + ansiMessageBuffer.debug(); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;36m" ) ); + } + + @Test + public void should_color_info() + { + ansiMessageBuffer.info(); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;34m" ) ); + } + + @Test + public void should_color_warning() + { + ansiMessageBuffer.warning(); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;33m" ) ); + } + + @Test + public void should_color_warning_and_reset() + { + ansiMessageBuffer.warning( "a warning message" ); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;33ma warning message\u001B[m" ) ); + } + + @Test + public void should_color_error() + { + ansiMessageBuffer.error(); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;31m" ) ); + } + + @Test + public void should_color_success() + { + ansiMessageBuffer.success(); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;32m" ) ); + } + + @Test + public void should_color_success_with_message() + { + ansiMessageBuffer.success( "a success message" ); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;32ma success message\u001B[m" ) ); + } + + @Test + public void should_color_failure() + { + ansiMessageBuffer.failure(); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;31m" ) ); + } + + @Test + public void should_color_failure_and_reset() + { + ansiMessageBuffer.failure( "a failure message" ); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;31ma failure message\u001B[m" ) ); + } + + @Test + public void should_color_strong() + { + ansiMessageBuffer.strong(); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1m" ) ); + } + + @Test + public void should_color_strong_and_reset() + { + ansiMessageBuffer.strong( "a strong message" ); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1ma strong message\u001B[m" ) ); + } + + @Test + public void should_color_mojo() + { + ansiMessageBuffer.mojo(); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[32m" ) ); + } + + @Test + public void should_color_mojo_and_reset() + { + ansiMessageBuffer.mojo( "a mojo" ); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[32ma mojo\u001B[m" ) ); + } + + @Test + public void should_color_project() + { + ansiMessageBuffer.project(); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[36m" ) ); + } + + @Test + public void should_color_project_and_reset() + { + ansiMessageBuffer.project( "a project" ); + + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[36ma project\u001B[m" ) ); + } + +} From e4317d8c3e4f7cfdc55bd9d2c55ca115968a0b45 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 9 Jul 2016 14:40:32 +0000 Subject: [PATCH 055/265] [MSHARED-562] added stripAnsi(String) helper git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1752009 13f79535-47bb-0310-9956-ffa450edef68 --- .../shared/utils/logging/MessageUtils.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java index b273c83c..aee080e7 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java @@ -24,6 +24,7 @@ /** * 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. */ public class MessageUtils { @@ -44,6 +45,9 @@ public class MessageUtils JANSI = jansi; } + /** + * Install color support. + */ public static void systemInstall() { if ( JANSI ) @@ -60,6 +64,10 @@ public static void systemUninstall() } } + /** + * Activates message color (if JAnsi is available). + * @param flag + */ public static void setColor( boolean flag ) { if ( JANSI ) @@ -68,23 +76,50 @@ public static void setColor( boolean flag ) } } + /** + * Is message color active: requires JAnsi available (through Maven) and the color has not been disabled. + * @return + */ public static boolean isColor() { return JANSI ? Ansi.isEnabled() : false; } + /** + * Create a default message buffer. + * @return a new buffer + */ public static MessageBuffer buffer() { return JANSI ? new AnsiMessageBuffer() : new PlainMessageBuffer(); } + /** + * Create a message buffer with defined String builder. + * @return a new buffer + */ public static MessageBuffer buffer( StringBuilder builder ) { return JANSI ? new AnsiMessageBuffer( builder ) : new PlainMessageBuffer( builder ); } + /** + * Create a message buffer with an internal buffer of defined size. + * @return a new buffer + */ public static MessageBuffer buffer( int size ) { return JANSI ? new AnsiMessageBuffer( size ) : new PlainMessageBuffer( size ); } + + /** + * Remove any ANSI code from a message + * @param msg message eventually containing ANSI codes + * @return the message with ANSI codes removed + */ + public static String stripAnsi( String msg ) + { + return msg.replaceAll( "\u001B\\[[;\\d]*[ -/]*[@-~]", "" ); + } + } From 0235da944199e298626874786f426b2a163a8b39 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 10 Jul 2016 11:13:01 +0000 Subject: [PATCH 056/265] [MSHARED-562] added background color support git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1752076 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/utils/logging/Style.java | 79 +++++++++++++------ 1 file changed, 55 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/Style.java b/src/main/java/org/apache/maven/shared/utils/logging/Style.java index 6a61ed0a..46e0df40 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/Style.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/Style.java @@ -20,11 +20,8 @@ */ import org.fusesource.jansi.Ansi; -import org.fusesource.jansi.Ansi.Attribute; import org.fusesource.jansi.Ansi.Color; -import static org.fusesource.jansi.Ansi.Attribute.INTENSITY_BOLD; - import java.util.Locale; /** @@ -43,66 +40,100 @@ enum Style MOJO( "green" ), PROJECT( "cyan" ); - private final Attribute attribute; + private final boolean bold; private final Color color; + private final Color bgColor; + Style( String defaultValue ) { - Attribute currentAttribute = null; + boolean currentBold = false; Color currentColor = null; + Color currentBgColor = null; - String value = System.getProperty( "style." + name().toLowerCase( Locale.ENGLISH ), defaultValue ); + String value = System.getProperty( "style." + name().toLowerCase( Locale.ENGLISH ), + defaultValue ).toLowerCase( Locale.ENGLISH ); for ( String token : value.split( "," ) ) { - for ( Color color : Color.values() ) + if ( "bold".equals( token ) ) { - if ( color.toString().equalsIgnoreCase( token ) ) - { - currentColor = color; - break; - } + currentBold = true; } - - if ( "bold".equalsIgnoreCase( token ) ) + else if ( token.startsWith( "bg" ) ) { - currentAttribute = INTENSITY_BOLD; + currentBgColor = toColor( token.substring( 2 ) ); + } + else + { + currentColor = toColor( token ); } } - this.attribute = currentAttribute; + this.bold = currentBold; this.color = currentColor; + this.bgColor = currentBgColor; + } + + private static Color toColor( String token ) + { + for ( Color color : Color.values() ) + { + if ( color.toString().equalsIgnoreCase( token ) ) + { + return color; + } + } + return null; } void apply( Ansi ansi ) { - if ( attribute != null ) + if ( bold ) { - ansi.a( attribute ); + ansi.bold(); } if ( color != null ) { ansi.fg( color ); } + if ( bgColor != null ) + { + ansi.bg( bgColor ); + } } @Override public String toString() { - if ( attribute == null && color == null ) + if ( !bold && color == null && bgColor == null ) { return name(); } - if ( attribute == null ) + StringBuilder sb = new StringBuilder(); + if ( bold ) + { + sb.append( "bold" ); + } + if ( color != null ) { - return name() + "=" + color.toString(); + if ( sb.length() > 0 ) + { + sb.append( ',' ); + } + sb.append( color.name() ); } - if ( color == null ) + if ( bgColor != null ) { - return name() + "=" + attribute.toString(); + if ( sb.length() > 0 ) + { + sb.append( ',' ); + } + sb.append( "bg" ); + sb.append( bgColor.name() ); } - return name() + "=" + attribute + "," + color; + return name() + '=' + sb; } } From cab67f84bc8ec0da08235841d135a5858e1f6118 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 10 Jul 2016 11:39:43 +0000 Subject: [PATCH 057/265] [MSHARED-562] added support for bright colors git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1752080 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/utils/logging/Style.java | 47 +++++++++++++++++-- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/Style.java b/src/main/java/org/apache/maven/shared/utils/logging/Style.java index 46e0df40..81b4d642 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/Style.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/Style.java @@ -42,14 +42,20 @@ enum Style private final boolean bold; + private final boolean bright; + private final Color color; + private final boolean bgBright; + private final Color bgColor; Style( String defaultValue ) { boolean currentBold = false; + boolean currentBright = false; Color currentColor = null; + boolean currentBgBright = false; Color currentBgColor = null; String value = System.getProperty( "style." + name().toLowerCase( Locale.ENGLISH ), @@ -63,16 +69,29 @@ enum Style } else if ( token.startsWith( "bg" ) ) { - currentBgColor = toColor( token.substring( 2 ) ); + token = token.substring( 2 ); + if ( token.startsWith( "bright" ) ) + { + currentBgBright = true; + token = token.substring( 6 ); + } + currentBgColor = toColor( token ); } else { + if ( token.startsWith( "bright" ) ) + { + currentBright = true; + token = token.substring( 6 ); + } currentColor = toColor( token ); } } this.bold = currentBold; + this.bright = currentBright; this.color = currentColor; + this.bgBright = currentBgBright; this.bgColor = currentBgColor; } @@ -96,11 +115,25 @@ void apply( Ansi ansi ) } if ( color != null ) { - ansi.fg( color ); + if ( bright ) + { + ansi.fgBright( color ); + } + else + { + ansi.fg( color ); + } } if ( bgColor != null ) { - ansi.bg( bgColor ); + if ( bgBright ) + { + ansi.bgBright( bgColor ); + } + else + { + ansi.bg( bgColor ); + } } } @@ -122,6 +155,10 @@ public String toString() { sb.append( ',' ); } + if ( bright ) + { + sb.append( "bright" ); + } sb.append( color.name() ); } if ( bgColor != null ) @@ -131,6 +168,10 @@ public String toString() sb.append( ',' ); } sb.append( "bg" ); + if ( bgBright ) + { + sb.append( "bright" ); + } sb.append( bgColor.name() ); } return name() + '=' + sb; From bd8154bfe44ccf8737e31a4cebada1c4fd42d548 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Fri, 15 Jul 2016 21:22:16 +0000 Subject: [PATCH 058/265] [MSHARED-562] added documentation on the styled message API git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1752880 13f79535-47bb-0310-9956-ffa450edef68 --- .../shared/utils/logging/package-info.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/main/java/org/apache/maven/shared/utils/logging/package-info.java diff --git a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java new file mode 100644 index 00000000..cd1a417f --- /dev/null +++ b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java @@ -0,0 +1,47 @@ +// CHECKSTYLE_OFF: RegexpHeader +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * An API to write Maven messages to console with styled color content, consistently across whole + * Maven ecosystem (Maven itself or any plugin or extension). + *

    + * Messages are built with instances of {@link org.apache.maven.shared.utils.logging.MessageBuffer MessageBuffer} + * which provides a fluent API. + * {@link org.apache.maven.shared.utils.logging.MessageUtils MessageUtils} gives access to these buffers. + *

    + * Plugins can use this API with any Maven version: color + * just won't be activated when run with Maven version older than 3.4.0. + *

    + * Styles are:

      + *
    • debug, info, warning and error for slf4j level display,
      • + *
    • success, failure, strong, mojo and project for + * message content
      • + *
    + * Default styles colors can be configured through system properties, that can be set in MAVEN_OPTS + * environment variable (eventually in .mavenrc script):
      + *
    • system properties are named style.<style name>,
      • + *
    • values are comma separated combination of bold, <color> and + * bg<color> (for background), where <color> is + * an ANSI color: black, + * red, green, yellow, blue, magenta, + * cyan or white, eventually with bright prefix
      • + *
    + */ +package org.apache.maven.shared.utils.logging; + From 538803e0dc65544d14e0e44ea54f6f595c42f6a5 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 17 Jul 2016 07:32:56 +0000 Subject: [PATCH 059/265] [MSHARED-562] improved documentation git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1753019 13f79535-47bb-0310-9956-ffa450edef68 --- .../utils/logging/AnsiMessageBuffer.java | 4 +-- .../shared/utils/logging/MessageBuffer.java | 27 ++++++++++++++++++- .../shared/utils/logging/MessageUtils.java | 9 ++++--- .../shared/utils/logging/package-info.java | 2 +- src/site/apt/index.apt.vm | 11 +++++--- 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java index 14047ebb..d4276404 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java @@ -22,8 +22,8 @@ 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 Jansi + * with configurable styles through {@link Style}. */ class AnsiMessageBuffer implements MessageBuffer diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java index 58283cf2..c5c9d3da 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java @@ -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 ); } diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java index aee080e7..a3159766 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java @@ -23,8 +23,11 @@ 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, Jansi is used to render + * ANSI colors on any platform. */ public class MessageUtils { @@ -47,6 +50,7 @@ public class MessageUtils /** * Install color support. + * This method is called by Maven core, and calling it is not necessary in plugins. */ public static void systemInstall() { @@ -78,7 +82,6 @@ public static void setColor( boolean flag ) /** * Is message color active: requires JAnsi available (through Maven) and the color has not been disabled. - * @return */ public static boolean isColor() { diff --git a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java index cd1a417f..aa0c28eb 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java @@ -33,7 +33,7 @@ *

  • success, failure, strong, mojo and project for * message content
    • * - * Default styles colors can be configured through system properties, that can be set in MAVEN_OPTS + * Default styles colors can be overridden through system properties, that can be set in MAVEN_OPTS * environment variable (eventually in .mavenrc script):
      *
    • system properties are named style.<style name>,
      • *
    • values are comma separated combination of bold, <color> and diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index 38e007cc..a7bbc885 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -30,17 +30,20 @@ ${project.name} This project aims to be a functional replacement for - {{{http://plexus.codehaus.org/plexus-utils}plexus-utils}} in Maven. + {{{http://codehaus-plexus.github.io/plexus-utils/}plexus-utils}} in Maven. It is not a 100% API compatible replacement though but a replacement : lots of methods got cleaned up, generics got added and we dropped a lot of unused code. -Why ? + Then there are additions, like + {{{apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled message API}}. + +Why? plexus-utils consisted mostly of code that was forked from various apache projects. - maven-shared-utils is based on the original from the apache sources. + maven-shared-utils is based on the original from the Apache sources. -Why not commons ? +Why not commons? We would prefer code to use commons-* code where appropriate, but the plexus-utils became slightly incompatible (different) from the commons over the years, so migrating is not From c820a606199c52f8c9e997d23911172be7937084 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 17 Jul 2016 07:53:46 +0000 Subject: [PATCH 060/265] [MSHARED-562] fixed typo for link git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1753021 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/apt/index.apt.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index a7bbc885..0e035b7a 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -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? From b04aa9e359f758a69ac56ac78cd7a605d944009b Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 17 Jul 2016 17:06:27 +0000 Subject: [PATCH 061/265] [MSHARED-562] applied updates proposed by Michael git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1753088 13f79535-47bb-0310-9956-ffa450edef68 --- .../shared/utils/logging/MessageUtils.java | 19 ++++++++++++------- .../maven/shared/utils/logging/Style.java | 4 ++-- .../shared/utils/logging/package-info.java | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java index a3159766..409f855b 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java @@ -23,7 +23,7 @@ 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, Jansi is used to render @@ -60,6 +60,11 @@ public static void systemInstall() } } + /** + * 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 static void systemUninstall() } /** - * 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 static void setColor( boolean flag ) } /** - * 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 static MessageBuffer buffer( int size ) } /** - * 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]*[ -/]*[@-~]", "" ); } diff --git a/src/main/java/org/apache/maven/shared/utils/logging/Style.java b/src/main/java/org/apache/maven/shared/utils/logging/Style.java index 81b4d642..41ecc7f8 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/Style.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/Style.java @@ -144,7 +144,7 @@ public String toString() { return name(); } - StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder( name() + '=' ); if ( bold ) { sb.append( "bold" ); @@ -174,7 +174,7 @@ public String toString() } sb.append( bgColor.name() ); } - return name() + '=' + sb; + return sb.toString(); } } diff --git a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java index aa0c28eb..6f1288f4 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java @@ -30,8 +30,8 @@ *

      * Styles are:

        *
      • debug, info, warning and error for slf4j level display,
        • - *
      • success, failure, strong, mojo and project for - * message content
        • + *
      • success, warning, failure, strong, mojo + * and project for message content
        • *
      * Default styles colors can be overridden through system properties, that can be set in MAVEN_OPTS * environment variable (eventually in .mavenrc script):
        From 2ffb85bbe6c3be47d7a3899539de8bdc582092fe Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 17 Jul 2016 17:09:32 +0000 Subject: [PATCH 062/265] fixed error reported by Checkstyle... git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1753089 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/shared/utils/logging/AnsiMessageBuffer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java index d4276404..b3bc5394 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java @@ -22,8 +22,8 @@ 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 + * Jansi with configurable styles through {@link Style}. */ class AnsiMessageBuffer implements MessageBuffer From 9244b9ccb305e53f7915b4174461ec762a65d877 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 17 Jul 2016 22:26:17 +0000 Subject: [PATCH 063/265] [MSHARED-562] API simplification git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1753133 13f79535-47bb-0310-9956-ffa450edef68 --- .../utils/logging/AnsiMessageBuffer.java | 60 +++------------ .../shared/utils/logging/MessageBuffer.java | 73 +++++-------------- .../utils/logging/PlainMessageBuffer.java | 47 ++---------- .../maven/shared/utils/logging/Style.java | 3 +- .../utils/logging/AnsiMessageBufferTest.java | 60 ++------------- 5 files changed, 45 insertions(+), 198 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java index b3bc5394..10893c9f 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java @@ -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; } diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java index c5c9d3da..26f717be 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java @@ -26,124 +26,89 @@ 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 ); /** - * Insert color for INFO level display. + * Append message content for INFO level. * By default, bold blue */ - MessageBuffer info(); + MessageBuffer info( Object message ); /** - * Insert color for WARNING level or warning message display. + * Append message content in warning style or WARNING level. * By default, bold yellow */ - MessageBuffer warning(); - - /** - * Append warning message: equivalent to appending warning color, then message, then reset. - */ MessageBuffer warning( Object message ); /** - * Insert color for ERROR level display. + * Append message content for ERROR level. * By default, bold red */ - MessageBuffer error(); + MessageBuffer error( Object message ); /** - * Insert color for success message display. + * Append message content in success style. * By default, bold green */ - MessageBuffer success(); - - /** - * Append success message: equivalent to appending success color, then message, then reset. - */ MessageBuffer success( Object message ); /** - * Insert color for failure message display. + * Append message content in failure style. * By default, bold red */ - MessageBuffer failure(); - - /** - * Append failure message: equivalent to appending failure color, then message, then reset. - */ MessageBuffer failure( Object message ); - - /** - * Insert color for strong message display. - * By default, bold - */ - MessageBuffer strong(); /** - * Append strong message: equivalent to appending strong color, then message, then reset. + * Append message content in strong style. + * By default, bold */ MessageBuffer strong( Object message ); /** - * Insert color for mojo message display. + * Append message content in mojo style. * By default, green */ - MessageBuffer mojo(); - - /** - * Append mojo message: equivalent to appending mojo color, then message, then reset. - */ MessageBuffer mojo( Object message ); /** - * Insert color for project message display. + * Append message content in project style. * By default, cyan */ - MessageBuffer project(); - - /** - * Append project message: equivalent to appending project color, then message, then reset. - */ MessageBuffer project( Object message ); // // message building methods modelled after Ansi methods // /** - * Reset to default style. - */ - MessageBuffer reset(); - - /** - * Append content to the buffer. + * Append content to the message buffer. */ MessageBuffer a( char[] value, int offset, int len ); /** - * Append content to the buffer. + * Append content to the message buffer. */ MessageBuffer a( char[] value ); /** - * Append content to the buffer. + * Append content to the message buffer. */ MessageBuffer a( CharSequence value, int start, int end ); /** - * Append content to the buffer. + * Append content to the message buffer. */ MessageBuffer a( CharSequence value ); /** - * Append content to the buffer. + * Append content to the message buffer. */ MessageBuffer a( Object value ); /** - * Append a newline to the buffer. + * Append newline to the message buffer. */ MessageBuffer newline(); diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuffer.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuffer.java index 7dadc417..b84776aa 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuffer.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuffer.java @@ -42,19 +42,14 @@ class PlainMessageBuffer buffer = new StringBuilder( size ); } - public PlainMessageBuffer debug() + public PlainMessageBuffer debug( Object message ) { - return this; - } - - public PlainMessageBuffer info() - { - return this; + return a( message ); } - public PlainMessageBuffer warning() + public PlainMessageBuffer info( Object message ) { - return this; + return a( message ); } public PlainMessageBuffer warning( Object message ) @@ -62,14 +57,9 @@ public PlainMessageBuffer warning( Object message ) return a( message ); } - public PlainMessageBuffer error() + public PlainMessageBuffer error( Object message ) { - return this; - } - - public PlainMessageBuffer success() - { - return this; + return a( message ); } public PlainMessageBuffer success( Object message ) @@ -77,51 +67,26 @@ public PlainMessageBuffer success( Object message ) return a( message ); } - public PlainMessageBuffer failure() - { - return this; - } - public PlainMessageBuffer failure( Object message ) { return a( message ); } - public PlainMessageBuffer strong() - { - return this; - } - public PlainMessageBuffer strong( Object message ) { return a( message ); } - public PlainMessageBuffer mojo() - { - return this; - } - public PlainMessageBuffer mojo( Object message ) { return a( message ); } - public PlainMessageBuffer project() - { - return this; - } - public PlainMessageBuffer project( Object message ) { return a( message ); } - public PlainMessageBuffer reset() - { - return this; - } - public PlainMessageBuffer a( char[] value, int offset, int len ) { buffer.append( value, offset, len ); diff --git a/src/main/java/org/apache/maven/shared/utils/logging/Style.java b/src/main/java/org/apache/maven/shared/utils/logging/Style.java index 41ecc7f8..defc2aa3 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/Style.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/Style.java @@ -107,7 +107,7 @@ private static Color toColor( String token ) return null; } - void apply( Ansi ansi ) + Ansi apply( Ansi ansi ) { if ( bold ) { @@ -135,6 +135,7 @@ void apply( Ansi ansi ) ansi.bg( bgColor ); } } + return ansi; } @Override diff --git a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java index 4bcedec6..55a436aa 100644 --- a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java +++ b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java @@ -39,25 +39,17 @@ public void initializeAnsiMessageBuffer() @Test public void should_color_debug() { - ansiMessageBuffer.debug(); + ansiMessageBuffer.debug( "a debug message" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;36m" ) ); + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;36ma debug message\u001B[m" ) ); } @Test public void should_color_info() { - ansiMessageBuffer.info(); + ansiMessageBuffer.info( "an info message" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;34m" ) ); - } - - @Test - public void should_color_warning() - { - ansiMessageBuffer.warning(); - - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;33m" ) ); + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;34man info message\u001B[m" ) ); } @Test @@ -71,17 +63,9 @@ public void should_color_warning_and_reset() @Test public void should_color_error() { - ansiMessageBuffer.error(); + ansiMessageBuffer.error( "an error message" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;31m" ) ); - } - - @Test - public void should_color_success() - { - ansiMessageBuffer.success(); - - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;32m" ) ); + assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;31man error message\u001B[m" ) ); } @Test @@ -92,14 +76,6 @@ public void should_color_success_with_message() assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;32ma success message\u001B[m" ) ); } - @Test - public void should_color_failure() - { - ansiMessageBuffer.failure(); - - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;31m" ) ); - } - @Test public void should_color_failure_and_reset() { @@ -108,14 +84,6 @@ public void should_color_failure_and_reset() assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;31ma failure message\u001B[m" ) ); } - @Test - public void should_color_strong() - { - ansiMessageBuffer.strong(); - - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1m" ) ); - } - @Test public void should_color_strong_and_reset() { @@ -124,14 +92,6 @@ public void should_color_strong_and_reset() assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1ma strong message\u001B[m" ) ); } - @Test - public void should_color_mojo() - { - ansiMessageBuffer.mojo(); - - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[32m" ) ); - } - @Test public void should_color_mojo_and_reset() { @@ -140,14 +100,6 @@ public void should_color_mojo_and_reset() assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[32ma mojo\u001B[m" ) ); } - @Test - public void should_color_project() - { - ansiMessageBuffer.project(); - - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[36m" ) ); - } - @Test public void should_color_project_and_reset() { From 0d314f0c895d6cd6729a671be1add382c4806c0d Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 17 Jul 2016 22:38:57 +0000 Subject: [PATCH 064/265] [MSHARED-562] renamed MessageBuffer to MessageBuilder git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1753134 13f79535-47bb-0310-9956-ffa450edef68 --- ...ageBuffer.java => AnsiMessageBuilder.java} | 46 +++++++++---------- ...MessageBuffer.java => MessageBuilder.java} | 36 +++++++-------- .../shared/utils/logging/MessageUtils.java | 12 ++--- ...geBuffer.java => PlainMessageBuilder.java} | 44 +++++++++--------- .../shared/utils/logging/package-info.java | 2 +- ...rTest.java => AnsiMessageBuilderTest.java} | 42 ++++++++--------- 6 files changed, 91 insertions(+), 91 deletions(-) rename src/main/java/org/apache/maven/shared/utils/logging/{AnsiMessageBuffer.java => AnsiMessageBuilder.java} (68%) rename src/main/java/org/apache/maven/shared/utils/logging/{MessageBuffer.java => MessageBuilder.java} (73%) rename src/main/java/org/apache/maven/shared/utils/logging/{PlainMessageBuffer.java => PlainMessageBuilder.java} (63%) rename src/test/java/org/apache/maven/shared/utils/logging/{AnsiMessageBufferTest.java => AnsiMessageBuilderTest.java} (52%) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java similarity index 68% rename from src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java rename to src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java index 10893c9f..9f716566 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuffer.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java @@ -22,125 +22,125 @@ import org.fusesource.jansi.Ansi; /** - * Message buffer implementation that supports ANSI colors through + * Message builder implementation that supports ANSI colors through * 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 ).reset(); return this; } - public AnsiMessageBuffer failure( Object message ) + public AnsiMessageBuilder failure( Object message ) { Style.FAILURE.apply( ansi ).a( message ).reset(); return this; } - public AnsiMessageBuffer strong( Object message ) + public AnsiMessageBuilder strong( Object message ) { Style.STRONG.apply( ansi ).a( message ).reset(); return this; } - public AnsiMessageBuffer mojo( Object message ) + public AnsiMessageBuilder mojo( Object message ) { Style.MOJO.apply( ansi ).a( message ).reset(); return this; } - public AnsiMessageBuffer project( Object message ) + public AnsiMessageBuilder project( Object message ) { Style.PROJECT.apply( ansi ).a( message ).reset(); return this; } - public AnsiMessageBuffer a( char[] value, int offset, int len ) + public AnsiMessageBuilder a( char[] value, int offset, int len ) { ansi.a( value, offset, len ); return this; } - public AnsiMessageBuffer a( char[] value ) + public AnsiMessageBuilder a( char[] value ) { ansi.a( value ); return this; } - public AnsiMessageBuffer a( CharSequence value, int start, int end ) + public AnsiMessageBuilder a( CharSequence value, int start, int end ) { ansi.a( value, start, end ); return this; } - public AnsiMessageBuffer a( CharSequence value ) + public AnsiMessageBuilder a( CharSequence value ) { ansi.a( value ); return this; } - public AnsiMessageBuffer a( Object value ) + public AnsiMessageBuilder a( Object value ) { ansi.a( value ); return this; } - public AnsiMessageBuffer newline() + public AnsiMessageBuilder newline() { ansi.newline(); return this; } - public AnsiMessageBuffer format( String pattern, Object... args ) + public AnsiMessageBuilder format( String pattern, Object... args ) { ansi.format( pattern, args ); return this; diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java similarity index 73% rename from src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java rename to src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java index 26f717be..37fbbc88 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuffer.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java @@ -20,64 +20,64 @@ */ /** - * Message buffer that supports configurable styling. + * Message builder that supports configurable styling. * @see MessageUtils */ -public interface MessageBuffer +public interface MessageBuilder { /** * Append message content for DEBUG level. * By default, bold cyan */ - MessageBuffer debug( Object message ); + MessageBuilder debug( Object message ); /** * Append message content for INFO level. * By default, bold blue */ - MessageBuffer info( Object message ); + MessageBuilder info( Object message ); /** * Append message content in warning style or WARNING level. * By default, bold yellow */ - MessageBuffer warning( Object message ); + MessageBuilder warning( Object message ); /** * Append message content for ERROR level. * By default, bold red */ - MessageBuffer error( Object message ); + MessageBuilder error( Object message ); /** * Append message content in success style. * By default, bold green */ - MessageBuffer success( Object message ); + MessageBuilder success( Object message ); /** * Append message content in failure style. * By default, bold red */ - MessageBuffer failure( Object message ); + MessageBuilder failure( Object message ); /** * Append message content in strong style. * By default, bold */ - MessageBuffer strong( Object message ); + MessageBuilder strong( Object message ); /** * Append message content in mojo style. * By default, green */ - MessageBuffer mojo( Object message ); + MessageBuilder mojo( Object message ); /** * Append message content in project style. * By default, cyan */ - MessageBuffer project( Object message ); + MessageBuilder project( Object message ); // // message building methods modelled after Ansi methods @@ -85,36 +85,36 @@ public interface MessageBuffer /** * Append content to the message buffer. */ - MessageBuffer a( char[] value, int offset, int len ); + MessageBuilder a( char[] value, int offset, int len ); /** * Append content to the message buffer. */ - MessageBuffer a( char[] value ); + MessageBuilder a( char[] value ); /** * Append content to the message buffer. */ - MessageBuffer a( CharSequence value, int start, int end ); + MessageBuilder a( CharSequence value, int start, int end ); /** * Append content to the message buffer. */ - MessageBuffer a( CharSequence value ); + MessageBuilder a( CharSequence value ); /** * Append content to the message buffer. */ - MessageBuffer a( Object value ); + MessageBuilder a( Object value ); /** * Append newline to the message buffer. */ - MessageBuffer newline(); + MessageBuilder newline(); /** * Append formatted content to the buffer. * @see String#format(String, Object...) */ - MessageBuffer format( String pattern, Object... args ); + MessageBuilder format( String pattern, Object... args ); } diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java index 409f855b..0a67bb14 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java @@ -97,27 +97,27 @@ public static boolean isColorEnabled() * Create a default message buffer. * @return a new buffer */ - public static MessageBuffer buffer() + public static MessageBuilder buffer() { - return JANSI ? new AnsiMessageBuffer() : new PlainMessageBuffer(); + return JANSI ? new AnsiMessageBuilder() : new PlainMessageBuilder(); } /** * Create a message buffer with defined String builder. * @return a new buffer */ - public static MessageBuffer buffer( StringBuilder builder ) + public static MessageBuilder buffer( StringBuilder builder ) { - return JANSI ? new AnsiMessageBuffer( builder ) : new PlainMessageBuffer( builder ); + return JANSI ? new AnsiMessageBuilder( builder ) : new PlainMessageBuilder( builder ); } /** * Create a message buffer with an internal buffer of defined size. * @return a new buffer */ - public static MessageBuffer buffer( int size ) + public static MessageBuilder buffer( int size ) { - return JANSI ? new AnsiMessageBuffer( size ) : new PlainMessageBuffer( size ); + return JANSI ? new AnsiMessageBuilder( size ) : new PlainMessageBuilder( size ); } /** diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuffer.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java similarity index 63% rename from src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuffer.java rename to src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java index b84776aa..e60a762c 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuffer.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java @@ -20,110 +20,110 @@ */ /** - * Message buffer implementation that just ignores styling, for Maven version earlier than 3.4.0. + * Message builder implementation that just ignores styling, for Maven version earlier than 3.4.0. */ -class PlainMessageBuffer - implements MessageBuffer +class PlainMessageBuilder + implements MessageBuilder { private StringBuilder buffer; - PlainMessageBuffer() + PlainMessageBuilder() { buffer = new StringBuilder(); } - PlainMessageBuffer( StringBuilder builder ) + PlainMessageBuilder( StringBuilder builder ) { buffer = builder; } - PlainMessageBuffer( int size ) + PlainMessageBuilder( int size ) { buffer = new StringBuilder( size ); } - public PlainMessageBuffer debug( Object message ) + public PlainMessageBuilder debug( Object message ) { return a( message ); } - public PlainMessageBuffer info( Object message ) + public PlainMessageBuilder info( Object message ) { return a( message ); } - public PlainMessageBuffer warning( Object message ) + public PlainMessageBuilder warning( Object message ) { return a( message ); } - public PlainMessageBuffer error( Object message ) + public PlainMessageBuilder error( Object message ) { return a( message ); } - public PlainMessageBuffer success( Object message ) + public PlainMessageBuilder success( Object message ) { return a( message ); } - public PlainMessageBuffer failure( Object message ) + public PlainMessageBuilder failure( Object message ) { return a( message ); } - public PlainMessageBuffer strong( Object message ) + public PlainMessageBuilder strong( Object message ) { return a( message ); } - public PlainMessageBuffer mojo( Object message ) + public PlainMessageBuilder mojo( Object message ) { return a( message ); } - public PlainMessageBuffer project( Object message ) + public PlainMessageBuilder project( Object message ) { return a( message ); } - public PlainMessageBuffer a( char[] value, int offset, int len ) + public PlainMessageBuilder a( char[] value, int offset, int len ) { buffer.append( value, offset, len ); return this; } - public PlainMessageBuffer a( char[] value ) + public PlainMessageBuilder a( char[] value ) { buffer.append( value ); return this; } - public PlainMessageBuffer a( CharSequence value, int start, int end ) + public PlainMessageBuilder a( CharSequence value, int start, int end ) { buffer.append( value, start, end ); return this; } - public PlainMessageBuffer a( CharSequence value ) + public PlainMessageBuilder a( CharSequence value ) { buffer.append( value ); return this; } - public PlainMessageBuffer a( Object value ) + public PlainMessageBuilder a( Object value ) { buffer.append( value ); return this; } - public PlainMessageBuffer newline() + public PlainMessageBuilder newline() { buffer.append( System.getProperty( "line.separator" ) ); return this; } - public PlainMessageBuffer format( String pattern, Object... args ) + public PlainMessageBuilder format( String pattern, Object... args ) { buffer.append( String.format( pattern, args ) ); return this; diff --git a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java index 6f1288f4..2ff1c661 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java @@ -21,7 +21,7 @@ * An API to write Maven messages to console with styled color content, consistently across whole * Maven ecosystem (Maven itself or any plugin or extension). *

        - * Messages are built with instances of {@link org.apache.maven.shared.utils.logging.MessageBuffer MessageBuffer} + * Messages are built with instances of {@link org.apache.maven.shared.utils.logging.MessageBuilder MessageBuilder} * which provides a fluent API. * {@link org.apache.maven.shared.utils.logging.MessageUtils MessageUtils} gives access to these buffers. *

        diff --git a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java similarity index 52% rename from src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java rename to src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java index 55a436aa..d1ae7eab 100644 --- a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBufferTest.java +++ b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java @@ -25,87 +25,87 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; -public class AnsiMessageBufferTest +public class AnsiMessageBuilderTest { - private AnsiMessageBuffer ansiMessageBuffer; + private AnsiMessageBuilder ansiMessageBuilder; @Before public void initializeAnsiMessageBuffer() { - this.ansiMessageBuffer = new AnsiMessageBuffer(); + this.ansiMessageBuilder = new AnsiMessageBuilder(); } @Test public void should_color_debug() { - ansiMessageBuffer.debug( "a debug message" ); + ansiMessageBuilder.debug( "a debug message" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;36ma debug message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;36ma debug message\u001B[m" ) ); } @Test public void should_color_info() { - ansiMessageBuffer.info( "an info message" ); + ansiMessageBuilder.info( "an info message" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;34man info message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;34man info message\u001B[m" ) ); } @Test public void should_color_warning_and_reset() { - ansiMessageBuffer.warning( "a warning message" ); + ansiMessageBuilder.warning( "a warning message" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;33ma warning message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;33ma warning message\u001B[m" ) ); } @Test public void should_color_error() { - ansiMessageBuffer.error( "an error message" ); + ansiMessageBuilder.error( "an error message" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;31man error message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;31man error message\u001B[m" ) ); } @Test public void should_color_success_with_message() { - ansiMessageBuffer.success( "a success message" ); + ansiMessageBuilder.success( "a success message" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;32ma success message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;32ma success message\u001B[m" ) ); } @Test public void should_color_failure_and_reset() { - ansiMessageBuffer.failure( "a failure message" ); + ansiMessageBuilder.failure( "a failure message" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1;31ma failure message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;31ma failure message\u001B[m" ) ); } @Test public void should_color_strong_and_reset() { - ansiMessageBuffer.strong( "a strong message" ); + ansiMessageBuilder.strong( "a strong message" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[1ma strong message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1ma strong message\u001B[m" ) ); } @Test public void should_color_mojo_and_reset() { - ansiMessageBuffer.mojo( "a mojo" ); + ansiMessageBuilder.mojo( "a mojo" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[32ma mojo\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[32ma mojo\u001B[m" ) ); } @Test public void should_color_project_and_reset() { - ansiMessageBuffer.project( "a project" ); + ansiMessageBuilder.project( "a project" ); - assertThat( ansiMessageBuffer.toString(), equalTo( "\u001B[36ma project\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[36ma project\u001B[m" ) ); } } From 0ec15a61195e42575b5dcbd6a0c451993ba328b9 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Wed, 20 Jul 2016 21:33:04 +0000 Subject: [PATCH 065/265] [maven-release-plugin] prepare release maven-shared-utils-3.1.0 git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1753613 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f98ad7d5..3e93f9a2 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 3.1.0-SNAPSHOT + 3.1.0 Apache Maven Shared Utils Shared utils without any further dependencies @@ -38,10 +38,10 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.1.0 + scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.1.0 - http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils + http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-3.1.0 jira From c3d5d39a1fe680970562bd121241899e3225edea Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Wed, 20 Jul 2016 21:33:18 +0000 Subject: [PATCH 066/265] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1753615 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3e93f9a2..1d6a2404 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 3.1.0 + 3.1.1-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies @@ -38,10 +38,10 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.1.0 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.1.0 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-3.1.0 + http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils jira From 53f34b18759ed28f7dbd4b41c394eaadd390d003 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 4 Sep 2016 12:08:03 +0000 Subject: [PATCH 067/265] [MSHARED-587] extracted LoggerLevelRenderer interface from MessageBuilder git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1759175 13f79535-47bb-0310-9956-ffa450edef68 --- .../utils/logging/AnsiMessageBuilder.java | 28 +++++----- .../utils/logging/LoggerLevelRenderer.java | 53 +++++++++++++++++++ .../shared/utils/logging/MessageBuilder.java | 27 ++-------- .../shared/utils/logging/MessageUtils.java | 11 ++++ .../utils/logging/PlainMessageBuilder.java | 23 ++++---- .../maven/shared/utils/logging/Style.java | 1 + .../shared/utils/logging/package-info.java | 1 + .../utils/logging/AnsiMessageBuilderTest.java | 16 +++--- 8 files changed, 108 insertions(+), 52 deletions(-) create mode 100644 src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java index 9f716566..2d59bc9d 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java @@ -26,7 +26,7 @@ * Jansi with configurable styles through {@link Style}. */ class AnsiMessageBuilder - implements MessageBuilder + implements MessageBuilder, LoggerLevelRenderer { private Ansi ansi; @@ -50,28 +50,24 @@ class AnsiMessageBuilder this.ansi = ansi; } - public AnsiMessageBuilder debug( Object message ) + public String debug( String level ) { - Style.DEBUG.apply( ansi ).a( message ).reset(); - return this; + return Style.DEBUG.apply( ansi ).a( level ).reset().toString(); } - public AnsiMessageBuilder info( Object message ) + public String info( String level ) { - Style.INFO.apply( ansi ).a( message ).reset(); - return this; + return Style.INFO.apply( ansi ).a( level ).reset().toString(); } - public AnsiMessageBuilder warning( Object message ) + public String warning( String level ) { - Style.WARNING.apply( ansi ).a( message ).reset(); - return this; + return Style.WARNING.apply( ansi ).a( level ).reset().toString(); } - public AnsiMessageBuilder error( Object message ) + public String error( String level ) { - Style.ERROR.apply( ansi ).a( message ).reset(); - return this; + return Style.ERROR.apply( ansi ).a( level ).reset().toString(); } public AnsiMessageBuilder success( Object message ) @@ -80,6 +76,12 @@ public AnsiMessageBuilder success( Object message ) return this; } + public AnsiMessageBuilder warning( Object message ) + { + Style.WARNING.apply( ansi ).a( message ).reset(); + return this; + } + public AnsiMessageBuilder failure( Object message ) { Style.FAILURE.apply( ansi ).a( message ).reset(); diff --git a/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java b/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java new file mode 100644 index 00000000..9dac0eb1 --- /dev/null +++ b/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java @@ -0,0 +1,53 @@ +package org.apache.maven.shared.utils.logging; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Logger level renderer, intended for Maven slf4j logging provider implementers to render + * logger level. + * + * @since 3.2.0 + */ +public interface LoggerLevelRenderer +{ + /** + * Render DEBUG level. + * By default, bold cyan + */ + String debug( String level ); + + /** + * Render INFO level. + * By default, bold blue + */ + String info( String level ); + + /** + * Render WARNING level. + * By default, bold yellow + */ + String warning( String level ); + + /** + * Render ERROR level. + * By default, bold red + */ + String error( String level ); +} diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java index 37fbbc88..060e824e 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java @@ -22,39 +22,22 @@ /** * Message builder that supports configurable styling. * @see MessageUtils + * @since 3.1.0 */ public interface MessageBuilder { /** - * Append message content for DEBUG level. - * By default, bold cyan - */ - MessageBuilder debug( Object message ); - - /** - * Append message content for INFO level. - * By default, bold blue + * Append message content in success style. + * By default, bold green */ - MessageBuilder info( Object message ); + MessageBuilder success( Object message ); /** - * Append message content in warning style or WARNING level. + * Append message content in warning style. * By default, bold yellow */ MessageBuilder warning( Object message ); - /** - * Append message content for ERROR level. - * By default, bold red - */ - MessageBuilder error( Object message ); - - /** - * Append message content in success style. - * By default, bold green - */ - MessageBuilder success( Object message ); - /** * Append message content in failure style. * By default, bold red diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java index 0a67bb14..ece58f1a 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java @@ -28,6 +28,7 @@ *

        * Internally, Jansi is used to render * ANSI colors on any platform. + * @since 3.1.0 */ public class MessageUtils { @@ -120,6 +121,16 @@ public static MessageBuilder buffer( int size ) return JANSI ? new AnsiMessageBuilder( size ) : new PlainMessageBuilder( size ); } + /** + * Create a message buffer with an internal buffer of defined size. + * @return a new buffer + */ + @SuppressWarnings( "checkstyle:magicnumber" ) + public static LoggerLevelRenderer logger() + { + return JANSI ? new AnsiMessageBuilder( 20 ) : new PlainMessageBuilder( 7 ); + } + /** * Remove any ANSI code from a message (colors or other escape sequences). * @param msg message eventually containing ANSI codes diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java index e60a762c..abee6dd3 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java @@ -23,7 +23,7 @@ * Message builder implementation that just ignores styling, for Maven version earlier than 3.4.0. */ class PlainMessageBuilder - implements MessageBuilder + implements MessageBuilder, LoggerLevelRenderer { private StringBuilder buffer; @@ -42,24 +42,24 @@ class PlainMessageBuilder buffer = new StringBuilder( size ); } - public PlainMessageBuilder debug( Object message ) + public String debug( String level ) { - return a( message ); + return a( level ).toString(); } - public PlainMessageBuilder info( Object message ) + public String info( String level ) { - return a( message ); + return a( level ).toString(); } - public PlainMessageBuilder warning( Object message ) + public String warning( String level ) { - return a( message ); + return a( level ).toString(); } - public PlainMessageBuilder error( Object message ) + public String error( String level ) { - return a( message ); + return a( level ).toString(); } public PlainMessageBuilder success( Object message ) @@ -67,6 +67,11 @@ public PlainMessageBuilder success( Object message ) return a( message ); } + public PlainMessageBuilder warning( Object message ) + { + return a( message ); + } + public PlainMessageBuilder failure( Object message ) { return a( message ); diff --git a/src/main/java/org/apache/maven/shared/utils/logging/Style.java b/src/main/java/org/apache/maven/shared/utils/logging/Style.java index defc2aa3..756ff141 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/Style.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/Style.java @@ -26,6 +26,7 @@ /** * Configurable message styles. + * @since 3.1.0 */ enum Style { diff --git a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java index 2ff1c661..5f8e3423 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java @@ -42,6 +42,7 @@ * red, green, yellow, blue, magenta, * cyan or white, eventually with bright prefix *

      + * @since 3.1.0 */ package org.apache.maven.shared.utils.logging; diff --git a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java index d1ae7eab..81a32b39 100644 --- a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java +++ b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java @@ -39,33 +39,33 @@ public void initializeAnsiMessageBuffer() @Test public void should_color_debug() { - ansiMessageBuilder.debug( "a debug message" ); + ansiMessageBuilder.debug( "DEBUG" ); - assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;36ma debug message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;36mDEBUG\u001B[m" ) ); } @Test public void should_color_info() { - ansiMessageBuilder.info( "an info message" ); + ansiMessageBuilder.info( "INFO" ); - assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;34man info message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;34mINFO\u001B[m" ) ); } @Test public void should_color_warning_and_reset() { - ansiMessageBuilder.warning( "a warning message" ); + ansiMessageBuilder.warning( "WARNING" ); - assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;33ma warning message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;33mWARNING\u001B[m" ) ); } @Test public void should_color_error() { - ansiMessageBuilder.error( "an error message" ); + ansiMessageBuilder.error( "ERROR" ); - assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;31man error message\u001B[m" ) ); + assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;31mERROR\u001B[m" ) ); } @Test From 4a5421b7ead12c908267b968cb2ccc598b69be42 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 4 Sep 2016 12:15:40 +0000 Subject: [PATCH 068/265] [MSHARED-587] typos git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1759176 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- .../apache/maven/shared/utils/logging/MessageUtils.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1d6a2404..1c4f36f0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java index ece58f1a..c21165b2 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java @@ -122,11 +122,12 @@ public static MessageBuilder buffer( int size ) } /** - * Create a message buffer with an internal buffer of defined size. - * @return a new buffer + * Create a logger level renderer. + * @return a logger level renderer + * @since 3.2.0 */ @SuppressWarnings( "checkstyle:magicnumber" ) - public static LoggerLevelRenderer logger() + public static LoggerLevelRenderer level() { return JANSI ? new AnsiMessageBuilder( 20 ) : new PlainMessageBuilder( 7 ); } From 358dcad331131180beb41f09fc22ebd35b025471 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 10 Sep 2016 11:42:33 +0000 Subject: [PATCH 069/265] [MSHARED-587] improved documentation git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1760149 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/utils/logging/package-info.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java index 5f8e3423..e90ab654 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java @@ -22,16 +22,19 @@ * Maven ecosystem (Maven itself or any plugin or extension). *

      * Messages are built with instances of {@link org.apache.maven.shared.utils.logging.MessageBuilder MessageBuilder} - * which provides a fluent API. - * {@link org.apache.maven.shared.utils.logging.MessageUtils MessageUtils} gives access to these buffers. + * which provides a fluent API, while error level are colored by slf4j provider with + * {@link org.apache.maven.shared.utils.logging.LoggerLevelRenderer LoggerLevelRenderer}. + *

      + * {@link org.apache.maven.shared.utils.logging.MessageUtils MessageUtils} gives access to these builders. *

      * Plugins can use this API with any Maven version: color * just won't be activated when run with Maven version older than 3.4.0. *

      * Styles are:

        - *
      • debug, info, warning and error for slf4j level display,
        • + *
      • debug, info, warning and error for + * {@link org.apache.maven.shared.utils.logging.LoggerLevelRenderer logger level rendering},
        • *
      • success, warning, failure, strong, mojo - * and project for message content
        • + * and project for {@link org.apache.maven.shared.utils.logging.MessageBuilder message content} *
      * Default styles colors can be overridden through system properties, that can be set in MAVEN_OPTS * environment variable (eventually in .mavenrc script):
        From 402bc641c4e0d78ebadf8ac6bac180ceec0eaec4 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sun, 8 Jan 2017 04:10:41 +0000 Subject: [PATCH 070/265] [MSHARED-610] PrettyPrintXMLWriter internally uses java.io.PrintWriter without checking for any errors. o Updated the 'XMLWriter' interface method to allow implementations to throw 'IOException's and made the implementations stop silently ignore any IO errors. This commit makes the API for writig match the API for reading which also throws 'IOException's. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1777861 13f79535-47bb-0310-9956-ffa450edef68 --- .../utils/xml/PrettyPrintXMLWriter.java | 42 +++++++++++++++---- .../maven/shared/utils/xml/XMLWriter.java | 16 ++++--- .../maven/shared/utils/xml/XmlWriterUtil.java | 40 +++++++++++++----- .../maven/shared/utils/xml/Xpp3Dom.java | 30 +++++++++---- .../maven/shared/utils/xml/Xpp3DomWriter.java | 13 ++++-- .../utils/xml/PrettyPrintXmlWriterTest.java | 19 +++++---- 6 files changed, 117 insertions(+), 43 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java index 4bbe4e9b..fa963bbe 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java @@ -19,11 +19,11 @@ * under the License. */ -import org.apache.maven.shared.utils.Os; - +import java.io.IOException; import java.io.PrintWriter; import java.io.Writer; import java.util.ArrayList; +import org.apache.maven.shared.utils.Os; /** * XMLWriter with nice indentation @@ -64,6 +64,7 @@ public class PrettyPrintXMLWriter /** * @param writer not null * @param lineIndent could be null, but the normal way is some spaces. + * @throws IOException if {@code writer} is in error state. */ public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent ) { @@ -160,6 +161,7 @@ public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent, String lineS private PrettyPrintXMLWriter( PrintWriter writer, char[] lineIndent, char[] lineSeparator, String encoding, String doctype ) { + super(); this.writer = writer; this.lineIndent = lineIndent; this.lineSeparator = lineSeparator; @@ -167,10 +169,13 @@ private PrettyPrintXMLWriter( PrintWriter writer, char[] lineIndent, char[] line this.docType = doctype; depth = 0; + + // Fail early with assertions enabled. Issue is in the calling code not having checked for any errors. + assert !writer.checkError() : "Unexpected error state PrintWriter passed to PrettyPrintXMLWriter."; } /** {@inheritDoc} */ - public void addAttribute( String key, String value ) + public void addAttribute( String key, String value ) throws IOException { if ( !processingElement ) { @@ -181,6 +186,10 @@ public void addAttribute( String key, String value ) writer.write( key ); writer.write( '=' ); XMLEncode.xmlEncodeTextAsPCDATA( value, true, '"', writer ); + if ( writer.checkError() ) + { + throw new IOException( "Failure adding attribute '" + key + "' with value '" + value + "'" ); + } } /** {@inheritDoc} */ @@ -232,7 +241,7 @@ public void setLineIndenter( String lineIndentParameter ) } /** {@inheritDoc} */ - public void startElement( String elementName ) + public void startElement( String elementName ) throws IOException { boolean firstLine = ensureDocumentStarted(); @@ -245,6 +254,10 @@ public void startElement( String elementName ) writer.write( '<' ); writer.write( elementName ); + if ( writer.checkError() ) + { + throw new IOException( "Failure starting element '" + elementName + "'." ); + } processingElement = true; @@ -252,7 +265,7 @@ public void startElement( String elementName ) } /** {@inheritDoc} */ - public void writeText( String text ) + public void writeText( String text ) throws IOException { ensureDocumentStarted(); @@ -261,20 +274,30 @@ public void writeText( String text ) XMLEncode.xmlEncodeText( text, writer ); endOnSameLine = true; + + if ( writer.checkError() ) + { + throw new IOException( "Failure writing text." ); + } } /** {@inheritDoc} */ - public void writeMarkup( String markup ) + public void writeMarkup( String markup ) throws IOException { ensureDocumentStarted(); completePreviouslyOpenedElement(); writer.write( markup ); + + if ( writer.checkError() ) + { + throw new IOException( "Failure writing markup." ); + } } /** {@inheritDoc} */ - public void endElement() + public void endElement() throws IOException { String chars = elementStack.get( --depth ); if ( processingElement ) @@ -298,6 +321,11 @@ public void endElement() } endOnSameLine = false; + + if ( writer.checkError() ) + { + throw new IOException( "Failure ending element." ); + } } /** diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java index a352c9c7..0daad8bc 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java @@ -19,6 +19,7 @@ * under the License. */ +import java.io.IOException; /** * Interface for tools writing XML files. @@ -48,8 +49,9 @@ public interface XMLWriter /** * Start an XML Element tag. * @param name The name of the tag. + * @throws IOException if starting the element fails. */ - void startElement( String name ); + void startElement( String name ) throws IOException; /** @@ -58,27 +60,31 @@ public interface XMLWriter * @param key The key of the attribute. * @param value The value of the attribute. * @throws IllegalStateException if no element tag is currently in process + * @throws IOException if adding the attribute fails. */ - void addAttribute( String key, String value ); + void addAttribute( String key, String value ) throws IOException; /** * Add a value text to the current element tag * This will perform XML escaping to guarantee valid content * @param text The text which should be written. * @throws IllegalStateException if no element tag got started yet + * @throws IOException if writing the text fails. */ - void writeText( String text ); + void writeText( String text ) throws IOException; /** * Add a preformatted markup to the current element tag * @param text The text which should be written. * @throws IllegalStateException if no element tag got started yet + * @throws IOException if writing the markup fails. */ - void writeMarkup( String text ); + void writeMarkup( String text ) throws IOException; /** * End the previously opened element. * @see #startElement(String) + * @throws IOException if ending the element fails. */ - void endElement(); + void endElement() throws IOException; } diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java index b0d33dec..e83d1cf5 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java @@ -19,6 +19,7 @@ * under the License. */ +import java.io.IOException; import org.apache.maven.shared.utils.StringUtils; /** @@ -42,8 +43,9 @@ public class XmlWriterUtil * Convenience method to write one CRLF. * * @param writer not null writer + * @throws IOException if writing fails. */ - public static void writeLineBreak( XMLWriter writer ) + public static void writeLineBreak( XMLWriter writer ) throws IOException { writeLineBreak( writer, 1 ); } @@ -53,8 +55,9 @@ public static void writeLineBreak( XMLWriter writer ) * * @param writer not null * @param repeat positive number + * @throws IOException if writing fails. */ - public static void writeLineBreak( XMLWriter writer, int repeat ) + public static void writeLineBreak( XMLWriter writer, int repeat ) throws IOException { for ( int i = 0; i < repeat; i++ ) { @@ -70,8 +73,9 @@ public static void writeLineBreak( XMLWriter writer, int repeat ) * @param indent positive number * @see #DEFAULT_INDENTATION_SIZE * @see #writeLineBreak(XMLWriter, int, int, int) + * @throws IOException if writing fails. */ - public static void writeLineBreak( XMLWriter writer, int repeat, int indent ) + public static void writeLineBreak( XMLWriter writer, int repeat, int indent ) throws IOException { writeLineBreak( writer, repeat, indent, DEFAULT_INDENTATION_SIZE ); } @@ -83,8 +87,9 @@ public static void writeLineBreak( XMLWriter writer, int repeat, int indent ) * @param repeat The number of repetitions of the indent * @param indent positive number * @param indentSize positive number + * @throws IOException if writing fails. */ - public static void writeLineBreak( XMLWriter writer, int repeat, int indent, int indentSize ) + public static void writeLineBreak( XMLWriter writer, int repeat, int indent, int indentSize ) throws IOException { writeLineBreak( writer, repeat ); @@ -107,8 +112,9 @@ public static void writeLineBreak( XMLWriter writer, int repeat, int indent, int * @param writer not null * @see #DEFAULT_COLUMN_LINE * @see #writeCommentLineBreak(XMLWriter, int) + * @throws IOException if writing fails. */ - public static void writeCommentLineBreak( XMLWriter writer ) + public static void writeCommentLineBreak( XMLWriter writer ) throws IOException { writeCommentLineBreak( writer, DEFAULT_COLUMN_LINE ); } @@ -118,8 +124,9 @@ public static void writeCommentLineBreak( XMLWriter writer ) * * @param writer not null * @param columnSize positive number + * @throws IOException if writing fails. */ - public static void writeCommentLineBreak( XMLWriter writer, int columnSize ) + public static void writeCommentLineBreak( XMLWriter writer, int columnSize ) throws IOException { if ( columnSize < 10 ) { @@ -137,8 +144,9 @@ public static void writeCommentLineBreak( XMLWriter writer, int columnSize ) * @param comment The comment to write * @see #DEFAULT_INDENTATION_SIZE * @see #writeComment(XMLWriter, String, int, int) + * @throws IOException if writing fails. */ - public static void writeComment( XMLWriter writer, String comment ) + public static void writeComment( XMLWriter writer, String comment ) throws IOException { writeComment( writer, comment, 0, DEFAULT_INDENTATION_SIZE ); } @@ -152,8 +160,9 @@ public static void writeComment( XMLWriter writer, String comment ) * @param indent positive number * @see #DEFAULT_INDENTATION_SIZE * @see #writeComment(XMLWriter, String, int, int) + * @throws IOException if writing fails. */ - public static void writeComment( XMLWriter writer, String comment, int indent ) + public static void writeComment( XMLWriter writer, String comment, int indent ) throws IOException { writeComment( writer, comment, indent, DEFAULT_INDENTATION_SIZE ); } @@ -168,8 +177,9 @@ public static void writeComment( XMLWriter writer, String comment, int indent ) * @param indentSize positive number * @see #DEFAULT_COLUMN_LINE * @see #writeComment(XMLWriter, String, int, int, int) + * @throws IOException if writing fails. */ - public static void writeComment( XMLWriter writer, String comment, int indent, int indentSize ) + public static void writeComment( XMLWriter writer, String comment, int indent, int indentSize ) throws IOException { writeComment( writer, comment, indent, indentSize, DEFAULT_COLUMN_LINE ); } @@ -183,8 +193,10 @@ public static void writeComment( XMLWriter writer, String comment, int indent, i * @param indent positive number * @param indentSize positive number * @param columnSize positive number + * @throws IOException if writing fails. */ public static void writeComment( XMLWriter writer, String comment, int indent, int indentSize, int columnSize ) + throws IOException { if ( comment == null ) { @@ -263,8 +275,9 @@ public static void writeComment( XMLWriter writer, String comment, int indent, i * @param comment The comment to write * @see #DEFAULT_INDENTATION_SIZE * @see #writeCommentText(XMLWriter, String, int, int) + * @throws IOException if writing fails. */ - public static void writeCommentText( XMLWriter writer, String comment ) + public static void writeCommentText( XMLWriter writer, String comment ) throws IOException { writeCommentText( writer, comment, 0, DEFAULT_INDENTATION_SIZE ); } @@ -279,8 +292,9 @@ public static void writeCommentText( XMLWriter writer, String comment ) * @param indent positive number * @see #DEFAULT_INDENTATION_SIZE * @see #writeCommentText(XMLWriter, String, int, int) + * @throws IOException if writing fails. */ - public static void writeCommentText( XMLWriter writer, String comment, int indent ) + public static void writeCommentText( XMLWriter writer, String comment, int indent ) throws IOException { writeCommentText( writer, comment, indent, DEFAULT_INDENTATION_SIZE ); } @@ -295,8 +309,10 @@ public static void writeCommentText( XMLWriter writer, String comment, int inden * @param indentSize positive number * @see #DEFAULT_COLUMN_LINE * @see #writeCommentText(XMLWriter, String, int, int, int) + * @throws IOException if writing fails. */ public static void writeCommentText( XMLWriter writer, String comment, int indent, int indentSize ) + throws IOException { writeCommentText( writer, comment, indent, indentSize, DEFAULT_COLUMN_LINE ); } @@ -311,8 +327,10 @@ public static void writeCommentText( XMLWriter writer, String comment, int inden * @param indent positive number * @param indentSize positive number * @param columnSize positive number + * @throws IOException if writing fails. */ public static void writeCommentText( XMLWriter writer, String comment, int indent, int indentSize, int columnSize ) + throws IOException { if ( indent < 0 ) { diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java index 94d11c6e..b24d6f7e 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java @@ -19,6 +19,7 @@ * under the License. */ +import java.io.IOException; import java.io.StringWriter; import java.util.ArrayList; import java.util.Collections; @@ -375,10 +376,17 @@ public int hashCode() /** {@inheritDoc} */ public String toString() { - StringWriter writer = new StringWriter(); - Xpp3DomWriter.write( getPrettyPrintXMLWriter( writer ), this ); - return writer.toString(); - + try + { + StringWriter writer = new StringWriter(); + Xpp3DomWriter.write( getPrettyPrintXMLWriter( writer ), this ); + return writer.toString(); + } + catch ( final IOException e ) + { + // JDK error in StringWriter. + throw new AssertionError( "Unexpected IOException from StringWriter." ); + } } /** @@ -386,9 +394,17 @@ public String toString() */ public String toUnescapedString() { - StringWriter writer = new StringWriter(); - Xpp3DomWriter.write( getPrettyPrintXMLWriter( writer ), this, false ); - return writer.toString(); + try + { + StringWriter writer = new StringWriter(); + Xpp3DomWriter.write( getPrettyPrintXMLWriter( writer ), this, false ); + return writer.toString(); + } + catch ( final IOException e ) + { + // JDK error in StringWriter. + throw new AssertionError( "Unexpected IOException from StringWriter." ); + } } private PrettyPrintXMLWriter getPrettyPrintXMLWriter( StringWriter writer ) diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java index 9acf23c4..b390c545 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java @@ -19,6 +19,7 @@ * under the License. */ +import java.io.IOException; import java.io.PrintWriter; import java.io.Writer; @@ -30,8 +31,9 @@ public class Xpp3DomWriter /** * @param writer {@link Writer} * @param dom {@link Xpp3Dom} + * @throws IOException if writing fails. */ - public static void write( Writer writer, Xpp3Dom dom ) + public static void write( Writer writer, Xpp3Dom dom ) throws IOException { write( new PrettyPrintXMLWriter( writer ), dom ); } @@ -39,8 +41,9 @@ public static void write( Writer writer, Xpp3Dom dom ) /** * @param writer {@link PrintWriter} * @param dom {@link Xpp3Dom} + * @throws IOException if writing fails. */ - public static void write( PrintWriter writer, Xpp3Dom dom ) + public static void write( PrintWriter writer, Xpp3Dom dom ) throws IOException { write( new PrettyPrintXMLWriter( writer ), dom ); } @@ -48,8 +51,9 @@ public static void write( PrintWriter writer, Xpp3Dom dom ) /** * @param xmlWriter {@link XMLWriter} * @param dom {@link Xpp3Dom} + * @throws IOException if writing fails. */ - public static void write( XMLWriter xmlWriter, Xpp3Dom dom ) + public static void write( XMLWriter xmlWriter, Xpp3Dom dom ) throws IOException { write( xmlWriter, dom, true ); } @@ -58,8 +62,9 @@ public static void write( XMLWriter xmlWriter, Xpp3Dom dom ) * @param xmlWriter {@link XMLWriter} * @param dom {@link Xpp3Dom} * @param escape true/false. + * @throws IOException if writing fails. */ - public static void write( XMLWriter xmlWriter, Xpp3Dom dom, boolean escape ) + public static void write( XMLWriter xmlWriter, Xpp3Dom dom, boolean escape ) throws IOException { xmlWriter.startElement( dom.getName() ); String[] attributeNames = dom.getAttributeNames(); diff --git a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java index f60dd223..f2723327 100644 --- a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java +++ b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java @@ -1,5 +1,6 @@ package org.apache.maven.shared.utils.xml; +import java.io.IOException; import javax.swing.text.html.HTML; import java.io.StringWriter; @@ -60,7 +61,7 @@ public void after() } @Test - public void testDefaultPrettyPrintXMLWriter() + public void testDefaultPrettyPrintXMLWriter() throws IOException { writer.startElement( HTML.Tag.HTML.toString() ); @@ -74,7 +75,7 @@ public void testDefaultPrettyPrintXMLWriter() } @Test - public void testPrettyPrintXMLWriterWithGivenLineSeparator() + public void testPrettyPrintXMLWriterWithGivenLineSeparator() throws IOException { writer.setLineSeparator( "\n" ); @@ -90,7 +91,7 @@ public void testPrettyPrintXMLWriterWithGivenLineSeparator() } @Test - public void testPrettyPrintXMLWriterWithGivenLineIndenter() + public void testPrettyPrintXMLWriterWithGivenLineIndenter() throws IOException { writer.setLineIndenter( " " ); @@ -106,7 +107,7 @@ public void testPrettyPrintXMLWriterWithGivenLineIndenter() } @Test - public void testEscapeXmlAttributeWindows() + public void testEscapeXmlAttributeWindows() throws IOException { // Windows writer.startElement( HTML.Tag.DIV.toString() ); @@ -116,7 +117,7 @@ public void testEscapeXmlAttributeWindows() } @Test - public void testEscapeXmlAttributeMac() + public void testEscapeXmlAttributeMac() throws IOException { // Mac writer.startElement( HTML.Tag.DIV.toString() ); @@ -126,7 +127,7 @@ public void testEscapeXmlAttributeMac() } @Test - public void testEscapeXmlAttributeTrailingCR() + public void testEscapeXmlAttributeTrailingCR() throws IOException { // Mac writer.startElement( HTML.Tag.DIV.toString() ); @@ -136,7 +137,7 @@ public void testEscapeXmlAttributeTrailingCR() } @Test - public void testEscapeXmlAttributeUnix() + public void testEscapeXmlAttributeUnix() throws IOException { // Unix writer.startElement( HTML.Tag.DIV.toString() ); @@ -145,7 +146,7 @@ public void testEscapeXmlAttributeUnix() Assert.assertEquals( "
        ", w.toString() ); } - private void writeXhtmlHead( XMLWriter writer ) + private void writeXhtmlHead( XMLWriter writer ) throws IOException { writer.startElement( HTML.Tag.HEAD.toString() ); writer.startElement( HTML.Tag.TITLE.toString() ); @@ -162,7 +163,7 @@ private void writeXhtmlHead( XMLWriter writer ) writer.endElement(); // Tag.HEAD } - private void writeXhtmlBody( XMLWriter writer ) + private void writeXhtmlBody( XMLWriter writer ) throws IOException { writer.startElement( HTML.Tag.BODY.toString() ); writer.startElement( HTML.Tag.P.toString() ); From cf152e0ef6784aac93cb82ae894af7376ab413cc Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sun, 8 Jan 2017 04:13:22 +0000 Subject: [PATCH 071/265] [MSHARED-610] PrettyPrintXMLWriter internally uses java.io.PrintWriter without checking for any errors. o Removed an incorrect '@throws' tag from the Javadoc. o Updated to provide causing exception with any AssertionErrors added in last commit. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1777862 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java | 1 - src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java index fa963bbe..6623a82c 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java @@ -64,7 +64,6 @@ public class PrettyPrintXMLWriter /** * @param writer not null * @param lineIndent could be null, but the normal way is some spaces. - * @throws IOException if {@code writer} is in error state. */ public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent ) { diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java index b24d6f7e..83f20cd6 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java @@ -385,7 +385,7 @@ public String toString() catch ( final IOException e ) { // JDK error in StringWriter. - throw new AssertionError( "Unexpected IOException from StringWriter." ); + throw new AssertionError( "Unexpected IOException from StringWriter.", e ); } } @@ -403,7 +403,7 @@ public String toUnescapedString() catch ( final IOException e ) { // JDK error in StringWriter. - throw new AssertionError( "Unexpected IOException from StringWriter." ); + throw new AssertionError( "Unexpected IOException from StringWriter.", e ); } } From 269a0a3e6059c11474b97e1c8e4714303a76c6c1 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sun, 8 Jan 2017 04:41:30 +0000 Subject: [PATCH 072/265] [MSHARED-610] PrettyPrintXMLWriter internally uses java.io.PrintWriter without checking for any errors. o Updated to restore JDK compatibility by removing calls to constructors only available since Java 7. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1777864 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java index 83f20cd6..5efa8fc9 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java @@ -385,7 +385,7 @@ public String toString() catch ( final IOException e ) { // JDK error in StringWriter. - throw new AssertionError( "Unexpected IOException from StringWriter.", e ); + throw (AssertionError) new AssertionError( "Unexpected IOException from StringWriter." ).initCause( e ); } } @@ -403,7 +403,7 @@ public String toUnescapedString() catch ( final IOException e ) { // JDK error in StringWriter. - throw new AssertionError( "Unexpected IOException from StringWriter.", e ); + throw (AssertionError) new AssertionError( "Unexpected IOException from StringWriter." ).initCause( e ); } } From 362805fbf6341523edfdf509905812acb42f6a97 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sat, 25 Feb 2017 07:37:56 +0000 Subject: [PATCH 073/265] o Updated to remove an unused field (always null) and to not suppress exceptions silently when closing resources fails. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1784350 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/utils/cli/StreamPumper.java | 44 ++++++++----------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java index 5bed568c..7fa3ae4e 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java @@ -23,14 +23,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.PrintWriter; import java.io.Reader; import java.nio.charset.Charset; - import javax.annotation.Nullable; -import org.apache.maven.shared.utils.io.IOUtil; - /** * Class to pump the error stream during Process's runtime. Copied from the Ant built-in task. * @@ -44,8 +40,6 @@ public class StreamPumper private final StreamConsumer consumer; - private final PrintWriter out; - private volatile Exception exception = null; private static final int SIZE = 1024; @@ -56,7 +50,7 @@ public class StreamPumper */ public StreamPumper( InputStream in, StreamConsumer consumer ) { - this( new InputStreamReader( in ), null, consumer ); + this( new InputStreamReader( in ), consumer ); } /** @@ -66,18 +60,17 @@ public StreamPumper( InputStream in, StreamConsumer consumer ) */ public StreamPumper( InputStream in, StreamConsumer consumer, @Nullable Charset charset ) { - this( null == charset ? new InputStreamReader( in ) : new InputStreamReader( in, charset ), null, consumer ); + this( null == charset ? new InputStreamReader( in ) : new InputStreamReader( in, charset ), consumer ); } /** - * @param in {@link Writer} - * @param writer {@link PrintWriter} + * @param in {@link Reader} * @param consumer {@link StreamConsumer} */ - private StreamPumper( Reader in, PrintWriter writer, StreamConsumer consumer ) + private StreamPumper( Reader in, StreamConsumer consumer ) { + super(); this.in = new BufferedReader( in, SIZE ); - this.out = writer; this.consumer = consumer; } @@ -99,14 +92,6 @@ public void run() { exception = t; } - - if ( out != null ) - { - out.println( line ); - - out.flush(); - } - } } catch ( IOException e ) @@ -115,7 +100,17 @@ public void run() } finally { - IOUtil.close( in ); + try + { + in.close(); + } + catch ( final IOException e2 ) + { + if ( this.exception == null ) + { + this.exception = e2; + } + } synchronized ( this ) { @@ -131,10 +126,7 @@ public void run() */ public void flush() { - if ( out != null ) - { - out.flush(); - } + // Nothing to flush. } /** @@ -142,7 +134,7 @@ public void flush() */ public void close() { - IOUtil.close( out ); + // Nothing to close. } /** From 27af45337a67d1e9618d1fd6670ba90225ad9e05 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sat, 25 Feb 2017 08:11:19 +0000 Subject: [PATCH 074/265] o Updated method 'consumeLine(String)' of the 'StreamConsumer' interface adding 'IOException' to the list of declared exceptions to allow implementors to report any failures when consuming a line fails. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1784357 13f79535-47bb-0310-9956-ffa450edef68 --- .../shared/utils/cli/CommandLineUtils.java | 1 + .../shared/utils/cli/DefaultConsumer.java | 15 +++++++++++-- .../shared/utils/cli/StreamConsumer.java | 5 ++++- .../maven/shared/utils/cli/StreamPumper.java | 2 +- .../utils/cli/WriterStreamConsumer.java | 21 ++++++++++++------- .../utils/cli/javatool/AbstractJavaTool.java | 2 ++ 6 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java index c39ec695..6e1bc812 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java @@ -52,6 +52,7 @@ public static class StringStreamConsumer private static final String LS = System.getProperty( "line.separator" ); /** {@inheritDoc} */ + @Override public void consumeLine( String line ) { string.append( line ).append( LS ); diff --git a/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java b/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java index 040b8adf..5104877c 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java @@ -19,6 +19,8 @@ * under the License. */ +import java.io.IOException; + /** * @author Emmanuel Venisse * @version $Id$ @@ -26,9 +28,18 @@ public class DefaultConsumer implements StreamConsumer { - /** {@inheritDoc} */ - public void consumeLine( String line ) + + /** + * {@inheritDoc} + */ + @Override + public void consumeLine( String line ) throws IOException { System.out.println( line ); + if ( System.out.checkError() ) + { + throw new IOException( String.format( "Failure writing line '%s' to stdout.", line ) ); + } } + } diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java index dc6802b8..0cde961e 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java @@ -19,6 +19,8 @@ * under the License. */ +import java.io.IOException; + /** * Works in concert with the StreamPumper class to * allow implementations to gain access to the lines being @@ -35,6 +37,7 @@ public interface StreamConsumer /** * Called when the StreamPumper pumps a line from the Stream. * @param line The line to be consumed. + * @throws IOException if consuming {@code line} fails. */ - void consumeLine( String line ); + void consumeLine( String line ) throws IOException; } diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java index 7fa3ae4e..411d55e0 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java @@ -145,7 +145,7 @@ public Exception getException() return exception; } - private void consumeLine( String line ) + private void consumeLine( String line ) throws IOException { if ( consumer != null && !isDisabled() ) { diff --git a/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java b/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java index b95a81f8..f8ce0d8c 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java @@ -19,7 +19,8 @@ * under the License. */ -import java.io.PrintWriter; +import java.io.BufferedWriter; +import java.io.IOException; import java.io.Writer; /** @@ -30,22 +31,26 @@ public class WriterStreamConsumer implements StreamConsumer { - private final PrintWriter writer; + private final BufferedWriter writer; /** * @param writer {@link Writer} */ public WriterStreamConsumer( Writer writer ) { - this.writer = new PrintWriter( writer ); + super(); + this.writer = new BufferedWriter( writer ); } - /** {@inheritDoc} + /** + * {@inheritDoc} */ - public void consumeLine( String line ) + @Override + public void consumeLine( String line ) throws IOException { - writer.println( line ); - - writer.flush(); + this.writer.append( line ); + this.writer.newLine(); + this.writer.flush(); } + } diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java index 09b33f0b..22826802 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java @@ -199,6 +199,7 @@ protected StreamConsumer createSystemErrorStreamConsumer( Request request ) /** * {@inheritDoc} */ + @Override public void consumeLine( final String line ) { getLogger().warn( line ); @@ -226,6 +227,7 @@ protected StreamConsumer createSystemOutStreamConsumer( Request request ) /** * {@inheritDoc} */ + @Override public void consumeLine( final String line ) { getLogger().info( line ); From 9c22e95bda599604e98d5e42e1f28e0fb69645b0 Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sun, 26 Feb 2017 10:08:13 +0000 Subject: [PATCH 075/265] [MSHARED-619] StreamFeeder silently ignores exceptions. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1784430 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/utils/cli/StreamFeeder.java | 39 ++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java index 8409eebb..1655c789 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java @@ -33,25 +33,26 @@ class StreamFeeder extends AbstractStreamHandler { + private final AtomicReference input; + private final AtomicReference output; + private volatile Throwable exception; + /** * Create a new StreamFeeder * - * @param input Stream to read from + * @param input Stream to read from * @param output Stream to write to */ public StreamFeeder( InputStream input, OutputStream output ) { + super(); this.input = new AtomicReference( input ); this.output = new AtomicReference( output ); } - // ---------------------------------------------------------------------- - // Runnable implementation - // ---------------------------------------------------------------------- - @Override public void run() { @@ -62,6 +63,10 @@ public void run() catch ( Throwable e ) { // Catch everything so the streams will be closed and flagged as done. + if ( this.exception != null ) + { + this.exception = e; + } } finally { @@ -74,10 +79,6 @@ public void run() } } - // ---------------------------------------------------------------------- - // - // ---------------------------------------------------------------------- - public void close() { setDone(); @@ -90,7 +91,10 @@ public void close() } catch ( IOException ex ) { - // ignore + if ( this.exception != null ) + { + this.exception = ex; + } } } @@ -103,14 +107,21 @@ public void close() } catch ( IOException ex ) { - // ignore + if ( this.exception != null ) + { + this.exception = ex; + } } } } - // ---------------------------------------------------------------------- - // - // ---------------------------------------------------------------------- + /** + * @since 3.2.0 + */ + public Throwable getException() + { + return this.exception; + } @SuppressWarnings( "checkstyle:innerassignment" ) private void feed() From fd082c077c78f8ce83fce2a92f0265e83599a42f Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sun, 26 Feb 2017 10:09:58 +0000 Subject: [PATCH 076/265] [MSHARED-617] StreamFeeder should flush OutputStream git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1784431 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/shared/utils/cli/StreamFeeder.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java index 1655c789..2d32e2d0 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java @@ -129,6 +129,8 @@ private void feed() { InputStream is = input.get(); OutputStream os = output.get(); + boolean flush = false; + if ( is != null && os != null ) { for ( int data; !isDone() && ( data = is.read() ) != -1; ) @@ -136,8 +138,14 @@ private void feed() if ( !isDisabled() ) { os.write( data ); + flush = true; } } + + if ( flush ) + { + os.flush(); + } } } From f2246e0653b185297451902ee278e6aec1ff470e Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sun, 26 Feb 2017 10:19:55 +0000 Subject: [PATCH 077/265] [MSHARED-618] CommandLineCallable does not always call the 'runAfterProcessTermination' runnable. [MSHARED-620] CommandLineCallable should defer starting threads until called. [MSHARED-621] CommandLineCallable should calculate process timeouts using 'System.nanoTime' instead of 'System.currentTimeMillis'. [MSHARED-622] CommandLineCallable silently ignores exceptions thrown from the stdin processor (StreemFeeder). git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1784432 13f79535-47bb-0310-9956-ffa450edef68 --- .../shared/utils/cli/CommandLineUtils.java | 196 +++++++++++------- 1 file changed, 124 insertions(+), 72 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java index 6e1bc812..4beea131 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java @@ -42,16 +42,21 @@ public abstract class CommandLineUtils { /** - * + * A {@code StreamConsumer} providing consumed lines as a {@code String}. + * + * @see #getOutput() */ public static class StringStreamConsumer implements StreamConsumer { + private final StringBuffer string = new StringBuffer(); - private static final String LS = System.getProperty( "line.separator" ); + private static final String LS = System.getProperty( "line.separator", "\n" ); - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ @Override public void consumeLine( String line ) { @@ -65,27 +70,18 @@ public String getOutput() { return string.toString(); } - } - - private static class ProcessHook - extends Thread - { - private final Process process; - - private ProcessHook( Process process ) - { - super( "CommandlineUtils process shutdown hook" ); - this.process = process; - this.setContextClassLoader( null ); - } - /** {@inheritDoc} */ - public void run() - { - process.destroy(); - } } + /** + * Number of milliseconds per second. + */ + private static final long MILLIS_PER_SECOND = 1000L; + + /** + * Number of nanoseconds per second. + */ + private static final long NANOS_PER_SECOND = 1000000000L; /** * @param cl The command line {@link Commandline} @@ -248,32 +244,48 @@ public static CommandLineCallable executeCommandLineAsCallable( @Nonnull final C final Process p = cl.execute(); - final StreamFeeder inputFeeder = systemIn != null ? new StreamFeeder( systemIn, p.getOutputStream() ) : null; - - final StreamPumper outputPumper = new StreamPumper( p.getInputStream(), systemOut ); - - final StreamPumper errorPumper = new StreamPumper( p.getErrorStream(), systemErr ); - - if ( inputFeeder != null ) + final Thread processHook = new Thread() { - inputFeeder.start(); - } - outputPumper.start(); + { + this.setName( "CommandLineUtils process shutdown hook" ); + this.setContextClassLoader( null ); + } - errorPumper.start(); + @Override + public void run() + { + p.destroy(); + } - final ProcessHook processHook = new ProcessHook( p ); + }; ShutdownHookUtils.addShutDownHook( processHook ); return new CommandLineCallable() { + + @Override public Integer call() throws CommandLineException { + StreamFeeder inputFeeder = null; + StreamPumper outputPumper = null; + StreamPumper errorPumper = null; try { + if ( systemIn != null ) + { + inputFeeder = new StreamFeeder( systemIn, p.getOutputStream() ); + inputFeeder.start(); + } + + outputPumper = new StreamPumper( p.getInputStream(), systemOut ); + outputPumper.start(); + + errorPumper = new StreamPumper( p.getErrorStream(), systemErr ); + errorPumper.start(); + int returnValue; if ( timeoutInSeconds <= 0 ) { @@ -281,83 +293,123 @@ public Integer call() } else { - long now = System.currentTimeMillis(); - long timeoutInMillis = 1000L * timeoutInSeconds; - long finish = now + timeoutInMillis; - while ( isAlive( p ) && ( System.currentTimeMillis() < finish ) ) + final long now = System.nanoTime(); + final long timeout = now + NANOS_PER_SECOND * timeoutInSeconds; + while ( isAlive( p ) && ( System.nanoTime() < timeout ) ) { - Thread.sleep( 10 ); + // The timeout is specified in seconds. Therefore we must not sleep longer than one second + // but we should sleep as long as possible to reduce the number of iterations performed. + Thread.sleep( MILLIS_PER_SECOND - 1L ); } + if ( isAlive( p ) ) { - throw new InterruptedException( - "Process timeout out after " + timeoutInSeconds + " seconds" ); + throw new InterruptedException( String.format( "Process timed out after %d seconds.", + timeoutInSeconds ) ); + } returnValue = p.exitValue(); } - if ( runAfterProcessTermination != null ) +// TODO Find out if waitUntilDone needs to be called using a try-finally construct. The method may throw an +// InterruptedException so that calls to waitUntilDone may be skipped. +// try +// { +// if ( inputFeeder != null ) +// { +// inputFeeder.waitUntilDone(); +// } +// } +// finally +// { +// try +// { +// outputPumper.waitUntilDone(); +// } +// finally +// { +// errorPumper.waitUntilDone(); +// } +// } + if ( inputFeeder != null ) { - runAfterProcessTermination.run(); + inputFeeder.waitUntilDone(); } - waitForAllPumpers( inputFeeder, outputPumper, errorPumper ); + outputPumper.waitUntilDone(); + errorPumper.waitUntilDone(); + + if ( inputFeeder != null ) + { + inputFeeder.close(); + + if ( inputFeeder.getException() != null ) + { + throw new CommandLineException( "Failure processing stdin.", inputFeeder.getException() ); + } + } if ( outputPumper.getException() != null ) { - throw new CommandLineException( "Error inside systemOut parser", outputPumper.getException() ); + throw new CommandLineException( "Failure processing stdout.", outputPumper.getException() ); } if ( errorPumper.getException() != null ) { - throw new CommandLineException( "Error inside systemErr parser", errorPumper.getException() ); + throw new CommandLineException( "Failure processing stderr.", errorPumper.getException() ); } return returnValue; } catch ( InterruptedException ex ) { - if ( inputFeeder != null ) - { - inputFeeder.disable(); - } - - outputPumper.disable(); - errorPumper.disable(); throw new CommandLineTimeOutException( "Error while executing external command, process killed.", ex ); + } finally { - ShutdownHookUtils.removeShutdownHook( processHook ); - - processHook.run(); - if ( inputFeeder != null ) { - inputFeeder.close(); + inputFeeder.disable(); + } + if ( outputPumper != null ) + { + outputPumper.disable(); + } + if ( errorPumper != null ) + { + errorPumper.disable(); } - outputPumper.close(); + try + { + if ( runAfterProcessTermination != null ) + { + runAfterProcessTermination.run(); + } + } + finally + { + ShutdownHookUtils.removeShutdownHook( processHook ); - errorPumper.close(); + try + { + processHook.run(); + } + finally + { + if ( inputFeeder != null ) + { + inputFeeder.close(); + } + } + } } } - }; - } - private static void waitForAllPumpers( @Nullable StreamFeeder inputFeeder, StreamPumper outputPumper, - StreamPumper errorPumper ) - throws InterruptedException - { - if ( inputFeeder != null ) - { - inputFeeder.waitUntilDone(); - } - - outputPumper.waitUntilDone(); - errorPumper.waitUntilDone(); + }; } /** From 32f70b9b99aa25515ce0d3af1965a4f8b11d6d8f Mon Sep 17 00:00:00 2001 From: Christian Schulte Date: Sun, 26 Feb 2017 10:23:23 +0000 Subject: [PATCH 078/265] [MSHARED-623] Deprecation of methods 'close' and 'flush' of class 'StreamPumper'. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1784434 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/shared/utils/cli/StreamPumper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java index 411d55e0..980bfb61 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java @@ -123,7 +123,10 @@ public void run() /** * flush. + * + * @deprecated As of 3.2.0, removed without replacement. */ + @Deprecated public void flush() { // Nothing to flush. @@ -131,7 +134,10 @@ public void flush() /** * Close it. + * + * @deprecated As of 3.2.0, removed without replacement. */ + @Deprecated public void close() { // Nothing to close. From e2b98b342a270cf044ef17481bee8dd7ee3a98fc Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Fri, 21 Apr 2017 09:52:28 +0000 Subject: [PATCH 079/265] [MSHARED-574] UT failure on Windows: utils.io.Java7SupportTest createAndReadSymlink Disable #createAndReadSymlink() for all Windows. Eventhough Windows Vista+ suppor Symlinks, we need elevated rights which we cannot obtain at runtime. Disable for now on Windows in general. It might be better to catch the exception on Windows... This closes #16 git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1792170 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/shared/utils/io/Java7SupportTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java b/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java index 36cc1cb4..9652e53f 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java @@ -26,8 +26,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assume.assumeThat; -import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.startsWith; public class Java7SupportTest { @@ -47,7 +47,7 @@ public void testIsSymLink() public void createAndReadSymlink() throws Exception { - assumeThat( System.getProperty( "os.name" ), is( not( "Windows XP" ) ) ); + assumeThat( System.getProperty( "os.name" ), not( startsWith( "Windows" ) ) ); File file = new File( "target/fzz" ); if ( Java7Support.isAtLeastJava7() ) { From 80329614359e04ce9d5c151036c2714854eb7b79 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Fri, 21 Apr 2017 09:55:10 +0000 Subject: [PATCH 080/265] [MSHARED-630] Javadoc of several classes still references Maven 3.4.0 for color support git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1792172 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/utils/logging/MessageUtils.java | 8 ++++---- .../shared/utils/logging/PlainMessageBuilder.java | 10 +++++----- .../maven/shared/utils/logging/package-info.java | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java index c21165b2..6cec6be9 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java @@ -23,8 +23,8 @@ import org.fusesource.jansi.AnsiConsole; /** - * 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. + * Colored message utils, to manage colors consistently across plugins (only if Maven version is at least 3.5.0). + * For Maven version before 3.5.0, message built with this util will never add color. *

        * Internally, Jansi is used to render * ANSI colors on any platform. @@ -39,7 +39,7 @@ public class MessageUtils boolean jansi = true; try { - // JAnsi is provided by Maven core since 3.4.0 + // JAnsi is provided by Maven core since 3.5.0 Class.forName( "org.fusesource.jansi.Ansi" ); } catch ( ClassNotFoundException cnfe ) @@ -51,7 +51,7 @@ public class MessageUtils /** * Install color support. - * This method is called by Maven core, and calling it is not necessary in plugins. + * This method is called by Maven core, and calling it is not necessary in plugins. */ public static void systemInstall() { diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java index abee6dd3..6a7b56e1 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java @@ -20,7 +20,7 @@ */ /** - * Message builder implementation that just ignores styling, for Maven version earlier than 3.4.0. + * Message builder implementation that just ignores styling, for Maven version earlier than 3.5.0. */ class PlainMessageBuilder implements MessageBuilder, LoggerLevelRenderer @@ -46,17 +46,17 @@ public String debug( String level ) { return a( level ).toString(); } - + public String info( String level ) { return a( level ).toString(); } - + public String warning( String level ) { return a( level ).toString(); } - + public String error( String level ) { return a( level ).toString(); @@ -71,7 +71,7 @@ public PlainMessageBuilder warning( Object message ) { return a( message ); } - + public PlainMessageBuilder failure( Object message ) { return a( message ); diff --git a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java index e90ab654..dfc5ddee 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/package-info.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/package-info.java @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -19,7 +19,7 @@ */ /** * An API to write Maven messages to console with styled color content, consistently across whole - * Maven ecosystem (Maven itself or any plugin or extension). + * Maven ecosystem (Maven itself or any plugin or extension). *

        * Messages are built with instances of {@link org.apache.maven.shared.utils.logging.MessageBuilder MessageBuilder} * which provides a fluent API, while error level are colored by slf4j provider with @@ -28,10 +28,10 @@ * {@link org.apache.maven.shared.utils.logging.MessageUtils MessageUtils} gives access to these builders. *

        * Plugins can use this API with any Maven version: color - * just won't be activated when run with Maven version older than 3.4.0. + * just won't be activated when run with Maven version older than 3.5.0. *

        * Styles are:

          - *
        • debug, info, warning and error for + *
        • debug, info, warning and error for * {@link org.apache.maven.shared.utils.logging.LoggerLevelRenderer logger level rendering},
          • *
        • success, warning, failure, strong, mojo * and project for {@link org.apache.maven.shared.utils.logging.MessageBuilder message content}
          • @@ -40,7 +40,7 @@ * environment variable (eventually in .mavenrc script):
            *
          • system properties are named style.<style name>,
            • *
          • values are comma separated combination of bold, <color> and - * bg<color> (for background), where <color> is + * bg<color> (for background), where <color> is * an ANSI color: black, * red, green, yellow, blue, magenta, * cyan or white, eventually with bright prefix
            • From ce1b1608f6563547c0b6293866affc0132c06a99 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Tue, 13 Jun 2017 19:02:25 +0000 Subject: [PATCH 081/265] [MSHARED-639] Removed prerequisites cause it is not a plugin git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1798627 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1c4f36f0..3afa511d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,10 +33,6 @@ Apache Maven Shared Utils Shared utils without any further dependencies - - ${mavenVersion} - - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils From 3ee83bb20533670204a55d91c0e259cb0bb80946 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Tue, 13 Jun 2017 19:06:22 +0000 Subject: [PATCH 082/265] [maven-release-plugin] prepare release maven-shared-utils-3.2.0 git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1798628 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3afa511d..b8fffbb8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,16 +28,16 @@ maven-shared-utils - 3.2.0-SNAPSHOT + 3.2.0 Apache Maven Shared Utils Shared utils without any further dependencies - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.2.0 + scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.2.0 - http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils + http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-3.2.0 jira From eae39e84f5242330062399845f23b25adeedbad4 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Tue, 13 Jun 2017 19:06:38 +0000 Subject: [PATCH 083/265] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1798630 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b8fffbb8..14add686 100644 --- a/pom.xml +++ b/pom.xml @@ -28,16 +28,16 @@ maven-shared-utils - 3.2.0 + 3.2.1-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.2.0 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.2.0 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-3.2.0 + http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils jira From c6dc1fa6c2eb09b8c66791d80de2a5c3dc3cd3b0 Mon Sep 17 00:00:00 2001 From: Robert Scholte Date: Mon, 3 Jul 2017 22:01:39 +0000 Subject: [PATCH 084/265] [MSHARED-648] Add registerShutdownHook to MessageUtils git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1800716 13f79535-47bb-0310-9956-ffa450edef68 --- .../shared/utils/logging/MessageUtils.java | 59 +++++++++++++++++++ .../utils/logging/MessageUtilsTest.java | 48 +++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java index 6cec6be9..74b85a42 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java @@ -34,6 +34,12 @@ public class MessageUtils { private static final boolean JANSI; + /** Reference to the JVM shutdown hook, if registered */ + private static Thread shutdownHook; + + /** Synchronization monitor for the "uninstall" */ + private static final Object STARTUP_SHUTDOWN_MONITOR = new Object(); + static { boolean jansi = true; @@ -67,6 +73,31 @@ public static void systemInstall() * it is actually uninstalled. */ public static void systemUninstall() + { + synchronized ( STARTUP_SHUTDOWN_MONITOR ) + { + doSystemUninstall(); + + // hook can only set when JANSI is true + if ( shutdownHook != null ) + { + // if out and system_out are same instance again, ansi is assumed to be uninstalled + if ( AnsiConsole.out == AnsiConsole.system_out ) + { + try + { + Runtime.getRuntime().removeShutdownHook( shutdownHook ); + } + catch ( IllegalStateException ex ) + { + // ignore - VM is already shutting down + } + } + } + } + } + + private static void doSystemUninstall() { if ( JANSI ) { @@ -142,4 +173,32 @@ public static String stripAnsiCodes( String msg ) return msg.replaceAll( "\u001B\\[[;\\d]*[ -/]*[@-~]", "" ); } + /** + * Register a shutdown hook with the JVM runtime, uninstalling Ansi support on + * JVM shutdown unless is has already been uninstalled at that time. + *

            Delegates to {@link #doSystemUninstall()} for the actual uninstall procedure + * + * @see Runtime#addShutdownHook(Thread) + * @see MessageUtils#systemUninstall() + * @see #doSystemUninstall() + */ + public static void registerShutdownHook() + { + if ( JANSI && shutdownHook == null ) + { + // No shutdown hook registered yet. + shutdownHook = new Thread() + { + @Override + public void run() + { + synchronized ( STARTUP_SHUTDOWN_MONITOR ) + { + doSystemUninstall(); + } + } + }; + Runtime.getRuntime().addShutdownHook( shutdownHook ); + } + } } diff --git a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java new file mode 100644 index 00000000..1a6d4b47 --- /dev/null +++ b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java @@ -0,0 +1,48 @@ +package org.apache.maven.shared.utils.logging; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.sameInstance; +import static org.junit.Assert.assertThat; + +import java.io.PrintStream; + +import org.junit.Test; + +public class MessageUtilsTest +{ + @Test + public void testSystem() + { + PrintStream currentOut = System.out; + try + { + MessageUtils.systemInstall(); + assertThat( System.out, not( sameInstance( currentOut ) ) ); + MessageUtils.systemUninstall(); + assertThat( System.out, sameInstance( currentOut ) ); + } + finally + { + System.setOut( currentOut ); + } + } +} From 8f12a7280e9f7ef166b611f212da376d207efa88 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 30 Jul 2017 22:43:41 +0000 Subject: [PATCH 085/265] fixed errors reported by Checkstyle git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1803476 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/shared/utils/cli/StreamFeeder.java | 2 +- .../utils/introspection/IntrospectionException.java | 4 ++-- .../utils/introspection/ReflectionValueExtractor.java | 2 +- .../org/apache/maven/shared/utils/io/DirectoryWalker.java | 4 ++-- .../org/apache/maven/shared/utils/io/ScanConductor.java | 2 +- .../apache/maven/shared/utils/reflection/Reflector.java | 2 +- .../maven/shared/utils/reflection/ReflectorException.java | 8 ++++---- .../maven/shared/utils/xml/XmlStreamReaderException.java | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java index 2d32e2d0..26e9de3a 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java @@ -46,7 +46,7 @@ class StreamFeeder * @param input Stream to read from * @param output Stream to write to */ - public StreamFeeder( InputStream input, OutputStream output ) + StreamFeeder( InputStream input, OutputStream output ) { super(); this.input = new AtomicReference( input ); diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java b/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java index 56200a4c..924137c5 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java @@ -28,12 +28,12 @@ class IntrospectionException */ private static final long serialVersionUID = -6090771282553728784L; - public IntrospectionException( String message ) + IntrospectionException( String message ) { super( message ); } - public IntrospectionException( Throwable cause ) + IntrospectionException( Throwable cause ) { super( cause ); } diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java index 3cf3a487..014f10c9 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java @@ -76,7 +76,7 @@ static class Tokenizer int idx; - public Tokenizer( String expression ) + Tokenizer( String expression ) { this.expression = expression; } diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java index 33d214c7..3713fe2f 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java @@ -67,7 +67,7 @@ static class DirStackEntry * @param d the directory to track * @param length the length of entries in the directory. */ - public DirStackEntry( File d, int length ) + DirStackEntry( File d, int length ) { dir = d; count = length; @@ -125,7 +125,7 @@ public String toString() private final List listeners; - public DirectoryWalker() + DirectoryWalker() { this.includes = new ArrayList(); this.excludes = new ArrayList(); diff --git a/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java b/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java index 61d74620..bd19067b 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java +++ b/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java @@ -39,7 +39,7 @@ public interface ScanConductor /** * */ - public enum ScanAction + enum ScanAction { /** * Abort the whole scanning process. The current file will not diff --git a/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java b/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java index f35cf129..c4cb3b70 100644 --- a/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java +++ b/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java @@ -45,7 +45,7 @@ final class Reflector /** * Ensure no instances of Reflector are created...this is a utility. */ - public Reflector() + Reflector() { } diff --git a/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java b/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java index 5910662c..76fa2147 100644 --- a/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java +++ b/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java @@ -32,7 +32,7 @@ class ReflectorException /** * Create a new ReflectorException. */ - public ReflectorException() + ReflectorException() { } @@ -41,7 +41,7 @@ public ReflectorException() * * @param msg The message. */ - public ReflectorException( String msg ) + ReflectorException( String msg ) { super( msg ); } @@ -51,7 +51,7 @@ public ReflectorException( String msg ) * * @param root The root cause. */ - public ReflectorException( Throwable root ) + ReflectorException( Throwable root ) { super( root ); } @@ -63,7 +63,7 @@ public ReflectorException( Throwable root ) * @param msg The message. * @param root The root cause. */ - public ReflectorException( String msg, Throwable root ) + ReflectorException( String msg, Throwable root ) { super( msg, root ); } diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java index f1fbb1a3..eeabae53 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java @@ -54,7 +54,7 @@ class XmlStreamReaderException * @param xmlEnc XML prolog encoding. * @param is the unconsumed InputStream. */ - public XmlStreamReaderException( String msg, String bomEnc, String xmlGuessEnc, String xmlEnc, InputStream is ) + XmlStreamReaderException( String msg, String bomEnc, String xmlGuessEnc, String xmlEnc, InputStream is ) { super( msg, bomEnc, xmlGuessEnc, xmlEnc, is ); } @@ -73,7 +73,7 @@ public XmlStreamReaderException( String msg, String bomEnc, String xmlGuessEnc, * @param xmlEnc XML prolog encoding. * @param is the unconsumed InputStream. */ - public XmlStreamReaderException( String msg, String ctMime, String ctEnc, String bomEnc, String xmlGuessEnc, + XmlStreamReaderException( String msg, String ctMime, String ctEnc, String bomEnc, String xmlGuessEnc, String xmlEnc, InputStream is ) { super( msg, ctMime, ctEnc, bomEnc, xmlGuessEnc, xmlEnc, is ); From 029ac4ec7b6636e8c1d3230799be624ba769e4cf Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Tue, 8 Aug 2017 19:49:52 +0000 Subject: [PATCH 086/265] [maven-release-plugin] prepare release maven-shared-utils-3.3.0 git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1804466 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 14add686..30f1bb84 100644 --- a/pom.xml +++ b/pom.xml @@ -28,16 +28,16 @@ maven-shared-utils - 3.2.1-SNAPSHOT + 3.3.0 Apache Maven Shared Utils Shared utils without any further dependencies - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.3.0 + scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.3.0 - http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils + http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-3.3.0 jira From a8da2d52d99b2907314d3424eb9eb413699f62ef Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Tue, 8 Aug 2017 19:50:08 +0000 Subject: [PATCH 087/265] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1804468 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 30f1bb84..68316a1e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,16 +28,16 @@ maven-shared-utils - 3.3.0 + 3.3.1-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.3.0 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-shared-utils-3.3.0 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - http://svn.apache.org/viewvc/maven/shared/tags/maven-shared-utils-3.3.0 + http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils jira From 25c214821a525d8dff9ad13ee6fbc6ff7aba798d Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Tue, 8 Aug 2017 20:29:02 +0000 Subject: [PATCH 088/265] Undone release based on JDK 9 issue. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1804471 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68316a1e..14add686 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 3.3.1-SNAPSHOT + 3.2.1-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies From 0081a364449eeb25ae32173ec71f0140a33a369d Mon Sep 17 00:00:00 2001 From: Robert Scholte Date: Mon, 16 Oct 2017 19:09:31 +0000 Subject: [PATCH 089/265] Fix CaseTest for Azeri (equivalent to turkish) git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1812311 13f79535-47bb-0310-9956-ffa450edef68 --- src/test/java/org/apache/maven/shared/utils/CaseTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/apache/maven/shared/utils/CaseTest.java b/src/test/java/org/apache/maven/shared/utils/CaseTest.java index 232a06dc..46e8055d 100644 --- a/src/test/java/org/apache/maven/shared/utils/CaseTest.java +++ b/src/test/java/org/apache/maven/shared/utils/CaseTest.java @@ -145,7 +145,8 @@ public void testAsciiAvailableLocales() // check result String expectedToUpperCase = upper; String expectedToLowerCase = lower; - if ( LOCALE_TURKISH.getLanguage().equals( locale.getLanguage() ) ) + if ( LOCALE_TURKISH.getLanguage().equals( locale.getLanguage() ) || + new Locale( "az" ).getLanguage().equals( locale.getLanguage() ) ) { expectedToUpperCase = upper.replace( DOTLESS_I, DOTTED_I ); expectedToLowerCase = lower.replace( DOTTED_i, DOTLESS_i ); From 5bba182f939fdeeb86a311ba208102826588764d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sat, 9 Dec 2017 19:30:51 +0100 Subject: [PATCH 090/265] moved to git --- .gitignore | 15 +++++++++++++++ Jenkinsfile | 20 ++++++++++++++++++++ pom.xml | 14 +++++++++----- 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 .gitignore create mode 100644 Jenkinsfile diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f79c9285 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +target/ +.project +.classpath +.settings/ +.svn/ +bin/ +# Intellij +*.ipr +*.iml +.idea +out/ +.DS_Store +/bootstrap +/dependencies.xml +.java-version diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..09ac70f1 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() diff --git a/pom.xml b/pom.xml index 14add686..8f4028df 100644 --- a/pom.xml +++ b/pom.xml @@ -34,15 +34,19 @@ Shared utils without any further dependencies - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-utils - - http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils - + scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git + scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git + https://github.com/apache/maven-shared-utils/tree/${project.scm.tag} + HEAD + jira https://issues.apache.org/jira/browse/MSHARED/component/12326452 + + Jenkins + https://builds.apache.org/job/maven-box/job/maven-shared-utils/ + apache.website From 80f07d8168a6916d7f32778ed0639c240a8e001a Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sat, 30 Dec 2017 18:49:17 +0100 Subject: [PATCH 091/265] [MSHARED-672] Upgrade plexus-container-default to 1.7.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f4028df..662b1e21 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ org.codehaus.plexus plexus-container-default - 1.0-alpha-9-stable-1 + 1.7.1 provided From 25e36069b555cac2e1cf2fb7edbac55d4a26d296 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 31 Dec 2017 13:22:34 +0100 Subject: [PATCH 092/265] Upgraded maven-surefire/maven-failsafe to 2.20.1 to check for the failures of tests on Jenkins. --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index 662b1e21..10f2bf06 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,20 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20.1 + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.20.1 + + + org.codehaus.mojo From f7db03e0dab71ff10e8d64570fa45bb56d11a2c6 Mon Sep 17 00:00:00 2001 From: rfscholte Date: Mon, 5 Feb 2018 21:42:25 +0100 Subject: [PATCH 093/265] [maven-release-plugin] prepare release maven-shared-utils-3.2.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 10f2bf06..f10066b8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 3.2.1-SNAPSHOT + 3.2.1 Apache Maven Shared Utils Shared utils without any further dependencies @@ -37,7 +37,7 @@ scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git https://github.com/apache/maven-shared-utils/tree/${project.scm.tag} - HEAD + maven-shared-utils-3.2.1 jira From 8d81509523afd75c782f35e1bbb18441f3c28bb0 Mon Sep 17 00:00:00 2001 From: rfscholte Date: Mon, 5 Feb 2018 21:42:55 +0100 Subject: [PATCH 094/265] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f10066b8..ace86fb9 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ maven-shared-utils - 3.2.1 + 3.2.2-SNAPSHOT Apache Maven Shared Utils Shared utils without any further dependencies @@ -37,7 +37,7 @@ scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git https://github.com/apache/maven-shared-utils/tree/${project.scm.tag} - maven-shared-utils-3.2.1 + HEAD jira From c83335ae80a928e42379bb292e662bb1f75060c2 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Fri, 23 Feb 2018 19:27:43 +0100 Subject: [PATCH 095/265] [MSHARED-684] - Upgrade parent to 31 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ace86fb9..497a4806 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components - 30 + 31 ../../pom/maven/maven-shared-components/pom.xml From fe1bf39b73b8fffafb9c33ac762b2314e7ced375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Fri, 11 May 2018 15:01:36 +0200 Subject: [PATCH 096/265] [MNGSITE-328] use sha1 checksum instead of md5 --- src/site/xdoc/download.xml.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index 5d1650bd..43899462 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -108,7 +108,7 @@ under the License. ${project.name} ${project.version} (Source zip) maven/shared/${project.artifactId}-${project.version}-source-release.zip - maven/shared/${project.artifactId}-${project.version}-source-release.zip.md5 + maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha1 maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc From 283d4f9ff66bdad1826c7edb4fbfdec48d2134b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Tue, 19 Jun 2018 00:02:20 +0200 Subject: [PATCH 097/265] [INFRA-16467] move components documentation out of CMS space --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 497a4806..e4129cbc 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ apache.website - scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path} + scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path} From ff82b1ea094468e0c1b3e4de4438514269974034 Mon Sep 17 00:00:00 2001 From: Kathryn Date: Thu, 26 Jul 2018 16:52:36 +0100 Subject: [PATCH 098/265] (doc) readme update for shared-utils in line with apache/maven-compiler-plugin --- readme.md | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 5881dece..1cf95ed2 100644 --- a/readme.md +++ b/readme.md @@ -16,7 +16,86 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -Apache Maven Shared Utils -This project aims to be a functional replacement for -plexus-utils in maven core. \ No newline at end of file +Contributing to Apache Maven Shared Utils +====================== + +[![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license] +[![Jenkins Status](https://img.shields.io/jenkins/s/https/builds.apache.org/job/maven-box/job/maven-shared-utils/job/master.svg?style=flat-square)][build] +[![Jenkins tests](https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-box/job/maven-shared-utils/job/master.svg?style=flat-square)][test-results] + + +You have found a bug or you have an idea for a cool new feature? Contributing +code is a great way to give something back to the open source community, learn from experts and widen your network. Before +you dig right into the code, there are a few guidelines that we need +contributors to follow so that we can have a chance of keeping on top of +things. + +Getting Started +--------------- + ++ Make sure you have a [JIRA account](https://issues.apache.org/jira/). ++ Make sure you have a [GitHub account](https://github.com/signup/free). ++ If you're planning to implement a new feature, it makes sense to discuss your changes + on the [dev list](https://maven.apache.org/mail-lists.html) first. + This way you can make sure you're not wasting your time on something that isn't + considered to be in Apache Maven's scope. ++ Submit a ticket for your issue or enhancement, assuming one does not already exist. + + Clearly describe the issue, including steps to reproduce when it is a bug. + + Make sure you fill in the earliest version that you know has the issue. ++ Fork the repository on GitHub. + +Making and Submitting Changes +-------------- + +We accept Pull Requests via GitHub. The [developer mailing list][dev-ml-list] is the +main channel of communication for contributors. +There are some guidelines which will make applying PRs easier for us: ++ Create a topic branch from where you want to base your work (this is usually the master branch). + Push your changes to a topic branch in your fork of the repository. ++ Make commits of logical units. ++ Respect the original code style: by using the same [codestyle][code-style], + patches should only highlight the actual difference, not being disturbed by any formatting issues: + + Only use spaces for indentation. + + Create minimal diffs - disable on save actions like reformat source code or organize imports. + If you feel the source code should be reformatted, create a separate PR for this change. + + Check for unnecessary whitespace with `git diff --check` before committing. ++ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue. +``` +[MSHARED-XXX] - Subject of the JIRA Ticket + Optional supplemental description. +``` ++ Make sure you have added the necessary tests (JUnit/IT) for your changes. ++ Run all the tests with `mvn test` to assure nothing else was accidentally broken. ++ Submit a pull request to the repository in the Apache organization. + +If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla]. + +Making Trivial Changes +---------------------- + +For changes of a trivial nature to comments and documentation, it is not always +necessary to create a new ticket in JIRA. In this case, it is appropriate to +start the first line of a commit with '(doc)' instead of a ticket number. + +Additional Resources +-------------------- + ++ [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch) ++ [Apache Maven Help JIRA project page](https://issues.apache.org/jira/projects/MSHARED/) ++ [Contributor License Agreement][cla] ++ [General GitHub documentation](https://help.github.com/) ++ [GitHub pull request documentation](https://help.github.com/send-pull-requests/) ++ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject) ++ #Maven IRC channel on freenode.org + +[license]: https://www.apache.org/licenses/LICENSE-2.0 +[dev-ml-list]: http://maven.apache.org/mailing-lists.html +[code-style]: https://maven.apache.org/developers/conventions/code.html +[cla]: https://www.apache.org/licenses/#clas +[maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index +[test-results]: https://builds.apache.org/job/maven-box/job/maven-shared-utils/job/master/lastCompletedBuild/testReport/ +[build]: https://builds.apache.org/job/maven-box/job/maven-shared-utils/job/master/ + + + From fd27c71c603a7b0ef2e5a0c23a12bd0b43ece924 Mon Sep 17 00:00:00 2001 From: Kathryn Newbould Date: Thu, 26 Jul 2018 16:55:24 +0100 Subject: [PATCH 099/265] Update readme.md --- readme.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 1cf95ed2..f78e6859 100644 --- a/readme.md +++ b/readme.md @@ -51,9 +51,10 @@ Making and Submitting Changes We accept Pull Requests via GitHub. The [developer mailing list][dev-ml-list] is the main channel of communication for contributors. There are some guidelines which will make applying PRs easier for us: -+ Create a topic branch from where you want to base your work (this is usually the master branch). - Push your changes to a topic branch in your fork of the repository. ++ Create a branch from where you want to base your work (this is usually the master branch). + Push your changes to a branch in your fork of the repository. + Make commits of logical units. ++ You can use version 9 of Java, but be aware that the code has target of version 6. + Respect the original code style: by using the same [codestyle][code-style], patches should only highlight the actual difference, not being disturbed by any formatting issues: + Only use spaces for indentation. From 7e86acbcbc9fa638e4e1b6bd4c73a8b999ce51ce Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 26 Jul 2018 18:18:38 +0200 Subject: [PATCH 100/265] [MSHARED-748] - Upgrade maven-shared-parent to 32 --- pom.xml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index e4129cbc..daa0dcbe 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components - 31 + 32 ../../pom/maven/maven-shared-components/pom.xml @@ -120,20 +120,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20.1 - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.20.1 - - - org.codehaus.mojo From 6a570592964b67168618ae5baca4cd822dba9398 Mon Sep 17 00:00:00 2001 From: Kathryn Date: Thu, 26 Jul 2018 15:45:12 +0100 Subject: [PATCH 101/265] [MSHARED-416] Odd number of quotes in command-line fails --- .../maven/shared/utils/StringUtils.java | 8 ++--- .../shared/utils/cli/shell/BourneShell.java | 8 +++-- .../utils/cli/CommandLineUtilsTest.java | 32 +++++++++++++++++-- .../utils/cli/shell/BourneShellTest.java | 14 ++++---- 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 58bf8be0..6b9a55af 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -2290,9 +2290,9 @@ public static String quoteAndEscape( @Nullable String source, char quoteChar, /** * @param source The source. * @param quoteChar The quote character. - * @param escapedChars The escaped characters. + * @param escapedChars set of characters to escape. * @param quotingTriggers The quoting trigger. - * @param escapeChar The escape character. + * @param escapeChar prefix for escaping a character. * @param force true/false. * @return the String quoted and escaped */ @@ -2343,8 +2343,8 @@ else if ( !escaped.equals( source ) ) /** * @param source The source. - * @param escapedChars escape characters. - * @param escapeChar escape character. + * @param escapedChars set of characters to escape. + * @param escapeChar prefix for escaping a character. * @return the String escaped */ public static String escape( @Nullable String source, @Nonnull final char[] escapedChars, char escapeChar ) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java index 81167075..1793cbb7 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java @@ -31,17 +31,19 @@ public class BourneShell extends Shell { + private static final char DOUBLE_QUOTATION = '"'; + private static final char[] BASH_QUOTING_TRIGGER_CHARS = { ' ', '$', ';', '&', '|', '<', '>', '*', '?', '(', ')', '[', ']', '{', '}', '`' }; /** - * Create instance of BournShell. + * Create instance of BourneShell. */ public BourneShell() { setShellCommand( "/bin/sh" ); - setArgumentQuoteDelimiter( '\'' ); - setExecutableQuoteDelimiter( '\"' ); + setArgumentQuoteDelimiter( DOUBLE_QUOTATION ); + setExecutableQuoteDelimiter( DOUBLE_QUOTATION ); setSingleQuotedArgumentEscaped( true ); setSingleQuotedExecutableEscaped( false ); setQuotedExecutableEnabled( true ); diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java index 0f8b7998..4ed35ed7 100644 --- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java @@ -19,22 +19,27 @@ * under the License. */ +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.util.Arrays; import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.Properties; + import org.apache.maven.shared.utils.Os; -import junit.framework.TestCase; +import org.junit.Test; public class CommandLineUtilsTest - extends TestCase { /** * Tests that case-insensitive environment variables are normalized to upper case. */ + @Test public void testGetSystemEnvVarsCaseInsensitive() { Properties vars = CommandLineUtils.getSystemEnvVars( false ); @@ -45,6 +50,7 @@ public void testGetSystemEnvVarsCaseInsensitive() } } + @Test public void testEnsureCaseSensitivity() throws Exception { @@ -57,6 +63,7 @@ public void testEnsureCaseSensitivity() /** * Tests that environment variables on Windows are normalized to upper case. Does nothing on Unix platforms. */ + @Test public void testGetSystemEnvVarsWindows() throws Exception { @@ -75,6 +82,7 @@ public void testGetSystemEnvVarsWindows() /** * Tests the splitting of a command line into distinct arguments. */ + @Test public void testTranslateCommandline() throws Exception { @@ -91,6 +99,26 @@ public void testTranslateCommandline() assertCmdLineArgs( new String[] { "foo", " ' ", "bar" }, "foo \" ' \" bar" ); } + @Test + public void givenASingleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Returned() throws Exception { + final Process p = exec("echo \"let's go\""); + + assertEquals(0, p.exitValue()); + } + + @Test + public void givenADoubleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Returned() throws Exception { + final Process p = exec("echo \"let\"s go\""); + + assertEquals(0, p.exitValue()); + } + + private Process exec(String cmd) throws CommandLineException, InterruptedException { + Process p = new Commandline(cmd).execute(); + Thread.sleep(1000); + return p; + } + private void assertCmdLineArgs( String[] expected, String cmdLine ) throws Exception { diff --git a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java index cfca54b4..c83287c2 100644 --- a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java +++ b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java @@ -78,7 +78,7 @@ public void testPreserveSingleQuotesOnArgument() sh.setWorkingDirectory( "/usr/bin" ); sh.setExecutable( "chmod" ); - String[] args = { "\'some arg with spaces\'" }; + final String[] args = { "\"some arg with spaces\"" }; List shellCommandLine = sh.getShellCommandLine( args ); @@ -100,10 +100,10 @@ public void testAddSingleQuotesOnArgumentWithSpaces() String cli = StringUtils.join( shellCommandLine.iterator(), " " ); System.out.println( cli ); - assertTrue( cli.endsWith( "\'" + args[0] + "\'" ) ); + assertTrue( cli.endsWith( "\"" + args[0] + "\"" ) ); } - public void testArgumentsWithsemicolon() + public void testArgumentsWithSemicolon() { System.out.println( "---- semi colon tests ----" ); @@ -119,7 +119,7 @@ public void testArgumentsWithsemicolon() String cli = StringUtils.join( shellCommandLine.iterator(), " " ); System.out.println( cli ); - assertTrue( cli.endsWith( "\'" + args[0] + "\'" ) ); + assertTrue( cli.endsWith( "\"" + args[0] + "\"" ) ); Commandline commandline = new Commandline( newShell() ); commandline.setExecutable( "chmod" ); @@ -132,7 +132,7 @@ public void testArgumentsWithsemicolon() assertEquals( "/bin/sh", lines.get( 0 ) ); assertEquals( "-c", lines.get( 1 ) ); - assertEquals( "chmod --password ';password'", lines.get( 2 ) ); + assertEquals( "chmod --password \";password\"", lines.get( 2 ) ); commandline = new Commandline( newShell() ); commandline.setExecutable( "chmod" ); @@ -144,7 +144,7 @@ public void testArgumentsWithsemicolon() assertEquals( "/bin/sh", lines.get( 0) ); assertEquals( "-c", lines.get( 1 ) ); - assertEquals( "chmod --password ';password'", lines.get( 2 ) ); + assertEquals( "chmod --password \";password\"", lines.get( 2 ) ); commandline = new Commandline( new CmdShell() ); commandline.getShell().setQuotedArgumentsEnabled( true ); @@ -192,7 +192,7 @@ public void testBourneShellQuotingCharacters() assertEquals( "/bin/sh", lines.get( 0 ) ); assertEquals( "-c", lines.get( 1 ) ); - assertEquals( "chmod ' ' '|' '&&' '||' ';' ';;' '&' '()' '<' '<<' '>' '>>' '*' '?' '[' ']' '{' '}' '`'", + assertEquals( "chmod \" \" \"|\" \"&&\" \"||\" \";\" \";;\" \"&\" \"()\" \"<\" \"<<\" \">\" \">>\" \"*\" \"?\" \"[\" \"]\" \"{\" \"}\" \"`\"", lines.get( 2 ) ); } From 336594396f2e9be8a572100e30a611f8123a837d Mon Sep 17 00:00:00 2001 From: Kathryn Date: Fri, 27 Jul 2018 09:40:39 +0100 Subject: [PATCH 102/265] [MSHARED-750] - Unbalanced quotes in command with escaped double quotation mark --- .../shared/utils/cli/CommandLineUtils.java | 46 +++++++++++++++++-- .../utils/cli/CommandLineUtilsTest.java | 36 ++++++++++----- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java index 4beea131..3a745abf 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java @@ -477,8 +477,9 @@ public static String[] translateCommandline( String toProcess ) throws CommandLi final int normal = 0; final int inQuote = 1; final int inDoubleQuote = 2; + boolean inEscape = false; int state = normal; - StringTokenizer tok = new StringTokenizer( toProcess, "\"\' ", true ); + final StringTokenizer tok = new StringTokenizer( toProcess, "\"\' \\", true ); List tokens = new ArrayList(); StringBuilder current = new StringBuilder(); @@ -490,31 +491,65 @@ public static String[] translateCommandline( String toProcess ) throws CommandLi case inQuote: if ( "\'".equals( nextTok ) ) { - state = normal; + if ( inEscape ) + { + current.append( nextTok ); + inEscape = false; + } + else + { + state = normal; + } } else { current.append( nextTok ); + inEscape = "\\".equals( nextTok ); } break; case inDoubleQuote: if ( "\"".equals( nextTok ) ) { - state = normal; + if ( inEscape ) + { + current.append( nextTok ); + inEscape = false; + } + else + { + state = normal; + } } else { current.append( nextTok ); + inEscape = "\\".equals( nextTok ); } break; default: if ( "\'".equals( nextTok ) ) { - state = inQuote; + if ( inEscape ) + { + inEscape = false; + current.append( nextTok ); + } + else + { + state = inQuote; + } } else if ( "\"".equals( nextTok ) ) { - state = inDoubleQuote; + if ( inEscape ) + { + inEscape = false; + current.append( nextTok ); + } + else + { + state = inDoubleQuote; + } } else if ( " ".equals( nextTok ) ) { @@ -527,6 +562,7 @@ else if ( " ".equals( nextTok ) ) else { current.append( nextTok ); + inEscape = "\\".equals( nextTok ); } break; } diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java index 4ed35ed7..d64fdd89 100644 --- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; import java.util.Arrays; import java.util.HashMap; @@ -99,27 +100,38 @@ public void testTranslateCommandline() assertCmdLineArgs( new String[] { "foo", " ' ", "bar" }, "foo \" ' \" bar" ); } - @Test - public void givenASingleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Returned() throws Exception { - final Process p = exec("echo \"let's go\""); - assertEquals(0, p.exitValue()); + @Test + public void givenASingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkIsNotEscaped() throws Exception + { + final String command = "echo \"let's go\""; + final String[] expected = new String[]{"echo", "let's go"}; + assertCmdLineArgs(expected, command); } @Test - public void givenADoubleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Returned() throws Exception { - final Process p = exec("echo \"let\"s go\""); + public void givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped() throws Exception + { + final String command = "echo \"let\\\"s go\""; + final String[] expected = new String[]{"echo", "let\\\"s go"}; + assertCmdLineArgs(expected, command); + } - assertEquals(0, p.exitValue()); + @Test + public void givenAnEscapedSingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped() throws Exception + { + final String command = "echo \"let\\\'s go\""; + final String[] expected = new String[]{"echo", "let\\\'s go"}; + assertCmdLineArgs(expected, command); } - private Process exec(String cmd) throws CommandLineException, InterruptedException { - Process p = new Commandline(cmd).execute(); - Thread.sleep(1000); - return p; + @Test + public void givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenNoExceptionIsThrown() throws Exception + { + new Commandline("echo \"let\\\"s go\"").execute(); } - private void assertCmdLineArgs( String[] expected, String cmdLine ) + private void assertCmdLineArgs( final String[] expected, final String cmdLine ) throws Exception { String[] actual = CommandLineUtils.translateCommandline( cmdLine ); From 43210ae850b9c2d9426fc850aa9b9ad71d543294 Mon Sep 17 00:00:00 2001 From: Kathryn Date: Fri, 27 Jul 2018 09:38:54 +0100 Subject: [PATCH 103/265] [MSHARED-749] - Commandline does not thrown CommandLineException when uneven number of quotation marks used --- .../apache/maven/shared/utils/cli/Arg.java | 2 +- .../maven/shared/utils/cli/Commandline.java | 19 +++++--------- .../utils/cli/CommandLineUtilsTest.java | 26 +++++++++++++++++++ 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Arg.java b/src/main/java/org/apache/maven/shared/utils/cli/Arg.java index bd1fa084..e0eccf3a 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/Arg.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/Arg.java @@ -34,7 +34,7 @@ public interface Arg /** * @param line The line of arguments. */ - void setLine( String line ); + void setLine( String line ) throws CommandLineException; /** * @param value The file to be set. diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java index 94fbdccb..db137708 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java @@ -92,19 +92,11 @@ public Commandline( Shell shell ) * * @param toProcess The command to process */ - public Commandline( String toProcess ) + public Commandline( String toProcess ) throws CommandLineException { setDefaultShell(); - String[] tmp = new String[0]; - try - { - tmp = CommandLineUtils.translateCommandline( toProcess ); - } - catch ( Exception e ) - { - System.err.println( "Error translating Commandline." ); - } - if ( ( tmp != null ) && ( tmp.length > 0 ) ) + String[] tmp = CommandLineUtils.translateCommandline( toProcess ); + if ( ( tmp.length > 0 ) ) { setExecutable( tmp[0] ); for ( int i = 1; i < tmp.length; i++ ) @@ -484,7 +476,7 @@ public void setValue( String value ) /** * {@inheritDoc} */ - public void setLine( String line ) + public void setLine( String line ) throws CommandLineException { if ( line == null ) { @@ -494,9 +486,10 @@ public void setLine( String line ) { parts = CommandLineUtils.translateCommandline( line ); } - catch ( Exception e ) + catch ( CommandLineException e ) { System.err.println( "Error translating Commandline." ); + throw( e ); } } diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java index d64fdd89..5b5ec2a4 100644 --- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java @@ -19,6 +19,7 @@ * under the License. */ +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -101,6 +102,31 @@ public void testTranslateCommandline() } + @Test + public void givenASingleQuoteMarkInArgument_whenExecutingCode_thenNoExceptionIsThrown() throws Exception { + new Commandline("echo \"let's go\"").execute(); + } + + @Test + public void givenADoubleQuoteMarkInArgument_whenExecutingCode_thenCommandLineExceptionIsThrown() throws Exception { + try { + new Commandline("echo \"let\"s go\"").execute(); + } catch (CommandLineException e) { + assertTrue(true); + return; + } + fail("Exception was not thrown when given invalid (3 unescaped double quote) input"); + } + + + @Test + public void givenASingleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Returned() throws Exception { + final Process p = new Commandline("echo \"let's go\"").execute(); + // Note, this sleep should be removed when java version reaches Java 8 + Thread.sleep(1000); + assertEquals(0, p.exitValue()); + } + @Test public void givenASingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkIsNotEscaped() throws Exception { From 45966f8b554eff6fc96ee60bcae508832468976b Mon Sep 17 00:00:00 2001 From: rfscholte Date: Tue, 31 Jul 2018 21:20:47 +0200 Subject: [PATCH 104/265] Add contributor --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index daa0dcbe..171f2f9e 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,12 @@ + + + Kathryn Newbould + + + RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder From c2203f673b5a0042391e4d1f75cfeca3ed34852c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Wed, 29 Aug 2018 14:43:13 +0200 Subject: [PATCH 105/265] [MNGSITE-341] use https for sigs, hashes and KEYS --- src/site/xdoc/download.xml.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index 43899462..499a2137 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -34,7 +34,7 @@ under the License.

            In order to guard against corrupted downloads/installations, it is highly recommended to verify the signature - of the release bundles against the public KEYS used by the Apache Maven + of the release bundles against the public KEYS used by the Apache Maven developers.

            ${project.name} is distributed under the Apache License, version 2.0.

            @@ -108,8 +108,8 @@ under the License. ${project.name} ${project.version} (Source zip) maven/shared/${project.artifactId}-${project.version}-source-release.zip - maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha1 - maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc + maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha1 + maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc From 4d336effd3f2516a1ae240e30b8c6c471d1a68fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Wed, 29 Aug 2018 14:53:31 +0200 Subject: [PATCH 106/265] [MPOM-205] use sha512 checksums instead of sha1 --- src/site/xdoc/download.xml.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index 499a2137..666d997c 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -108,7 +108,7 @@ under the License. ${project.name} ${project.version} (Source zip) maven/shared/${project.artifactId}-${project.version}-source-release.zip - maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha1 + maven/shared/${project.artifactId}-${project.version}-source-release.zip.sha512 maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc From ba671665b40bd088f27d7824776255d9a2f01b4e Mon Sep 17 00:00:00 2001 From: Maarten Mulders Date: Tue, 11 Jun 2019 19:29:25 +0200 Subject: [PATCH 107/265] [MSHARED-826] Require Java 7 --- pom.xml | 10 +++++- .../org/apache/maven/shared/utils/OsTest.java | 33 ------------------- 2 files changed, 9 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 171f2f9e..01763d98 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components - 32 + 33 ../../pom/maven/maven-shared-components/pom.xml @@ -63,6 +63,7 @@ RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder + 7 3.0 @@ -144,6 +145,13 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + false + + diff --git a/src/test/java/org/apache/maven/shared/utils/OsTest.java b/src/test/java/org/apache/maven/shared/utils/OsTest.java index 051a930b..d5ea6838 100644 --- a/src/test/java/org/apache/maven/shared/utils/OsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/OsTest.java @@ -24,8 +24,6 @@ import org.junit.After; import org.junit.Assert; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.Set; import static org.hamcrest.CoreMatchers.*; @@ -40,65 +38,34 @@ public class OsTest extends Assert { private String origOsName; - private String origOsFamily; private String origOsArch; private String origOsVersion; @Before public void setUp() - throws Exception { origOsName = System.getProperty( "os.name" ); origOsArch = System.getProperty( "os.arch" ); origOsVersion = System.getProperty( "os.version" ); - origOsFamily = Os.OS_FAMILY; // and now set some special settings ;) System.setProperty( "os.name" , "os/2" ); System.setProperty( "os.arch" , "i386" ); System.setProperty( "os.version", "2.1.32" ); - - // blow away the originally loaded values - setStaticOsField( "OS_NAME", "os/2" ); - setStaticOsField( "OS_FAMILY", "os/2" ); - setStaticOsField( "OS_ARCH", "i386" ); - setStaticOsField( "OS_VERSION", "2.1.32" ); } @After public void tearDown() - throws Exception { // set the original OS settings again System.setProperty( "os.name" , origOsName ); System.setProperty( "os.arch" , origOsArch ); System.setProperty( "os.version", origOsVersion ); - - // restore the originally loaded values - setStaticOsField( "OS_NAME", origOsName ); - setStaticOsField( "OS_ARCH", origOsArch ); - setStaticOsField( "OS_VERSION", origOsVersion ); - setStaticOsField( "OS_FAMILY", origOsFamily ); - } - - private void setStaticOsField( String variableName, Object value ) - throws NoSuchFieldException, IllegalAccessException - { - Field field = Os.class.getField( variableName ); - - Field modifiersField = Field.class.getDeclaredField( "modifiers" ); - modifiersField.setAccessible( true ); - modifiersField.setInt( field, field.getModifiers() & ~Modifier.FINAL ); - - field.setAccessible( true ); - field.set( null, value ); } - @Test public void testConstructor() - throws Exception { Os os = new Os(); os.eval(); From 482754350469a3fedbb54ec4ed94eb22653f14f3 Mon Sep 17 00:00:00 2001 From: Dos Moonen Date: Tue, 23 May 2017 11:33:45 +0200 Subject: [PATCH 108/265] Move newline for prettier print This closes apache/maven-shared#23 --- .../org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java index 6623a82c..deb07d21 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java @@ -366,10 +366,10 @@ private void writeDocumentHeader() if ( docType != null ) { - newLine(); writer.write( "' ); + newLine(); } } From 7d2010147881ce22cdbfad5d1f177e6d31d96b8a Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 8 Dec 2019 20:36:05 +0100 Subject: [PATCH 109/265] [MSHARED-847] - Upgrade commons-io to 2.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01763d98..99847c98 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ commons-io commons-io - 2.5 + 2.6 org.apache.commons From 29fddbc11d3e1520a310e5c9190a071e169b59d0 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 23 Feb 2020 10:57:30 -0500 Subject: [PATCH 110/265] docs: grammar @hboutemy --- src/site/apt/index.apt.vm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index 0e035b7a..0ee0872a 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -40,12 +40,12 @@ ${project.name} Why? - plexus-utils consisted mostly of code that was forked from various apache projects. + plexus-utils consisted mostly of code that was forked from various Apache projects. maven-shared-utils is based on the original from the Apache sources. Why not commons? - We would prefer code to use commons-* code where appropriate, but the plexus-utils became + We would prefer code to use commons-* where appropriate, but the plexus-utils became slightly incompatible (different) from the commons over the years, so migrating is not always a 1:1 operation. Migrating to maven-shared-utils is a 1:1 operation in most cases. @@ -55,7 +55,7 @@ Relation to Commons-* classes into our own private package to prevent classpath clashes. This is the reason why any public API in maven-shared-utils must - avoid to expose commons-io classes directly. Most times it's sufficient - to just create an empty subclass and expose that instead. + avoid exposing commons-io classes directly. Most times it's sufficient + to create an empty subclass and expose that instead. [] From 5f0ea247afb8e458fc9b8d7c72d6fb3a315f2f0e Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 23 Feb 2020 16:44:57 -0500 Subject: [PATCH 111/265] [MSHARED-803] set names on threads (#15) * set names on threads * add whitspace --- .../org/apache/maven/shared/utils/cli/CommandLineUtils.java | 3 +++ .../apache/maven/shared/utils/cli/CommandLineUtilsTest.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java index 3a745abf..904ecb91 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java @@ -277,13 +277,16 @@ public Integer call() if ( systemIn != null ) { inputFeeder = new StreamFeeder( systemIn, p.getOutputStream() ); + inputFeeder.setName( "StreamFeeder-systemIn" ); inputFeeder.start(); } outputPumper = new StreamPumper( p.getInputStream(), systemOut ); + outputPumper.setName( "StreamPumper-systemOut" ); outputPumper.start(); errorPumper = new StreamPumper( p.getErrorStream(), systemErr ); + errorPumper.setName( "StreamPumper-systemErr" ); errorPumper.start(); int returnValue; diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java index 5b5ec2a4..44835278 100644 --- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java @@ -19,7 +19,6 @@ * under the License. */ -import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; From 576948106e264e5fb0ffecd1e1916bb534bd42ca Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 24 Feb 2020 10:38:46 -0500 Subject: [PATCH 112/265] [MSHARED-685] assert some things (#16) * assert some things --- .../shared/utils/io/DirectoryScannerTest.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index e331db9d..a6149a3f 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -50,7 +50,10 @@ private void createTestData() { File rootDir = tempFolder.getRoot(); File folder1 = new File( rootDir, "folder1" ); - folder1.mkdirs(); + if ( !folder1.mkdirs() ) + { + Assert.fail(); + } FileTestHelper.generateTestFile( new File( rootDir, "file1.txt" ), 11 ); FileTestHelper.generateTestFile( new File( rootDir, "file2.txt" ), 12 ); @@ -60,7 +63,10 @@ private void createTestData() FileTestHelper.generateTestFile( new File( folder1, "file5.dat" ), 15 ); File folder2 = new File( folder1, "ignorefolder" ); - folder2.mkdirs(); + if ( !folder2.mkdirs() ) + { + Assert.fail(); + } FileTestHelper.generateTestFile( new File( folder2, "file7.txt" ), 17 ); } @@ -131,11 +137,9 @@ public void checkSymlinkBehaviour() ds.scan(); String[] includedDirectories = ds.getIncludedDirectories(); String[] files = ds.getIncludedFiles(); - - //FIXME: This should be changed to some kind of assert...WhatEver()... - System.out.println( "files = " + files ); - - + assertAlwaysIncluded( Arrays.asList( files ) ); + assertEquals( 5, includedDirectories.length ); + assertEquals( 9, files.length ); } @Test @@ -155,7 +159,7 @@ public void followSymlinksFalse() assertAlwaysIncluded( included ); assertEquals( 9, included.size() ); List includedDirs = Arrays.asList( ds.getIncludedDirectories() ); - assertTrue( includedDirs.contains( "" ) ); // w00t ! + assertTrue( includedDirs.contains( "" ) ); assertTrue( includedDirs.contains( "aRegularDir" ) ); assertTrue( includedDirs.contains( "symDir" ) ); assertTrue( includedDirs.contains( "symLinkToDirOnTheOutside" ) ); From da96cb437586bf909baa74764cde5f5b300875ac Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 24 Feb 2020 15:31:44 -0500 Subject: [PATCH 113/265] docs: fix issues URL (#14) * docs: fix issues URL --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99847c98..9361cdad 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@             jira - https://issues.apache.org/jira/browse/MSHARED/component/12326452 + https://issues.apache.org/jira/issues/?jql=project%20%3D%20MSHARED%20AND%20component%20%3D%20maven-shared-utils Jenkins From 4c422c2869761b7660ab3d4e0aaa376cf53067a0 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 1 Mar 2020 14:02:20 -0500 Subject: [PATCH 114/265] docs: this project does have further dependencies (#13) @michael-o --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9361cdad..07c58b95 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 3.2.2-SNAPSHOT Apache Maven Shared Utils - Shared utils without any further dependencies + Shared utilities for use by Maven core and plugins scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git From 2e3bcacb8744acfafa9e52a27adb2a1d61eaed91 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 23 Feb 2020 16:14:00 -0500 Subject: [PATCH 115/265] deps: update JUnit Closes #13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 07c58b95..28c46bae 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ junit junit - 4.11 + 4.13 test From a950ff4f5e69e5e61c5c862987edd4ee9ab6ae88 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 8 Mar 2020 13:51:45 -0400 Subject: [PATCH 116/265] remove unreachable code (#17) --- .../shared/utils/reflection/Reflector.java | 573 -------- .../utils/reflection/ReflectorException.java | 70 - .../utils/reflection/ReflectorTest.java | 1232 ----------------- .../utils/reflection/ReflectorTestHelper.java | 119 -- 4 files changed, 1994 deletions(-) delete mode 100644 src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java delete mode 100644 src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java delete mode 100644 src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java delete mode 100644 src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java diff --git a/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java b/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java deleted file mode 100644 index c4cb3b70..00000000 --- a/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java +++ /dev/null @@ -1,573 +0,0 @@ -package org.apache.maven.shared.utils.reflection; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Member; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - -/** - * Utility class used to instantiate an object using reflection. This utility hides many of the gory details needed to - * do this. - * - * @author John Casey - */ -final class Reflector -{ - private static final String CONSTRUCTOR_METHOD_NAME = "$$CONSTRUCTOR$$"; - - private static final String GET_INSTANCE_METHOD_NAME = "getInstance"; - - private final Map>> classMaps = - new HashMap>>(); - - /** - * Ensure no instances of Reflector are created...this is a utility. - */ - Reflector() - { - } - - /** - * Create a new instance of a class, given the array of parameters... Uses constructor caching to find a constructor - * that matches the parameter types, either specifically (first choice) or abstractly... - * - * @param theClass The class to instantiate - * @param params The parameters to pass to the constructor - * @return The instantiated object - * @throws ReflectorException In case anything goes wrong here... - */ - public Object newInstance( Class theClass, Object... params ) - throws ReflectorException - { - if ( params == null ) - { - params = new Object[0]; - } - - Class[] paramTypes = new Class[params.length]; - - for ( int i = 0, len = params.length; i < len; i++ ) - { - paramTypes[i] = params[i].getClass(); - } - - try - { - Constructor con = getConstructor( theClass, paramTypes ); - - return con.newInstance( params ); - } - catch ( InstantiationException ex ) - { - throw new ReflectorException( ex ); - } - catch ( InvocationTargetException ex ) - { - throw new ReflectorException( ex ); - } - catch ( IllegalAccessException ex ) - { - throw new ReflectorException( ex ); - } - } - - /** - * Retrieve the singleton instance of a class, given the array of parameters... Uses constructor caching to find a - * constructor that matches the parameter types, either specifically (first choice) or abstractly... - * - * @param theClass The class to retrieve the singleton of - * @param initParams The parameters to pass to the constructor - * @return The singleton object - * @throws ReflectorException In case anything goes wrong here... - */ - public Object getSingleton( Class theClass, Object... initParams ) - throws ReflectorException - { - Class[] paramTypes = new Class[initParams.length]; - - for ( int i = 0, len = initParams.length; i < len; i++ ) - { - paramTypes[i] = initParams[i].getClass(); - } - - try - { - Method method = getMethod( theClass, GET_INSTANCE_METHOD_NAME, paramTypes ); - - return method.invoke( null, initParams ); - } - catch ( InvocationTargetException ex ) - { - throw new ReflectorException( ex ); - } - catch ( IllegalAccessException ex ) - { - throw new ReflectorException( ex ); - } - } - - /** - * Invoke the specified method on the specified target with the specified params... - * - * @param target The target of the invocation - * @param methodName The method name to invoke - * @param params The parameters to pass to the method invocation - * @return The result of the method call - * @throws ReflectorException In case of an error looking up or invoking the method. - */ - public Object invoke( Object target, String methodName, Object... params ) - throws ReflectorException - { - if ( params == null ) - { - params = new Object[0]; - } - - Class[] paramTypes = new Class[params.length]; - - for ( int i = 0, len = params.length; i < len; i++ ) - { - paramTypes[i] = params[i].getClass(); - } - - try - { - Method method = getMethod( target.getClass(), methodName, paramTypes ); - - return method.invoke( target, params ); - } - catch ( InvocationTargetException ex ) - { - throw new ReflectorException( ex ); - } - catch ( IllegalAccessException ex ) - { - throw new ReflectorException( ex ); - } - } - - public Object getStaticField( Class targetClass, String fieldName ) - throws ReflectorException - { - try - { - Field field = targetClass.getField( fieldName ); - - return field.get( null ); - } - catch ( SecurityException e ) - { - throw new ReflectorException( e ); - } - catch ( NoSuchFieldException e ) - { - throw new ReflectorException( e ); - } - catch ( IllegalArgumentException e ) - { - throw new ReflectorException( e ); - } - catch ( IllegalAccessException e ) - { - throw new ReflectorException( e ); - } - } - - public Object getField( Object target, String fieldName ) - throws ReflectorException - { - return getField( target, fieldName, false ); - } - - public Object getField( Object target, String fieldName, boolean breakAccessibility ) - throws ReflectorException - { - Class targetClass = target.getClass(); - while ( targetClass != null ) - { - try - { - Field field = targetClass.getDeclaredField( fieldName ); - - boolean accessibilityBroken = false; - if ( !field.isAccessible() && breakAccessibility ) - { - field.setAccessible( true ); - accessibilityBroken = true; - } - - Object result = field.get( target ); - - if ( accessibilityBroken ) - { - field.setAccessible( false ); - } - - return result; - } - catch ( SecurityException e ) - { - throw new ReflectorException( e ); - } - catch ( NoSuchFieldException e ) - { - if ( targetClass == Object.class ) - { - throw new ReflectorException( e ); - } - targetClass = targetClass.getSuperclass(); - } - catch ( IllegalAccessException e ) - { - throw new ReflectorException( e ); - } - } - // Never reached, but needed to satisfy compiler - return null; - } - - /** - * Invoke the specified static method with the specified params... - * - * @param targetClass The target class of the invocation - * @param methodName The method name to invoke - * @param params The parameters to pass to the method invocation - * @return The result of the method call - * @throws ReflectorException In case of an error looking up or invoking the method. - */ - public Object invokeStatic( Class targetClass, String methodName, Object... params ) - throws ReflectorException - { - if ( params == null ) - { - params = new Object[0]; - } - - Class[] paramTypes = new Class[params.length]; - - for ( int i = 0, len = params.length; i < len; i++ ) - { - paramTypes[i] = params[i].getClass(); - } - - try - { - Method method = getMethod( targetClass, methodName, paramTypes ); - - return method.invoke( null, params ); - } - catch ( InvocationTargetException ex ) - { - throw new ReflectorException( ex ); - } - catch ( IllegalAccessException ex ) - { - throw new ReflectorException( ex ); - } - } - - /** - * Return the constructor, checking the cache first and storing in cache if not already there.. - * - * @param targetClass The class to get the constructor from - * @param params The classes of the parameters which the constructor should match. - * @return the Constructor object that matches, never {@code null} - * @throws ReflectorException In case we can't retrieve the proper constructor. - */ - public Constructor getConstructor( Class targetClass, Class... params ) - throws ReflectorException - { - Map constructorMap = getConstructorMap( targetClass ); - - @SuppressWarnings( "checkstyle:magicnumber" ) - StringBuilder key = new StringBuilder( 200 ); - - key.append( "(" ); - - for ( Class param : params ) - { - key.append( param.getName() ); - key.append( "," ); - } - - if ( params.length > 0 ) - { - key.setLength( key.length() - 1 ); - } - - key.append( ")" ); - - Constructor constructor; - - String paramKey = key.toString(); - - synchronized ( paramKey.intern() ) - { - constructor = (Constructor) constructorMap.get( paramKey ); - - if ( constructor == null ) - { - Constructor[] cands = targetClass.getConstructors(); - - for ( Constructor cand : cands ) - { - Class[] types = cand.getParameterTypes(); - - if ( params.length != types.length ) - { - continue; - } - - for ( int j = 0, len2 = params.length; j < len2; j++ ) - { - if ( !types[j].isAssignableFrom( params[j] ) ) - { - continue; - } - } - - // we got it, so store it! - constructor = cand; - constructorMap.put( paramKey, constructor ); - } - } - } - - if ( constructor == null ) - { - throw new ReflectorException( "Error retrieving constructor object for: " + targetClass.getName() - + paramKey ); - } - - return constructor; - } - - public Object getObjectProperty( Object target, String propertyName ) - throws ReflectorException - { - Object returnValue; - - if ( propertyName == null || propertyName.trim().length() < 1 ) - { - throw new ReflectorException( "Cannot retrieve value for empty property." ); - } - - String beanAccessor = "get" + Character.toUpperCase( propertyName.charAt( 0 ) ); - if ( propertyName.trim().length() > 1 ) - { - beanAccessor += propertyName.substring( 1 ).trim(); - } - - Class targetClass = target.getClass(); - Class[] emptyParams = {}; - - Method method = _getMethod( targetClass, beanAccessor, emptyParams ); - if ( method == null ) - { - method = _getMethod( targetClass, propertyName, emptyParams ); - } - - if ( method != null ) - { - try - { - returnValue = method.invoke( target, new Object[] {} ); - } - catch ( IllegalAccessException e ) - { - throw new ReflectorException( "Error retrieving property \'" + propertyName + "\' from \'" - + targetClass + "\'", e ); - } - catch ( InvocationTargetException e ) - { - throw new ReflectorException( "Error retrieving property \'" + propertyName + "\' from \'" - + targetClass + "\'", e ); - } - } - else - { - returnValue = getField( target, propertyName, true ); - if ( returnValue == null ) - { - // TODO: Check if exception is the right action! Field exists, but contains null - throw new ReflectorException( "Neither method: \'" + propertyName + "\' nor bean accessor: \'" - + beanAccessor + "\' can be found for class: \'" + targetClass + "\', and retrieval of field: \'" - + propertyName + "\' returned null as value." ); - } - } - - return returnValue; - } - - /** - * Return the method, checking the cache first and storing in cache if not already there.. - * - * @param targetClass The class to get the method from - * @param params The classes of the parameters which the method should match. - * @return the Method object that matches, never {@code null} - * @throws ReflectorException In case we can't retrieve the proper method. - */ - public Method getMethod( Class targetClass, String methodName, Class... params ) - throws ReflectorException - { - Method method = _getMethod( targetClass, methodName, params ); - - if ( method == null ) - { - throw new ReflectorException( "Method: \'" + methodName + "\' not found in class: \'" + targetClass - + "\'" ); - } - - return method; - } - - @SuppressWarnings( "checkstyle:methodname" ) - private Method _getMethod( Class targetClass, String methodName, Class... params ) - throws ReflectorException - { - Map methodMap = getMethodMap( targetClass, methodName ); - - @SuppressWarnings( "checkstyle:magicnumber" ) - StringBuilder key = new StringBuilder( 200 ); - - key.append( "(" ); - - for ( Class param : params ) - { - key.append( param.getName() ); - key.append( "," ); - } - - key.append( ")" ); - - Method method; - - String paramKey = key.toString(); - - synchronized ( paramKey.intern() ) - { - method = (Method) methodMap.get( paramKey ); - - if ( method == null ) - { - Method[] cands = targetClass.getMethods(); - - for ( Method cand : cands ) - { - String name = cand.getName(); - - if ( !methodName.equals( name ) ) - { - continue; - } - - Class[] types = cand.getParameterTypes(); - - if ( params.length != types.length ) - { - continue; - } - - for ( int j = 0, len2 = params.length; j < len2; j++ ) - { - if ( !types[j].isAssignableFrom( params[j] ) ) - { - continue; - } - } - - // we got it, so store it! - method = cand; - methodMap.put( paramKey, method ); - } - } - } - - return method; - } - - /** - * Retrieve the cache of constructors for the specified class. - * - * @param theClass the class to lookup. - * @return The cache of constructors. - * @throws ReflectorException in case of a lookup error. - */ - private Map getConstructorMap( Class theClass ) - throws ReflectorException - { - return getMethodMap( theClass, CONSTRUCTOR_METHOD_NAME ); - } - - /** - * Retrieve the cache of methods for the specified class and method name. - * - * @param theClass the class to lookup. - * @param methodName The name of the method to lookup. - * @return The cache of constructors. - */ - private Map getMethodMap( Class theClass, String methodName ) - { - Map methodMap; - - if ( theClass == null ) - { - return null; - } - - String className = theClass.getName(); - - synchronized ( className.intern() ) - { - Map> classMethods = classMaps.get( className ); - - if ( classMethods == null ) - { - classMethods = new HashMap>(); - methodMap = new HashMap(); - classMethods.put( methodName, methodMap ); - - classMaps.put( className, classMethods ); - } - else - { - String key = className + "::" + methodName; - - synchronized ( key.intern() ) - { - methodMap = classMethods.get( methodName ); - - if ( methodMap == null ) - { - methodMap = new HashMap(); - classMethods.put( methodName, methodMap ); - } - } - } - } - - return methodMap; - } -} diff --git a/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java b/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java deleted file mode 100644 index 76fa2147..00000000 --- a/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.apache.maven.shared.utils.reflection; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * Exception indicating that an error has occurred while instantiating a class - * with the Reflector class. This exception is meant to put a more user-friendly - * face on the myriad other exceptions throws during reflective object creation. - * - * @author John Casey - */ -class ReflectorException - extends Exception -{ - /** - * Create a new ReflectorException. - */ - ReflectorException() - { - } - - /** - * Create a new ReflectorException with the specified message. - * - * @param msg The message. - */ - ReflectorException( String msg ) - { - super( msg ); - } - - /** - * Create a new ReflectorException with the specified root cause. - * - * @param root The root cause. - */ - ReflectorException( Throwable root ) - { - super( root ); - } - - /** - * Create a new ReflectorException with the specified message and root - * cause. - * - * @param msg The message. - * @param root The root cause. - */ - ReflectorException( String msg, Throwable root ) - { - super( msg, root ); - } -} diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java deleted file mode 100644 index a3cceb2f..00000000 --- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java +++ /dev/null @@ -1,1232 +0,0 @@ -package org.apache.maven.shared.utils.reflection; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.junit.Test; - -import java.lang.reflect.Constructor; - -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import static org.apache.maven.shared.utils.testhelpers.ExceptionHelper.*; - -/** - * @author Stephen Connolly - */ -public class ReflectorTest -{ - private final Reflector reflector = new Reflector(); - - //// newInstance( Class, Object[] ) - - @Test( expected = NullPointerException.class ) - public void newInstanceNullNull() - throws Exception - { - reflector.newInstance( (Class)null, (Object)null ); - } - - @Test - public void newInstanceClassNull() - throws Exception - { - assertThat( reflector.newInstance( Object.class, null ), is( Object.class ) ); - } - - @Test( expected = NullPointerException.class ) - public void newInstanceNullEmptyArray() - throws Exception - { - reflector.newInstance( null, new Object[0] ); - } - - @Test - public void newInstanceClassEmptyArray() - throws Exception - { - assertThat( reflector.newInstance( Object.class, new Object[0] ), is( Object.class ) ); - } - - @Test( expected = ReflectorException.class ) - public void newInstanceClassInvalidSignature() - throws Exception - { - reflector.newInstance( Object.class, new Object[]{ this } ); - } - - @Test( expected = ReflectorException.class ) - public void newInstancePrivateConstructor() - throws Exception - { - reflector.newInstance( ReflectorTestHelper.class, new Object[0] ); - } - - @Test( expected = IllegalArgumentException.class ) - // // @ReproducesPlexusBug( "Looking up constructors by signature has an unlabelled continue, so finds the wrong constructor" ) - public void newInstancePackageConstructor() - throws Exception - { - reflector.newInstance( ReflectorTestHelper.class, new Object[]{ Boolean.FALSE } ); - } - - @Test( expected = IllegalArgumentException.class ) - // // @ReproducesPlexusBug( "Looking up constructors by signature has an unlabelled continue, so finds the wrong constructor" ) - public void newInstancePackageConstructorThrowsSomething() - throws Exception - { - reflector.newInstance( ReflectorTestHelper.class, new Object[]{ Boolean.TRUE } ); - } - - @Test( expected = IllegalArgumentException.class ) - // // @ReproducesPlexusBug("Looking up constructors by signature has an unlabelled continue, so finds the wrong constructor" ) - public void newInstanceProtectedConstructor() - throws Exception - { - reflector.newInstance( ReflectorTestHelper.class, new Object[]{ 0 } ); - } - - @Test( expected = IllegalArgumentException.class ) - // // @ReproducesPlexusBug( "Looking up constructors by signature has an unlabelled continue, so finds the wrong constructor" ) - public void newInstanceProtectedConstructorThrowsSomething() - throws Exception - { - reflector.newInstance( ReflectorTestHelper.class, new Object[]{ 1 } ); - } - - @Test - public void newInstancePublicConstructor() - throws Exception - { - assertTrue( reflector.newInstance( ReflectorTestHelper.class, new Object[]{ "" } ) - instanceof ReflectorTestHelper ); - } - - @Test( expected = NullPointerException.class ) - public void newInstancePublicConstructorNullValue() - throws Exception - { - reflector.newInstance( ReflectorTestHelper.class, new Object[]{ null } ); - } - - @Test - public void newInstancePublicConstructorThrowsSomething() - throws Exception - { - try - { - reflector.newInstance( ReflectorTestHelper.class, new Object[]{ "Message" } ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( ReflectorTestHelper.HelperException.class ) ); - } - } - - //// getSingleton( Class, Object[] ) - - @Test( expected = NullPointerException.class ) - public void getSingletonNullNull() - throws Exception - { - reflector.getSingleton( (Class)null, (Object)null ); - } - - @Test( expected = NullPointerException.class ) - public void getSingletonClassNull() - throws Exception - { - assertThat( reflector.getSingleton( (Class)Object.class, (Object)null ), is( Object.class ) ); - } - - @Test( expected = NullPointerException.class ) - public void getSingletonNullEmptyArray() - throws Exception - { - reflector.getSingleton( null, new Object[0] ); - } - - @Test( expected = ReflectorException.class ) - public void getSingletonClassEmptyArray() - throws Exception - { - assertThat( reflector.getSingleton( Object.class, new Object[0] ), is( Object.class ) ); - } - - @Test( expected = ReflectorException.class ) - public void getSingletonClassInvalidSignature() - throws Exception - { - reflector.getSingleton( Object.class, new Object[]{ this } ); - } - - @Test( expected = ReflectorException.class ) - public void getSingletonPrivateMethod() - throws Exception - { - reflector.getSingleton( ReflectorTestHelper.class, new Object[0] ); - } - - @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabeled continue, so finds the wrong method" ) - public void getSingletonPackageMethod() - throws Exception - { - reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ Boolean.FALSE } ); - } - - @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabeled continue, so finds the wrong method" ) - public void getSingletonPackageMethodThrowsSomething() - throws Exception - { - reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ Boolean.TRUE } ); - } - - @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabeled continue, so finds the wrong method" ) - public void getSingletonProtectedMethod() - throws Exception - { - reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ 0 } ); - } - - @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabeled continue, so finds the wrong method" ) - public void getSingletonProtectedMethodThrowsSomething() - throws Exception - { - reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ 1 } ); - } - - @Test - public void getSingletonPublicMethod() - throws Exception - { - assertTrue( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "" } ) - instanceof ReflectorTestHelper ); - } - - @Test( expected = NullPointerException.class ) - public void getSingletonPublicMethodNullValue() - throws Exception - { - reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ null } ); - } - - @Test - public void getSingletonPublicMethodThrowsSomething() - throws Exception - { - try - { - reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "Message" } ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( ReflectorTestHelper.HelperException.class ) ); - } - } - - @Test( expected = NullPointerException.class ) - public void getSingletonNonStaticMethod() - throws Exception - { - assertTrue( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "", Boolean.FALSE } ) - instanceof ReflectorTestHelper ); - } - - //// invoke( Object, String, Object[] ) - - @Test( expected = NullPointerException.class ) - public void invokeNullNullNull() - throws Exception - { - reflector.invoke( (Object)null, (String)null, (Object)null ); - } - - @Test( expected = NullPointerException.class ) - public void invokeNullNullEmpty() - throws Exception - { - reflector.invoke( null, null, new Object[0] ); - } - - @Test( expected = NullPointerException.class ) - public void invokeNullEmptyNull() - throws Exception - { - reflector.invoke( (Object)null, "", (Object)null ); - } - - @Test( expected = NullPointerException.class ) - public void invokeNullEmptyEmpty() - throws Exception - { - reflector.invoke( null, "", new Object[0] ); - } - - @Test( expected = NullPointerException.class ) - public void invokeObjectNullNull() - throws Exception - { - reflector.invoke( new Object(), (String)null, (Object)null ); - } - - @Test( expected = NullPointerException.class ) - public void invokeObjectNullEmpty() - throws Exception - { - reflector.invoke( new Object(), null, new Object[0] ); - } - - @Test( expected = ReflectorException.class ) - public void invokeObjectEmptyNull() - throws Exception - { - reflector.invoke( new Object(), "", null ); - } - - @Test( expected = ReflectorException.class ) - public void invokeObjectEmptyEmpty() - throws Exception - { - reflector.invoke( new Object(), "", new Object[0] ); - } - - @Test - public void invokeObjectValidNull() - throws Exception - { - Object object = new Object(); - assertThat( reflector.invoke( object, "hashCode", null ), is( (Object) object.hashCode() ) ); - } - - @Test - public void invokeObjectValidEmpty() - throws Exception - { - Object object = new Object(); - assertThat( reflector.invoke( object, "hashCode", new Object[0] ), - is( (Object) object.hashCode() ) ); - } - - @Test( expected = ReflectorException.class ) - public void invokeObjectValidWrongSignature() - throws Exception - { - reflector.invoke( new Object(), "hashCode", new Object[]{ this } ); - } - - @Test( expected = ReflectorException.class ) - public void invokePrivateMethod() - throws Exception - { - class CoT - { - @SuppressWarnings( "unused" ) - private Object doSomething() - { - return "Done"; - } - } - assertThat( reflector.invoke( new CoT(), "doSomething", new Object[0] ), is( (Object) "Done" ) ); - } - - @Test( expected = ReflectorException.class ) - public void invokePackageMethod() - throws Exception - { - class CoT - { - @SuppressWarnings( "unused" ) - Object doSomething() - { - return "Done"; - } - } - assertThat( reflector.invoke( new CoT(), "doSomething", new Object[0] ), is( (Object) "Done" ) ); - } - - @Test( expected = ReflectorException.class ) - public void invokeProtectedMethod() - throws Exception - { - class CoT - { - @SuppressWarnings( "unused" ) - protected Object doSomething() - { - return "Done"; - } - } - assertThat( reflector.invoke( new CoT(), "doSomething", new Object[0] ), is( (Object) "Done" ) ); - } - - @Test - public void invokePublicMethod() - throws Exception - { - class CoT - { - @SuppressWarnings( "unused" ) - public Object doSomething() - { - return "Done"; - } - } - assertThat( reflector.invoke( new CoT(), "doSomething", new Object[0] ), is( (Object) "Done" ) ); - } - - //// getStaticField( Class, String ) - - @Test( expected = NullPointerException.class ) - public void getStaticFieldNullNull() - throws Exception - { - reflector.getStaticField( null, null ); - } - - @Test( expected = NullPointerException.class ) - public void getStaticFieldNullEmpty() - throws Exception - { - reflector.getStaticField( null, "" ); - } - - @Test( expected = NullPointerException.class ) - public void getStaticFieldObjectNull() - throws Exception - { - reflector.getStaticField( Object.class, null ); - } - - @Test - public void getStaticFieldObjectEmpty() - throws Exception - { - try - { - reflector.getStaticField( Object.class, "" ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( NoSuchFieldException.class ) ); - } - } - - @Test - public void getStaticFieldPrivateField() - throws Exception - { - try - { - reflector.getStaticField( ReflectorTestHelper.class, "PRIVATE_STATIC_STRING" ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( NoSuchFieldException.class ) ); - } - } - - @Test - public void getStaticFieldPackageField() - throws Exception - { - try - { - reflector.getStaticField( ReflectorTestHelper.class, "PACKAGE_STATIC_STRING" ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( NoSuchFieldException.class ) ); - } - } - - @Test - public void getStaticFieldProtectedField() - throws Exception - { - try - { - reflector.getStaticField( ReflectorTestHelper.class, "PROTECTED_STATIC_STRING" ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( NoSuchFieldException.class ) ); - } - } - - @Test - public void getStaticFieldPublicField() - throws Exception - { - assertThat( reflector.getStaticField( ReflectorTestHelper.class, "PUBLIC_STATIC_STRING" ), - is( (Object) "public static string" ) ); - } - - //// getField( Object, String ) - - @Test( expected = NullPointerException.class ) - public void getFieldNullNull() - throws Exception - { - reflector.getField( null, null ); - } - - @Test( expected = NullPointerException.class ) - public void getFieldNullEmpty() - throws Exception - { - reflector.getField( null, "" ); - } - - @Test( expected = NullPointerException.class ) - public void getFieldObjectNull() - throws Exception - { - reflector.getField( new Object(), null ); - } - - @Test - public void getFieldObjectEmpty() - throws Exception - { - try - { - reflector.getField( new Object(), "" ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( NoSuchFieldException.class ) ); - } - } - - @Test - public void getFieldCoTValuePrivateField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - private String value = expected; - } - try - { - assertThat( reflector.getField( new CoT(), "value" ), is( (Object) expected ) ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( IllegalAccessException.class ) ); - } - } - - @Test - public void getFieldCoTValuePackageField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - String value = expected; - } - assertThat( reflector.getField( new CoT(), "value" ), is( (Object) expected ) ); - } - - @Test - public void getFieldCoTValueProtectedField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - protected String value = expected; - } - assertThat( reflector.getField( new CoT(), "value" ), is( (Object) expected ) ); - } - - @Test - public void getFieldCoTValuePublicField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - public String value = expected; - } - assertThat( reflector.getField( new CoT(), "value" ), is( (Object) expected ) ); - } - - //// getField( Object, String, boolean ) - - @Test( expected = NullPointerException.class ) - public void getFieldNullNullFalse() - throws Exception - { - reflector.getField( null, null, false ); - } - - @Test( expected = NullPointerException.class ) - public void getFieldNullEmptyFalse() - throws Exception - { - reflector.getField( null, "", false ); - } - - @Test( expected = NullPointerException.class ) - public void getFieldObjectNullFalse() - throws Exception - { - reflector.getField( new Object(), null, false ); - } - - @Test - public void getFieldObjectEmptyFalse() - throws Exception - { - try - { - reflector.getField( new Object(), "", false ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( NoSuchFieldException.class ) ); - } - } - - @Test - public void getFieldCoTValueFalsePrivateField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - private String value = expected; - } - try - { - assertThat( reflector.getField( new CoT(), "value", false ), is( (Object) expected ) ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( IllegalAccessException.class ) ); - } - } - - @Test - public void getFieldCoTValueFalsePackageField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - String value = expected; - } - assertThat( reflector.getField( new CoT(), "value", false ), is( (Object) expected ) ); - } - - @Test - public void getFieldCoTValueFalseProtectedField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - protected String value = expected; - } - assertThat( reflector.getField( new CoT(), "value", false ), is( (Object) expected ) ); - } - - @Test - public void getFieldCoTValueFalsePublicField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - public String value = expected; - } - assertThat( reflector.getField( new CoT(), "value", false ), is( (Object) expected ) ); - } - - @Test( expected = NullPointerException.class ) - public void getFieldNullNullTrue() - throws Exception - { - reflector.getField( null, null, true ); - } - - @Test( expected = NullPointerException.class ) - public void getFieldNullEmptyTrue() - throws Exception - { - reflector.getField( null, "", true ); - } - - @Test( expected = NullPointerException.class ) - public void getFieldObjectNullTrue() - throws Exception - { - reflector.getField( new Object(), null, true ); - } - - @Test - public void getFieldObjectEmptyTrue() - throws Exception - { - try - { - reflector.getField( new Object(), "", true ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( NoSuchFieldException.class ) ); - } - } - - @Test - public void getFieldCoTValueTruePrivateField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - private String value = expected; - } - assertThat( reflector.getField( new CoT(), "value", true ), is( (Object) expected ) ); - } - - @Test - public void getFieldCoTValueTruePackageField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - String value = expected; - } - assertThat( reflector.getField( new CoT(), "value", true ), is( (Object) expected ) ); - } - - @Test - public void getFieldCoTValueTrueProtectedField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - protected String value = expected; - } - assertThat( reflector.getField( new CoT(), "value", true ), is( (Object) expected ) ); - } - - @Test - public void getFieldCoTValueTruePublicField() - throws Exception - { - final String expected = "gotIt"; - class CoT - { - @SuppressWarnings( "unused" ) - public String value = expected; - } - assertThat( reflector.getField( new CoT(), "value", true ), is( (Object) expected ) ); - } - - //// invokeStatic( Class, String, Object[] ) - - @Test( expected = NullPointerException.class ) - public void invokeStaticNullNullNull() - throws Exception - { - reflector.invokeStatic( (Class)null, (String)null, (Object)null ); - } - - @Test( expected = NullPointerException.class ) - public void invokeStaticClassNullNull() - throws Exception - { - assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), is( Object.class ) ); - } - - @Test( expected = NullPointerException.class ) - public void invokeStaticNullNullEmptyArray() - throws Exception - { - reflector.invokeStatic( null, null, new Object[0] ); - } - - @Test( expected = NullPointerException.class ) - public void invokeStaticClassNullEmptyArray() - throws Exception - { - assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), is( Object.class ) ); - } - - @Test( expected = NullPointerException.class ) - public void invokeStaticNullEmptyNull() - throws Exception - { - reflector.invokeStatic( (Class)null, "", (Object)null ); - } - - @Test( expected = ReflectorException.class ) - public void invokeStaticClassEmptyNull() - throws Exception - { - reflector.invokeStatic( Object.class, "", null ); - } - - @Test( expected = NullPointerException.class ) - public void invokeStaticNullEmptyEmptyArray() - throws Exception - { - reflector.invokeStatic( null, "", new Object[0] ); - } - - @Test( expected = ReflectorException.class ) - public void invokeStaticClassEmptyEmptyArray() - throws Exception - { - assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), is( Object.class ) ); - } - - @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) - public void invokeStaticClassInvalidSignature() - throws Exception - { - reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ this } ); - } - - @Test( expected = ReflectorException.class ) - public void invokeStaticPrivateMethod() - throws Exception - { - reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[0] ); - } - - @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) - public void invokeStaticPackageMethod() - throws Exception - { - reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ Boolean.FALSE } ); - } - - @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) - public void invokeStaticPackageMethodThrowsSomething() - throws Exception - { - reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ Boolean.TRUE } ); - } - - @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) - public void invokeStaticProtectedMethod() - throws Exception - { - reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ 0 } ); - } - - @Test( expected = IllegalArgumentException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) - public void invokeStaticProtectedMethodThrowsSomething() - throws Exception - { - reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ 1 } ); - } - - @Test - public void invokeStaticPublicMethod() - throws Exception - { - assertTrue( reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "" } ) - instanceof ReflectorTestHelper ); - } - - @Test( expected = NullPointerException.class ) - public void invokeStaticPublicMethodNullValue() - throws Exception - { - reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ null } ); - } - - @Test - public void invokeStaticPublicMethodThrowsSomething() - throws Exception - { - try - { - reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "Message" } ); - fail(); - } - catch ( ReflectorException e ) - { - assertThat( e, hasCause( ReflectorTestHelper.HelperException.class ) ); - } - } - - @Test( expected = NullPointerException.class ) - public void invokeStaticNonStaticMethod() - throws Exception - { - assertTrue( - reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "", Boolean.FALSE } ) - instanceof ReflectorTestHelper ); - } - - //// getConstructor( Class, Class[] ) - - @Test( expected = NullPointerException.class ) - public void getConstructorNullNull() - throws Exception - { - reflector.getConstructor( (Class)null, (Class)null ); - } - - @Test( expected = NullPointerException.class ) - public void getConstructorNullEmpty() - throws Exception - { - reflector.getConstructor( null, new Class[0] ); - } - - @SuppressWarnings( "rawtypes" ) - @Test( expected = NullPointerException.class ) - public void getConstructorObjectNull() - throws Exception - { - assertThat( reflector.getConstructor( Object.class, (Class)null ), - is( (Constructor) Object.class.getDeclaredConstructor() ) ); - } - - @SuppressWarnings( "rawtypes" ) - @Test - public void getConstructorObjectEmpty() - throws Exception - { - assertThat( reflector.getConstructor( Object.class), - is( (Constructor) Object.class.getDeclaredConstructor() ) ); - } - - @SuppressWarnings( "rawtypes" ) - @Test( expected = ReflectorException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) - public void getConstructorPrivate() - throws Exception - { - assertThat( reflector.getConstructor( ReflectorTestHelper.class), - is( (Constructor) ReflectorTestHelper.class.getDeclaredConstructor() ) ); - } - - @SuppressWarnings( "rawtypes" ) - @Test - public void getConstructorPackage() - throws Exception - { - assertThat( reflector.getConstructor( ReflectorTestHelper.class, Boolean.class), - not( is( (Constructor) ReflectorTestHelper.class.getDeclaredConstructor( Boolean.class ) ) ) ); - } - - @SuppressWarnings( "rawtypes" ) - @Test - public void getConstructorProtected() - throws Exception - { - assertThat( reflector.getConstructor( ReflectorTestHelper.class, Integer.class), - not( is( (Constructor) ReflectorTestHelper.class.getDeclaredConstructor( Integer.class ) ) ) ); - } - - @SuppressWarnings( "rawtypes" ) - @Test - public void getConstructorPublic() - throws Exception - { - assertThat( reflector.getConstructor( ReflectorTestHelper.class, String.class), - is( (Constructor) ReflectorTestHelper.class.getDeclaredConstructor( String.class ) ) ); - } - - //// getObjectProperty( Object, String ) - - @Test( expected = ReflectorException.class ) - public void getObjectPropertyNullNull() - throws Exception - { - reflector.getObjectProperty( null, null ); - } - - @Test( expected = ReflectorException.class ) - public void getObjectPropertyNullEmpty() - throws Exception - { - reflector.getObjectProperty( null, "" ); - } - - @Test( expected = ReflectorException.class ) - public void getObjectPropertyObjectNull() - throws Exception - { - reflector.getObjectProperty( new Object(), null ); - } - - @Test( expected = ReflectorException.class ) - public void getObjectPropertyObjectEmpty() - throws Exception - { - reflector.getObjectProperty( new Object(), "" ); - } - - @Test - // @ReproducesPlexusBug( "Should only access public properties" ) - public void getObjectPropertyViaPrivateField() - throws Exception - { - class CoT - { - @SuppressWarnings( "unused" ) - private int value = 42; - } - assertThat( reflector.getObjectProperty( new CoT(), "value" ), is( (Object) 42 ) ); - } - - @Test - // @ReproducesPlexusBug( "Should only access public properties" ) - public void getObjectPropertyViaPackageField() - throws Exception - { - class CoT - { - @SuppressWarnings( "unused" ) - int value = 42; - } - assertThat( reflector.getObjectProperty( new CoT(), "value" ), is( (Object) 42 ) ); - } - - @Test - // @ReproducesPlexusBug( "Should only access public properties" ) - public void getObjectPropertyViaProtectedField() - throws Exception - { - class CoT - { - @SuppressWarnings( "unused" ) - protected int value = 42; - } - assertThat( reflector.getObjectProperty( new CoT(), "value" ), is( (Object) 42 ) ); - } - - @Test - public void getObjectPropertyViaPublicField() - throws Exception - { - class CoT - { - @SuppressWarnings( "unused" ) - public int value = 42; - } - assertThat( reflector.getObjectProperty( new CoT(), "value" ), is( (Object) 42 ) ); - } - - @Test( expected = ReflectorException.class ) - public void getObjectPropertyViaPrivateGetter() - throws Exception - { - class CoT - { - private final int _value = 42; - - @SuppressWarnings( "unused" ) - private int getValue() - { - return _value; - } - } - reflector.getObjectProperty( new CoT(), "value" ); - } - - @Test( expected = ReflectorException.class ) - public void getObjectPropertyViaPackageGetter() - throws Exception - { - class CoT - { - private final int _value = 42; - - @SuppressWarnings( "unused" ) - int getValue() - { - return _value; - } - } - reflector.getObjectProperty( new CoT(), "value" ); - } - - @Test( expected = ReflectorException.class ) - public void getObjectPropertyViaProtectedGetter() - throws Exception - { - class CoT - { - private final int _value = 42; - - @SuppressWarnings( "unused" ) - protected int getValue() - { - return _value; - } - } - reflector.getObjectProperty( new CoT(), "value" ); - } - - @Test - public void getObjectPropertyViaPublicGetter() - throws Exception - { - class CoT - { - private final int _value = 42; - - @SuppressWarnings( "unused" ) - public int getValue() - { - return _value; - } - } - assertThat( reflector.getObjectProperty( new CoT(), "value" ), is( (Object) 42 ) ); - } - - //// getMethod( Class, String, Class[] ) - - @Test( expected = NullPointerException.class ) - public void getMethodNullNullNull() - throws Exception - { - reflector.getMethod( (Class)null, (String)null, (Class)null ); - } - - @Test( expected = NullPointerException.class ) - public void getMethodNullNullEmpty() - throws Exception - { - reflector.getMethod( null, null, new Class[0] ); - } - - @Test( expected = NullPointerException.class ) - public void getMethodObjectNullNull() - throws Exception - { - reflector.getMethod( Object.class, (String)null, (Class)null ); - } - - @Test( expected = NullPointerException.class ) - public void getMethodObjectNullEmpty() - throws Exception - { - reflector.getMethod( Object.class, null, new Class[0] ); - } - - @Test( expected = NullPointerException.class ) - public void getMethodNullEmptyNull() - throws Exception - { - reflector.getMethod( (Class)null, "", (Class)null ); - } - - @Test( expected = NullPointerException.class ) - public void getMethodNullEmptyEmpty() - throws Exception - { - reflector.getMethod( null, "", new Class[0] ); - } - - @Test( expected = NullPointerException.class ) - public void getMethodObjectEmptyNull() - throws Exception - { - reflector.getMethod( Object.class, "", (Class)null ); - } - - @Test( expected = ReflectorException.class ) - public void getMethodObjectEmptyEmpty() - throws Exception - { - reflector.getMethod( Object.class, "", new Class[0] ); - } - - @Test( expected = ReflectorException.class ) - // @ReproducesPlexusBug( "Looking up methods by signature has an unlabelled continue, so finds the wrong method" ) - public void getMethodPrivate() - throws Exception - { - assertThat( reflector.getMethod( ReflectorTestHelper.class, "getInstance", new Class[0] ), - is( ReflectorTestHelper.class.getDeclaredMethod( "getInstance" ) ) ); - } - - @Test - public void getMethodPackage() - throws Exception - { - assertThat( reflector.getMethod( ReflectorTestHelper.class, "getInstance", new Class[]{ Boolean.class } ), - not( is( ReflectorTestHelper.class.getDeclaredMethod( "getInstance", Boolean.class ) ) ) ); - } - - @Test - public void getMethodProtected() - throws Exception - { - assertThat( reflector.getMethod( ReflectorTestHelper.class, "getInstance", new Class[]{ Integer.class } ), - not( is( ReflectorTestHelper.class.getDeclaredMethod( "getInstance", Integer.class ) ) ) ); - } - - @Test - public void getMethodPublic() - throws Exception - { - assertThat( reflector.getMethod( ReflectorTestHelper.class, "getInstance", new Class[]{ String.class } ), - is( ReflectorTestHelper.class.getDeclaredMethod( "getInstance", String.class ) ) ); - } - -} diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java deleted file mode 100644 index 544df298..00000000 --- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.apache.maven.shared.utils.reflection; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * - * @author stephenc - */ -class ReflectorTestHelper -{ - static String PACKAGE_STATIC_STRING = "package static string"; - protected static String PROTECTED_STATIC_STRING = "protected static string"; - public static String PUBLIC_STATIC_STRING = "public static string"; - - private ReflectorTestHelper() - { - } - - ReflectorTestHelper( Boolean throwSomething ) - { - if ( Boolean.TRUE.equals( throwSomething ) ) - { - throw new HelperException( "Something" ); - } - } - - protected ReflectorTestHelper( Integer throwCount ) - { - if ( throwCount != null && throwCount > 0 ) - { - throw new HelperException( "Something" ); - } - } - - public ReflectorTestHelper( String throwMessage ) - { - if ( throwMessage != null && throwMessage.length() > 0 ) - { - throw new HelperException( throwMessage ); - } - } - - static ReflectorTestHelper getInstance( Boolean throwSomething ) - { - if ( Boolean.TRUE.equals( throwSomething ) ) - { - throw new HelperException( "Something" ); - } - return new ReflectorTestHelper(); - } - - protected static ReflectorTestHelper getInstance( Integer throwCount ) - { - if ( throwCount != null && throwCount > 0 ) - { - throw new HelperException( "Something" ); - } - return new ReflectorTestHelper(); - } - - public static ReflectorTestHelper getInstance( String throwMessage ) - { - if ( throwMessage != null && throwMessage.length() > 0 ) - { - throw new HelperException( throwMessage ); - } - return new ReflectorTestHelper(); - } - - public ReflectorTestHelper getInstance( String aString, Boolean aBoolean ) - { - return new ReflectorTestHelper(); - } - - public static class HelperException - extends RuntimeException - { - /** - * - */ - private static final long serialVersionUID = -3395757415194358525L; - - public HelperException() - { - super(); //To change body of overridden methods use File | Settings | File Templates. - } - - public HelperException( String message ) - { - super( message ); //To change body of overridden methods use File | Settings | File Templates. - } - - public HelperException( String message, Throwable cause ) - { - super( message, cause ); //To change body of overridden methods use File | Settings | File Templates. - } - - public HelperException( Throwable cause ) - { - super( cause ); //To change body of overridden methods use File | Settings | File Templates. - } - } -} From 663aa806018c15f62e463f591bfd8546fb8d8726 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 8 Mar 2020 14:54:36 -0400 Subject: [PATCH 117/265] remove info about what's not here (#19) --- .../maven/shared/utils/package-info.java | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 src/main/java/org/apache/maven/shared/utils/package-info.java diff --git a/src/main/java/org/apache/maven/shared/utils/package-info.java b/src/main/java/org/apache/maven/shared/utils/package-info.java deleted file mode 100644 index ba04e238..00000000 --- a/src/main/java/org/apache/maven/shared/utils/package-info.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.apache.maven.shared.utils; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * - * The following classes have not been implemented because they are easy to get other where: - * - *
            - *
            Base64
            - *
            commons-io has a much better maintained version than plexus-utils had. - * Commons / Jakarta is also the original source.
            - *
            - *
            - *
            FastMap
            - *
            This stuff contains tons of ancient java-1.2 logic. HotSpot collections are much faster that this stuff - * in the meantime.
            - *
            - */ From 8ed3e6827885a161a8802100f0f50968555356b0 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 8 Mar 2020 16:35:12 -0400 Subject: [PATCH 118/265] remove unreferenced non-public class (#18) --- .../org/apache/maven/shared/utils/Expand.java | 233 ------------ .../apache/maven/shared/utils/ExpandTest.java | 336 ------------------ 2 files changed, 569 deletions(-) delete mode 100644 src/main/java/org/apache/maven/shared/utils/Expand.java delete mode 100644 src/test/java/org/apache/maven/shared/utils/ExpandTest.java diff --git a/src/main/java/org/apache/maven/shared/utils/Expand.java b/src/main/java/org/apache/maven/shared/utils/Expand.java deleted file mode 100644 index 28c01edc..00000000 --- a/src/main/java/org/apache/maven/shared/utils/Expand.java +++ /dev/null @@ -1,233 +0,0 @@ -package org.apache.maven.shared.utils; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Date; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.utils.io.IOUtil; - -/** - * Expand will unpack the given zip archive. - * - * @author Mark Struberg - */ -class Expand -{ - /** - * Source file which should get expanded - */ - private File source; - - /** - * destination directory - */ - private File dest; - - /** - * if the unpackaging should get performed if the destination already exists. - */ - private boolean overwrite = false; - - private static final int BUFFER_SIZE = 2 ^ 16; - - - /** - * The zip archive which should get expanded. - * - * @param sourceArchive - */ - public void setSrc( File sourceArchive ) - { - this.source = sourceArchive; - } - - /** - * Set the destination directory into which the archive should get expanded. - * The directory will get created if it doesn't yet exist - * while executing the expand. - * - * @param destinationDirectory - */ - public void setDest( File destinationDirectory ) - { - this.dest = destinationDirectory; - } - - /** - * If the destination directory should get overwritten if the content - * already exists. If false we will only overwrite if the local - * file or directory is older than the one in the archive. - * - * @param overwrite - */ - public void setOverwrite( boolean overwrite ) - { - this.overwrite = overwrite; - } - - /** - * Actually perform the unpacking of the source archive - * into the destination directory. - * - * @throws Exception - */ - public void execute() - throws Exception - { - expandFile( source, dest ); - } - - /** - *

            It is intended to be overwritten when implementing an own unarchiver

            - *

            - *

            Note: we kept this protected method for the sake of backward compatibility!

            - * - * @param srcFile The source file. - * @param destination The destination. - * @throws Exception In case of failure. - */ - void expandFile( File srcFile, File destination ) - throws Exception - { - if ( source == null ) - { - throw new NullPointerException( "Source Archive must not be null!" ); - } - - File destDir = destination; - if ( destDir == null ) - { - destDir = new File( System.getProperty( "user.dir" ) ); - } - - ZipInputStream in = null; - try - { - in = new ZipInputStream( new FileInputStream( srcFile ) ); - - for ( ZipEntry zipEntry = in.getNextEntry(); zipEntry != null; zipEntry = in.getNextEntry() ) - { - String zipEntryName = zipEntry.getName(); - Date zipEntryDate = new Date( zipEntry.getTime() ); - - extractFile( source, destDir, in, zipEntryName, zipEntryDate, zipEntry.isDirectory() ); - } - - in.close(); - in = null; - } - finally - { - IOUtil.close( in ); - } - } - - /** - * Extract a single ZipEntry. - *

            - *

            Note: we kept this protected method for the sake of backward compatibility!

            - * - * @param archive the archive to unpack - * @param destDir the destination dirctory - * @param compressedInputStream - * @param entryName - * @param entryDate - * @param isDirectory - * @throws Exception - */ - void extractFile( File archive, File destDir, InputStream compressedInputStream, String entryName, - Date entryDate, boolean isDirectory ) - throws Exception - { - File targetFile = new File( destDir, entryName ); - - if ( !targetFile.getAbsolutePath().startsWith( destDir.getAbsolutePath() ) ) - { - throw new IOException( "Entry '" + entryName + "' outside the target directory." ); - } - - // if overwrite is specified and the file type - // of the existing file does not match, then delete it - if ( overwrite && targetFile.exists() && targetFile.isDirectory() != isDirectory ) - { - deleteFileOrDir( targetFile ); - } - - if ( !targetFile.exists() || overwrite || targetFile.lastModified() <= entryDate.getTime() ) - { - if ( isDirectory ) - { - targetFile.mkdirs(); - } - else - { - byte[] buffer = new byte[BUFFER_SIZE]; - OutputStream out = null; - try - { - out = new FileOutputStream( targetFile ); - - int len; - while ( ( len = compressedInputStream.read( buffer ) ) >= 0 ) - { - out.write( buffer, 0, len ); - } - - out.close(); - out = null; - } - finally - { - IOUtil.close( out ); - } - targetFile.setLastModified( entryDate.getTime() ); - } - } - } - - /** - * small helper method who deletes the given directory or file. - * - * @param targetFile - * @throws IOException - */ - private void deleteFileOrDir( File targetFile ) - throws IOException - { - if ( targetFile.isDirectory() ) - { - FileUtils.deleteDirectory( targetFile ); - } - else - { - FileUtils.delete( targetFile ); - } - - } -} diff --git a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java deleted file mode 100644 index 6718c830..00000000 --- a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java +++ /dev/null @@ -1,336 +0,0 @@ -package org.apache.maven.shared.utils; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.apache.maven.shared.utils.io.FileUtils; -import org.junit.Rule; -import org.junit.Test; -import org.junit.Assert; -import org.junit.rules.TemporaryFolder; - -import java.io.File; -import java.io.FileNotFoundException; -import java.net.URL; - -import static org.hamcrest.CoreMatchers.*; - -/** - * This will test the plexus utility class {@link Expand}. - * - * Most of this stuff will be obsolete because java-1.4.2 - * introduced a java.util.zip package which works like a charm. - * - * We of course need to implement this class due to compatibility - * reasons. - * - * @author Mark Struberg - */ -public class ExpandTest - extends Assert -{ - - private static final String TEST_ZIP_LOCATION = "/expand/expand_test.zip"; - private static final String TEST_ZIP_TARGET_FOLDER = "expand_test_target/"; - - private static final String TEST_UNZIPPED_FILE = "expand_test/test_file.txt"; - private static final String TEST_UNZIPPED_CONTENT = "TestContent"; - - - @Rule - public TemporaryFolder tempFolder = new TemporaryFolder(); - - private File getSourceFile() - { - URL zipFileUrl = getClass().getResource( TEST_ZIP_LOCATION ); - - assertNotNull( zipFileUrl ); - - return new File( zipFileUrl.getFile() ); - } - - /** - * Create a clean target directory for unzipping. - * If it did exist, then clean it first. - * - * @return The target folder. - */ - private File getTestTargetDir() - throws Exception - { - return tempFolder.newFolder( TEST_ZIP_TARGET_FOLDER ); - } - - @Test - public void testSetDest_No_NPE() - { - Expand expand = new Expand(); - expand.setDest( null ); - } - - @Test - public void testSetSrc_No_NPE() - { - Expand expand = new Expand(); - expand.setSrc( null ); - } - - @Test - public void testExecute() - throws Exception - { - Expand expand = new Expand(); - - File source = getSourceFile(); - expand.setSrc( source ); - - File targetDir = getTestTargetDir(); - expand.setDest( targetDir ); - - expand.execute(); - - verifyExpandedFileAndContent( targetDir, TEST_UNZIPPED_CONTENT ); - } - - @Test - public void testExecuteIntoNonexistingDirectory() - throws Exception - { - Expand expand = new Expand(); - - File source = getSourceFile(); - expand.setSrc( source ); - - File nonexisingDir = new File( getTestTargetDir(), "nonexisting_dir" ); - - if ( nonexisingDir.exists() ) - { - FileUtils.deleteDirectory( nonexisingDir ); - } - - expand.setDest( nonexisingDir ); - - expand.execute(); - - verifyExpandedFileAndContent( nonexisingDir, TEST_UNZIPPED_CONTENT ); - } - - @Test - public void testExecuteNonexistingSource() - throws Exception - { - Expand expand = new Expand(); - - File nonexistingSource = new File( "target/expand_test_target/nonexisting_source_file.nixda" ); - expand.setSrc( nonexistingSource ); - - File targetDir = getTestTargetDir(); - expand.setDest( targetDir ); - - try - { - expand.execute(); - fail( "expand with notexiting source must throw Exception!" ); - } - catch ( Exception e ) - { - Throwable cause = ExceptionUtils.getRootCause( e ); - if ( cause == null ) - { - cause = e; - } - - assertTrue( "cause must be a FileNotFoundException", cause instanceof FileNotFoundException ); - } - - } - - @Test( expected = NullPointerException.class ) - public void testExecute_NullSource() - throws Exception - { - Expand expand = new Expand(); - expand.setSrc( null ); - - File targetDir = getTestTargetDir(); - expand.setDest( targetDir ); - - expand.execute(); - } - - @Test - public void testExecute_NullDest() - throws Exception - { - Expand expand = new Expand(); - expand.setSrc( getSourceFile() ); - - // execute without a dest directory seems to - // expand all the archive into the current working directory - expand.setDest( null ); - - String oldWorkingDirectory = System.getProperty( "user.dir" ); - - try - { - File targetDir = getTestTargetDir(); - System.setProperty( "user.dir", targetDir.getAbsolutePath() ); - - expand.execute(); - - verifyExpandedFileAndContent( targetDir, TEST_UNZIPPED_CONTENT ); - } - finally - { - System.setProperty( "user.dir", oldWorkingDirectory ); - } - } - - @Test - public void testExecute_Overwrite() - throws Exception - { - File targetDir = getTestTargetDir(); - File expandedFile = null; - - { - // part1: expand - - Expand expand = new Expand(); - - File source = getSourceFile(); - expand.setSrc( source ); - - expand.setDest( targetDir ); - - expand.execute(); - - expandedFile = verifyExpandedFile( targetDir ); - } - - // turn the clock back 10 seconds - long time = System.currentTimeMillis() - 10000L; - - // round down to 1s; - time = time - time % 1000L; - - expandedFile.setLastModified( time ); - assertEquals( time, expandedFile.lastModified() ); - - { - // part2: expand in non-overwrite mode - - Expand expand = new Expand(); - - File source = getSourceFile(); - expand.setSrc( source ); - expand.setDest( targetDir ); - - expand.setOverwrite( false ); - - expand.execute(); - - expandedFile = verifyExpandedFile( targetDir ); - - assertEquals( "file must still have the old lastModified timestamp" - , time, expandedFile.lastModified() ); - - } - - { - // part3: expand in overwrite mode but local file is still newer than the one in the archive - - Expand expand = new Expand(); - - File source = getSourceFile(); - expand.setSrc( source ); - expand.setDest( targetDir ); - - expand.setOverwrite( true ); - - expand.execute(); - - expandedFile = verifyExpandedFile( targetDir ); - - // obviously the file will be overwritten anyway - assertTrue( "file must now have the original old lastModified timestamp, but was: time=" + time - + " expandedFile.lastModified()= " + expandedFile.lastModified() - , time > expandedFile.lastModified() ); - } - - // turn the clock back a loooong time! - time = 100000000L; - - expandedFile.setLastModified( time ); - assertEquals( time, expandedFile.lastModified() ); - - { - // part3: expand in overwrite mode but local file is now older than the one in the archive - - Expand expand = new Expand(); - - File source = getSourceFile(); - expand.setSrc( source ); - expand.setDest( targetDir ); - - expand.setOverwrite( true ); - - expand.execute(); - - expandedFile = verifyExpandedFile( targetDir ); - - assertTrue( "file must now have newer lastModified timestamp, but was: time=" + time - + " expandedFile.lastModified()= " + expandedFile.lastModified() - , time < expandedFile.lastModified() ); - - } - } - - - private File verifyExpandedFile( File targetDir ) - { - assertThat( "target directory must exist" - , targetDir.exists() - , is( true ) ); - - File expandedFile = new File( targetDir, TEST_UNZIPPED_FILE ); - - assertThat( "expanded file must exist: " + expandedFile.getAbsolutePath() - , expandedFile.exists() - , is( true ) ); - - return expandedFile; - } - - private void verifyExpandedFileAndContent( File targetDir, String expectedContent ) - throws FileNotFoundException - { - File expandedFile = verifyExpandedFile( targetDir ); - - assertNotNull( expandedFile ); - - java.util.Scanner scanner = new java.util.Scanner( expandedFile ).useDelimiter( "\n" ); - String text = scanner.next(); - - assertThat( "expanded file content must match" - , text - , is( expectedContent ) ); - } -} From 7d4ea36ee5b4541586d6fba395fcccc906d67053 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 11 Mar 2020 16:28:35 -0400 Subject: [PATCH 119/265] system independent file separator --- .gitignore | 2 ++ .../maven/shared/utils/io/DirectoryScannerTest.java | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f79c9285..e1b7e456 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ out/ /bootstrap /dependencies.xml .java-version +.checkstyle + diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index a6149a3f..21553383 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -135,10 +135,12 @@ public void checkSymlinkBehaviour() ds.setBasedir( new File( "src/test/resources/symlinks/src" ) ); ds.setFollowSymlinks( false ); ds.scan(); + String[] includedDirectories = ds.getIncludedDirectories(); + assertEquals( 5, includedDirectories.length ); + String[] files = ds.getIncludedFiles(); assertAlwaysIncluded( Arrays.asList( files ) ); - assertEquals( 5, includedDirectories.length ); assertEquals( 9, files.length ); } @@ -169,8 +171,8 @@ public void followSymlinksFalse() private void assertAlwaysIncluded( List included ) { - assertTrue( included.contains( "aRegularDir/aRegularFile.txt" ) ); - assertTrue( included.contains( "targetDir/targetFile.txt" ) ); + assertTrue( included.contains( "aRegularDir" + File.separator + "aRegularFile.txt" ) ); + assertTrue( included.contains( "targetDir" + File.separator + "targetFile.txt" ) ); assertTrue( included.contains( "fileR.txt" ) ); assertTrue( included.contains( "fileW.txt" ) ); assertTrue( included.contains( "fileX.txt" ) ); From 659222a3c53b5f9a585302a92d14ceba97da58f6 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 11 Mar 2020 18:38:17 -0400 Subject: [PATCH 120/265] document buggy behavior --- .../org/apache/maven/shared/utils/io/DirectoryScanner.java | 2 ++ .../apache/maven/shared/utils/io/DirectoryScannerTest.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java index 309ebf95..ba8fc01f 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java @@ -828,9 +828,11 @@ public String[] getExcludedFiles() * Returns the names of the directories which matched at least one of the include patterns and none of the exclude * patterns. The names are relative to the base directory. * + * @deprecated this method is buggy. Do not depend on it. * @return the names of the directories which matched at least one of the include patterns and none of the exclude * patterns. May also contain symbolic links to directories. */ + @Deprecated public String[] getIncludedDirectories() { return dirsIncluded.toArray( new String[dirsIncluded.size()] ); diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index 21553383..b96b4e7f 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -137,7 +137,9 @@ public void checkSymlinkBehaviour() ds.scan(); String[] includedDirectories = ds.getIncludedDirectories(); - assertEquals( 5, includedDirectories.length ); + // FIXME 3 (Windows) and 5 (Linux) are both wrong. The correct answer is 4. + // This method is broken in different ways on different operating systems. + assertTrue( includedDirectories.length == 3 || includedDirectories.length == 5); String[] files = ds.getIncludedFiles(); assertAlwaysIncluded( Arrays.asList( files ) ); From 778f934f29e6203f98b06cb8d868d24dad5504b2 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 11 Mar 2020 19:05:31 -0400 Subject: [PATCH 121/265] document buggy behavior --- .../org/apache/maven/shared/utils/io/DirectoryScanner.java | 2 ++ .../org/apache/maven/shared/utils/io/DirectoryScannerTest.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java index ba8fc01f..721d7a92 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java @@ -784,9 +784,11 @@ boolean isExcluded( @Nonnull final String name ) * Returns the names of the files which matched at least one of the include patterns and none of the exclude * patterns. The names are relative to the base directory. * + * @deprecated this method does not work correctly on Windows. * @return the names of the files which matched at least one of the include patterns and none of the exclude * patterns. May also contain symbolic links to files. */ + @Deprecated public String[] getIncludedFiles() { if ( filesIncluded == null ) diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index b96b4e7f..b2eeccc4 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -143,6 +143,9 @@ public void checkSymlinkBehaviour() String[] files = ds.getIncludedFiles(); assertAlwaysIncluded( Arrays.asList( files ) ); + + // FIXME getIncludedFiles is broken on Windows + assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) ); assertEquals( 9, files.length ); } From 9f89c115ddfcd8c4ff401a3085d31cbc7a743173 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 11 Mar 2020 21:45:04 -0400 Subject: [PATCH 122/265] work around Windows --- .../apache/maven/shared/utils/io/DirectoryScannerTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index b2eeccc4..5a5dae97 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -144,9 +144,8 @@ public void checkSymlinkBehaviour() String[] files = ds.getIncludedFiles(); assertAlwaysIncluded( Arrays.asList( files ) ); - // FIXME getIncludedFiles is broken on Windows - assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) ); - assertEquals( 9, files.length ); + // FIXME getIncludedFiles is broken on Windows; correct answer is 9 + assertTrue( files.length == 9|| files.length == 11); } @Test From 06dfcc993be1db41db0b766c8477d98982eae9dd Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 12 Mar 2020 05:58:07 -0400 Subject: [PATCH 123/265] work around Windows --- .../org/apache/maven/shared/utils/io/DirectoryScannerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index 5a5dae97..27e59b28 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -145,7 +145,7 @@ public void checkSymlinkBehaviour() assertAlwaysIncluded( Arrays.asList( files ) ); // FIXME getIncludedFiles is broken on Windows; correct answer is 9 - assertTrue( files.length == 9|| files.length == 11); + assertTrue( files.length == 9 || files.length == 11); } @Test From dd0b4270c84b7afd2c33f933373652039ba3076d Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 12 Mar 2020 06:23:49 -0400 Subject: [PATCH 124/265] add message --- .../org/apache/maven/shared/utils/io/DirectoryScannerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index 27e59b28..f19562f0 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -145,7 +145,7 @@ public void checkSymlinkBehaviour() assertAlwaysIncluded( Arrays.asList( files ) ); // FIXME getIncludedFiles is broken on Windows; correct answer is 9 - assertTrue( files.length == 9 || files.length == 11); + assertTrue("files.length is " + files.length, files.length == 9 || files.length == 11 ); } @Test From cb448b90918a5e894c38b86d00d402638f195502 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 12 Mar 2020 10:54:24 -0400 Subject: [PATCH 125/265] [MSHARED-860] deprecated Windows 9X CommandShell (#20) * deprecated Windows 9X CommandShell * correct JavaDoc --- .../shared/utils/cli/shell/CmdShell.java | 4 +-- .../shared/utils/cli/shell/CommandShell.java | 5 ++- .../maven/shared/utils/cli/shell/Shell.java | 32 +++++++++---------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java index 7c27ac19..04aa6de1 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java @@ -23,9 +23,7 @@ import java.util.List; /** - *

            - * Implementation to call the CMD Shell present on Windows NT, 2000 and XP - *

            + * Implementation to call the CMD Shell present on Windows NT, 2000, XP, 7, 8, and 10. * * @author Carlos Sanchez * diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java index dcee0466..ba85633b 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java @@ -21,13 +21,12 @@ /** - *

            * Implementation to call the Command.com Shell present on Windows 95, 98 and Me - *

            * * @author Carlos Sanchez - * + * @deprecated Windows ME is long dead. Update to Windows 10 and use {@link CmdShell}. */ +@Deprecated public class CommandShell extends Shell { diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java index 58096109..bec555e0 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java @@ -27,14 +27,13 @@ import org.apache.maven.shared.utils.StringUtils; /** - *

            * Class that abstracts the Shell functionality, - * with subclases for shells that behave particularly, like + * with subclasses for shells that behave particularly, like

            + * *

              *
            • command.com
              • *
            • cmd.exe
              • *
            - *

            * * @author Carlos Sanchez * @@ -65,9 +64,9 @@ public class Shell private char exeQuoteDelimiter = '\"'; /** - * Set the command to execute the shell (eg. COMMAND.COM, /bin/bash,...) + * Set the command to execute the shell (e.g. COMMAND.COM, /bin/bash,...). * - * @param shellCommand The command + * @param shellCommand the command */ void setShellCommand( String shellCommand ) { @@ -75,9 +74,9 @@ void setShellCommand( String shellCommand ) } /** - * Get the command to execute the shell + * Get the command to execute the shell. * - * @return The command + * @return the command */ String getShellCommand() { @@ -86,7 +85,7 @@ String getShellCommand() /** * Set the shell arguments when calling a command line (not the executable arguments) - * (eg. /X /C for CMD.EXE) + * (e.g. /X /C for CMD.EXE). * * @param shellArgs the arguments to the shell */ @@ -99,7 +98,7 @@ void setShellArgs( String[] shellArgs ) /** * Get the shell arguments * - * @return The arguments + * @return the arguments */ String[] getShellArgs() { @@ -118,7 +117,7 @@ String[] getShellArgs() * * @param executableParameter executable that the shell has to call * @param argumentsParameter arguments for the executable, not the shell - * @return List with one String object with executable and arguments quoted as needed + * @return list with one String object with executable and arguments quoted as needed */ List getCommandLine( String executableParameter, String... argumentsParameter ) { @@ -126,9 +125,9 @@ List getCommandLine( String executableParameter, String... argumentsPara } /** - * @param executableParameter Executable. - * @param argumentsParameter The arguments for the executable. - * @return The list on command line. + * @param executableParameter Executable + * @param argumentsParameter the arguments for the executable + * @return the list on command line */ List getRawCommandLine( String executableParameter, String... argumentsParameter ) { @@ -211,7 +210,7 @@ char[] getEscapeChars( boolean includeSingleQuote, boolean includeDoubleQuote ) } /** - * @return false in all cases. + * @return false in all cases */ protected boolean isDoubleQuotedArgumentEscaped() { @@ -354,7 +353,8 @@ public void setWorkingDirectory( String path ) /** * Sets execution directory. - * @param workingDirectory The working directory. + * + * @param workingDirectory the working directory */ public void setWorkingDirectory( File workingDirectory ) { @@ -365,7 +365,7 @@ public void setWorkingDirectory( File workingDirectory ) } /** - * @return The working directory. + * @return the working directory */ public File getWorkingDirectory() { From 4264899a152a6205b0f34a32e9c947edcd9cb1e8 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 21 Mar 2020 10:41:12 -0400 Subject: [PATCH 126/265] update to parent 34 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28c46bae..21a01e03 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components - 33 + 34 ../../pom/maven/maven-shared-components/pom.xml From 001baa7d7b534f1cec4bc509e750c03e53a695ce Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 23 Mar 2020 16:29:34 -0400 Subject: [PATCH 127/265] fix a number of small warnings and formatting issues (#10) * fix a number of small warnings and formatting issues * setters shouldn't return values --- .../maven/shared/utils/io/FileUtils.java | 8 --- .../maven/shared/utils/xml/Xpp3Dom.java | 9 ---- .../shared/utils/XmlStreamReaderTest.java | 54 +++++++------------ .../utils/cli/CommandLineUtilsTest.java | 26 +++++---- .../shared/utils/io/SymlinkTestSetup.java | 15 +++--- 5 files changed, 41 insertions(+), 71 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java index 63a5aa38..e5264b2e 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java @@ -106,11 +106,6 @@ protected FileUtils() */ private static final int ONE_MB = ONE_KB * ONE_KB; - /** - * The number of bytes in a gigabyte. - */ - private static final int ONE_GB = ONE_KB * ONE_MB; - /** * The file copy buffer size (30 MB) */ @@ -497,9 +492,6 @@ public static void fileDelete( @Nonnull String fileName ) /** * Given a directory and an array of extensions return an array of compliant files. *

            - * TODO Should an ignore list be passed in? - * TODO Should a recurse flag be passed in? - *

            * The given extensions should be like "java" and not like ".java" * * @param directory The path of the directory. diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java index 5efa8fc9..1b2f1b66 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java @@ -311,15 +311,6 @@ public void setParent( Xpp3Dom parent ) this.parent = parent; } - // Todo: Support writing to serializer (>1.0) - // public void writeToSerializer( String namespace, XmlSerializer serializer ) - // throws IOException - - private static Xpp3Dom merge( Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMergeOverride ) - { - return Xpp3DomUtils.merge( dominant, recessive, childMergeOverride ); - } - /** * @param dominant The dominant part. * @param recessive The recessive part. diff --git a/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java b/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java index 05715c1a..3ffb98d3 100644 --- a/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java +++ b/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java @@ -55,8 +55,6 @@ public class XmlStreamReaderTest private static final byte[] BOM_UTF8 = { (byte)0xEF, (byte)0xBB, (byte)0xBF }; private static final byte[] BOM_UTF16BE = { (byte)0xFE, (byte)0xFF }; private static final byte[] BOM_UTF16LE = { (byte)0xFF, (byte)0xFE }; - private static final byte[] BOM_UTF32BE = { (byte)0x00, (byte)0x00, (byte)0xFF, (byte)0xFE }; - private static final byte[] BOM_UTF32LE = { (byte)0xFF, (byte)0xFE, (byte)0x00, (byte)0x00 }; private static String createXmlContent( String text, String encoding ) { @@ -74,8 +72,7 @@ private static void checkXmlContent( String xml, String encoding ) checkXmlContent( xml, encoding, null ); } - private static void checkXmlContent( String xml, String encoding, byte[] bom ) - throws IOException + private static void checkXmlContent( String xml, String encoding, byte[] bom ) throws IOException { byte[] xmlContent = xml.getBytes( encoding ); InputStream in = new ByteArrayInputStream( xmlContent ); @@ -92,104 +89,90 @@ private static void checkXmlContent( String xml, String encoding, byte[] bom ) } private static void checkXmlStreamReader( String text, String encoding, String effectiveEncoding ) - throws IOException + throws IOException { checkXmlStreamReader( text, encoding, effectiveEncoding, null ); } - private static void checkXmlStreamReader( String text, String encoding ) - throws IOException + private static void checkXmlStreamReader( String text, String encoding ) throws IOException { checkXmlStreamReader( text, encoding, encoding, null ); } - private static void checkXmlStreamReader( String text, String encoding, byte[] bom ) - throws IOException + private static void checkXmlStreamReader( String text, String encoding, byte[] bom ) throws IOException { checkXmlStreamReader( text, encoding, encoding, bom ); } private static void checkXmlStreamReader( String text, String encoding, String effectiveEncoding, byte[] bom ) - throws IOException + throws IOException { String xml = createXmlContent( text, encoding ); checkXmlContent( xml, effectiveEncoding, bom ); } - public void testNoXmlHeader() - throws IOException + public void testNoXmlHeader() throws IOException { String xml = "text with no XML header"; checkXmlContent( xml, "UTF-8" ); checkXmlContent( xml, "UTF-8", BOM_UTF8 ); } - public void testDefaultEncoding() - throws IOException + public void testDefaultEncoding() throws IOException { checkXmlStreamReader( TEXT_UNICODE, null, "UTF-8" ); checkXmlStreamReader( TEXT_UNICODE, null, "UTF-8", BOM_UTF8 ); } - public void testUTF8Encoding() - throws IOException + public void testUTF8Encoding() throws IOException { checkXmlStreamReader( TEXT_UNICODE, "UTF-8" ); checkXmlStreamReader( TEXT_UNICODE, "UTF-8", BOM_UTF8 ); } - public void testUTF16Encoding() - throws IOException + public void testUTF16Encoding() throws IOException { checkXmlStreamReader( TEXT_UNICODE, "UTF-16", "UTF-16BE", null ); checkXmlStreamReader( TEXT_UNICODE, "UTF-16", "UTF-16LE", BOM_UTF16LE ); checkXmlStreamReader( TEXT_UNICODE, "UTF-16", "UTF-16BE", BOM_UTF16BE ); } - public void testUTF16BEEncoding() - throws IOException + public void testUTF16BEEncoding() throws IOException { checkXmlStreamReader( TEXT_UNICODE, "UTF-16BE" ); } - public void testUTF16LEEncoding() - throws IOException + public void testUTF16LEEncoding() throws IOException { checkXmlStreamReader( TEXT_UNICODE, "UTF-16LE" ); } - public void testLatin1Encoding() - throws IOException + public void testLatin1Encoding() throws IOException { checkXmlStreamReader( TEXT_LATIN1, "ISO-8859-1" ); } - public void testLatin7Encoding() - throws IOException + public void testLatin7Encoding() throws IOException { checkXmlStreamReader( TEXT_LATIN7, "ISO-8859-7" ); } - public void testLatin15Encoding() - throws IOException + public void testLatin15Encoding() throws IOException { checkXmlStreamReader( TEXT_LATIN15, "ISO-8859-15" ); } - public void testEUC_JPEncoding() - throws IOException + public void testEUC_JPEncoding() throws IOException { checkXmlStreamReader( TEXT_EUC_JP, "EUC-JP" ); } - public void testEBCDICEncoding() - throws IOException + public void testEBCDICEncoding() throws IOException { checkXmlStreamReader( "simple text in EBCDIC", "CP1047" ); } - public void testInappropriateEncoding() - throws IOException + public void testInappropriateEncoding() throws IOException { try { @@ -202,8 +185,7 @@ public void testInappropriateEncoding() } } - public void testEncodingAttribute() - throws IOException + public void testEncodingAttribute() throws IOException { String xml = ""; checkXmlContent( xml, "US-ASCII" ); diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java index 44835278..50d9336c 100644 --- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java @@ -127,33 +127,37 @@ public void givenASingleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Retur } @Test - public void givenASingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkIsNotEscaped() throws Exception + public void givenASingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkIsNotEscaped() + throws Exception { final String command = "echo \"let's go\""; - final String[] expected = new String[]{"echo", "let's go"}; - assertCmdLineArgs(expected, command); + final String[] expected = new String[] { "echo", "let's go" }; + assertCmdLineArgs( expected, command ); } @Test - public void givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped() throws Exception + public void givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped() + throws Exception { final String command = "echo \"let\\\"s go\""; - final String[] expected = new String[]{"echo", "let\\\"s go"}; - assertCmdLineArgs(expected, command); + final String[] expected = new String[] { "echo", "let\\\"s go" }; + assertCmdLineArgs( expected, command ); } @Test - public void givenAnEscapedSingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped() throws Exception + public void givenAnEscapedSingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped() + throws Exception { final String command = "echo \"let\\\'s go\""; - final String[] expected = new String[]{"echo", "let\\\'s go"}; - assertCmdLineArgs(expected, command); + final String[] expected = new String[] { "echo", "let\\\'s go" }; + assertCmdLineArgs( expected, command ); } @Test - public void givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenNoExceptionIsThrown() throws Exception + public void givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenNoExceptionIsThrown() + throws Exception { - new Commandline("echo \"let\\\"s go\"").execute(); + new Commandline( "echo \"let\\\"s go\"" ).execute(); } private void assertCmdLineArgs( final String[] expected, final String cmdLine ) diff --git a/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java b/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java index 63bcd237..6ae3ba94 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java +++ b/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java @@ -3,6 +3,7 @@ import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import static org.apache.commons.io.FileUtils.write; @@ -36,18 +37,18 @@ public static File createStandardSymlinkTestDir( File root ) srcDir.mkdirs(); File target = new File( srcDir, "targetDir" ); target.mkdirs(); - write( new File( target, "targetFile.txt" ), "a regular File payload" ); + write( new File( target, "targetFile.txt" ), "a regular File payload", StandardCharsets.UTF_8 ); File aRegularDir = new File( srcDir, "aRegularDir" ); aRegularDir.mkdirs(); - write( new File( aRegularDir, "aRegularFile.txt" ), "a regular File payload" ); + write( new File( aRegularDir, "aRegularFile.txt" ), "a regular File payload", StandardCharsets.UTF_8 ); File dirOnTheOutside = new File( root, "dirOnTheOutside" ); dirOnTheOutside.mkdirs(); - write( new File( dirOnTheOutside, "FileInDirOnTheOutside.txt" ), "a file in dir on the outside" ); - write( new File( root, "onTheOutside.txt" ), "A file on the outside" ); - write( new File( srcDir, "fileR.txt" ), "FileR payload" ); - write( new File( srcDir, "fileW.txt" ), "FileW payload" ); - write( new File( srcDir, "fileX.txt" ), "FileX payload" ); + write( new File( dirOnTheOutside, "FileInDirOnTheOutside.txt" ), "a file in dir on the outside", StandardCharsets.UTF_8 ); + write( new File( root, "onTheOutside.txt" ), "A file on the outside", StandardCharsets.UTF_8 ); + write( new File( srcDir, "fileR.txt" ), "FileR payload", StandardCharsets.UTF_8 ); + write( new File( srcDir, "fileW.txt" ), "FileW payload", StandardCharsets.UTF_8 ); + write( new File( srcDir, "fileX.txt" ), "FileX payload", StandardCharsets.UTF_8 ); // todo: set file attributes (not used here) Java7Support.createSymbolicLink( new File( srcDir, "symDir" ), new File( "targetDir" ) ); From 297e7ff82ec6f3708b502279b9f71b44a18a9db0 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 24 Mar 2020 18:32:48 -0400 Subject: [PATCH 128/265] docs: Java 7 is the target (#24) @rfscholte update from java 6 --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index f78e6859..4050f9df 100644 --- a/readme.md +++ b/readme.md @@ -54,7 +54,7 @@ There are some guidelines which will make applying PRs easier for us: + Create a branch from where you want to base your work (this is usually the master branch). Push your changes to a branch in your fork of the repository. + Make commits of logical units. -+ You can use version 9 of Java, but be aware that the code has target of version 6. ++ You can compile with JDK 7 or later, but the code targets Java 7. For example, you cannot use lambdas. + Respect the original code style: by using the same [codestyle][code-style], patches should only highlight the actual difference, not being disturbed by any formatting issues: + Only use spaces for indentation. From 50bba92fd7d7b2c37f6302ececd99de6b7f814ef Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 27 Mar 2020 10:56:56 -0400 Subject: [PATCH 129/265] docs: we don't shade commons-io (#22) @hboutemy Maybe we used to, but not anymore. --- src/site/apt/index.apt.vm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index 0ee0872a..419146d8 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -49,13 +49,4 @@ Why not commons? slightly incompatible (different) from the commons over the years, so migrating is not always a 1:1 operation. Migrating to maven-shared-utils is a 1:1 operation in most cases. -Relation to Commons-* - - maven-shared-utils internally use {{{http://commons.apache.org/io/}commons-io}}. We shade all commons - classes into our own private package to prevent classpath clashes. - - This is the reason why any public API in maven-shared-utils must - avoid exposing commons-io classes directly. Most times it's sufficient - to create an empty subclass and expose that instead. - [] From a46b881cf887e1394c51e2f3b1df00be1aa90aba Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 4 Apr 2020 16:48:57 -0400 Subject: [PATCH 130/265] don't throw a java.lang.Error when reading invalid or corrupt properties files (#25) --- .../maven/shared/utils/PropertyUtils.java | 145 +++++++----------- .../maven/shared/utils/PropertyUtilsTest.java | 22 ++- 2 files changed, 73 insertions(+), 94 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java index 4c211d54..ca6b6935 100644 --- a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java @@ -47,12 +47,10 @@ public PropertyUtils() /** * @param url The URL which should be used to load the properties. - * * @return The loaded properties. - * * @deprecated As of 3.1.0, please use method {@link #loadOptionalProperties(java.net.URL)}. This method should not - * be used as it suppresses exceptions silently when loading properties fails and returns {@code null} instead of an - * empty {@code Properties} instance when the given {@code URL} is {@code null}. + * be used as it suppresses exceptions silently when loading properties fails and returns {@code null} + * instead of an empty {@code Properties} instance when the given {@code URL} is {@code null}. */ @Deprecated public static java.util.Properties loadProperties( @Nonnull URL url ) @@ -70,12 +68,10 @@ public static java.util.Properties loadProperties( @Nonnull URL url ) /** * @param file The file from which the properties will be loaded. - * * @return The loaded properties. - * * @deprecated As of 3.1.0, please use method {@link #loadOptionalProperties(java.io.File)}. This method should not - * be used as it suppresses exceptions silently when loading properties fails and returns {@code null} instead of an - * empty {@code Properties} instance when the given {@code File} is {@code null}. + * be used as it suppresses exceptions silently when loading properties fails and returns {@code null} + * instead of an empty {@code Properties} instance when the given {@code File} is {@code null}. */ @Deprecated public static Properties loadProperties( @Nonnull File file ) @@ -93,11 +89,9 @@ public static Properties loadProperties( @Nonnull File file ) /** * @param is {@link InputStream} - * * @return The loaded properties. - * * @deprecated As of 3.1.0, please use method {@link #loadOptionalProperties(java.io.InputStream)}. This method - * should not be used as it suppresses exceptions silently when loading properties fails. + * should not be used as it suppresses exceptions silently when loading properties fails. */ @Deprecated public static Properties loadProperties( @Nullable InputStream is ) @@ -133,121 +127,98 @@ public static Properties loadProperties( @Nullable InputStream is ) /** * Loads {@code Properties} from a given {@code URL}. *

            - * If the given {@code URL} is not {@code null}, it is asserted to represent a valid and loadable properties - * resource. + * If the given {@code URL} is {@code null} or the properties can't be read, an empty properties object is returned. *

            * - * @param url The {@code URL} of the properties resource to load or {@code null}. - * - * @return The loaded properties or an empty {@code Properties} instance if {@code url} is {@code null}. - * + * @param url the {@code URL} of the properties resource to load or {@code null} + * @return the loaded properties or an empty {@code Properties} instance if properties fail to load * @since 3.1.0 */ - @Nonnull public static Properties loadOptionalProperties( final @Nullable URL url ) + @Nonnull + public static Properties loadOptionalProperties( final @Nullable URL url ) { - InputStream in = null; - try - { - final Properties properties = new Properties(); - if ( url != null ) + Properties properties = new Properties(); + if ( url != null ) + { + try ( InputStream in = url.openStream() ) { - in = url.openStream(); properties.load( in ); - in.close(); - in = null; } - - return properties; - } - catch ( final IOException e ) - { - throw new AssertionError( e ); - } - finally - { - IOUtil.close( in ); + catch ( IllegalArgumentException | IOException ex ) + { + // ignore and return empty properties + } } + return properties; } /** * Loads {@code Properties} from a given {@code File}. *

            - * If the given {@code File} is not {@code null}, it is asserted to represent a valid and loadable properties - * resource. + * If the given {@code File} is {@code null} or the properties file can't be read, an empty properties object is + * returned. *

            * - * @param file The {@code File} of the properties resource to load or {@code null}. - * - * @return The loaded properties or an empty {@code Properties} instance if {@code file} is {@code null}. - * + * @param file the {@code File} of the properties resource to load or {@code null} + * @return the loaded properties or an empty {@code Properties} instance if properties fail to load * @since 3.1.0 */ - @Nonnull public static Properties loadOptionalProperties( final @Nullable File file ) + @Nonnull + public static Properties loadOptionalProperties( final @Nullable File file ) { - InputStream in = null; - try + Properties properties = new Properties(); + if ( file != null ) { - final Properties properties = new Properties(); - - if ( file != null ) + try ( InputStream in = new FileInputStream( file ) ) { - in = new FileInputStream( file ); properties.load( in ); - in.close(); - in = null; } - - return properties; - } - catch ( final IOException e ) - { - throw new AssertionError( e ); - } - finally - { - IOUtil.close( in ); + catch ( IllegalArgumentException | IOException ex ) + { + // ignore and return empty properties + } } + + return properties; + } /** * Loads {@code Properties} from a given {@code InputStream}. *

            - * If the given {@code InputStream} is not {@code null}, it is asserted to represent a valid and loadable properties - * resource. + * If the given {@code InputStream} is {@code null} or the properties can't be read, an empty properties object is + * returned. *

            * - * @param inputStream The {@code InputStream} of the properties resource to load or {@code null}. - * - * @return The loaded properties or an empty {@code Properties} instance if {@code inputStream} is {@code null}. - * + * @param inputStream the properties resource to load or {@code null} + * @return the loaded properties or an empty {@code Properties} instance if properties fail to load * @since 3.1.0 */ - @Nonnull public static Properties loadOptionalProperties( final @Nullable InputStream inputStream ) + @Nonnull + public static Properties loadOptionalProperties( final @Nullable InputStream inputStream ) { - InputStream in = null; - try - { - final Properties properties = new Properties(); - if ( inputStream != null ) - { - in = inputStream; - properties.load( in ); - in.close(); - in = null; - } + Properties properties = new Properties(); - return properties; - } - catch ( final IOException e ) + if ( inputStream != null ) { - throw new AssertionError( e ); - } - finally - { - IOUtil.close( in ); + try + { + properties.load( inputStream ); + } + catch ( IllegalArgumentException | IOException ex ) + { + // ignore and return empty properties + } + finally + { + IOUtil.close( inputStream ); + } } + + return properties; + } } diff --git a/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java index b7c5ba6d..41067a40 100644 --- a/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java @@ -22,8 +22,10 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.UnsupportedEncodingException; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -38,7 +40,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class PropertyUtilsTest { @@ -67,6 +69,15 @@ public void loadOptionalNullInputStream() { assertThat( PropertyUtils.loadOptionalProperties( (InputStream) null ), is( new Properties() ) ); } + + + @Test + public void loadOptionalProperties_ioException() + throws Exception + { + URL url = new URL( "https://nonesuch12344.foo.bar.com/" ); + assertThat( PropertyUtils.loadOptionalProperties( url ), is( new Properties() ) ); + } @Test @SuppressWarnings( "deprecation" ) @@ -137,8 +148,7 @@ public void loadEmptyURL() @Test @SuppressWarnings( "deprecation" ) - public void loadValidInputStream() - throws Exception + public void loadValidInputStream() throws UnsupportedEncodingException { Properties value = new Properties(); value.setProperty( "a", "b" ); @@ -154,8 +164,7 @@ public void loadValidInputStream() @Test @NeedsTemporaryFolder @SuppressWarnings( "deprecation" ) - public void loadValidFile() - throws Exception + public void loadValidFile() throws IOException { OutputStream out = null; try @@ -179,8 +188,7 @@ public void loadValidFile() @Test @NeedsTemporaryFolder @SuppressWarnings( "deprecation" ) - public void loadValidURL() - throws Exception + public void loadValidURL() throws IOException { OutputStream out = null; try From c26ac49709a53b3685f466c779129fbd73487105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sun, 12 Apr 2020 10:41:05 +0200 Subject: [PATCH 131/265] added README and GitHub configuration --- .asf.yaml | 25 +++++++++++++++++ readme.md => README.md | 63 ++++++++++++++++++++---------------------- 2 files changed, 55 insertions(+), 33 deletions(-) create mode 100644 .asf.yaml rename readme.md => README.md (63%) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 00000000..1b0cb95b --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,25 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# see https://s.apache.org/asfyaml +github: + description: "Apache Maven Shared Utils" + homepage: https://maven.apache.org/shared/maven-shared-utils/ + labels: + - java + - build-management + - maven-shared + - maven diff --git a/readme.md b/README.md similarity index 63% rename from readme.md rename to README.md index 4050f9df..adf4e28b 100644 --- a/readme.md +++ b/README.md @@ -1,32 +1,31 @@ - -Contributing to Apache Maven Shared Utils +Contributing to [Apache Maven Shared Utils](https://maven.apache.org/shared/maven-shared-utils/) ====================== +[![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MSHARED.json)][jira] [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license] -[![Jenkins Status](https://img.shields.io/jenkins/s/https/builds.apache.org/job/maven-box/job/maven-shared-utils/job/master.svg?style=flat-square)][build] -[![Jenkins tests](https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-box/job/maven-shared-utils/job/master.svg?style=flat-square)][test-results] +[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.shared/maven-shared-utils.svg?label=Maven%20Central)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.apache.maven.shared%22%20AND%20a%3A%22maven-shared-utils%22) +[![Jenkins Status](https://img.shields.io/jenkins/s/https/builds.apache.org/job/maven-box/job/maven-shared-utils/job/master.svg)][build] +[![Jenkins tests](https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-box/job/maven-shared-utils/job/master.svg)][test-results] You have found a bug or you have an idea for a cool new feature? Contributing -code is a great way to give something back to the open source community, learn from experts and widen your network. Before +code is a great way to give something back to the open source community. Before you dig right into the code, there are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things. @@ -37,10 +36,10 @@ Getting Started + Make sure you have a [JIRA account](https://issues.apache.org/jira/). + Make sure you have a [GitHub account](https://github.com/signup/free). + If you're planning to implement a new feature, it makes sense to discuss your changes - on the [dev list](https://maven.apache.org/mail-lists.html) first. + on the [dev list][ml-list] first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Maven's scope. -+ Submit a ticket for your issue or enhancement, assuming one does not already exist. ++ Submit a ticket for your issue, assuming one does not already exist. + Clearly describe the issue, including steps to reproduce when it is a bug. + Make sure you fill in the earliest version that you know has the issue. + Fork the repository on GitHub. @@ -48,13 +47,12 @@ Getting Started Making and Submitting Changes -------------- -We accept Pull Requests via GitHub. The [developer mailing list][dev-ml-list] is the +We accept Pull Requests via GitHub. The [developer mailing list][ml-list] is the main channel of communication for contributors. There are some guidelines which will make applying PRs easier for us: -+ Create a branch from where you want to base your work (this is usually the master branch). - Push your changes to a branch in your fork of the repository. ++ Create a topic branch from where you want to base your work (this is usually the master branch). + Push your changes to a topic branch in your fork of the repository. + Make commits of logical units. -+ You can compile with JDK 7 or later, but the code targets Java 7. For example, you cannot use lambdas. + Respect the original code style: by using the same [codestyle][code-style], patches should only highlight the actual difference, not being disturbed by any formatting issues: + Only use spaces for indentation. @@ -67,8 +65,9 @@ There are some guidelines which will make applying PRs easier for us: Optional supplemental description. ``` + Make sure you have added the necessary tests (JUnit/IT) for your changes. -+ Run all the tests with `mvn test` to assure nothing else was accidentally broken. ++ Run all the tests with `mvn -Prun-its verify` to assure nothing else was accidentally broken. + Submit a pull request to the repository in the Apache organization. ++ Update your JIRA ticket and include a link to the pull request in the ticket. If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla]. @@ -83,20 +82,18 @@ Additional Resources -------------------- + [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch) -+ [Apache Maven Help JIRA project page](https://issues.apache.org/jira/projects/MSHARED/) ++ [Apache Maven Shared Components project page][jira] + [Contributor License Agreement][cla] + [General GitHub documentation](https://help.github.com/) + [GitHub pull request documentation](https://help.github.com/send-pull-requests/) + [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject) + #Maven IRC channel on freenode.org +[jira]: https://issues.apache.org/jira/projects/MSHARED/ [license]: https://www.apache.org/licenses/LICENSE-2.0 -[dev-ml-list]: http://maven.apache.org/mailing-lists.html +[ml-list]: https://maven.apache.org/mailing-lists.html [code-style]: https://maven.apache.org/developers/conventions/code.html [cla]: https://www.apache.org/licenses/#clas [maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index [test-results]: https://builds.apache.org/job/maven-box/job/maven-shared-utils/job/master/lastCompletedBuild/testReport/ [build]: https://builds.apache.org/job/maven-box/job/maven-shared-utils/job/master/ - - - From 29e61f2fd71ec0768607decf4410c6f015cccab7 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 12 Apr 2020 07:35:28 -0400 Subject: [PATCH 132/265] docs: edit various comments for typos and Sun javadoc conventions (#26) --- .../maven/shared/utils/io/FileUtils.java | 127 +++++++++--------- 1 file changed, 63 insertions(+), 64 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java index e5264b2e..c1303853 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java @@ -93,7 +93,7 @@ public class FileUtils */ protected FileUtils() { - // This is a utility class. Normally dont instantiate + // This is a utility class. Normally don't instantiate } /** @@ -134,7 +134,7 @@ protected FileUtils() } /** - * @return the default excludes pattern as list. + * @return the default excludes pattern as list * @see #getDefaultExcludes() */ @Nonnull public static List getDefaultExcludesAsList() @@ -157,7 +157,7 @@ protected FileUtils() * Matches the equally named unix command. * * @param filename the file path - * @return The directory portion excluding the ending file separator. + * @return the directory portion excluding the ending file separator */ @Nonnull public static String dirname( @Nonnull String filename ) { @@ -169,7 +169,7 @@ protected FileUtils() * Returns the filename portion of a file specification string. * * @param filename the file path - * @return The filename string with extension. + * @return the filename string with extension */ @Nonnull public static String filename( @Nonnull String filename ) { @@ -212,10 +212,10 @@ protected FileUtils() } /** - * Check if a file exits. + * Check if a file exists. * - * @param fileName the file path. - * @return true if file exists. + * @param fileName the file path + * @return true if file exists */ public static boolean fileExists( @Nonnull String fileName ) { @@ -227,7 +227,7 @@ public static boolean fileExists( @Nonnull String fileName ) * Note: the file content is read with platform encoding. * * @param file the file path - * @return the file content using the platform encoding. + * @return the file content using the platform encoding * @throws IOException if any */ @Nonnull public static String fileRead( @Nonnull String file ) @@ -239,7 +239,7 @@ public static boolean fileExists( @Nonnull String fileName ) /** * @param file the file path * @param encoding the wanted encoding - * @return the file content using the specified encoding. + * @return the file content using the specified encoding * @throws IOException if any */ @Nonnull private static String fileRead( @Nonnull String file, @Nullable String encoding ) @@ -249,10 +249,10 @@ public static boolean fileExists( @Nonnull String fileName ) } /** - * Note: the file content is read with platform encoding + * Note: the file content is read with platform encoding. * * @param file the file path - * @return the file content using the platform encoding. + * @return the file content using the platform encoding * @throws IOException if any */ @Nonnull public static String fileRead( @Nonnull File file ) @@ -264,7 +264,7 @@ public static boolean fileExists( @Nonnull String fileName ) /** * @param file the file path * @param encoding the wanted encoding - * @return the file content using the specified encoding. + * @return the file content using the specified encoding * @throws IOException if any */ @Nonnull public static String fileRead( @Nonnull File file, @Nullable String encoding ) @@ -303,9 +303,9 @@ public static boolean fileExists( @Nonnull String fileName ) /** * @param file the file path - * @return the file content lines as String[] using the systems default encoding. - * An empty List if the file didn't exist. - * @throws IOException in case of failure. + * @return the file content lines as String[] using the system default encoding. + * An empty List if the file doesn't exist. + * @throws IOException in case of failure */ @Nonnull public static String[] fileReadArray( @Nonnull File file ) throws IOException @@ -316,11 +316,11 @@ public static boolean fileExists( @Nonnull String fileName ) } /** - * Appends data to a file. The file will be created if it does not exist. - * Note: the data is written with platform encoding + * Appends data to a file. The file is created if it does not exist. + * Note: the data is written with platform encoding. * - * @param fileName The path of the file to write. - * @param data The content to write to the file. + * @param fileName the path of the file to write + * @param data the content to write to the file * @throws IOException if any */ public static void fileAppend( @Nonnull String fileName, @Nonnull String data ) @@ -332,9 +332,9 @@ public static void fileAppend( @Nonnull String fileName, @Nonnull String data ) /** * Appends data to a file. The file will be created if it does not exist. * - * @param fileName The path of the file to write. - * @param encoding The encoding of the file. - * @param data The content to write to the file. + * @param fileName the path of the file to write + * @param encoding the encoding of the file + * @param data the content to write to the file * @throws IOException if any */ public static void fileAppend( @Nonnull String fileName, @Nullable String encoding, @Nonnull String data ) @@ -365,8 +365,8 @@ public static void fileAppend( @Nonnull String fileName, @Nullable String encodi * Writes data to a file. The file will be created if it does not exist. * Note: the data is written with platform encoding * - * @param fileName The path of the file to write. - * @param data The content to write to the file. + * @param fileName the path of the file to write + * @param data the content to write to the file * @throws IOException if any */ public static void fileWrite( @Nonnull String fileName, @Nonnull String data ) @@ -378,9 +378,9 @@ public static void fileWrite( @Nonnull String fileName, @Nonnull String data ) /** * Writes data to a file. The file will be created if it does not exist. * - * @param fileName The path of the file to write. - * @param encoding The encoding of the file. - * @param data The content to write to the file. + * @param fileName the path of the file to write + * @param encoding the encoding of the file + * @param data the content to write to the file * @throws IOException if any */ public static void fileWrite( @Nonnull String fileName, @Nullable String encoding, @Nonnull String data ) @@ -393,9 +393,9 @@ public static void fileWrite( @Nonnull String fileName, @Nullable String encodin /** * Writes data to a file. The file will be created if it does not exist. * - * @param file The path of the file to write. - * @param encoding The encoding of the file. - * @param data The content to write to the file. + * @param file the path of the file to write + * @param encoding the encoding of the file + * @param data the content to write to the file * @throws IOException if any */ public static void fileWrite( @Nonnull File file, @Nullable String encoding, @Nonnull String data ) @@ -426,8 +426,8 @@ public static void fileWrite( @Nonnull File file, @Nullable String encoding, @No * Writes String array data to a file in the systems default encoding. * The file will be created if it does not exist. * - * @param file The path of the file to write. - * @param data The content to write to the file. + * @param file the path of the file to write + * @param data the content to write to the file * @throws IOException if any */ public static void fileWriteArray( @Nonnull File file, @Nullable String... data ) @@ -437,11 +437,11 @@ public static void fileWriteArray( @Nonnull File file, @Nullable String... data } /** - * Writes String array data to a file. The file will be created if it does not exist. + * Writes String array data to a file. The file is created if it does not exist. * - * @param file The path of the file to write. - * @param encoding The encoding of the file. - * @param data The content to write to the file. + * @param file the path of the file to write + * @param encoding the encoding of the file + * @param data the content to write to the file * @throws IOException if any */ public static void fileWriteArray( @Nonnull File file, @Nullable String encoding, @Nullable String... data ) @@ -480,7 +480,7 @@ public static void fileWriteArray( @Nonnull File file, @Nullable String encoding /** * Deletes a file. * - * @param fileName The path of the file to delete. + * @param fileName the path of the file to delete */ public static void fileDelete( @Nonnull String fileName ) { @@ -494,9 +494,9 @@ public static void fileDelete( @Nonnull String fileName ) *

            * The given extensions should be like "java" and not like ".java" * - * @param directory The path of the directory. - * @param extensions an array of expected extensions. - * @return An array of files for the wanted extensions. + * @param directory the path of the directory + * @param extensions an array of expected extensions + * @return tn array of files for the wanted extensions */ public static String[] getFilesFromExtension( @Nonnull String directory, @Nonnull String... extensions ) { @@ -524,7 +524,7 @@ public static String[] getFilesFromExtension( @Nonnull String directory, @Nonnul continue; } - // ok... transverse into this directory and get all the files... then combine + // ok... traverse into this directory and get all the files... then combine // them with the current list. String[] fetchFiles = getFilesFromExtension( currentFileName, extensions ); @@ -661,9 +661,9 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F /** * Convert from a URL to a File. * - * @param url File URL. - * @return The equivalent File object, or null if the URL's protocol - * is not file + * @param url file URL + * @return the equivalent File object, or null if the URL's protocol + * is not file */ @Nullable public static File toFile( @Nullable final URL url ) { @@ -707,8 +707,7 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F } /** - * Remove extension from filename. - * ie + * Remove extension from filename. E.g. * 

                  * foo.txt    --> foo
      * a\b\c.jpg --> a\b\c
@@ -732,8 +731,8 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
     }
 
     /**
-     * Get extension from filename.
-     * ie
+     * Get extension from filename. E.g.
+     *
      * 
                  * foo.txt    --> "txt"
      * a\b\c.jpg --> "jpg"
@@ -753,10 +752,10 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
      * (and any parent directories) will be created. If a file source in
      * destinationDirectory exists, it will be overwritten.
      *
-     * @param source               An existing File to copy.
-     * @param destinationDirectory A directory to copy source into.
-     * @throws java.io.FileNotFoundException if source isn't a normal file.
-     * @throws IllegalArgumentException      if destinationDirectory isn't a directory.
+     * @param source               an existing File to copy
+     * @param destinationDirectory a directory to copy source into
+     * @throws java.io.FileNotFoundException if source isn't a normal file
+     * @throws IllegalArgumentException      if destinationDirectory isn't a directory
      * @throws IOException                   if source does not exist, the file in
      *                                       destinationDirectory cannot be written to, or an IO error
      *                                       occurs during copying.
@@ -775,16 +774,16 @@ public static void copyFileToDirectory( @Nonnull final File source, @Nonnull fin
     /**
      * Copy file from source to destination only if source is newer than the target file.
      * If destinationDirectory does not exist, it
-     * (and any parent directories) will be created. If a file source in
-     * destinationDirectory exists, it will be overwritten.
+     * (and any parent directories) is created. If a file source in
+     * destinationDirectory exists, it is overwritten.
      *
-     * @param source               An existing File to copy.
-     * @param destinationDirectory A directory to copy source into.
-     * @throws java.io.FileNotFoundException if source isn't a normal file.
-     * @throws IllegalArgumentException      if destinationDirectory isn't a directory.
+     * @param source               an existing File to copy
+     * @param destinationDirectory a directory to copy source into
+     * @throws java.io.FileNotFoundException if source isn't a normal file
+     * @throws IllegalArgumentException      if destinationDirectory isn't a directory
      * @throws IOException                   if source does not exist, the file in
      *                                       destinationDirectory cannot be written to, or an IO error
-     *                                       occurs during copying.
+     *                                       occurs during copying
      */
     private static void copyFileToDirectoryIfModified( @Nonnull final File source,
                                                        @Nonnull final File destinationDirectory )
@@ -804,11 +803,11 @@ private static void copyFileToDirectoryIfModified( @Nonnull final File source,
      * created if they don't already exist. destination will be overwritten if it
      * already exists.
      *
-     * @param source      An existing non-directory File to copy bytes from.
-     * @param destination A non-directory File to write bytes to (possibly
-     *                    overwriting).
-     * @throws IOException                   if source does not exist, destination cannot be
-     *                                       written to, or an IO error occurs during copying.
+     * @param source      an existing non-directory File to copy bytes from
+     * @param destination a non-directory File to write bytes to (possibly
+     *                    overwriting)
+     * @throws IOException  if source does not exist, destination cannot be
+     *                      written to, or an IO error occurs during copying.
      * @throws java.io.FileNotFoundException if destination is a directory
      */
     public static void copyFile( @Nonnull final File source, @Nonnull final File destination )

From ff23ef7d872bd5a2aa6488cc1a2a0fc9befe30a5 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Mon, 13 Apr 2020 13:52:48 -0400
Subject: [PATCH 133/265] [MSHARED-881] use try with resources (#27)

* use try with resources

* format
---
 .../maven/shared/utils/io/FileUtils.java      | 235 +++++-------------
 .../shared/utils/xml/Xpp3DomBuilder.java      |   6 +-
 .../maven/shared/utils/io/FileUtilsTest.java  |   2 +-
 3 files changed, 68 insertions(+), 175 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index c1303853..36e6fd97 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -31,7 +31,6 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -41,6 +40,7 @@
 import java.io.Writer;
 import java.net.URL;
 import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
 import java.security.SecureRandom;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -270,32 +270,20 @@ public static boolean fileExists( @Nonnull String fileName )
     @Nonnull public static String fileRead( @Nonnull File file, @Nullable String encoding )
         throws IOException
     {
-        StringBuilder buf = new StringBuilder();
-
-        Reader reader = null;
+        StringBuilder buf = new StringBuilder();   
+        if ( encoding == null ) 
+        {
+            encoding = Charset.defaultCharset().name();
+        }
 
-        try
+        try ( Reader reader = new InputStreamReader( new FileInputStream( file ), encoding ) )
         {
-            if ( encoding != null )
-            {
-                reader = new InputStreamReader( new FileInputStream( file ), encoding );
-            }
-            else
-            {
-                reader = new InputStreamReader( new FileInputStream( file ) );
-            }
             int count;
             char[] b = new char[512];
             while ( ( count = reader.read( b ) ) >= 0 )  // blocking read
             {
                 buf.append( b, 0, count );
             }
-            reader.close();
-            reader = null;
-        }
-        finally
-        {
-            IOUtil.close( reader );
         }
 
         return buf.toString();
@@ -340,24 +328,15 @@ public static void fileAppend( @Nonnull String fileName, @Nonnull String data )
     public static void fileAppend( @Nonnull String fileName, @Nullable String encoding, @Nonnull String data )
         throws IOException
     {
-        FileOutputStream out = null;
-        try
+        
+        if ( encoding == null ) 
         {
-            out = new FileOutputStream( fileName, true );
-            if ( encoding != null )
-            {
-                out.write( data.getBytes( encoding ) );
-            }
-            else
-            {
-                out.write( data.getBytes() );
-            }
-            out.close();
-            out = null;
+            encoding = Charset.defaultCharset().name();
         }
-        finally
+        
+        try ( OutputStream out = new FileOutputStream( fileName, true ) )
         {
-            IOUtil.close( out );
+          out.write( data.getBytes( encoding ) );
         }
     }
 
@@ -401,24 +380,15 @@ public static void fileWrite( @Nonnull String fileName, @Nullable String encodin
     public static void fileWrite( @Nonnull File file, @Nullable String encoding, @Nonnull String data )
         throws IOException
     {
-        Writer writer = null;
-        try
+        
+        if ( encoding == null ) 
         {
-            if ( encoding != null )
-            {
-                writer = new OutputStreamWriter( new FileOutputStream( file ), encoding );
-            }
-            else
-            {
-                writer = new OutputStreamWriter( new FileOutputStream( file ) );
-            }
-            writer.write( data );
-            writer.close();
-            writer = null;
+            encoding = Charset.defaultCharset().name();
         }
-        finally
+
+        try ( Writer writer = new OutputStreamWriter( new FileOutputStream( file ), encoding ) ) 
         {
-            IOUtil.close( writer );
+            writer.write( data );
         }
     }
 
@@ -447,18 +417,14 @@ public static void fileWriteArray( @Nonnull File file, @Nullable String... data
     public static void fileWriteArray( @Nonnull File file, @Nullable String encoding, @Nullable String... data )
         throws IOException
     {
-        Writer writer = null;
-        try
+        
+        if ( encoding == null ) 
         {
-            if ( encoding != null )
-            {
-                writer = new OutputStreamWriter( new FileOutputStream( file ), encoding );
-            }
-            else
-            {
-                writer = new OutputStreamWriter( new FileOutputStream( file ) );
-            }
+            encoding = Charset.defaultCharset().name();
+        }
 
+        try ( Writer writer = new OutputStreamWriter( new FileOutputStream( file ), encoding ) )
+        {
             for ( int i = 0; data != null && i < data.length; i++ )
             {
                 writer.write( data[i] );
@@ -467,13 +433,6 @@ public static void fileWriteArray( @Nonnull File file, @Nullable String encoding
                     writer.write( "\n" );
                 }
             }
-
-            writer.close();
-            writer = null;
-        }
-        finally
-        {
-            IOUtil.close( writer );
         }
     }
 
@@ -637,25 +596,11 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
             return false;
         }
 
-        InputStream input1 = null;
-        InputStream input2 = null;
-        boolean equals = false;
-        try
-        {
-            input1 = new FileInputStream( file1 );
-            input2 = new FileInputStream( file2 );
-            equals = IOUtil.contentEquals( input1, input2 );
-            input1.close();
-            input1 = null;
-            input2.close();
-            input2 = null;
+        try ( InputStream input1 = new FileInputStream( file1 );
+            InputStream  input2 = new FileInputStream( file2 ) )
+        { 
+            return IOUtil.contentEquals( input1, input2 );
         }
-        finally
-        {
-            IOUtil.close( input1 );
-            IOUtil.close( input2 );
-        }
-        return equals;
     }
 
     /**
@@ -857,16 +802,13 @@ private static void mkdirsFor( @Nonnull File destination )
     private static void doCopyFile( @Nonnull File source, @Nonnull File destination )
         throws IOException
     {
-        FileInputStream fis = null;
-        FileOutputStream fos = null;
-        FileChannel input = null;
-        FileChannel output = null;
-        try
+
+        try ( FileInputStream fis = new FileInputStream( source );
+              FileOutputStream fos = new FileOutputStream( destination );
+              FileChannel input = fis.getChannel();
+              FileChannel output = fos.getChannel() )
         {
-            fis = new FileInputStream( source );
-            fos = new FileOutputStream( destination );
-            input = fis.getChannel();
-            output = fos.getChannel();
+            
             long size = input.size();
             long pos = 0;
             long count;
@@ -875,21 +817,6 @@ private static void doCopyFile( @Nonnull File source, @Nonnull File destination
                 count = size - pos > FILE_COPY_BUFFER_SIZE ? FILE_COPY_BUFFER_SIZE : size - pos;
                 pos += output.transferFrom( input, pos, count );
             }
-            output.close();
-            output = null;
-            fos.close();
-            fos = null;
-            input.close();
-            input = null;
-            fis.close();
-            fis = null;
-        }
-        finally
-        {
-            IOUtil.close( output );
-            IOUtil.close( fos );
-            IOUtil.close( input );
-            IOUtil.close( fis );
         }
     }
 
@@ -959,35 +886,23 @@ private static void copyStreamToFile( @Nonnull @WillClose final InputStream sour
                                           @Nonnull final File destination )
         throws IOException
     {
-        InputStream in = source;
-        OutputStream out = null;
-        try
+        // does destination directory exist ?
+        if ( destination.getParentFile() != null && !destination.getParentFile().exists() )
         {
-            //does destination directory exist ?
-            if ( destination.getParentFile() != null && !destination.getParentFile().exists() )
-            {
-                //noinspection ResultOfMethodCallIgnored
-                destination.getParentFile().mkdirs();
-            }
-
-            //make sure we can write to destination
-            if ( destination.exists() && !destination.canWrite() )
-            {
-                final String message = "Unable to open file " + destination + " for writing.";
-                throw new IOException( message );
-            }
+            // noinspection ResultOfMethodCallIgnored
+            destination.getParentFile().mkdirs();
+        }
 
-            out = new FileOutputStream( destination );
-            IOUtil.copy( in, out );
-            out.close();
-            out = null;
-            in.close();
-            in = null;
+        // make sure we can write to destination
+        if ( destination.exists() && !destination.canWrite() )
+        {
+            final String message = "Unable to open file " + destination + " for writing.";
+            throw new IOException( message );
         }
-        finally
+
+        try ( OutputStream out = new FileOutputStream( destination ); InputStream in = source )
         {
-            IOUtil.close( out );
-            IOUtil.close( in );
+            IOUtil.copy( in, out );
         }
     }
 
@@ -1179,7 +1094,7 @@ public static void forceDelete( @Nonnull final File file )
      * deletes a file.
      *
      * @param file The file to delete
-     * @throws IOException If the file cannot be delted.
+     * @throws IOException if the file cannot be deleted
      */
 
 
@@ -1913,37 +1828,25 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str
     {
         if ( wrappers != null && wrappers.length > 0 )
         {
+            
+            if ( encoding == null || encoding.isEmpty() ) 
+            {
+                encoding = Charset.defaultCharset().name();
+            }
+            
             // buffer so it isn't reading a byte at a time!
-            Reader fileReader = null;
-            Writer fileWriter = null;
-            try
+            try ( Reader fileReader =
+                new BufferedReader( new InputStreamReader( new FileInputStream( from ), encoding ) );
+                            Writer fileWriter = new OutputStreamWriter( new FileOutputStream( to ), encoding ) )
             {
-                if ( encoding == null || encoding.length() < 1 )
-                {
-                    fileReader = new BufferedReader( new FileReader( from ) );
-                    fileWriter = new FileWriter( to );
-                }
-                else
-                {
-                    fileReader = new BufferedReader( new InputStreamReader( new FileInputStream( from ), encoding ) );
-                    fileWriter = new OutputStreamWriter( new FileOutputStream( to ), encoding );
-                }
 
+                Reader wrapped = fileReader;
                 for ( FilterWrapper wrapper : wrappers )
                 {
-                    fileReader = wrapper.getReader( fileReader );
+                    wrapped = wrapper.getReader( wrapped );
                 }
 
-                IOUtil.copy( fileReader, fileWriter );
-                fileWriter.close();
-                fileWriter = null;
-                fileReader.close();
-                fileReader = null;
-            }
-            finally
-            {
-                IOUtil.close( fileReader );
-                IOUtil.close( fileWriter );
+                IOUtil.copy( wrapped, fileWriter );
             }
         }
         else
@@ -1956,7 +1859,7 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str
     }
 
     /**
-     * Note: the file content is read with platform encoding
+     * Note: the file content is read with platform encoding.
      *
      * @param file the file
      * @return a List containing every every line not starting with # and not empty
@@ -1969,31 +1872,21 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str
 
         if ( file.exists() )
         {
-            BufferedReader reader = null;
-            try
+            try ( BufferedReader reader = new BufferedReader( new FileReader( file ) ) )
             {
-                reader = new BufferedReader( new FileReader( file ) );
-
                 for ( String line = reader.readLine(); line != null; line = reader.readLine() )
                 {
                     line = line.trim();
-
                     if ( !line.startsWith( "#" ) && line.length() != 0 )
                     {
                         lines.add( line );
                     }
                 }
-
-                reader.close();
-                reader = null;
-            }
-            finally
-            {
-                IOUtil.close( reader );
             }
         }
 
         return lines;
+
     }
 
     /**
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
index 0798e4f4..596e127d 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
@@ -92,9 +92,9 @@ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding
 
     /**
      * @param reader {@link Reader}
-     * @param trim true/false.
-     * @return the built dom.
-     * @throws XmlPullParserException in case of an error.
+     * @param trim true/false
+     * @return the built dom
+     * @throws XmlPullParserException in case of an error
      */
     public static Xpp3Dom build( @WillClose Reader reader, boolean trim )
         throws XmlPullParserException
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 73717b7c..e6ef175e 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -4,8 +4,8 @@
 import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;

From 75ea857c12d1e1d072f223841c769ff07fa360c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= 
Date: Mon, 13 Apr 2020 22:25:15 +0200
Subject: [PATCH 134/265] README improvement

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index adf4e28b..6ddc421d 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Contributing to [Apache Maven Shared Utils](https://maven.apache.org/shared/mave
 
 [![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MSHARED.json)][jira]
 [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license]
-[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.shared/maven-shared-utils.svg?label=Maven%20Central)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.apache.maven.shared%22%20AND%20a%3A%22maven-shared-utils%22)
+[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.shared/maven-shared-utils.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.shared/maven-shared-utils)
 [![Jenkins Status](https://img.shields.io/jenkins/s/https/builds.apache.org/job/maven-box/job/maven-shared-utils/job/master.svg)][build]
 [![Jenkins tests](https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-box/job/maven-shared-utils/job/master.svg)][test-results]
 

From bb2f85e98c3c651ae50b7f642500cb74f50abb0d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 9 Mar 2020 04:19:41 +0000
Subject: [PATCH 135/265] Bump hamcrest-core from 1.3 to 2.2

Bumps [hamcrest-core](https://github.com/hamcrest/JavaHamcrest) from 1.3 to 2.2.
- [Release notes](https://github.com/hamcrest/JavaHamcrest/releases)
- [Changelog](https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md)
- [Commits](https://github.com/hamcrest/JavaHamcrest/compare/hamcrest-java-1.3...v2.2)

Signed-off-by: dependabot-preview[bot] 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 21a01e03..681089d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
     
       org.hamcrest
       hamcrest-core
-      1.3
+      2.2
       test
     
     

From 32942621ff5df2f8779e0f55276c902a1fcb42b9 Mon Sep 17 00:00:00 2001
From: Rob Oxspring 
Date: Sun, 17 May 2020 00:23:04 +0100
Subject: [PATCH 136/265] [MSHARED-860] Deprecate unnecessary Java7Support
 (#30)

* [MSHARED-860] Call java.nio.file.Files utility methods directly rather than via reflection

* [MSHARED-860] Move createSymbolicLink() utility to FileUtils

* [MSHARED-860] Deprecate Java7Support and call java.nio.file.Files methods directly
---
 .../shared/utils/io/DirectoryScanner.java     |   9 +-
 .../maven/shared/utils/io/FileUtils.java      |  59 +++----
 .../maven/shared/utils/io/Java7Support.java   | 162 ++----------------
 .../shared/utils/io/DirectoryScannerTest.java |   2 -
 .../maven/shared/utils/io/FileUtilsTest.java  |  20 ++-
 .../shared/utils/io/Java7SupportTest.java     |  23 +--
 .../shared/utils/io/SymlinkTestSetup.java     |  14 +-
 7 files changed, 66 insertions(+), 223 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
index 721d7a92..c22cfe33 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
@@ -21,6 +21,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -902,13 +903,7 @@ public void addDefaultExcludes()
     boolean isSymbolicLink( final File parent, final String name )
         throws IOException
     {
-        if ( Java7Support.isAtLeastJava7() )
-        {
-            return Java7Support.isSymLink( parent );
-        }
-        final File resolvedParent = new File( parent.getCanonicalPath() );
-        final File toTest = new File( resolvedParent, name );
-        return !toTest.getAbsolutePath().equals( toTest.getCanonicalPath() );
+        return Files.isSymbolicLink( parent.toPath() );
     }
 
     private void setupDefaultFilters()
diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index 36e6fd97..f7de64c7 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -41,6 +41,7 @@
 import java.net.URL;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.security.SecureRandom;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -764,10 +765,10 @@ public static void copyFile( @Nonnull final File source, @Nonnull final File des
             final String message = "File " + source + " does not exist";
             throw new IOException( message );
         }
-        if ( Java7Support.isAtLeastJava7() && Java7Support.isSymLink( source ) )
+        if ( Files.isSymbolicLink( source.toPath() ) )
         {
-            File target = Java7Support.readSymbolicLink( source );
-            Java7Support.createSymbolicLink( destination, target );
+            File target = Files.readSymbolicLink( source.toPath() ).toFile();
+            createSymbolicLink( destination, target );
             return;
         }
 
@@ -1101,17 +1102,7 @@ public static void forceDelete( @Nonnull final File file )
     public static void delete( @Nonnull File file )
         throws IOException
     {
-        if ( Java7Support.isAtLeastJava7() )
-        {
-            Java7Support.delete( file );
-        }
-        else
-        {
-            if ( !file.delete() )
-            {
-                throw new IOException( "Could not delete " + file.getName() );
-            }
-        }
+        Files.delete( file.toPath() );
     }
 
     /**
@@ -1120,21 +1111,14 @@ public static void delete( @Nonnull File file )
      */
     public static boolean deleteLegacyStyle( @Nonnull File file )
     {
-        if ( Java7Support.isAtLeastJava7() )
+        try
         {
-            try
-            {
-                Java7Support.delete( file );
-                return true;
-            }
-            catch ( IOException e )
-            {
-                return false;
-            }
+            Files.delete( file.toPath() );
+            return true;
         }
-        else
+        catch ( IOException e )
         {
-            return file.delete();
+            return false;
         }
     }
 
@@ -1934,11 +1918,7 @@ private static boolean isValidWindowsFileName( @Nonnull File f )
     public static boolean isSymbolicLink( @Nonnull final File file )
         throws IOException
     {
-        if ( Java7Support.isAtLeastJava7() )
-        {
-            return Java7Support.isSymLink( file );
-        }
-        return isSymbolicLinkLegacy( file );
+        return Files.isSymbolicLink( file.toPath() );
     }
 
     /**
@@ -1953,7 +1933,7 @@ public static boolean isSymbolicLink( @Nonnull final File file )
     public static boolean isSymbolicLinkForSure( @Nonnull final File file )
         throws IOException
     {
-        return Java7Support.isAtLeastJava7() && Java7Support.isSymLink( file );
+        return Files.isSymbolicLink( file.toPath() );
     }
 
     /**
@@ -1981,4 +1961,19 @@ static boolean isSymbolicLinkLegacy( @Nonnull final File file )
         return !file.getAbsolutePath().equals( canonical.getPath() );
     }
 
+    /**
+     * @param symlink The link name.
+     * @param target The target.
+     * @return The linked file.
+     * @throws IOException in case of an error.
+     */
+    @Nonnull public static File createSymbolicLink( @Nonnull File symlink,  @Nonnull File target )
+            throws IOException
+    {
+        if ( !Files.exists( symlink.toPath() ) )
+        {
+            return Files.createSymbolicLink( symlink.toPath(), target.toPath() ).toFile();
+        }
+        return symlink;
+    }
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java b/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java
index 550de2f4..a51d5022 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java
@@ -22,93 +22,27 @@
 import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.nio.file.Files;
 
 /**
  * Java7 feature detection
  *
  * @author Kristian Rosenvold
+ *
+ * @deprecated no longer needed, prefer to use {@link java.nio.file.Files} methods directly.
  */
+@Deprecated
 public class Java7Support
 {
-
-    private static final boolean IS_JAVA7;
-
-    private static Method isSymbolicLink;
-
-    private static Method delete;
-
-    private static Method toPath;
-
-    private static Method exists;
-
-    private static Method toFile;
-
-    private static Method readSymlink;
-
-    private static Method createSymlink;
-
-    private static Object emptyLinkOpts;
-
-    private static Object emptyFileAttributes;
-
-    static
-    {
-        boolean isJava7x = true;
-        try
-        {
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            Class files = cl.loadClass( "java.nio.file.Files" );
-            Class path = cl.loadClass( "java.nio.file.Path" );
-            Class fa = cl.loadClass( "java.nio.file.attribute.FileAttribute" );
-            Class linkOption = cl.loadClass( "java.nio.file.LinkOption" );
-            isSymbolicLink = files.getMethod( "isSymbolicLink", path );
-            delete = files.getMethod( "delete", path );
-            readSymlink = files.getMethod( "readSymbolicLink", path );
-
-            emptyFileAttributes = Array.newInstance( fa, 0 );
-            final Object o = emptyFileAttributes;
-            createSymlink = files.getMethod( "createSymbolicLink", path, path, o.getClass() );
-            emptyLinkOpts = Array.newInstance( linkOption, 0 );
-            exists = files.getMethod( "exists", path, emptyLinkOpts.getClass() );
-            toPath = File.class.getMethod( "toPath" );
-            toFile = path.getMethod( "toFile" );
-        }
-        catch ( ClassNotFoundException e )
-        {
-            isJava7x = false;
-        }
-        catch ( NoSuchMethodException e )
-        {
-            isJava7x = false;
-        }
-        IS_JAVA7 = isJava7x;
-    }
-
     /**
      * @param file The file to check for being a symbolic link.
      * @return true if the file is a symlink false otherwise.
      */
     public static boolean isSymLink( @Nonnull File file )
     {
-        try
-        {
-            Object path = toPath.invoke( file );
-            return (Boolean) isSymbolicLink.invoke( null, path );
-        }
-        catch ( IllegalAccessException e )
-        {
-            throw new RuntimeException( e );
-        }
-        catch ( InvocationTargetException e )
-        {
-            throw new RuntimeException( e );
-        }
+        return Files.isSymbolicLink( file.toPath() );
     }
 
-
     /**
      * @param symlink The sym link.
      * @return The file.
@@ -117,23 +51,9 @@ public static boolean isSymLink( @Nonnull File file )
     @Nonnull public static File readSymbolicLink( @Nonnull File symlink )
         throws IOException
     {
-        try
-        {
-            Object path = toPath.invoke( symlink );
-            Object resultPath =  readSymlink.invoke( null, path );
-            return (File) toFile.invoke( resultPath );
-        }
-        catch ( IllegalAccessException e )
-        {
-            throw new RuntimeException( e );
-        }
-        catch ( InvocationTargetException e )
-        {
-            throw new RuntimeException( e );
-        }
+        return Files.readSymbolicLink( symlink.toPath() ).toFile();
     }
 
-
     /**
      * @param file The file to check.
      * @return true if exist false otherwise.
@@ -142,21 +62,7 @@ public static boolean isSymLink( @Nonnull File file )
     public static boolean exists( @Nonnull File file )
         throws IOException
     {
-        try
-        {
-            Object path = toPath.invoke( file );
-            final Object invoke = exists.invoke( null, path, emptyLinkOpts );
-            return (Boolean) invoke;
-        }
-        catch ( IllegalAccessException e )
-        {
-            throw new RuntimeException( e );
-        }
-        catch ( InvocationTargetException e )
-        {
-            throw (RuntimeException) e.getTargetException();
-        }
-
+        return Files.exists( file.toPath() );
     }
 
     /**
@@ -168,40 +74,9 @@ public static boolean exists( @Nonnull File file )
     @Nonnull public static File createSymbolicLink( @Nonnull File symlink,  @Nonnull File target )
         throws IOException
     {
-        try
-        {
-            if ( !exists( symlink ) )
-            {
-                Object link = toPath.invoke( symlink );
-                Object path = createSymlink.invoke( null, link, toPath.invoke( target ), emptyFileAttributes );
-                return (File) toFile.invoke( path );
-            }
-            return symlink;
-        }
-        catch ( IllegalAccessException e )
-        {
-            throw new RuntimeException( e );
-        }
-        catch ( InvocationTargetException e )
-        {
-            final Throwable targetException = e.getTargetException();
-            if ( targetException instanceof IOException )
-            {
-                throw (IOException) targetException;
-            }
-            else if ( targetException instanceof RuntimeException )
-            {
-                // java.lang.UnsupportedOperationException: Symbolic links not supported on this operating system
-                // java.lang.SecurityException: denies certain permissions see Javadoc
-                throw ( RuntimeException ) targetException;
-            }
-            else
-            {
-                throw new IOException( targetException.getClass() + ": " + targetException.getLocalizedMessage() );
-            }
-        }
-
+        return FileUtils.createSymbolicLink( symlink, target );
     }
+
     /**
      * Performs a nio delete
      * @param file the file to delete
@@ -210,19 +85,7 @@ else if ( targetException instanceof RuntimeException )
     public static void delete( @Nonnull File file )
         throws IOException
     {
-        try
-        {
-            Object path = toPath.invoke( file );
-            delete.invoke( null, path );
-        }
-        catch ( IllegalAccessException e )
-        {
-            throw new RuntimeException( e );
-        }
-        catch ( InvocationTargetException e )
-        {
-            throw (IOException) e.getTargetException();
-        }
+        Files.delete( file.toPath() );
     }
 
     /**
@@ -230,7 +93,7 @@ public static void delete( @Nonnull File file )
      */
     public static boolean isJava7()
     {
-        return IS_JAVA7;
+        return true;
     }
 
     /**
@@ -238,7 +101,6 @@ public static boolean isJava7()
      */
     public static boolean isAtLeastJava7()
     {
-        return IS_JAVA7;
+        return true;
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
index f19562f0..9ede93a0 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
@@ -153,7 +153,6 @@ public void followSymlinksFalse()
         throws IOException
     {
         assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
-        assumeTrue( Java7Support.isAtLeastJava7() );
 
         File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new File( "target/test/symlinkTestCase" ) );
 
@@ -191,7 +190,6 @@ public void followSymlinks()
         throws IOException
     {
         assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
-        assumeTrue( Java7Support.isAtLeastJava7() );
 
         DirectoryScanner ds = new DirectoryScanner();
         File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new File( "target/test/symlinkTestCase" ) );
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index e6ef175e..69e72a9d 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -4,7 +4,9 @@
 import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -21,6 +23,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -442,7 +445,6 @@ public void copyFile1()
     public void copyFileThatIsSymlink()
         throws Exception
     {
-        assumeTrue( Java7Support.isAtLeastJava7() );
         assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
 
         File destination = new File( tempFolder.getRoot(), "symCopy.txt" );
@@ -450,7 +452,8 @@ public void copyFileThatIsSymlink()
         File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new File( "target/test/symlinkCopy" ) );
 
         FileUtils.copyFile( new File( testDir, "symR" ), destination );
-        assertTrue( Java7Support.isSymLink(  destination ));
+
+        assertTrue( Files.isSymbolicLink( destination.toPath() ) );
     }
 
 
@@ -1439,6 +1442,19 @@ public void extensionUnixNonRootPathOnUnix()
         assertThat( FileUtils.extension( "/test/foo.bar.txt" ), is( "txt" ) );
     }
 
+    @Test
+    public void createAndReadSymlink()
+        throws Exception
+    {
+        assumeThat( System.getProperty( "os.name" ), not( startsWith( "Windows" ) ) );
+        File file = new File( "target/fzz" );
+        FileUtils.createSymbolicLink(  file, new File("../target") );
+
+        final File file1 = Files.readSymbolicLink( file.toPath() ).toFile();
+        assertEquals( "target", file1.getName() );
+        Files.delete( file.toPath() );
+    }
+
     //// constants for testing
 
     private static final String[] MINIMUM_DEFAULT_EXCLUDES = {
diff --git a/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java b/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java
index 9652e53f..39c3eb13 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java
@@ -27,7 +27,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assume.assumeThat;
 import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.startsWith;
 
 public class Java7SupportTest
 {
@@ -35,28 +34,8 @@ public class Java7SupportTest
     public void testIsSymLink()
         throws Exception
     {
-
         File file = new File( "." );
-        if ( Java7Support.isAtLeastJava7() )
-        {
-            assertFalse( Java7Support.isSymLink( file ) );
-        }
-    }
-
-    @Test
-    public void createAndReadSymlink()
-        throws Exception
-    {
-        assumeThat( System.getProperty( "os.name" ), not( startsWith( "Windows" ) ) );
-        File file = new File( "target/fzz" );
-        if ( Java7Support.isAtLeastJava7() )
-        {
-            Java7Support.createSymbolicLink(  file, new File("../target") );
-
-            final File file1 = Java7Support.readSymbolicLink( file );
-            assertEquals( "target", file1.getName());
-            Java7Support.delete(  file );
-        }
+        assertFalse( Java7Support.isSymLink( file ) );
     }
 
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java b/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
index 6ae3ba94..9283c970 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
@@ -51,14 +51,12 @@ public static File createStandardSymlinkTestDir( File root )
         write( new File( srcDir, "fileX.txt" ), "FileX payload", StandardCharsets.UTF_8 );
         // todo: set file attributes (not used here)
 
-        Java7Support.createSymbolicLink( new File( srcDir, "symDir" ), new File( "targetDir" ) );
-        Java7Support.createSymbolicLink( new File( srcDir, "symLinkToDirOnTheOutside" ),
-                                         new File( "../dirOnTheOutside" ) );
-        Java7Support.createSymbolicLink( new File( srcDir, "symLinkToFileOnTheOutside" ),
-                                         new File( "../onTheOutside.txt" ) );
-        Java7Support.createSymbolicLink( new File( srcDir, "symR" ), new File( "fileR.txt" ) );
-        Java7Support.createSymbolicLink( new File( srcDir, "symW" ), new File( "fileW.txt" ) );
-        Java7Support.createSymbolicLink( new File( srcDir, "symX" ), new File( "fileX.txt" ) );
+        FileUtils.createSymbolicLink( new File( srcDir, "symDir" ), new File( "targetDir" ) );
+        FileUtils.createSymbolicLink( new File( srcDir, "symLinkToDirOnTheOutside" ), new File( "../dirOnTheOutside" ) );
+        FileUtils.createSymbolicLink( new File( srcDir, "symLinkToFileOnTheOutside" ), new File( "../onTheOutside.txt" ) );
+        FileUtils.createSymbolicLink( new File( srcDir, "symR" ), new File( "fileR.txt" ) );
+        FileUtils.createSymbolicLink( new File( srcDir, "symW" ), new File( "fileW.txt" ) );
+        FileUtils.createSymbolicLink( new File( srcDir, "symX" ), new File( "fileX.txt" ) );
         return srcDir;
     }
 }

From 77ff09b0ee9732fe203f4c58b45f6c1e00d92f0d Mon Sep 17 00:00:00 2001
From: Rob Oxspring 
Date: Sun, 17 May 2020 00:55:09 +0100
Subject: [PATCH 137/265] [MRESOURCES-236] Attempt to copy file permissions
 when copying files (#29)

---
 .../maven/shared/utils/io/FileUtils.java      | 34 +++++++++++++++++++
 .../maven/shared/utils/io/FileUtilsTest.java  | 14 ++++++++
 2 files changed, 48 insertions(+)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index f7de64c7..895cf449 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -819,6 +819,8 @@ private static void doCopyFile( @Nonnull File source, @Nonnull File destination
                 pos += output.transferFrom( input, pos, count );
             }
         }
+
+        copyFilePermissions( source, destination );
     }
 
     /**
@@ -1840,6 +1842,38 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str
                 copyFile( from, to );
             }
         }
+
+        copyFilePermissions( from, to );
+    }
+
+    /**
+     * Attempts to copy file permissions from the source to the destination file.
+     * Initially attempts to copy posix file permissions, assuming that the files are both on posix filesystems.
+     * If the initial attempts fail then a second attempt using less precise permissions model.
+     * Note that permissions are copied on a best-efforts basis,
+     * failure to copy permissions will not result in an exception.
+     *
+     * @param source the file to copy permissions from.
+     * @param destination the file to copy permissions to.
+     */
+    private static void copyFilePermissions( @Nonnull File source, @Nonnull File destination )
+        throws IOException
+    {
+        try
+        {
+            // attempt to copy posix file permissions
+            Files.setPosixFilePermissions(
+                destination.toPath(),
+                Files.getPosixFilePermissions( source.toPath() )
+            );
+        }
+        catch ( UnsupportedOperationException e )
+        {
+            // fallback to setting partial permissions
+            destination.setExecutable( source.canExecute() );
+            destination.setReadable( source.canRead() );
+            destination.setWritable( source.canWrite() );
+        }
     }
 
     /**
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 69e72a9d..b5f17e69 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -493,6 +493,20 @@ public void deleteFileLegacyNofile()
         assertFalse( FileUtils.deleteLegacyStyle( destination ) );
     }
 
+    @Test
+    public void copyFileWithPermissions()
+        throws Exception
+    {
+        File source = new File( "/bin/sh" );
+        assumeThat( "Need an executable to copy", source.exists(), is( true ) );
+
+        File destination = new File( tempFolder.getRoot(), "executable" );
+
+        FileUtils.copyFile( source, destination );
+
+        assertThat( "Check executable", destination.canExecute(), is( true ) );
+    }
+
     @Test
     public void copyFile2()
         throws Exception

From cc9d8f3b817e98fc9139c0de9f0865442f7a9029 Mon Sep 17 00:00:00 2001
From: olivier lamy 
Date: Sun, 17 May 2020 11:03:50 +1000
Subject: [PATCH 138/265] this file is not needed anymore

Signed-off-by: olivier lamy 
---
 .../shared/utils/io/Java7SupportTest.java     | 41 -------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java

diff --git a/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java b/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java
deleted file mode 100644
index 39c3eb13..00000000
--- a/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.maven.shared.utils.io;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assume.assumeThat;
-import static org.hamcrest.CoreMatchers.not;
-
-public class Java7SupportTest
-{
-    @Test
-    public void testIsSymLink()
-        throws Exception
-    {
-        File file = new File( "." );
-        assertFalse( Java7Support.isSymLink( file ) );
-    }
-
-}

From 92a5ba3c431affcabb2cebd11ca17fe02b15748c Mon Sep 17 00:00:00 2001
From: olivier lamy 
Date: Sun, 17 May 2020 11:03:50 +1000
Subject: [PATCH 139/265] Fix issue with copying file executable test with ASF
 Jenkins Signed-off-by: olivier lamy 

---
 pom.xml                                       |  1 +
 .../maven/shared/utils/io/FileUtilsTest.java  | 14 +++++--
 .../shared/utils/io/Java7SupportTest.java     | 41 -------------------
 src/test/resources/executable                 |  1 +
 4 files changed, 12 insertions(+), 45 deletions(-)
 delete mode 100644 src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java
 create mode 100755 src/test/resources/executable

diff --git a/pom.xml b/pom.xml
index 681089d4..fa314445 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,7 @@
           
             src/test/resources/directorywalker/**/*
             src/test/resources/symlinks/**/*
+            src/test/resources/executable
           
         
       
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index b5f17e69..46b94ffe 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -497,14 +497,20 @@ public void deleteFileLegacyNofile()
     public void copyFileWithPermissions()
         throws Exception
     {
-        File source = new File( "/bin/sh" );
-        assumeThat( "Need an executable to copy", source.exists(), is( true ) );
+        File source = new File( "src/test/resources/executable" );
+        source.setExecutable( true );
+        assumeThat( "Need an existing file to copy", source.exists(), is( true ) );
+        assumeThat( "Need an executable file to copy", source.canExecute(), is( true ) );
 
-        File destination = new File( tempFolder.getRoot(), "executable" );
+        File destination = new File( tempFolder.getRoot(), "executable-copy" );
 
         FileUtils.copyFile( source, destination );
 
-        assertThat( "Check executable", destination.canExecute(), is( true ) );
+        assertThat( "destination not exists: " + destination.getAbsolutePath()
+                        + ", directory content: " + Arrays.asList( destination.getParentFile().list() ),
+                    Files.exists( destination.toPath() ), is( true ) );
+
+        assertThat( "Check copy executable", destination.canExecute(), is( true ) );
     }
 
     @Test
diff --git a/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java b/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java
deleted file mode 100644
index 39c3eb13..00000000
--- a/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.maven.shared.utils.io;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assume.assumeThat;
-import static org.hamcrest.CoreMatchers.not;
-
-public class Java7SupportTest
-{
-    @Test
-    public void testIsSymLink()
-        throws Exception
-    {
-        File file = new File( "." );
-        assertFalse( Java7Support.isSymLink( file ) );
-    }
-
-}
diff --git a/src/test/resources/executable b/src/test/resources/executable
new file mode 100755
index 00000000..e804f19a
--- /dev/null
+++ b/src/test/resources/executable
@@ -0,0 +1 @@
+noop

From 8b35ffcf1b410a0870a22ae37f18d96423d42852 Mon Sep 17 00:00:00 2001
From: Rob Oxspring 
Date: Sun, 17 May 2020 21:57:24 +0100
Subject: [PATCH 140/265] [MSHARED-681] createSymbolicLink() overwrites
 existing different symlinks Tests explicitly assuming Windows use consistent
 assumption

---
 .../maven/shared/utils/io/FileUtils.java      | 15 ++++++++--
 .../maven/shared/utils/io/FileUtilsTest.java  | 29 +++++++++++++++++--
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index 895cf449..24dcf985 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -42,6 +42,7 @@
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.security.SecureRandom;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -2004,10 +2005,18 @@ static boolean isSymbolicLinkLegacy( @Nonnull final File file )
     @Nonnull public static File createSymbolicLink( @Nonnull File symlink,  @Nonnull File target )
             throws IOException
     {
-        if ( !Files.exists( symlink.toPath() ) )
+        final Path symlinkPath = symlink.toPath();
+
+        if ( Files.exists( symlinkPath ) )
         {
-            return Files.createSymbolicLink( symlink.toPath(), target.toPath() ).toFile();
+            if ( target.equals( Files.readSymbolicLink( symlinkPath ).toFile() ) )
+            {
+                return symlink;
+            }
+
+            Files.delete( symlinkPath );
         }
-        return symlink;
+
+        return Files.createSymbolicLink( symlinkPath, target.toPath() ).toFile();
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 46b94ffe..b9fd7c45 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -1429,7 +1429,7 @@ public void isASymbolicLink()
         throws IOException
     {
         // This testcase will pass when running under java7 or higher
-        assumeThat( Os.isFamily(Os.FAMILY_WINDOWS), is(false) );
+        assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
 
         File file = new File( "src/test/resources/symlinks/src/symDir" );
         assertTrue(FileUtils.isSymbolicLink(file  ));
@@ -1466,7 +1466,8 @@ public void extensionUnixNonRootPathOnUnix()
     public void createAndReadSymlink()
         throws Exception
     {
-        assumeThat( System.getProperty( "os.name" ), not( startsWith( "Windows" ) ) );
+        assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+
         File file = new File( "target/fzz" );
         FileUtils.createSymbolicLink(  file, new File("../target") );
 
@@ -1475,6 +1476,30 @@ public void createAndReadSymlink()
         Files.delete( file.toPath() );
     }
 
+    @Test
+    public void createSymbolicLinkWithDifferentTargetOverwritesSymlink()
+            throws Exception
+    {
+        assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+
+        // Arrange
+
+        final File symlink1 = new File( tempFolder.getRoot(), "symlink" );
+
+        FileUtils.createSymbolicLink( symlink1, testFile1 );
+
+        // Act
+
+        final File symlink2 = FileUtils.createSymbolicLink( symlink1, testFile2 );
+
+        // Assert
+
+        assertThat(
+            Files.readSymbolicLink( symlink2.toPath() ).toFile(),
+            CoreMatchers.equalTo( testFile2 )
+        );
+    }
+
     //// constants for testing
 
     private static final String[] MINIMUM_DEFAULT_EXCLUDES = {

From 87da81f880be3ad32080e4d2176e280958aff2d7 Mon Sep 17 00:00:00 2001
From: olivier lamy 
Date: Tue, 26 May 2020 11:10:42 +1000
Subject: [PATCH 141/265] bump version

Signed-off-by: olivier lamy 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fa314445..1800bb9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
   
 
   maven-shared-utils
-  3.2.2-SNAPSHOT
+  3.3.0-SNAPSHOT
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins

From e57180309a64758e161513d80f1185e13dc84826 Mon Sep 17 00:00:00 2001
From: Rob Oxspring 
Date: Fri, 1 May 2020 00:35:56 +0100
Subject: [PATCH 142/265] [MSHARED-884] - Add tests for existing
 FileUtils.copyFile() method with no filtering.

- Add tests for existing FileUtils.copyFile() method with filtering.
- Refactor to deal with the simpler no-filters case first
- Only overwrite existing file if there's a content change
- Avoid conflicts with Java 9 additional Buffer methods
- Consistent explicit use of Charset instances
- Prefer Files.newBufferedReader/Writer methods
- Use TimeUnit rather than constants in millisecond
---
 .../maven/shared/utils/io/FileUtils.java      | 164 ++++++---
 .../maven/shared/utils/io/FileUtilsTest.java  | 321 +++++++++++++++++-
 2 files changed, 426 insertions(+), 59 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index f7de64c7..8929c4d3 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -30,17 +30,20 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
+import java.io.RandomAccessFile;
 import java.io.Reader;
 import java.io.Writer;
 import java.net.URL;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
 import java.nio.file.Files;
 import java.security.SecureRandom;
 import java.text.DecimalFormat;
@@ -110,7 +113,7 @@ protected FileUtils()
     /**
      * The file copy buffer size (30 MB)
      */
-    private static final long FILE_COPY_BUFFER_SIZE = ONE_MB * 30;
+    private static final int FILE_COPY_BUFFER_SIZE = ONE_MB * 30;
 
     /**
      * The vm line separator
@@ -271,13 +274,12 @@ public static boolean fileExists( @Nonnull String fileName )
     @Nonnull public static String fileRead( @Nonnull File file, @Nullable String encoding )
         throws IOException
     {
-        StringBuilder buf = new StringBuilder();   
-        if ( encoding == null ) 
-        {
-            encoding = Charset.defaultCharset().name();
-        }
+        Charset charset = charset( encoding );
+
+        StringBuilder buf = new StringBuilder();
+
 
-        try ( Reader reader = new InputStreamReader( new FileInputStream( file ), encoding ) )
+        try ( Reader reader = Files.newBufferedReader( file.toPath(), charset ) )
         {
             int count;
             char[] b = new char[512];
@@ -329,15 +331,11 @@ public static void fileAppend( @Nonnull String fileName, @Nonnull String data )
     public static void fileAppend( @Nonnull String fileName, @Nullable String encoding, @Nonnull String data )
         throws IOException
     {
-        
-        if ( encoding == null ) 
-        {
-            encoding = Charset.defaultCharset().name();
-        }
-        
+        Charset charset = charset( encoding );
+
         try ( OutputStream out = new FileOutputStream( fileName, true ) )
         {
-          out.write( data.getBytes( encoding ) );
+          out.write( data.getBytes( charset ) );
         }
     }
 
@@ -381,13 +379,9 @@ public static void fileWrite( @Nonnull String fileName, @Nullable String encodin
     public static void fileWrite( @Nonnull File file, @Nullable String encoding, @Nonnull String data )
         throws IOException
     {
-        
-        if ( encoding == null ) 
-        {
-            encoding = Charset.defaultCharset().name();
-        }
+        Charset charset = charset( encoding );
 
-        try ( Writer writer = new OutputStreamWriter( new FileOutputStream( file ), encoding ) ) 
+        try ( Writer writer = Files.newBufferedWriter( file.toPath(), charset ) )
         {
             writer.write( data );
         }
@@ -418,13 +412,9 @@ public static void fileWriteArray( @Nonnull File file, @Nullable String... data
     public static void fileWriteArray( @Nonnull File file, @Nullable String encoding, @Nullable String... data )
         throws IOException
     {
-        
-        if ( encoding == null ) 
-        {
-            encoding = Charset.defaultCharset().name();
-        }
+        Charset charset = charset( encoding );
 
-        try ( Writer writer = new OutputStreamWriter( new FileOutputStream( file ), encoding ) )
+        try ( Writer writer = Files.newBufferedWriter( file.toPath(), charset ) )
         {
             for ( int i = 0; data != null && i < data.length; i++ )
             {
@@ -1810,34 +1800,97 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str
                                  @Nullable FilterWrapper[] wrappers, boolean overwrite )
         throws IOException
     {
-        if ( wrappers != null && wrappers.length > 0 )
+        if ( wrappers == null || wrappers.length == 0 )
         {
-            
-            if ( encoding == null || encoding.isEmpty() ) 
+            if ( overwrite || to.lastModified() < from.lastModified() )
             {
-                encoding = Charset.defaultCharset().name();
+                copyFile( from, to );
             }
-            
+        }
+        else
+        {
+            Charset charset = charset( encoding );
+
             // buffer so it isn't reading a byte at a time!
-            try ( Reader fileReader =
-                new BufferedReader( new InputStreamReader( new FileInputStream( from ), encoding ) );
-                            Writer fileWriter = new OutputStreamWriter( new FileOutputStream( to ), encoding ) )
+            try ( Reader fileReader = Files.newBufferedReader( from.toPath(), charset ) )
             {
-
                 Reader wrapped = fileReader;
                 for ( FilterWrapper wrapper : wrappers )
                 {
                     wrapped = wrapper.getReader( wrapped );
                 }
 
-                IOUtil.copy( wrapped, fileWriter );
-            }
-        }
-        else
-        {
-            if ( to.lastModified() < from.lastModified() || overwrite )
-            {
-                copyFile( from, to );
+                if ( overwrite || !to.exists() )
+                {
+                    try ( Writer fileWriter = Files.newBufferedWriter( to.toPath(), charset ) )
+                    {
+                        IOUtil.copy( wrapped, fileWriter );
+                    }
+                }
+                else
+                {
+                    CharsetEncoder encoder = charset.newEncoder();
+
+                    int totalBufferSize = FILE_COPY_BUFFER_SIZE;
+
+                    int charBufferSize = ( int ) Math.floor( totalBufferSize / ( 2 + 2 * encoder.maxBytesPerChar() ) );
+                    int byteBufferSize = ( int ) Math.ceil( charBufferSize * encoder.maxBytesPerChar() );
+
+                    CharBuffer newChars = CharBuffer.allocate( charBufferSize );
+                    ByteBuffer newBytes = ByteBuffer.allocate( byteBufferSize );
+                    ByteBuffer existingBytes = ByteBuffer.allocate( byteBufferSize );
+
+                    CoderResult coderResult;
+                    int existingRead;
+                    boolean writing = false;
+
+                    try ( final RandomAccessFile existing = new RandomAccessFile( to, "rw" ) )
+                    {
+                        int n;
+                        while ( -1 != ( n = wrapped.read( newChars ) ) )
+                        {
+                            ( ( Buffer ) newChars ).flip();
+
+                            coderResult = encoder.encode( newChars, newBytes, n != 0 );
+                            if ( coderResult.isError() )
+                            {
+                                coderResult.throwException();
+                            }
+
+                            ( ( Buffer ) newBytes ).flip();
+
+                            if ( !writing )
+                            {
+                                existingRead = existing.read( existingBytes.array(), 0, newBytes.remaining() );
+                                ( ( Buffer ) existingBytes ).position( existingRead );
+                                ( ( Buffer ) existingBytes ).flip();
+
+                                if ( newBytes.compareTo( existingBytes ) != 0 )
+                                {
+                                    writing = true;
+                                    if ( existingRead > 0 )
+                                    {
+                                        existing.seek( existing.getFilePointer() - existingRead );
+                                    }
+                                }
+                            }
+
+                            if ( writing )
+                            {
+                                existing.write( newBytes.array(), 0, newBytes.remaining() );
+                            }
+
+                            ( ( Buffer ) newChars ).clear();
+                            ( ( Buffer ) newBytes ).clear();
+                            ( ( Buffer ) existingBytes ).clear();
+                        }
+
+                        if ( existing.length() > existing.getFilePointer() )
+                        {
+                            existing.setLength( existing.getFilePointer() );
+                        }
+                    }
+                }
             }
         }
     }
@@ -1856,7 +1909,7 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str
 
         if ( file.exists() )
         {
-            try ( BufferedReader reader = new BufferedReader( new FileReader( file ) ) )
+            try ( BufferedReader reader = Files.newBufferedReader( file.toPath(), Charset.defaultCharset() ) )
             {
                 for ( String line = reader.readLine(); line != null; line = reader.readLine() )
                 {
@@ -1873,6 +1926,23 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str
 
     }
 
+    /**
+     * Returns the named charset or the default charset.
+     * @param encoding the name or alias of the charset, null or empty
+     * @return A charset object for the named or default charset.
+     */
+    private static Charset charset( String encoding )
+    {
+        if ( encoding == null || encoding.isEmpty() )
+        {
+            return Charset.defaultCharset();
+        }
+        else
+        {
+            return Charset.forName( encoding );
+        }
+    }
+
     /**
      * For Windows OS, check if the file name contains any of the following characters:
      * ":", "*", "?", "\"", "<", ">", "|"
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 69e72a9d..24bf43d3 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -14,19 +14,38 @@
 import static org.junit.Assume.assumeThat;
 import static org.junit.Assume.assumeTrue;
 
+import org.apache.maven.shared.utils.Os;
+import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
+import org.codehaus.plexus.util.InterpolationFilterReader;
+import org.hamcrest.CoreMatchers;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestName;
+
+import javax.annotation.Nonnull;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
 import java.net.URL;
 import java.nio.file.Files;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -47,16 +66,6 @@
  * under the License.
  */
 
-import org.apache.maven.shared.utils.Os;
-import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
-import org.hamcrest.CoreMatchers;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
-
 /**
  * This is used to test FileUtils for correctness.
  *
@@ -441,9 +450,298 @@ public void copyFile1()
             testFile1.lastModified() == destination.lastModified());*/
     }
 
+    /** A time today, rounded down to the previous minute */
+    private static long MODIFIED_TODAY = (System.currentTimeMillis() / TimeUnit.MINUTES.toMillis( 1 )) * TimeUnit.MINUTES.toMillis( 1 );
+
+    /** A time yesterday, rounded down to the previous minute */
+    private static long MODIFIED_YESTERDAY = MODIFIED_TODAY - TimeUnit.DAYS.toMillis( 1 );
+
+    /** A time last week, rounded down to the previous minute */
+    private static long MODIFIED_LAST_WEEK = MODIFIED_TODAY - TimeUnit.DAYS.toMillis( 7 );
+
     @Test
-    public void copyFileThatIsSymlink()
+    public void copyFileWithNoFiltersAndNoDestination()
         throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_YESTERDAY,
+            "Hello World!"
+        );
+        File to = new File(
+            tempFolder.getRoot(),
+            "to.txt"
+        );
+
+        FileUtils.copyFile( from, to, null, ( FileUtils.FilterWrapper[] ) null);
+
+        assertTrue(
+            "to.txt did not exist so should have been written",
+            to.lastModified() >= MODIFIED_TODAY
+        );
+        assertFileContent( to, "Hello World!" );
+    }
+
+    @Test
+    public void copyFileWithNoFiltersAndOutdatedDestination()
+            throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_YESTERDAY,
+            "Hello World!"
+        );
+        File to = write(
+            "to.txt",
+            MODIFIED_LAST_WEEK,
+            "Older content"
+        );
+
+        FileUtils.copyFile( from, to, null, ( FileUtils.FilterWrapper[] ) null);
+
+        assertTrue(
+            "to.txt was outdated so should have been overwritten",
+            to.lastModified() >= MODIFIED_TODAY
+        );
+        assertFileContent( to, "Hello World!" );
+    }
+
+    @Test
+    public void copyFileWithNoFiltersAndNewerDestination()
+            throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_LAST_WEEK,
+            "Hello World!"
+        );
+        File to = write(
+            "to.txt",
+            MODIFIED_YESTERDAY,
+            "Older content"
+        );
+
+        FileUtils.copyFile( from, to, null, ( FileUtils.FilterWrapper[] ) null);
+
+        assertTrue(
+            "to.txt was newer so should have been left alone",
+            to.lastModified() < MODIFIED_TODAY
+        );
+        assertFileContent( to, "Older content" );
+    }
+
+    @Test
+    public void copyFileWithNoFiltersAndNewerDestinationButForcedOverwrite()
+            throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_LAST_WEEK,
+            "Hello World!"
+        );
+        File to = write(
+            "to.txt",
+            MODIFIED_YESTERDAY,
+            "Older content"
+        );
+
+        FileUtils.copyFile( from, to, null, null, true);
+
+        assertTrue(
+            "to.txt was newer but the overwrite should have been forced",
+            to.lastModified() >= MODIFIED_TODAY
+        );
+        assertFileContent( to, "Hello World!" );
+    }
+
+    @Test
+    public void copyFileWithFilteringButNoFilters()
+            throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_YESTERDAY,
+            "Hello ${name}!"
+        );
+        File to = write(
+            "to.txt",
+            MODIFIED_LAST_WEEK,
+            "Older content"
+        );
+
+        FileUtils.copyFile( from, to, null );
+
+        assertTrue(
+            "to.txt was outdated so should have been overwritten",
+            to.lastModified() >= MODIFIED_TODAY
+        );
+        assertFileContent( to, "Hello ${name}!" );
+    }
+
+    @Test
+    public void copyFileWithFilteringAndNoDestination()
+            throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_YESTERDAY,
+            "Hello ${name}!"
+        );
+        File to = new File(
+            tempFolder.getRoot(),
+            "to.txt"
+        );
+
+        FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ) );
+
+        assertTrue(
+            "to.txt did not exist so should have been written",
+            to.lastModified() >= MODIFIED_TODAY
+        );
+        assertFileContent( to, "Hello Bob!" );
+    }
+
+    @Test
+    public void copyFileWithFilteringAndOutdatedDestination()
+            throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_YESTERDAY,
+            "Hello ${name}!"
+        );
+        File to = write(
+            "to.txt",
+            MODIFIED_LAST_WEEK,
+            "Older content"
+        );
+
+        FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ) );
+
+        assertTrue(
+            "to.txt was outdated so should have been overwritten",
+            to.lastModified() >= MODIFIED_TODAY
+        );
+        assertFileContent( to, "Hello Bob!" );
+    }
+
+    @Test
+    public void copyFileWithFilteringAndNewerDestinationButForcedOverwrite()
+            throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_LAST_WEEK,
+            "Hello ${name}!"
+        );
+        File to = write(
+            "to.txt",
+            MODIFIED_YESTERDAY,
+            "Older content"
+        );
+
+        FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ), true );
+
+        assertTrue(
+            "to.txt was newer but the overwrite should have been forced",
+            to.lastModified() >= MODIFIED_TODAY
+        );
+        assertFileContent( to, "Hello Bob!" );
+    }
+
+    @Test
+    public void copyFileWithFilteringAndNewerDestinationButModifiedContent()
+            throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_LAST_WEEK,
+            "Hello ${name}!"
+        );
+        File to = write(
+            "to.txt",
+            MODIFIED_YESTERDAY,
+            "Hello Charlie!"
+        );
+
+        FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ) );
+
+        assertTrue(
+            "to.txt was outdated so should have been overwritten",
+            to.lastModified() >= MODIFIED_TODAY
+        );
+        assertFileContent( to, "Hello Bob!" );
+    }
+
+    @Test
+    public void copyFileWithFilteringAndNewerDestinationAndMatchingContent()
+            throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_LAST_WEEK,
+            "Hello ${name}!"
+        );
+        File to = write(
+            "to.txt",
+            MODIFIED_YESTERDAY,
+            "Hello Bob!"
+        );
+
+        String encoding = null;
+
+        FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ) );
+
+        assertFileContent( to, "Hello Bob!" );
+        assertTrue(
+            "to.txt content should be unchanged and have been left alone",
+            to.lastModified() < MODIFIED_TODAY
+        );
+    }
+
+    private FileUtils.FilterWrapper[] wrappers( String key, String value )
+    {
+        final Map map = new HashMap();
+        map.put( key, value );
+        return new FileUtils.FilterWrapper[]
+            {
+                new FileUtils.FilterWrapper()
+                {
+                    @Override
+                    public Reader getReader( Reader reader )
+                    {
+                        return new InterpolationFilterReader( reader, map );
+                    }
+                }
+            };
+    }
+
+    private File write( @Nonnull String name, long lastModified, @Nonnull String text) throws IOException
+    {
+        final File file = new File( tempFolder.getRoot(), name );
+        try ( final Writer writer = new FileWriter( file ) ) {
+            writer.write(text);
+        }
+        assertTrue( file.setLastModified( lastModified ) );
+        assertEquals( "Failed to set lastModified date on " + file.getPath(), lastModified, file.lastModified() );
+        return file;
+    }
+
+    private static void assertFileContent( @Nonnull File file, @Nonnull String expected ) throws IOException
+    {
+        try ( Reader in = new FileReader( file ))
+        {
+            assertEquals(
+                "Expected " + file.getPath() + " to contain: " + expected,
+                expected,
+                IOUtil.toString( in )
+            );
+        }
+    }
+
+    @Test
+    public void copyFileThatIsSymlink()
+            throws Exception
     {
         assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
 
@@ -457,7 +755,6 @@ public void copyFileThatIsSymlink()
     }
 
 
-
     @Test
     public void deleteFile()
         throws Exception

From 83d44c98dbc340006a28d2fd0acbf9b1844ac74c Mon Sep 17 00:00:00 2001
From: Dom 
Date: Fri, 22 May 2020 04:31:50 +0200
Subject: [PATCH 143/265] [MSHARED-881] use try-with-resources

---
 .../maven/shared/utils/io/FileUtilsTest.java  | 23 ++++---------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 86dc0a2e..66d1844c 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -156,10 +156,9 @@ void createFile( File file, long size )
     void assertEqualContent( byte[] b0, File file )
         throws IOException
     {
-        InputStream is = new java.io.FileInputStream( file );
         int count = 0, numRead = 0;
         byte[] b1 = new byte[b0.length];
-        try
+        try ( InputStream is = new FileInputStream( file ) )
         {
             while ( count < b0.length && numRead >= 0 )
             {
@@ -172,10 +171,6 @@ void assertEqualContent( byte[] b0, File file )
                 assertThat( "byte " + i + " differs", b1[i], is( b0[i] ) );
             }
         }
-        finally
-        {
-            is.close();
-        }
     }
 
     void deleteFile( File file )
@@ -345,17 +340,12 @@ public void copyURLToFile()
         String resourceName = "/java/lang/Object.class";
         FileUtils.copyURLToFile( getClass().getResource( resourceName ), file );
 
-        // Tests that resuorce was copied correctly
-        FileInputStream fis = new FileInputStream( file );
-        try
+        // Tests that resource was copied correctly
+        try ( FileInputStream fis = new FileInputStream( file ) )
         {
             assertThat( "Content is not equal.",
                         IOUtil.contentEquals( getClass().getResourceAsStream( resourceName ), fis ), is( true ) );
         }
-        finally
-        {
-            fis.close();
-        }
         //TODO Maybe test copy to itself like for copyFile()
     }
 
@@ -1180,15 +1170,10 @@ public void fileUtils()
         String filename = file1.getAbsolutePath();
 
         //Create test file on-the-fly (used to be in CVS)
-        OutputStream out = new java.io.FileOutputStream( file1 );
-        try
+        try ( OutputStream out = new java.io.FileOutputStream( file1 ) )
         {
             out.write( "This is a test".getBytes( "UTF-8" ) );
         }
-        finally
-        {
-            out.close();
-        }
 
         File file2 = new File( tempFolder.getRoot(), "test2.txt" );
 

From 35760122cedc997e28e81b38e194dfa8abf9433a Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Wed, 27 May 2020 08:07:04 -0400
Subject: [PATCH 144/265] update to commons-lang 3.8.1 (#33)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1800bb9d..772d7947 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,13 +94,13 @@
     
       org.apache.commons
       commons-lang3
-      3.4
+      3.8.1
       test
     
     
       com.google.code.findbugs
       jsr305
-      3.0.0
+      3.0.2
       provided
     
      foo
      * a\b\c.jpg --> a\b\c
@@ -691,7 +695,9 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
      *
      * @param filename the path of the file
      * @return the filename minus extension
+     * @deprecated use {@code org.apache.commons.io.FilenameUtils.removeExtension()}
      */
+    @Deprecated
     @Nonnull public static String removeExtension( @Nonnull final String filename )
     {
         String ext = extension( filename );
@@ -706,7 +712,7 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
     }
 
     /**
-     * Get extension from filename. E.g.
+     * Get extension from a path. E.g.
      *
      * 
                  * foo.txt    --> "txt"
@@ -716,7 +722,9 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
      *
      * @param filename the path of the file
      * @return the extension of filename or "" if none
+     * @deprecated use {@code org.apache.commons.io.FilenameUtils.getExtension()}
      */
+    @Deprecated
     @Nonnull public static String getExtension( @Nonnull final String filename )
     {
         return extension( filename );
@@ -734,7 +742,9 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
      * @throws IOException                   if source does not exist, the file in
      *                                       destinationDirectory cannot be written to, or an IO error
      *                                       occurs during copying.
+     * @deprecated use {@code org.apache.commons.io.FileUtils.copyFileToDirectory()}
      */
+    @Deprecated
     public static void copyFileToDirectory( @Nonnull final File source, @Nonnull final File destinationDirectory )
         throws IOException
     {
@@ -784,7 +794,10 @@ private static void copyFileToDirectoryIfModified( @Nonnull final File source,
      * @throws IOException  if source does not exist, destination cannot be
      *                      written to, or an IO error occurs during copying
      * @throws java.io.FileNotFoundException if destination is a directory
+     * @deprecated use {@code java.nio.Files.copy(source.toPath(), destination.toPath(), CopyOptions.NOFOLLOW_LINKS,
+     *     CopyOptions.REPLACE_EXISTING)}
      */
+    @Deprecated
     public static void copyFile( @Nonnull final File source, @Nonnull final File destination )
         throws IOException
     {
@@ -891,6 +904,8 @@ private static boolean copyFileIfModified( @Nonnull final File source, @Nonnull
      *                     
          • destination cannot be written to
            • 
      *                     
          • an IO error occurs during copying
            • 
      *
          + * @deprecated use {@code java.nio.Files.copy(source.openStream(), destination.toPath(), + * CopyOptions.REPLACE_EXISTING)} */ public static void copyURLToFile( @Nonnull final URL source, @Nonnull final File destination ) throws IOException @@ -909,11 +924,14 @@ public static void copyURLToFile( @Nonnull final URL source, @Nonnull final File * overwriting). * @throws IOException if *
            - *
          • source URL cannot be opened
            • + *
          • source cannot be opened
            • *
          • destination cannot be written to
            • - *
          • an IO error occurs during copying
            • + *
          • an I/O error occurs during copying
            • *
          + * @deprecated use {@code java.nio.Files.copy(source, destination.toPath(), + * CopyOptions.REPLACE_EXISTING)} */ + @Deprecated private static void copyStreamToFile( @Nonnull @WillClose final InputStream source, @Nonnull final File destination ) throws IOException @@ -955,7 +973,9 @@ private static void copyStreamToFile( @Nonnull @WillClose final InputStream sour * * @param path the path to normalize * @return the normalized String, or null if too many ..'s. + * @deprecated use {@code org.apache.commons.io.FileNameUtils.normalize()} */ + @Deprecated @Nonnull public static String normalize( @Nonnull final String path ) { String normalized = path; @@ -1083,11 +1103,13 @@ private static void copyStreamToFile( @Nonnull @WillClose final InputStream sour } /** - * Delete a file. If file is directory delete it and all sub-directories. + * Delete a file. If file is directory, delete it and all sub-directories. * * @param file the file path * @throws IOException if any + * @deprecated use {@code org.apache.commons.io.FileUtils.deleteQuietly()} */ + @Deprecated public static void forceDelete( @Nonnull final String file ) throws IOException { @@ -1095,11 +1117,13 @@ public static void forceDelete( @Nonnull final String file ) } /** - * Delete a file. If file is directory delete it and all sub-directories. + * Delete a file. If file is directory, delete it and all sub-directories. * * @param file a file * @throws IOException if any + * @deprecated use {@code org.apache.commons.io.FileUtils.deleteQuietly()} */ + @Deprecated public static void forceDelete( @Nonnull final File file ) throws IOException { @@ -1123,13 +1147,13 @@ public static void forceDelete( @Nonnull final File file ) } /** - * deletes a file. + * Deletes a file. * - * @param file The file to delete + * @param file the file to delete * @throws IOException if the file cannot be deleted + * @deprecated use {@code java.nio.files.Files.delete(file.toPath())} */ - - + @Deprecated public static void delete( @Nonnull File file ) throws IOException { @@ -1137,9 +1161,11 @@ public static void delete( @Nonnull File file ) } /** - * @param file The file. + * @param file the file * @return true / false + * @deprecated use {@code java.nio.files.Files.delete(file.toPath())} */ + @Deprecated public static boolean deleteLegacyStyle( @Nonnull File file ) { try @@ -1974,7 +2000,9 @@ private static void copyFilePermissions( @Nonnull File source, @Nonnull File des * @param file the file * @return a List containing every every line not starting with # and not empty * @throws IOException if any + * @deprecated assumes the platform default character set */ + @Deprecated @Nonnull public static List loadFile( @Nonnull File file ) throws IOException { From 5b7ecec410ee462280e40f3ee37cb31d939d2aaf Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 28 May 2020 14:30:14 -0400 Subject: [PATCH 148/265] [MSHARED-894] deprecate close methods since we require Java 7+ (#38) * deprecate close methods since we require Java 7+ * suppress warnings for tests of deprecated methods --- .../apache/maven/shared/utils/io/IOUtil.java | 53 ++++++++++--------- .../maven/shared/utils/io/IOUtilTest.java | 1 + 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java index c0e421d2..168a4aaf 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java +++ b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java @@ -43,34 +43,29 @@ * copying between sources (InputStream, Reader, String and * byte[]) and destinations (OutputStream, Writer, * String and byte[]). - *

          - *

          + * *

          Unless otherwise noted, these copy methods do not flush or close the * streams. Often, doing so would require making non-portable assumptions about the streams' origin * and further use. This means that both streams' close() methods must be called after * copying. if one omits this step, then the stream resources (sockets, file descriptors) are * released when the associated Stream is garbage-collected. It is not a good idea to rely on this - * mechanism. For a good overview of the distinction between "memory management" and "resource - * management", see this - * UnixReview article

          - *

          + * mechanism.

          + * *

          For each copy method, a variant is provided that allows the caller to specify the * buffer size (the default is 4k). As the buffer size can have a fairly large impact on speed, this * may be worth tweaking. Often "large buffer -> faster" does not hold, even for large data * transfers.

          - *

          *

          For byte-to-char methods, a copy variant allows the encoding to be selected * (otherwise the platform default is used).

          - *

          *

          The copy methods use an internal buffer when copying. It is therefore advisable * not to deliberately wrap the stream arguments to the copy methods in * Buffered* streams. For example, don't do the * following:

          - *

          + *

          * copy( new BufferedInputStream( in ), new BufferedOutputStream( out ) ); - *

          + *

          *

          The rationale is as follows:

          - *

          + * *

          Imagine that an InputStream's read() is a very expensive operation, which would usually suggest * wrapping in a BufferedInputStream. The BufferedInputStream works by issuing infrequent * {@link java.io.InputStream#read(byte[] b, int off, int len)} requests on the underlying InputStream, to @@ -133,9 +128,9 @@ private IOUtil() /** * Copy bytes from an InputStream to an OutputStream. - * @param input The input size. - * @param output The resulting output. - * @throws IOException in case of an error. + * @param input the input size + * @param output the resulting output + * @throws IOException in case of an error */ public static void copy( @Nonnull final InputStream input, @Nonnull final OutputStream output ) throws IOException @@ -146,10 +141,10 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Output /** * Copy bytes from an InputStream to an OutputStream. * - * @param input The input size. - * @param output The resulting output. - * @param bufferSize Size of internal buffer to use. - * @throws IOException in case of an error. + * @param input the input size + * @param output the resulting output + * @param bufferSize size of internal buffer to use + * @throws IOException in case of an error */ public static void copy( @Nonnull final InputStream input, @Nonnull final OutputStream output, final int bufferSize ) @@ -759,8 +754,8 @@ public static boolean contentEquals( @Nonnull final InputStream input1, @Nonnull /** * Closes a {@code Channel} suppressing any {@code IOException}. *

          - * Note:
          The usecase justifying this method is a shortcoming of the Java language up to but not including - * Java 7. For any code targetting Java 7 or later use of this method is highly discouraged and the + * Note: The use case justifying this method is a shortcoming of the Java language up to but not including + * Java 7. For any code targeting Java 7 or later use of this method is highly discouraged and the * {@code try-with-resources} statement should be used instead. Care must be taken to not use this method in a way * {@code IOException}s get suppressed incorrectly. * You must close all resources in use inside the {@code try} block to not suppress exceptions in the @@ -844,7 +839,9 @@ public static boolean contentEquals( @Nonnull final InputStream input1, @Nonnull *

          * * @param channel The channel to close or {@code null}. + * @deprecated use try-with-resources */ + @Deprecated public static void close( @Nullable Channel channel ) { try @@ -863,7 +860,7 @@ public static void close( @Nullable Channel channel ) /** * Closes an {@code InputStream} suppressing any {@code IOException}. *

          - * Note:
          The usecase justifying this method is a shortcoming of the Java language up to but not including + * Note: The use case justifying this method is a shortcoming of the Java language up to but not including * Java 7. For any code targeting Java 7 or later use of this method is highly discouraged and the * {@code try-with-resources} statement should be used instead. Care must be taken to not use this method in a way * {@code IOException}s get suppressed incorrectly. @@ -948,7 +945,9 @@ public static void close( @Nullable Channel channel ) *

          * * @param inputStream The stream to close or {@code null}. + * @deprecated use try-with-resources */ + @Deprecated public static void close( @Nullable InputStream inputStream ) { try @@ -967,7 +966,7 @@ public static void close( @Nullable InputStream inputStream ) /** * Closes an {@code OutputStream} suppressing any {@code IOException}. *

          - * Note:
          The usecase justifying this method is a shortcoming of the Java language up to but not including + * Note: The use case justifying this method is a shortcoming of the Java language up to but not including * Java 7. For any code targeting Java 7 or later use of this method is highly discouraged and the * {@code try-with-resources} statement should be used instead. Care must be taken to not use this method in a way * {@code IOException}s get suppressed incorrectly. @@ -1052,7 +1051,9 @@ public static void close( @Nullable InputStream inputStream ) *

          * * @param outputStream The stream to close or {@code null}. + * @deprecated use try-with-resources */ + @Deprecated public static void close( @Nullable OutputStream outputStream ) { try @@ -1071,7 +1072,7 @@ public static void close( @Nullable OutputStream outputStream ) /** * Closes a {@code Reader} suppressing any {@code IOException}. *

          - * Note:
          The usecase justifying this method is a shortcoming of the Java language up to but not including + * Note: The use case justifying this method is a shortcoming of the Java language up to but not including * Java 7. For any code targeting Java 7 or later use of this method is highly discouraged and the * {@code try-with-resources} statement should be used instead. Care must be taken to not use this method in a way * {@code IOException}s get suppressed incorrectly. @@ -1156,7 +1157,9 @@ public static void close( @Nullable OutputStream outputStream ) *

          * * @param reader The reader to close or {@code null}. + * @deprecated use try-with-resources */ + @Deprecated public static void close( @Nullable Reader reader ) { try @@ -1175,7 +1178,7 @@ public static void close( @Nullable Reader reader ) /** * Closes a {@code Writer} suppressing any {@code IOException}. *

          - * Note:
          The usecase justifying this method is a shortcoming of the Java language up to but not including + * Note: The use case justifying this method is a shortcoming of the Java language up to but not including * Java 7. For any code targeting Java 7 or later use of this method is highly discouraged and the * {@code try-with-resources} statement should be used instead. Care must be taken to not use this method in a way * {@code IOException}s get suppressed incorrectly. @@ -1260,7 +1263,9 @@ public static void close( @Nullable Reader reader ) *

          * * @param writer The writer to close or {@code null}. + * @deprecated use try-with-resources */ + @Deprecated public static void close( @Nullable Writer writer ) { try diff --git a/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java b/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java index 8a3f17bc..a8b6b31a 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java @@ -40,6 +40,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +@SuppressWarnings( "deprecation" ) public class IOUtilTest { From 9530c545b6f9675fc3e49eb072e85bbb093a993f Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Fri, 29 May 2020 06:38:30 +1000 Subject: [PATCH 149/265] no need of this we are svn free now Signed-off-by: olivier lamy --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 772d7947..7c89f763 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,6 @@ org.apache.maven.shared maven-shared-components 34 - ../../pom/maven/maven-shared-components/pom.xml maven-shared-utils From 1d4471a0318b08d5ae11ed40949b4453b6b51e03 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Fri, 29 May 2020 06:40:57 +1000 Subject: [PATCH 150/265] no need of this we are svn free now Signed-off-by: olivier lamy --- src/main/java/org/apache/maven/shared/utils/Os.java | 1 - src/main/java/org/apache/maven/shared/utils/StringUtils.java | 1 - src/main/java/org/apache/maven/shared/utils/WriterFactory.java | 1 - .../org/apache/maven/shared/utils/cli/CommandLineException.java | 1 - .../maven/shared/utils/cli/CommandLineTimeOutException.java | 1 - .../org/apache/maven/shared/utils/cli/CommandLineUtils.java | 1 - .../java/org/apache/maven/shared/utils/cli/DefaultConsumer.java | 1 - .../java/org/apache/maven/shared/utils/cli/StreamFeeder.java | 1 - .../org/apache/maven/shared/utils/cli/WriterStreamConsumer.java | 2 +- .../maven/shared/utils/cli/javatool/JavaToolException.java | 2 +- .../org/apache/maven/shared/utils/introspection/ClassMap.java | 2 +- .../org/apache/maven/shared/utils/introspection/MethodMap.java | 2 +- .../shared/utils/introspection/ReflectionValueExtractor.java | 2 +- .../org/apache/maven/shared/utils/io/DirectoryWalkListener.java | 2 +- .../java/org/apache/maven/shared/utils/io/DirectoryWalker.java | 2 +- src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 2 +- .../java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java | 2 +- .../utils/introspection/ReflectionValueExtractorTest.java | 2 +- .../apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java | 2 +- .../org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java | 2 +- 20 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/Os.java b/src/main/java/org/apache/maven/shared/utils/Os.java index 8f87d7b8..c4c5f33b 100644 --- a/src/main/java/org/apache/maven/shared/utils/Os.java +++ b/src/main/java/org/apache/maven/shared/utils/Os.java @@ -39,7 +39,6 @@ * @author Magesh Umasankar * @author Brian Fox * @author Mark Struberg - * @version $Revision$ * */ public class Os diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 6b9a55af..2a14de31 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -49,7 +49,6 @@ * @author Fredrik Westermarck * @author Holger Krauth * @author Alexander Day Chaffee - * @version $Id$ * */ public class StringUtils diff --git a/src/main/java/org/apache/maven/shared/utils/WriterFactory.java b/src/main/java/org/apache/maven/shared/utils/WriterFactory.java index 7e33c8f9..fb2f2134 100644 --- a/src/main/java/org/apache/maven/shared/utils/WriterFactory.java +++ b/src/main/java/org/apache/maven/shared/utils/WriterFactory.java @@ -40,7 +40,6 @@ * @author Hervé Boutemy * @see java.nio.charset.Charset * @see Supported encodings - * @version $Id$ */ public class WriterFactory { diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java index 77a50ee7..9954e353 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java @@ -21,7 +21,6 @@ /** * @author Trygve Laugstøl - * @version $Id$ */ public class CommandLineException extends Exception diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java index 5d834948..c1f82091 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java @@ -21,7 +21,6 @@ /** * @author Olivier Lamy - * @version $Id$ * */ public class CommandLineTimeOutException diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java index 904ecb91..2ffcfb24 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java @@ -36,7 +36,6 @@ /** * @author Trygve Laugstøl - * @version $Id$ */ public abstract class CommandLineUtils { diff --git a/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java b/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java index 5104877c..59d99719 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java @@ -23,7 +23,6 @@ /** * @author Emmanuel Venisse - * @version $Id$ */ public class DefaultConsumer implements StreamConsumer diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java index 26e9de3a..6f6723c4 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java @@ -28,7 +28,6 @@ * Read from an InputStream and write the output to an OutputStream. * * @author Trygve Laugstøl - * @version $Id$ */ class StreamFeeder extends AbstractStreamHandler diff --git a/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java b/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java index f8ce0d8c..b93ccb7c 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java @@ -25,7 +25,7 @@ /** * @author Jason van Zyl - * @version $Id$ + * */ public class WriterStreamConsumer implements StreamConsumer diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java index 6b6946c7..fa10b33b 100644 --- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java +++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java @@ -27,7 +27,7 @@ * non-zero exit code. * * @author Tony Chemit - * @version $Id$ + * * @see JavaToolResult#getExitCode() * @since 0.5 */ diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java b/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java index 7d0120cf..19b17322 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java @@ -33,7 +33,7 @@ * @author Bob McWhirter * @author Attila Szegedi * @author Geir Magnusson Jr. - * @version $Id$ + * */ public class ClassMap { diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java b/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java index 16df95c4..8cf80f8d 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java @@ -33,7 +33,7 @@ * @author Christoph Reck * @author Geir Magnusson Jr. * @author Attila Szegedi - * @version $Id$ + * */ class MethodMap { diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java index 014f10c9..963c9829 100644 --- a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java +++ b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java @@ -41,7 +41,7 @@ * * @author Jason van Zyl * @author Vincent Siveton - * @version $Id$ + * * @see * http://struts.apache.org/1.x/struts-taglib/indexedprops.html */ diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java index cf28080b..292298cd 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java @@ -24,7 +24,7 @@ /** * DirectoryWalkListener * - * @version $Id$ + * */ public interface DirectoryWalkListener { diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java index 3713fe2f..2aff206b 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java @@ -27,7 +27,7 @@ /** * DirectoryWalker * - * @version $Id$ + * */ class DirectoryWalker { diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java index d8023c5d..71c3ae33 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java @@ -89,7 +89,7 @@ * @author Christoph.Reck * @author Peter Donald * @author Jeff Turner - * @version $Id$ + * */ public class FileUtils { diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java index e83d1cf5..d9dd49e3 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java @@ -26,7 +26,7 @@ * Utility class for the XmlWriter class. * * @author Vincent Siveton - * @version $Id$ + * */ public class XmlWriterUtil { diff --git a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java index e082617e..1c9a0e26 100644 --- a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java +++ b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java @@ -30,7 +30,7 @@ /** * @author Jason van Zyl - * @version $Id$ + * */ public class ReflectionValueExtractorTest extends TestCase diff --git a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java index f2723327..5679512f 100644 --- a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java +++ b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java @@ -36,7 +36,7 @@ * Test of {@link PrettyPrintXMLWriter} * * @author Vincent Siveton - * @version $Id$ + * */ public class PrettyPrintXmlWriterTest { diff --git a/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java b/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java index 894774a9..a22cece1 100644 --- a/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java +++ b/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java @@ -29,7 +29,7 @@ /** * @author Vincent Siveton - * @version $Id$ + * */ public class XmlWriterUtilTest extends TestCase From da69ad6f1c529834ca103487ce20621701e4765a Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 28 May 2020 17:14:15 -0400 Subject: [PATCH 151/265] [MSHARED-893] deprecate more methods and clean up api doc and tests (#37) * deprecate more methods and clean up api doc and tests --- .../maven/shared/utils/io/FileUtils.java | 124 ++++++++++-------- .../maven/shared/utils/io/FileUtilsTest.java | 43 +----- 2 files changed, 75 insertions(+), 92 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java index 71c3ae33..a3be324c 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java @@ -1221,8 +1221,7 @@ private static boolean deleteFile( @Nonnull File file ) * Make a directory. * * @param file not null - * @throws IOException If there already exists a file with specified name or - * the directory is unable to be created + * @throws IOException if a file already exists with the specified name or the directory is unable to be created * @throws IllegalArgumentException if the file contains illegal Windows characters under Windows OS. * @see #INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME */ @@ -1260,7 +1259,9 @@ public static void forceMkdir( @Nonnull final File file ) * * @param directory a directory * @throws IOException if any + * @deprecated use {@code org.apache.commons.io.FileUtils.deleteDirectory()} */ + @Deprecated public static void deleteDirectory( @Nonnull final String directory ) throws IOException { @@ -1272,7 +1273,9 @@ public static void deleteDirectory( @Nonnull final String directory ) * * @param directory a directory * @throws IOException if any + * @deprecated use {@code org.apache.commons.io.FileUtils.deleteDirectory()} */ + @Deprecated public static void deleteDirectory( @Nonnull final File directory ) throws IOException { @@ -1298,11 +1301,14 @@ public static void deleteDirectory( @Nonnull final File directory ) } /** - * Clean a directory without deleting it. + * Remove all files from a directory without deleting it. * * @param directory a directory - * @throws IOException if any + * @throws IOException if any. This can leave cleaning in a half-finished state where + * some but not all files have been deleted. + * @deprecated use {@code org.apache.commons.io.FileUtils.cleanDirectory()} */ + @Deprecated public static void cleanDirectory( @Nonnull final File directory ) throws IOException { @@ -1350,7 +1356,9 @@ public static void cleanDirectory( @Nonnull final File directory ) * * @param directory a directory * @return size of directory in bytes + * @deprecated use {@code org.apache.commons.io.FileUtils.sizeOf()} */ + @Deprecated public static long sizeOfDirectory( @Nonnull final String directory ) { return sizeOfDirectory( new File( directory ) ); @@ -1361,7 +1369,9 @@ public static long sizeOfDirectory( @Nonnull final String directory ) * * @param directory a directory * @return size of directory in bytes + * @deprecated use {@code org.apache.commons.io.FileUtils.sizeOf()} */ + @Deprecated public static long sizeOfDirectory( @Nonnull final File directory ) { if ( !directory.exists() ) @@ -1404,8 +1414,8 @@ public static long sizeOfDirectory( @Nonnull final File directory ) * including the directory name in each of the files * * @param directory the directory to scan - * @param includes the includes pattern, comma separated - * @param excludes the excludes pattern, comma separated + * @param includes the Ant includes pattern, comma separated + * @param excludes the Ant excludes pattern, comma separated * @return a list of File objects * @throws IOException in case of failure. * @see #getFileNames(File, String, String, boolean) @@ -1450,11 +1460,11 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc * This method use case sensitive file name. * * @param directory the directory to scan - * @param includes the includes pattern, comma separated - * @param excludes the excludes pattern, comma separated - * @param includeBasedir true to include the base dir in each String of file - * @return a list of files as String - * @throws IOException in case of failure. + * @param includes the Ant includes pattern, comma separated + * @param excludes the Ant excludes pattern, comma separated + * @param includeBasedir true to include the base directory in each String of file + * @return a list of file names + * @throws IOException in case of failure */ @Nonnull public static List getFileNames( @Nonnull File directory, @Nullable String includes, @Nullable String excludes, boolean includeBasedir ) @@ -1467,8 +1477,8 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc * Return a list of files as String depending options. * * @param directory the directory to scan - * @param includes the includes pattern, comma separated - * @param excludes the excludes pattern, comma separated + * @param includes the Ant includes pattern, comma separated + * @param excludes the Ant excludes pattern, comma separated * @param includeBasedir true to include the base dir in each String of file * @param isCaseSensitive true if case sensitive * @return a list of files as String @@ -1487,8 +1497,8 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc * This method use case sensitive file name. * * @param directory the directory to scan - * @param includes the includes pattern, comma separated - * @param excludes the excludes pattern, comma separated + * @param includes the Ant includes pattern, comma separated + * @param excludes the Ant excludes pattern, comma separated * @param includeBasedir true to include the base dir in each String of file * @return a list of directories as String * @throws IOException in case of failure. @@ -1501,15 +1511,15 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc } /** - * Return a list of directories as String depending options. + * Return a list of directories as Strings. * * @param directory the directory to scan - * @param includes the includes pattern, comma separated - * @param excludes the excludes pattern, comma separated - * @param includeBasedir true to include the base dir in each String of file + * @param includes the Ant includes pattern, comma separated + * @param excludes the Ant excludes pattern, comma separated + * @param includeBasedir true to include the base directory in each String of file * @param isCaseSensitive true if case sensitive * @return a list of directories as String - * @throws IOException in case of failure. + * @throws IOException in case of failure */ @Nonnull public static List getDirectoryNames( @Nonnull File directory, @Nullable String includes, @Nullable String excludes, boolean includeBasedir, @@ -1520,16 +1530,16 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc } /** - * Return a list of files as String depending options. + * Return a list of file names as Strings. * * @param directory the directory to scan - * @param includes the includes pattern, comma separated - * @param excludes the excludes pattern, comma separated - * @param includeBasedir true to include the base dir in each String of file + * @param includes the Ant includes pattern, comma separated + * @param excludes the Ant excludes pattern, comma separated + * @param includeBasedir true to include the base directory in each String of file * @param isCaseSensitive true if case sensitive - * @param getFiles true if get files - * @param getDirectories true if get directories - * @return a list of files as String + * @param getFiles true to include regular files + * @param getDirectories true to include directories + * @return a list of file names */ @Nonnull public static List getFileAndDirectoryNames( File directory, @Nullable String includes, @Nullable String excludes, boolean includeBasedir, @@ -1594,10 +1604,10 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc } /** - * Copy a directory to an other one. + * Copy the contents of a directory into another one. * - * @param sourceDirectory the source dir - * @param destinationDirectory the target dir + * @param sourceDirectory the source directory + * @param destinationDirectory the target directory * @throws IOException if any */ public static void copyDirectory( @Nonnull File sourceDirectory, @Nonnull File destinationDirectory ) @@ -1607,12 +1617,12 @@ public static void copyDirectory( @Nonnull File sourceDirectory, @Nonnull File d } /** - * Copy a directory to an other one. + * Copy the contents of a directory into another one. * - * @param sourceDirectory the source dir - * @param destinationDirectory the target dir - * @param includes include pattern - * @param excludes exlucde pattern + * @param sourceDirectory the source directory + * @param destinationDirectory the target directory + * @param includes Ant include pattern + * @param excludes Ant exclude pattern * @throws IOException if any * @see #getFiles(File, String, String) */ @@ -1634,18 +1644,20 @@ public static void copyDirectory( @Nonnull File sourceDirectory, @Nonnull File d } /** - * Copies a entire directory structure. + * Copies an entire directory structure. *

          * Note: *

            *
          • It will include empty directories. - *
          • The sourceDirectory must exists. + *
          • The sourceDirectory must exist. *
          * * @param sourceDirectory the source dir * @param destinationDirectory the target dir * @throws IOException if any + * @deprecated use {@code org.apache.commons.io.FileUtils.copyDirectory()} */ + @Deprecated public static void copyDirectoryStructure( @Nonnull File sourceDirectory, @Nonnull File destinationDirectory ) throws IOException { @@ -1743,7 +1755,9 @@ else if ( file.isDirectory() ) * @param to the new file name * @throws IOException if anything bad happens during this process. * Note that to may have been deleted already when this happens. + * @deprecated use {@code java.nio.Files.move()} */ + @Deprecated public static void rename( @Nonnull File from, @Nonnull File to ) throws IOException { @@ -1774,23 +1788,24 @@ public static void rename( @Nonnull File from, @Nonnull File to ) *

          The file denoted by the returned abstract pathname did not * exist before this method was invoked, any subsequent invocation * of this method will yield a different file name.

          - *

          + *

          * The filename is prefixNNNNNsuffix where NNNN is a random number *

          - *

          This method is different to {@link File#createTempFile(String, String, File)} of JDK 1.2 + *

          This method is different to {@link File#createTempFile(String, String, File)} * as it doesn't create the file itself. * It uses the location pointed to by java.io.tmpdir - * when the parentDir attribute is - * null.

          - *

          To delete automatically the file created by this method, use the + * when the parentDir attribute is null.

          + *

          To automatically delete the file created by this method, use the * {@link File#deleteOnExit()} method.

          * * @param prefix prefix before the random number * @param suffix file extension; include the '.' - * @param parentDir Directory to create the temporary file in -java.io.tmpdir - * used if not specificed + * @param parentDir directory to create the temporary file in -java.io.tmpdir + * used if not specified * @return a File reference to the new temporary file. + * @deprecated use {@code java.nio.Files.createTempFile()} */ + @Deprecated public static File createTempFile( @Nonnull String prefix, @Nonnull String suffix, @Nullable File parentDir ) { File result; @@ -1823,7 +1838,7 @@ private static int positiveRandom( Random rand ) } /** - * If wrappers is null or empty, the file will be copy only if to.lastModified() < from.lastModified() + * If wrappers is null or empty, the file will be copied only if to.lastModified() < from.lastModified() * * @param from the file to copy * @param to the destination file @@ -1840,13 +1855,12 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str /** * Wrapper class for Filter. - * */ public abstract static class FilterWrapper { /** * @param fileReader {@link Reader} - * @return The Reader instance. + * @return the Reader instance */ public abstract Reader getReader( Reader fileReader ); } @@ -1859,8 +1873,8 @@ public abstract static class FilterWrapper * @param to the destination file * @param encoding the file output encoding (only if wrappers is not empty) * @param wrappers array of {@link FilterWrapper} - * @param overwrite if true and f wrappers is null or empty, the file will be copy enven if to.lastModified() < - * from.lastModified() + * @param overwrite if true and wrappers is null or empty, the file will be copied even if + * to.lastModified() < from.lastModified() * @throws IOException if an IO error occurs during copying or filtering */ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable String encoding, @@ -2103,10 +2117,14 @@ public static boolean isSymbolicLinkForSure( @Nonnull final File file ) } /** - * @param symlink The link name. - * @param target The target. - * @return The linked file. - * @throws IOException in case of an error. + * Create a new symbolic link, possibly replacing an existing symbolic link. + * + * @param symlink the link name + * @param target the target + * @return the linked file + * @throws IOException in case of an error + * @see {@code java.nio.file.Files.createSymbolicLink(Path)} which creates a new + * symbolic link but does not replace exsiting symbolic links */ @Nonnull public static File createSymbolicLink( @Nonnull File symlink, @Nonnull File target ) throws IOException diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java index 90d93c60..9fa7c85e 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java @@ -74,6 +74,7 @@ * @version $Id: FileUtilsTestCase.java 1081025 2011-03-13 00:45:10Z niallp $ * @see FileUtils */ +@SuppressWarnings( "deprecation" ) public class FileUtilsTest { @@ -90,11 +91,6 @@ public class FileUtilsTest */ private static final int TEST_DIRECTORY_SIZE = 0; - /** - * Delay in milliseconds to make sure test for "last modified date" are accurate - */ - //private static final int LAST_MODIFIED_DELAY = 600; - private File testFile1; private File testFile2; @@ -132,18 +128,10 @@ void createFile( File file, long size ) { throw new IOException( "Cannot create file " + file + " as the parent directory does not exist" ); } - - OutputStream out = null; - try + + try (OutputStream out = new BufferedOutputStream( new FileOutputStream( file ) ) ) { - out = new BufferedOutputStream( new FileOutputStream( file ) ); FileTestHelper.generateTestData( out, size ); - out.close(); - out = null; - } - finally - { - IOUtil.close( out ); } } @@ -258,26 +246,6 @@ public void toURLs1() assertThat( urls[2].toExternalForm(), containsString( "test%20file.txt" ) ); } -// @Test public void toURLs2() throws Exception { -// File[] files = new File[] { -// new File(getTestDirectory(), "file1.txt"), -// null, -// }; -// URL[] urls = FileUtils.toURLs(files); -// -// assertEquals(files.length, urls.length); -// assertEquals(true, urls[0].toExternalForm().startsWith("file:")); -// assertEquals(true, urls[0].toExternalForm().indexOf("file1.txt") > 0); -// assertEquals(null, urls[1]); -// } -// -// @Test public void toURLs3() throws Exception { -// File[] files = null; -// URL[] urls = FileUtils.toURLs(files); -// -// assertEquals(0, urls.length); -// } - // contentEquals @Test @@ -676,8 +644,6 @@ public void copyFileWithFilteringAndNewerDestinationAndMatchingContent() "Hello Bob!" ); - String encoding = null; - FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ) ); assertFileContent( to, "Hello Bob!" ); @@ -689,7 +655,7 @@ public void copyFileWithFilteringAndNewerDestinationAndMatchingContent() private FileUtils.FilterWrapper[] wrappers( String key, String value ) { - final Map map = new HashMap(); + final Map map = new HashMap<>(); map.put( key, value ); return new FileUtils.FilterWrapper[] { @@ -1416,7 +1382,6 @@ public void getDefaultExcludes() //// getDefaultExcludesAsList @Test - @SuppressWarnings( "unchecked" ) public void getDefaultExcludesAsList() throws Exception { From cb239ef4f9b2f57551fa9e1b6399bda3cb24adb8 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 28 May 2020 17:14:29 -0400 Subject: [PATCH 152/265] [MSHARED-894] deprecate many easily replaced methods (#39) deprecate many easily replced methods --- .../apache/maven/shared/utils/io/IOUtil.java | 331 +++++++++++------- 1 file changed, 208 insertions(+), 123 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java index 168a4aaf..11f1bdd4 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java +++ b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java @@ -128,10 +128,14 @@ private IOUtil() /** * Copy bytes from an InputStream to an OutputStream. - * @param input the input size - * @param output the resulting output + * + * @param input the stream to read from + * @param output the stream to write to * @throws IOException in case of an error + * @deprecated use {@code org.apache.commons.io.IOUtils.copy()} or in + * Java 9 and later {@code InputStream.transferTo()}. */ + @Deprecated public static void copy( @Nonnull final InputStream input, @Nonnull final OutputStream output ) throws IOException { @@ -141,11 +145,16 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Output /** * Copy bytes from an InputStream to an OutputStream. * - * @param input the input size - * @param output the resulting output - * @param bufferSize size of internal buffer to use + * In Java 9 and later this is replaced by {@code InputStream.transferTo()}. + * + * @param input the stream to read from + * @param output the stream to write to + * @param bufferSize size of internal buffer * @throws IOException in case of an error + * @deprecated use {@code org.apache.commons.io.IOUtils.copy()} or in + * Java 9 and later {@code InputStream.transferTo()}. */ + @Deprecated public static void copy( @Nonnull final InputStream input, @Nonnull final OutputStream output, final int bufferSize ) throws IOException @@ -160,10 +169,12 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Output /** * Copy chars from a Reader to a Writer. - * @param input The input size. - * @param output The resulting output. - * @throws IOException in case of failure. + * + * @param input the reader to read from + * @param output the writer to write to + * @throws IOException in case of failure * @deprecated use {@code org.apache.commons.io.IOUtils.copy()}. */ + @Deprecated public static void copy( @Nonnull final Reader input, @Nonnull final Writer output ) throws IOException { @@ -173,11 +184,13 @@ public static void copy( @Nonnull final Reader input, @Nonnull final Writer outp /** * Copy chars from a Reader to a Writer. * - * @param input The input size. - * @param output The resulting output. - * @param bufferSize Size of internal buffer to use. - * @throws IOException in case of failure. + * @param input the reader to read from + * @param output the writer to write to + * @param bufferSize size of internal buffer + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.copy()}. */ + @Deprecated public static void copy( @Nonnull final Reader input, @Nonnull final Writer output, final int bufferSize ) throws IOException { @@ -201,11 +214,15 @@ public static void copy( @Nonnull final Reader input, @Nonnull final Writer outp /** * Copy and convert bytes from an InputStream to chars on a * Writer. + * * The platform's default encoding is used for the byte-to-char conversion. - * @param input The input size. - * @param output The resulting output. - * @throws IOException in case of failure. + * + * @param input the reader to read from + * @param output the writer to write to + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.copy()}. */ + @Deprecated public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output ) throws IOException { @@ -217,11 +234,13 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * Writer. * The platform's default encoding is used for the byte-to-char conversion. * - * @param input The input size. - * @param output The resulting output. - * @param bufferSize Size of internal buffer to use. - * @throws IOException in case of failure. + * @param input the input stream to read from + * @param output the writer to write to + * @param bufferSize size of internal buffer + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.copy()}. */ + @Deprecated public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output, final int bufferSize ) throws IOException { @@ -233,13 +252,15 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * Copy and convert bytes from an InputStream to chars on a * Writer, using the specified encoding. * - * @param input The input size. - * @param output The resulting output. - * @param encoding The name of a supported character encoding. See the - * IANA + * @param input the input stream to read from + * @param output the writer to write to + * @param encoding the name of a supported character encoding. See the + * IANA * Charset Registry for a list of valid encoding types. - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.copy()}. */ + @Deprecated public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output, @Nonnull final String encoding ) throws IOException @@ -252,14 +273,16 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * Copy and convert bytes from an InputStream to chars on a * Writer, using the specified encoding. * - * @param encoding The name of a supported character encoding. See the - * IANA + * @param encoding the name of a supported character encoding. See the + * IANA * Charset Registry for a list of valid encoding types. - * @param input The input size. - * @param output The resulting output. - * @param bufferSize Size of internal buffer to use. - * @throws IOException in case of failure. + * @param input the input stream to read from + * @param output the writer to write to + * @param bufferSize size of internal buffer + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.copy()}. */ + @Deprecated public static void copy( @Nonnull final InputStream input, @Nonnull final Writer output, @Nonnull final String encoding, final int bufferSize ) throws IOException @@ -274,10 +297,13 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a String. * The platform's default encoding is used for the byte-to-char conversion. - * @param input The input size. - * @return The resulting string. - * @throws IOException in case of failure. + * + * @param input the InputStream to read from + * @return the resulting string + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated @Nonnull public static String toString( @Nonnull final InputStream input ) throws IOException { @@ -288,11 +314,13 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer * Get the contents of an InputStream as a String. * The platform's default encoding is used for the byte-to-char conversion. * - * @param input The input size. - * @param bufferSize Size of internal buffer to use. - * @return the resulting string. - * @throws IOException in case of failure. + * @param input the InputStream to read from + * @param bufferSize size of internal buffer + * @return the resulting string + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated @Nonnull public static String toString( @Nonnull final InputStream input, final int bufferSize ) throws IOException { @@ -304,13 +332,15 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a String. * - * @param input The input size. - * @param encoding The name of a supported character encoding. See the - * IANA + * @param input the InputStream to read from + * @param encoding the name of a supported character encoding. See the + * IANA * Charset Registry for a list of valid encoding types. - * @return the converted string. - * @throws IOException in case of failure. + * @return the converted string + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.toString()}. */ + @Deprecated @Nonnull public static String toString( @Nonnull final InputStream input, @Nonnull final String encoding ) throws IOException { @@ -320,14 +350,16 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a String. * - * @param input The input size. - * @param encoding The name of a supported character encoding. See the - * IANA + * @param input the InputStream to read from + * @param encoding the name of a supported character encoding. See the + * IANA * Charset Registry for a list of valid encoding types. - * @param bufferSize Size of internal buffer to use. + * @param bufferSize size of internal buffer * @return The converted string. - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.toString()}. */ + @Deprecated @Nonnull public static String toString( @Nonnull final InputStream input, @Nonnull final String encoding, final int bufferSize ) throws IOException @@ -342,10 +374,13 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a byte[]. - * @param input The input size. + * + * @param input the InputStream to read from * @return the resulting byte array. - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.readFully()}. */ + @Deprecated @Nonnull public static byte[] toByteArray( @Nonnull final InputStream input ) throws IOException { @@ -355,11 +390,13 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Get the contents of an InputStream as a byte[]. * - * @param input The input size. - * @param bufferSize Size of internal buffer to use. + * @param input the InputStream to read from + * @param bufferSize size of internal buffer * @return the resulting byte array. - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.readFully()}. */ + @Deprecated @Nonnull public static byte[] toByteArray( @Nonnull final InputStream input, final int bufferSize ) throws IOException { @@ -379,10 +416,13 @@ public static void copy( @Nonnull final InputStream input, @Nonnull final Writer /** * Serialize chars from a Reader to bytes on an OutputStream, and * flush the OutputStream. - * @param input The input size. - * @param output The resulting output. - * @throws IOException in case of failure. + * + * @param input the InputStream to read from + * @param output the output stream to write to + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated public static void copy( @Nonnull final Reader input, @Nonnull final OutputStream output ) throws IOException { @@ -393,11 +433,13 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea * Serialize chars from a Reader to bytes on an OutputStream, and * flush the OutputStream. * - * @param input The input size. - * @param output The resulting output. - * @param bufferSize Size of internal buffer to use. - * @throws IOException in case of failure. + * @param input the InputStream to read from + * @param output the output to write to + * @param bufferSize size of internal buffer + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated public static void copy( @Nonnull final Reader input, @Nonnull final OutputStream output, final int bufferSize ) throws IOException { @@ -413,10 +455,12 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a String. - * @param input The input size. + * @param input the InputStream to read from * @return The converted string. - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.toString()}. */ + @Deprecated @Nonnull public static String toString( @Nonnull final Reader input ) throws IOException { @@ -426,11 +470,13 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a String. * - * @param input The input size. - * @param bufferSize Size of internal buffer to use. + * @param input the reader to read from + * @param bufferSize size of internal buffer * @return the resulting byte array. - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.toString()}. */ + @Deprecated @Nonnull public static String toString( @Nonnull final Reader input, final int bufferSize ) throws IOException { @@ -444,10 +490,13 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a byte[]. - * @param input The input size. + * + * @param input the InputStream to read from * @return the resulting byte array. - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated @Nonnull public static byte[] toByteArray( @Nonnull final Reader input ) throws IOException { @@ -457,11 +506,13 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Get the contents of a Reader as a byte[]. * - * @param input The input size. - * @param bufferSize Size of internal buffer to use. + * @param input the InputStream to read from + * @param bufferSize size of internal buffer * @return the resulting byte array. - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated @Nonnull public static byte[] toByteArray( @Nonnull final Reader input, final int bufferSize ) throws IOException { @@ -481,10 +532,12 @@ public static void copy( @Nonnull final Reader input, @Nonnull final OutputStrea /** * Serialize chars from a String to bytes on an OutputStream, and * flush the OutputStream. - * @param input The input size. - * @param output The resulting output. - * @throws IOException in case of failure. + * @param input the InputStream to read from + * @param output the output to write to + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated public static void copy( @Nonnull final String input, @Nonnull final OutputStream output ) throws IOException { @@ -495,11 +548,13 @@ public static void copy( @Nonnull final String input, @Nonnull final OutputStrea * Serialize chars from a String to bytes on an OutputStream, and * flush the OutputStream. * - * @param input The input size. - * @param output The resulting output. - * @param bufferSize Size of internal buffer to use. - * @throws IOException in case of failure. + * @param input the InputStream to read from + * @param output the output to write to + * @param bufferSize size of internal buffer + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated public static void copy( @Nonnull final String input, @Nonnull final OutputStream output, final int bufferSize ) throws IOException { @@ -516,10 +571,13 @@ public static void copy( @Nonnull final String input, @Nonnull final OutputStrea /** * Copy chars from a String to a Writer. - * @param input Input string. + * + * @param input the string to write * @param output resulting output {@link Writer} - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.write()}. */ + @Deprecated public static void copy( @Nonnull final String input, @Nonnull final Writer output ) throws IOException { @@ -531,10 +589,13 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp /** * Get the contents of a String as a byte[]. - * @param input The input size. - * @return The resulting byte array. - * @throws IOException in case of failure. + * + * @param input the String to read from + * @return the resulting byte array + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated @Nonnull public static byte[] toByteArray( @Nonnull final String input ) throws IOException { @@ -544,11 +605,13 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp /** * Get the contents of a String as a byte[]. * - * @param input The input size. - * @param bufferSize Size of internal buffer to use. - * @return The resulting byte array. - * @throws IOException in case of failure. + * @param input the InputStream to read from + * @param bufferSize size of internal buffer + * @return the resulting byte array + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated @Nonnull public static byte[] toByteArray( @Nonnull final String input, final int bufferSize ) throws IOException { @@ -569,10 +632,13 @@ public static void copy( @Nonnull final String input, @Nonnull final Writer outp * Copy and convert bytes from a byte[] to chars on a * Writer. * The platform's default encoding is used for the byte-to-char conversion. - * @param input The input size. - * @param output The resulting output. - * @throws IOException in case of failure. + * + * @param input the InputStream to read from + * @param output the output to write to + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output ) throws IOException { @@ -584,11 +650,13 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * Writer. * The platform's default encoding is used for the byte-to-char conversion. * - * @param input The input size. - * @param output The resulting output. - * @param bufferSize Size of internal buffer to use. - * @throws IOException in case of failure. + * @param input the InputStream to read from + * @param output the output to write to + * @param bufferSize size of internal buffer + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output, final int bufferSize ) throws IOException { @@ -600,13 +668,15 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * Copy and convert bytes from a byte[] to chars on a * Writer, using the specified encoding. * - * @param encoding The name of a supported character encoding. See the - * IANA + * @param encoding the name of a supported character encoding. See the + * IANA * Charset Registry for a list of valid encoding types. - * @param input The input size. - * @param output The resulting output. - * @throws IOException in case of failure. + * @param input the data to write + * @param output the writer to write to + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.write()}. */ + @Deprecated public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output, final String encoding ) throws IOException { @@ -618,14 +688,16 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * Copy and convert bytes from a byte[] to chars on a * Writer, using the specified encoding. * - * @param encoding The name of a supported character encoding. See the - * IANA + * @param encoding the name of a supported character encoding. See the + * IANA * Charset Registry for a list of valid encoding types. - * @param input The input bytes. + * @param input the input bytes * @param output The output buffer {@link Writer} - * @param bufferSize Size of internal buffer to use. - * @throws IOException in case of failure. + * @param bufferSize size of internal buffer + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.write()}. */ + @Deprecated public static void copy( @Nonnull final byte[] input, @Nonnull final Writer output, @Nonnull final String encoding, final int bufferSize ) throws IOException @@ -640,10 +712,12 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp /** * Get the contents of a byte[] as a String. * The platform's default encoding is used for the byte-to-char conversion. - * @param input The input bytes. - * @return The resulting string. - * @throws IOException in case of failure. + * @param input the input bytes + * @return the resulting string + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated @Nonnull public static String toString( @Nonnull final byte[] input ) throws IOException { @@ -654,11 +728,13 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp * Get the contents of a byte[] as a String. * The platform's default encoding is used for the byte-to-char conversion. * - * @param bufferSize Size of internal buffer to use. - * @param input The input bytes. - * @return The created string. - * @throws IOException in case of failure. + * @param bufferSize size of internal buffer + * @param input the input bytes + * @return the created string + * @throws IOException in case of failure + * @deprecated always specify a character encoding */ + @Deprecated @Nonnull public static String toString( @Nonnull final byte[] input, final int bufferSize ) throws IOException { @@ -670,13 +746,15 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp /** * Get the contents of a byte[] as a String. * - * @param encoding The name of a supported character encoding. See the - * IANA + * @param encoding the name of a supported character encoding. See the + * IANA * Charset Registry for a list of valid encoding types. - * @param input The input bytes. - * @return The resulting string. - * @throws IOException in case of failure. + * @param input the input bytes + * @return the resulting string + * @throws IOException in case of failure + * @deprecated use {@code new String(input, encoding)} */ + @Deprecated @Nonnull public static String toString( @Nonnull final byte[] input, @Nonnull final String encoding ) throws IOException { @@ -686,14 +764,16 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp /** * Get the contents of a byte[] as a String. * - * @param encoding The name of a supported character encoding. See the - * IANA + * @param encoding the name of a supported character encoding. See the + * IANA * Charset Registry for a list of valid encoding types. - * @param bufferSize Size of internal buffer to use. - * @param input Input bytes. - * @return The resulting string. - * @throws IOException in case of failure. + * @param bufferSize size of internal buffer + * @param input input bytes + * @return the resulting string + * @throws IOException in case of failure + * @deprecated use {@code new String(input, encoding)} */ + @Deprecated @Nonnull public static String toString( @Nonnull final byte[] input, @Nonnull final String encoding, final int bufferSize ) throws IOException @@ -708,10 +788,13 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final Writer outp /** * Copy bytes from a byte[] to an OutputStream. + * * @param input Input byte array. * @param output output stream {@link OutputStream} - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated inline this method */ + @Deprecated public static void copy( @Nonnull final byte[] input, @Nonnull final OutputStream output ) throws IOException { @@ -719,13 +802,15 @@ public static void copy( @Nonnull final byte[] input, @Nonnull final OutputStrea } /** - * Compare the contents of two Streams to determine if they are equal or not. + * Compare the contents of two streams to determine if they are equal or not. * * @param input1 the first stream * @param input2 the second stream * @return true if the content of the streams are equal or they both don't exist, false otherwise - * @throws IOException in case of failure. + * @throws IOException in case of failure + * @deprecated use {@code org.apache.commons.io.IOUtils.contentEquals()} */ + @Deprecated public static boolean contentEquals( @Nonnull final InputStream input1, @Nonnull final InputStream input2 ) throws IOException { From d1042e0aff6b4a70ed3620bb95e4767b95f85ad8 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 29 May 2020 07:49:27 -0400 Subject: [PATCH 153/265] -a (#43) remove unreferenced non-public class --- .../shared/utils/io/DirectoryWalker.java | 337 ------------------ .../shared/utils/io/DirectoryWalkerTest.java | 50 --- 2 files changed, 387 deletions(-) delete mode 100644 src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java delete mode 100644 src/test/java/org/apache/maven/shared/utils/io/DirectoryWalkerTest.java diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java deleted file mode 100644 index 2aff206b..00000000 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java +++ /dev/null @@ -1,337 +0,0 @@ -package org.apache.maven.shared.utils.io; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Stack; - -/** - * DirectoryWalker - * - * - */ -class DirectoryWalker -{ - /** - * DirStackEntry is an Item on the {@link DirectoryWalker#dirStack} - */ - static class DirStackEntry - { - /** - * Count of files in the directory. - */ - private final int count; - - /** - * Current Directory. - */ - private final File dir; - - /** - * Index (or offset) within the directory count. - */ - private int index; - - /** - * Offset for percentage calculations. Based on parent DirStackEntry. - */ - private double percentageOffset; - - /** - * Size of percentage space to work with. - */ - private double percentageSize; - - /** - * Create a DirStackEntry. - * - * @param d the directory to track - * @param length the length of entries in the directory. - */ - DirStackEntry( File d, int length ) - { - dir = d; - count = length; - } - - /** - * Calculate the next percentage offset. Used by the next DirStackEntry. - * - * @return the value for the next percentage offset. - */ - public double getNextPercentageOffset() - { - return percentageOffset + ( index * ( percentageSize / count ) ); - } - - /** - * Calculate the next percentage size. Used by the next DirStackEntry. - * - * @return the value for the next percentage size. - */ - public double getNextPercentageSize() - { - return ( percentageSize / count ); - } - - /** - * The percentage of the DirStackEntry right now. Based on count, index, percentageOffset, and percentageSize. - * - * @return the percentage right now. - */ - public int getPercentage() - { - double percentageWithinDir = (double) index / (double) count; - return (int) Math.floor( percentageOffset + ( percentageWithinDir * percentageSize ) ); - } - - public String toString() - { - return "DirStackEntry[" + "dir=" + dir.getAbsolutePath() + ",count=" + count + ",index=" + index - + ",percentageOffset=" + percentageOffset + ",percentageSize=" + percentageSize + ",percentage()=" - + getPercentage() + ",getNextPercentageOffset()=" + getNextPercentageOffset() - + ",getNextPercentageSize()=" + getNextPercentageSize() + "]"; - } - } - - private File baseDir; - - private int baseDirOffset; - - private Stack dirStack; - - private final List excludes; - - private final List includes; - - private final List listeners; - - DirectoryWalker() - { - this.includes = new ArrayList(); - this.excludes = new ArrayList(); - this.listeners = new ArrayList(); - } - - public void addDirectoryWalkListener( DirectoryWalkListener listener ) - { - this.listeners.add( listener ); - } - - void addExclude( String exclude ) - { - this.excludes.add( fixPattern( exclude ) ); - } - - void addInclude( String include ) - { - this.includes.add( fixPattern( include ) ); - } - - /** - * Add's to the Exclude List the default list of SCM excludes. - */ - public void addSCMExcludes() - { - String scmexcludes[] = DirectoryScanner.DEFAULTEXCLUDES; - for ( String scmexclude : scmexcludes ) - { - addExclude( scmexclude ); - } - } - - private void fireStep( File file ) - { - DirStackEntry dsEntry = dirStack.peek(); - int percentage = dsEntry.getPercentage(); - for ( DirectoryWalkListener listener : this.listeners ) - { - listener.directoryWalkStep( percentage, file ); - } - } - - private void fireWalkFinished() - { - for ( Object listener1 : this.listeners ) - { - DirectoryWalkListener listener = (DirectoryWalkListener) listener1; - listener.directoryWalkFinished(); - } - } - - private void fireWalkStarting() - { - for ( Object listener1 : this.listeners ) - { - DirectoryWalkListener listener = (DirectoryWalkListener) listener1; - listener.directoryWalkStarting( this.baseDir ); - } - } - - private void fireDebugMessage( String message ) - { - for ( Object listener1 : this.listeners ) - { - DirectoryWalkListener listener = (DirectoryWalkListener) listener1; - listener.debug( message ); - } - } - - private String fixPattern( String pattern ) - { - String cleanPattern = pattern; - - if ( File.separatorChar != '/' ) - { - cleanPattern = cleanPattern.replace( '/', File.separatorChar ); - } - - if ( File.separatorChar != '\\' ) - { - cleanPattern = cleanPattern.replace( '\\', File.separatorChar ); - } - - return cleanPattern; - } - - private boolean isExcluded( String name ) - { - return isMatch( this.excludes, name ); - } - - private boolean isIncluded( String name ) - { - return isMatch( this.includes, name ); - } - - private boolean isMatch( List patterns, String name ) - { - for ( String pattern : patterns ) - { - boolean caseSensitive = true; - if ( SelectorUtils.matchPath( pattern, name, caseSensitive ) ) - { - return true; - } - } - - return false; - } - - private String relativeToBaseDir( File file ) - { - return file.getAbsolutePath().substring( baseDirOffset + 1 ); - } - - /** - * Performs a Scan against the provided {@link #setBaseDir(File)} - */ - public void scan() - { - if ( baseDir == null ) - { - throw new IllegalStateException( "Scan Failure. BaseDir not specified." ); - } - - if ( !baseDir.exists() ) - { - throw new IllegalStateException( "Scan Failure. BaseDir does not exist." ); - } - - if ( !baseDir.isDirectory() ) - { - throw new IllegalStateException( "Scan Failure. BaseDir is not a directory." ); - } - - if ( this.includes.isEmpty() ) - { - // default to include all. - addInclude( "**" ); - } - - fireWalkStarting(); - dirStack = new Stack(); - scanDir( this.baseDir ); - fireWalkFinished(); - } - - private void scanDir( File dir ) - { - File files[] = dir.listFiles(); - - if ( files == null ) - { - return; - } - - DirStackEntry curStackEntry = new DirStackEntry( dir, files.length ); - if ( dirStack.isEmpty() ) - { - curStackEntry.percentageOffset = 0; - curStackEntry.percentageSize = 100; - } - else - { - DirStackEntry previousStackEntry = dirStack.peek(); - curStackEntry.percentageOffset = previousStackEntry.getNextPercentageOffset(); - curStackEntry.percentageSize = previousStackEntry.getNextPercentageSize(); - } - - dirStack.push( curStackEntry ); - - for ( int idx = 0; idx < files.length; idx++ ) - { - curStackEntry.index = idx; - String name = relativeToBaseDir( files[idx] ); - - if ( isExcluded( name ) ) - { - fireDebugMessage( name + " is excluded." ); - continue; - } - - if ( files[idx].isDirectory() ) - { - scanDir( files[idx] ); - } - else - { - if ( isIncluded( name ) ) - { - fireStep( files[idx] ); - } - } - } - - dirStack.pop(); - } - - /** - * @param baseDir The baseDir to set. - */ - public void setBaseDir( File baseDir ) - { - this.baseDir = baseDir; - this.baseDirOffset = baseDir.getAbsolutePath().length(); - } - -} diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryWalkerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryWalkerTest.java deleted file mode 100644 index 2bb86b22..00000000 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryWalkerTest.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.apache.maven.shared.utils.io; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.File; - -import org.junit.Test; -import org.junit.Assert; - -public class DirectoryWalkerTest -{ - @Test - public void testDirectoryWalk() - { - DirectoryWalker walker = new DirectoryWalker(); - - walker.addSCMExcludes(); - - walker.setBaseDir( new File("src/test/resources/directorywalker" ) ); - - WalkCollector collector = new WalkCollector(); - walker.addDirectoryWalkListener( collector ); - - walker.scan(); - - Assert.assertEquals( "Walk Collector / Starting Count", 1, collector.startCount ); - Assert.assertNotNull( "Walk Collector / Starting Dir", collector.startingDir ); - Assert.assertEquals( "Walk Collector / Finish Count", 1, collector.finishCount ); - Assert.assertEquals( "Walk Collector / Steps Count", 4, collector.steps.size() ); - Assert.assertTrue( "Walk Collector / percentage low >= 0", collector.percentageLow >= 0 ); - Assert.assertTrue( "Walk Collector / percentage high <= 100", collector.percentageHigh <= 100 ); - } -} From 660fd805ad8da2b9063502e944968fd7166fdc63 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 29 May 2020 07:50:11 -0400 Subject: [PATCH 154/265] [MSHARED-860] deprecate constants that are now available in Java 7+ (#42) * deprecate constants that are now available in Java 7+ * update URLs * fix some api doc --- .../maven/shared/utils/ReaderFactory.java | 81 +++++++++++-------- .../maven/shared/utils/WriterFactory.java | 78 +++++++++++------- 2 files changed, 93 insertions(+), 66 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java b/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java index 5103219c..4ec103a9 100644 --- a/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java +++ b/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java @@ -40,7 +40,7 @@ * * @author Hervé Boutemy * @see java.nio.charset.Charset - * @see Supported encodings + * @see Supported encodings */ public class ReaderFactory { @@ -48,16 +48,18 @@ public class ReaderFactory * ISO Latin Alphabet #1, also known as ISO-LATIN-1. * Every implementation of the Java platform is required to support this character encoding. * - * @see java.nio.charset.Charset + * @deprecated use {@code java.nio.charset.StandardCharset.ISO_8859_1} */ + @Deprecated public static final String ISO_8859_1 = "ISO-8859-1"; /** * Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block of the Unicode character set. * Every implementation of the Java platform is required to support this character encoding. * - * @see java.nio.charset.Charset + * @deprecated use {@code java.nio.charset.StandardCharset.US_ASCII} */ + @Deprecated public static final String US_ASCII = "US-ASCII"; /** @@ -65,32 +67,36 @@ public class ReaderFactory * order accepted on input, big-endian used on output). * Every implementation of the Java platform is required to support this character encoding. * - * @see java.nio.charset.Charset + * @deprecated use {@code java.nio.charset.StandardCharset.UTF_16} */ + @Deprecated public static final String UTF_16 = "UTF-16"; /** * Sixteen-bit Unicode Transformation Format, big-endian byte order. * Every implementation of the Java platform is required to support this character encoding. * - * @see java.nio.charset.Charset + * @deprecated use {@code java.nio.charset.StandardCharset.UTF_16BE} */ + @Deprecated public static final String UTF_16BE = "UTF-16BE"; /** * Sixteen-bit Unicode Transformation Format, little-endian byte order. * Every implementation of the Java platform is required to support this character encoding. * - * @see java.nio.charset.Charset + * @deprecated use {@code java.nio.charset.StandardCharset.UTF_16LE} */ + @Deprecated public static final String UTF_16LE = "UTF-16LE"; /** * Eight-bit Unicode Transformation Format. * Every implementation of the Java platform is required to support this character encoding. * - * @see java.nio.charset.Charset + * @deprecated use {@code java.nio.charset.StandardCharset.UTF_8} */ + @Deprecated public static final String UTF_8 = "UTF-8"; /** @@ -101,9 +107,9 @@ public class ReaderFactory /** * Create a new Reader with XML encoding detection rules. * - * @param in not null input stream. - * @return an XML reader instance for the input stream. - * @throws IOException if any. + * @param in not null input stream + * @return an XML reader instance for the input stream + * @throws IOException if any * @see XmlStreamReader */ public static Reader newXmlReader( @Nonnull InputStream in ) @@ -115,9 +121,9 @@ public static Reader newXmlReader( @Nonnull InputStream in ) /** * Create a new Reader with XML encoding detection rules. * - * @param file not null file. - * @return an XML reader instance for the input file. - * @throws IOException if any. + * @param file not null file + * @return an XML reader instance for the input file + * @throws IOException if any * @see XmlStreamReader */ public static Reader newXmlReader( @Nonnull File file ) @@ -129,9 +135,9 @@ public static Reader newXmlReader( @Nonnull File file ) /** * Create a new Reader with XML encoding detection rules. * - * @param url not null url. - * @return an XML reader instance for the input url. - * @throws IOException if any. + * @param url not null url + * @return an XML reader instance for the input URL + * @throws IOException if any * @see XmlStreamReader */ public static Reader newXmlReader( @Nonnull URL url ) @@ -141,13 +147,15 @@ public static Reader newXmlReader( @Nonnull URL url ) } /** - * Create a new Reader with default plaform encoding. + * Create a new Reader with default platform encoding. * * @param file not null file. - * @return a reader instance for the input file using the default platform charset. - * @throws FileNotFoundException if any. + * @return a reader instance for the input file using the default platform character set + * @throws FileNotFoundException if any * @see java.nio.charset.Charset#defaultCharset() + * @deprecated always specify an encoding. Do not depend on the default platform character set. */ + @Deprecated public static Reader newPlatformReader( @Nonnull File file ) throws FileNotFoundException { @@ -157,11 +165,12 @@ public static Reader newPlatformReader( @Nonnull File file ) /** * Create a new Reader with specified encoding. * - * @param in not null input stream. - * @param encoding not null supported encoding. - * @return a reader instance for the input stream using the given encoding. - * @throws UnsupportedEncodingException if any. - * @see Supported encodings + * @param in not null input stream + * @param encoding not null supported encoding + * @return a reader instance for the input stream using the given encoding + * @throws UnsupportedEncodingException if any + * @see Supported + * encodings */ public static Reader newReader( @Nonnull InputStream in, @Nonnull String encoding ) throws UnsupportedEncodingException @@ -172,12 +181,13 @@ public static Reader newReader( @Nonnull InputStream in, @Nonnull String encodin /** * Create a new Reader with specified encoding. * - * @param file not null file. - * @param encoding not null supported encoding. - * @return a reader instance for the input file using the given encoding. - * @throws FileNotFoundException if any. - * @throws UnsupportedEncodingException if any. - * @see Supported encodings + * @param file not null file + * @param encoding not null supported encoding + * @return a reader instance for the input file using the given encoding + * @throws FileNotFoundException if any + * @throws UnsupportedEncodingException if any + * @see Supported + * encodings */ public static Reader newReader( @Nonnull File file, @Nonnull String encoding ) throws FileNotFoundException, UnsupportedEncodingException @@ -188,11 +198,12 @@ public static Reader newReader( @Nonnull File file, @Nonnull String encoding ) /** * Create a new Reader with specified encoding. * - * @param url not null url. - * @param encoding not null supported encoding. - * @return a reader instance for the input url using the given encoding. - * @throws IOException if any. - * @see Supported encodings + * @param url not null URL + * @param encoding not null supported encoding + * @return a reader instance for the input URL using the given encoding + * @throws IOException if any + * @see Supported + * encodings */ public static Reader newReader( @Nonnull URL url, @Nonnull String encoding ) throws IOException diff --git a/src/main/java/org/apache/maven/shared/utils/WriterFactory.java b/src/main/java/org/apache/maven/shared/utils/WriterFactory.java index fb2f2134..e81cceed 100644 --- a/src/main/java/org/apache/maven/shared/utils/WriterFactory.java +++ b/src/main/java/org/apache/maven/shared/utils/WriterFactory.java @@ -39,51 +39,63 @@ * * @author Hervé Boutemy * @see java.nio.charset.Charset - * @see Supported encodings + * @see Supported encodings */ public class WriterFactory { /** * ISO Latin Alphabet #1, also known as ISO-LATIN-1. * Every implementation of the Java platform is required to support this character encoding. - * @see java.nio.charset.Charset + * + * @deprecated use {@code java.nio.charset.StandardCharset.ISO_8859_1} */ + @Deprecated public static final String ISO_8859_1 = "ISO-8859-1"; /** * Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block of the Unicode character set. * Every implementation of the Java platform is required to support this character encoding. - * @see java.nio.charset.Charset + * + * @deprecated use {@code java.nio.charset.StandardCharset.US_ASCII} */ + @Deprecated public static final String US_ASCII = "US-ASCII"; /** * Sixteen-bit Unicode Transformation Format, byte order specified by a mandatory initial byte-order mark (either * order accepted on input, big-endian used on output). * Every implementation of the Java platform is required to support this character encoding. - * @see java.nio.charset.Charset + * + * @deprecated use {@code java.nio.charset.StandardCharset.UTF_16} */ + @Deprecated public static final String UTF_16 = "UTF-16"; /** * Sixteen-bit Unicode Transformation Format, big-endian byte order. * Every implementation of the Java platform is required to support this character encoding. - * @see java.nio.charset.Charset + * + * @deprecated use {@code java.nio.charset.StandardCharset.UTF_16BE} */ + @Deprecated public static final String UTF_16BE = "UTF-16BE"; /** * Sixteen-bit Unicode Transformation Format, little-endian byte order. * Every implementation of the Java platform is required to support this character encoding. - * @see java.nio.charset.Charset + * + * @deprecated use {@code java.nio.charset.StandardCharset.UTF_16LE} */ + @Deprecated public static final String UTF_16LE = "UTF-16LE"; /** * Eight-bit Unicode Transformation Format. * Every implementation of the Java platform is required to support this character encoding. - * @see java.nio.charset.Charset + * + * @deprecated use {@code java.nio.charset.StandardCharset.UTF_8} */ + @Deprecated public static final String UTF_8 = "UTF-8"; /** @@ -94,9 +106,9 @@ public class WriterFactory /** * Create a new Writer with XML encoding detection rules. * - * @param out not null output stream. - * @return an XML writer instance for the output stream. - * @throws IOException if any. + * @param out not null output stream + * @return an XML writer instance for the output stream + * @throws IOException if any * @see XmlStreamWriter */ public static XmlStreamWriter newXmlWriter( @Nonnull OutputStream out ) @@ -108,9 +120,9 @@ public static XmlStreamWriter newXmlWriter( @Nonnull OutputStream out ) /** * Create a new Writer with XML encoding detection rules. * - * @param file not null file. - * @return an XML writer instance for the output file. - * @throws IOException if any. + * @param file not null file + * @return an XML writer instance for the output file + * @throws IOException if any * @see XmlStreamWriter */ public static XmlStreamWriter newXmlWriter( @Nonnull File file ) @@ -122,10 +134,11 @@ public static XmlStreamWriter newXmlWriter( @Nonnull File file ) /** * Create a new Writer with default platform encoding. * - * @param out not null output stream. - * @return a writer instance for the output stream using the default platform charset. - * @see java.nio.charset.Charset#defaultCharset() + * @param out not null output stream + * @return a writer instance for the output stream using the default platform charset + * @deprecated always specify an encoding. Do not depend on the default platform character set. */ + @Deprecated public static Writer newPlatformWriter( @Nonnull OutputStream out ) { return new OutputStreamWriter( out ); @@ -134,11 +147,12 @@ public static Writer newPlatformWriter( @Nonnull OutputStream out ) /** * Create a new Writer with default platform encoding. * - * @param file not null file. - * @return a writer instance for the output file using the default platform charset. - * @throws IOException if any. - * @see java.nio.charset.Charset#defaultCharset() + * @param file not null file + * @return a writer instance for the output file using the default platform charset + * @throws IOException if any + * @deprecated always specify an encoding. Do not depend on the default platform character set. */ + @Deprecated public static Writer newPlatformWriter( @Nonnull File file ) throws IOException { @@ -148,11 +162,12 @@ public static Writer newPlatformWriter( @Nonnull File file ) /** * Create a new Writer with specified encoding. * - * @param out not null output stream. - * @param encoding not null supported encoding. - * @return a writer instance for the output stream using the given encoding. - * @throws UnsupportedEncodingException if any. - * @see Supported encodings + * @param out not null output stream + * @param encoding not null supported encoding + * @return a writer instance for the output stream using the given encoding + * @throws UnsupportedEncodingException if any + * @see Supported + * encodings */ public static Writer newWriter( @Nonnull OutputStream out, @Nonnull String encoding ) throws UnsupportedEncodingException @@ -163,12 +178,13 @@ public static Writer newWriter( @Nonnull OutputStream out, @Nonnull String encod /** * Create a new Writer with specified encoding. * - * @param file not null file. - * @param encoding not null supported encoding. - * @return a writer instance for the output file using the given encoding. - * @throws UnsupportedEncodingException if any. - * @throws FileNotFoundException if any. - * @see Supported encodings + * @param file not null file + * @param encoding not null supported encoding + * @return a writer instance for the output file using the given encoding + * @throws UnsupportedEncodingException if any + * @throws FileNotFoundException if any + * @see Supported + * encodings */ public static Writer newWriter( @Nonnull File file, @Nonnull String encoding ) throws UnsupportedEncodingException, FileNotFoundException From a51b3eb7fa7fce0b635444f24b401de235f818f6 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 29 May 2020 10:43:08 -0400 Subject: [PATCH 155/265] [MSHARED-860] deprecate PropertyUtils constructor and clean up docs (#41) * deprecate PropertyUtils constructor and clean up docs * deprecate PathUtils constructor * warn about closing streams * close streams we create --- .../apache/maven/shared/utils/PathTool.java | 11 ++++ .../maven/shared/utils/PropertyUtils.java | 62 +++++++++---------- .../maven/shared/utils/PropertyUtilsTest.java | 39 ++++-------- 3 files changed, 50 insertions(+), 62 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/PathTool.java b/src/main/java/org/apache/maven/shared/utils/PathTool.java index b6162110..28bc3083 100644 --- a/src/main/java/org/apache/maven/shared/utils/PathTool.java +++ b/src/main/java/org/apache/maven/shared/utils/PathTool.java @@ -35,6 +35,17 @@ */ public class PathTool { + + /** + * The constructor. + * + * @deprecated This is a utility class with only static methods. Don't create instances of it. + */ + @Deprecated + public PathTool() + { + } + /** * Determines the relative path of a filename from a base directory. * This method is useful in building relative links within pages of diff --git a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java index ca6b6935..70e21ed2 100644 --- a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java @@ -29,35 +29,35 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.apache.maven.shared.utils.io.IOUtil; - /** - * + * Static utility methods for loading properties. */ public class PropertyUtils { /** * The constructor. + * + * @deprecated This is a utility class with only static methods. Don't create instances of it. */ + @Deprecated public PropertyUtils() { - // should throw new IllegalAccessError( "Utility class" ); } /** - * @param url The URL which should be used to load the properties. - * @return The loaded properties. - * @deprecated As of 3.1.0, please use method {@link #loadOptionalProperties(java.net.URL)}. This method should not + * @param url the URL which should be used to load the properties + * @return the loaded properties + * @deprecated use {@link #loadOptionalProperties(java.net.URL)} instead. This method should not * be used as it suppresses exceptions silently when loading properties fails and returns {@code null} * instead of an empty {@code Properties} instance when the given {@code URL} is {@code null}. */ @Deprecated public static java.util.Properties loadProperties( @Nonnull URL url ) { - try + try ( InputStream in = url.openStream() ) { - return loadProperties( url.openStream() ); + return loadProperties( in ); } catch ( Exception e ) { @@ -67,18 +67,18 @@ public static java.util.Properties loadProperties( @Nonnull URL url ) } /** - * @param file The file from which the properties will be loaded. - * @return The loaded properties. - * @deprecated As of 3.1.0, please use method {@link #loadOptionalProperties(java.io.File)}. This method should not + * @param file the file from which the properties will be loaded + * @return the loaded properties + * @deprecated use {@link #loadOptionalProperties(java.io.File)} instead. This method should not * be used as it suppresses exceptions silently when loading properties fails and returns {@code null} * instead of an empty {@code Properties} instance when the given {@code File} is {@code null}. */ @Deprecated public static Properties loadProperties( @Nonnull File file ) { - try + try ( InputStream in = new FileInputStream( file ) ) { - return loadProperties( new FileInputStream( file ) ); + return loadProperties( in ); } catch ( Exception e ) { @@ -88,9 +88,13 @@ public static Properties loadProperties( @Nonnull File file ) } /** + * Loads {@code Properties} from an {@code InputStream} and closes the stream. + * In a future release, this will no longer close the stream, so callers + * should close the stream themselves. + * * @param is {@link InputStream} - * @return The loaded properties. - * @deprecated As of 3.1.0, please use method {@link #loadOptionalProperties(java.io.InputStream)}. This method + * @return the loaded properties + * @deprecated use {@link #loadOptionalProperties(java.io.InputStream)} instead. This method * should not be used as it suppresses exceptions silently when loading properties fails. */ @Deprecated @@ -98,13 +102,12 @@ public static Properties loadProperties( @Nullable InputStream is ) { try { - // to make this the same behaviour as the others we should really return null on any error Properties result = new Properties(); if ( is != null ) { - try + try ( InputStream in = is ) { - result.load( is ); + result.load( in ); } catch ( IOException e ) { @@ -117,10 +120,6 @@ public static Properties loadProperties( @Nullable InputStream is ) { // ignore } - finally - { - IOUtil.close( is ); - } return null; } @@ -154,7 +153,7 @@ public static Properties loadOptionalProperties( final @Nullable URL url ) } /** - * Loads {@code Properties} from a given {@code File}. + * Loads {@code Properties} from a {@code File}. *

          * If the given {@code File} is {@code null} or the properties file can't be read, an empty properties object is * returned. @@ -185,11 +184,10 @@ public static Properties loadOptionalProperties( final @Nullable File file ) } /** - * Loads {@code Properties} from a given {@code InputStream}. - *

          + * Loads {@code Properties} from an {@code InputStream} and closes the stream. * If the given {@code InputStream} is {@code null} or the properties can't be read, an empty properties object is - * returned. - *

          + * returned. In a future release, this will no longer close the stream, so callers + * should close the stream themselves. * * @param inputStream the properties resource to load or {@code null} * @return the loaded properties or an empty {@code Properties} instance if properties fail to load @@ -203,18 +201,14 @@ public static Properties loadOptionalProperties( final @Nullable InputStream inp if ( inputStream != null ) { - try + try ( InputStream in = inputStream ) // reassign inputStream to autoclose { - properties.load( inputStream ); + properties.load( in ); } catch ( IllegalArgumentException | IOException ex ) { // ignore and return empty properties } - finally - { - IOUtil.close( inputStream ); - } } return properties; diff --git a/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java index 41067a40..0c696415 100644 --- a/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java @@ -33,7 +33,6 @@ import java.net.URL; import java.util.Properties; -import org.apache.maven.shared.utils.io.IOUtil; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -166,23 +165,15 @@ public void loadValidInputStream() throws UnsupportedEncodingException @SuppressWarnings( "deprecation" ) public void loadValidFile() throws IOException { - OutputStream out = null; - try + File valid = tempFolder.newFile( "valid" ); + Properties value = new Properties(); + value.setProperty( "a", "b" ); + try ( OutputStream out = new FileOutputStream( valid ) ) { - File valid = tempFolder.newFile( "valid" ); - Properties value = new Properties(); - value.setProperty( "a", "b" ); - out = new FileOutputStream( valid ); value.store( out, "a test" ); - out.close(); - out = null; assertThat( PropertyUtils.loadProperties( valid ), is( value ) ); assertThat( PropertyUtils.loadOptionalProperties( valid ), is( value ) ); } - finally - { - IOUtil.close( out ); - } } @Test @@ -190,22 +181,14 @@ public void loadValidFile() throws IOException @SuppressWarnings( "deprecation" ) public void loadValidURL() throws IOException { - OutputStream out = null; - try - { - File valid = tempFolder.newFile( "valid" ); - Properties value = new Properties(); - value.setProperty( "a", "b" ); - out = new FileOutputStream( valid ); - value.store( out, "a test" ); - out.close(); - out = null; - assertThat( PropertyUtils.loadProperties( valid.toURI().toURL() ), is( value ) ); - assertThat( PropertyUtils.loadOptionalProperties( valid.toURI().toURL() ), is( value ) ); - } - finally + File valid = tempFolder.newFile( "valid" ); + Properties value = new Properties(); + value.setProperty( "a", "b" ); + try ( OutputStream out = new FileOutputStream( valid ) ) { - IOUtil.close( out ); + value.store( out, "a test" ); + assertThat( PropertyUtils.loadProperties( valid.toURI().toURL() ), is( value ) ); + assertThat( PropertyUtils.loadOptionalProperties( valid.toURI().toURL() ), is( value ) ); } } From 7768b895c627ce7df4ef105979c418842963b80b Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 29 May 2020 14:49:55 -0400 Subject: [PATCH 156/265] docs: correct API docs for clean and trim (#44) * correct API docs for clean and trim * spelling --- .../maven/shared/utils/StringUtils.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 2a14de31..224c4706 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -69,7 +69,7 @@ public StringUtils() //-------------------------------------------------------------------------- /** - *

          Removes control characters, including whitespace, from both + *

          Removes C0 control characters, including ASCII whitespace, from both * ends of this String, handling null by returning * an empty String.

          * @@ -83,7 +83,7 @@ public StringUtils() } /** - *

          Removes control characters, including whitespace, from both + *

          Removes C0 control characters, including ASCII whitespace, from both * ends of this String, handling null by returning * null.

          * @@ -530,10 +530,10 @@ public static String mid( String str, int pos, int len ) *

          Splits the provided text into a array, based on a given separator.

          *

          *

          The separator is not included in the returned String array. The - * maximum number of splits to perfom can be controlled. A null - * separator will cause parsing to be on whitespace.

          + * maximum number of splits to perform can be controlled. A null + * separator causes splitting on whitespace.

          *

          - *

          This is useful for quickly splitting a String directly into + *

          This is useful for quickly splitting a String into * an array of tokens, instead of an enumeration of tokens (as * StringTokenizer does).

          * @@ -1688,7 +1688,7 @@ public static String getNestedString( String str, @Nonnull String open, @Nonnull * * @param str the String to check * @param sub the substring to count - * @return the number of occurances, 0 if the String is null + * @return the number of occurrences, 0 if the String is null * @throws NullPointerException if sub is null */ public static int countMatches( @Nullable String str, @Nonnull String sub ) @@ -1715,7 +1715,7 @@ public static int countMatches( @Nullable String str, @Nonnull String sub ) //-------------------------------------------------------------------------- /** - *

          Checks if the String contains only unicode letters.

          + *

          Checks if the String contains only Unicode letters.

          *

          *

          null will return false. * An empty String will return true.

          @@ -1767,7 +1767,7 @@ public static boolean isWhitespace( String str ) } /** - *

          Checks if the String contains only unicode letters and + *

          Checks if the String contains only Unicode letters and * space (' ').

          *

          *

          null will return false. An @@ -1795,7 +1795,7 @@ public static boolean isAlphaSpace( String str ) } /** - *

          Checks if the String contains only unicode letters or digits.

          + *

          Checks if the String contains only Unicode letters or digits.

          *

          *

          null will return false. An empty * String will return true.

          @@ -1822,7 +1822,7 @@ public static boolean isAlphanumeric( String str ) } /** - *

          Checks if the String contains only unicode letters, digits + *

          Checks if the String contains only Unicode letters, digits * or space (' ').

          *

          *

          null will return false. An empty @@ -1850,7 +1850,7 @@ public static boolean isAlphanumericSpace( String str ) } /** - *

          Checks if the String contains only unicode digits.

          + *

          Checks if the String contains only Unicode digits.

          *

          *

          null will return false. * An empty String will return true.

          From 07608672f79bf9ab5f6fd620d3804343c44cb92e Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 29 May 2020 17:46:50 -0400 Subject: [PATCH 157/265] [MSHARED-898] prefer JDK classes to DirectoryScanner (#45) deprecate much DirectoryScanner code in favor of java.nio.file.DirectoryStream and related classes available in Java 7 and later --- .../maven/shared/utils/io/DirectoryScanResult.java | 3 +++ .../maven/shared/utils/io/DirectoryScanner.java | 8 +++++--- .../shared/utils/io/DirectoryWalkListener.java | 13 +++++++------ .../apache/maven/shared/utils/io/MatchPattern.java | 4 +++- .../apache/maven/shared/utils/io/MatchPatterns.java | 2 ++ .../apache/maven/shared/utils/io/ScanConductor.java | 3 +++ .../apache/maven/shared/utils/io/SelectorUtils.java | 2 ++ .../apache/maven/shared/utils/io/WalkCollector.java | 5 +++-- .../maven/shared/utils/io/DirectoryScannerTest.java | 4 ++-- .../shared/utils/testhelpers/FileTestHelper.java | 11 +---------- 10 files changed, 31 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java index 42232f3d..ae5de32b 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanResult.java @@ -23,7 +23,10 @@ /** * Scan for files in a directory at a given time and reports removed and added files * between captures. + * + * @deprecated use {@code java.nio.file.DirectoryStream} and related classes */ +@Deprecated public class DirectoryScanResult { private final String[] filesAdded; diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java index c22cfe33..5d03525e 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java @@ -108,7 +108,9 @@ * @author Magesh Umasankar * @author Bruce Atherton * @author Antoine Levy-Lambert + * @deprecated use {@code java.nio.file.DirectoryStream} and related classes */ +@Deprecated public class DirectoryScanner { /** @@ -452,9 +454,9 @@ public DirectoryScanResult diffIncludedFiles( String... oldFiles ) } /** - * @param oldFiles array of old files. - * @param newFiles array of new files. - * @return calculated differerence. + * @param oldFiles array of old files + * @param newFiles array of new files + * @return calculated difference */ public static DirectoryScanResult diffFiles( @Nullable String[] oldFiles, @Nullable String[] newFiles ) { diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java index 292298cd..bb142b5d 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java +++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java @@ -22,16 +22,17 @@ import java.io.File; /** - * DirectoryWalkListener - * - * + * DirectoryWalkListener. + * + * @deprecated use {@code java.nio.file.FileVisitor} and related classes */ +@Deprecated public interface DirectoryWalkListener { /** * The directory walking has begun. * - * @param basedir the basedir that walk started in. + * @param basedir the basedir that walk started in */ void directoryWalkStarting( File basedir ); @@ -39,7 +40,7 @@ public interface DirectoryWalkListener * The included entry that was encountered. * * @param percentage rough percentage of the walk completed. (inaccurate) - * @param file the file that was included. + * @param file the file that was included */ void directoryWalkStep( int percentage, File file ); @@ -49,7 +50,7 @@ public interface DirectoryWalkListener void directoryWalkFinished(); /** - * @param message The message for the debugging output. + * @param message the message for the debugging output */ void debug( String message ); } diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java index 15ad1488..8abff427 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java +++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java @@ -33,7 +33,9 @@ * Significantly more efficient than using strings, since re-evaluation and re-tokenizing is avoided. * * @author Kristian Rosenvold + * @deprecated use {@code java.nio.filejava.nio.file.DirectoryStream.Filter} and related classes */ +@Deprecated public class MatchPattern { private final String source; @@ -98,7 +100,7 @@ public boolean matchPatternStart( @Nonnull String str, boolean isCaseSensitive ) { if ( regexPattern != null ) { - // FIXME: ICK! But we can't do partial matches for regex, so we have to reserve judgement until we have + // FIXME: ICK! But we can't do partial matches for regex, so we have to reserve judgment until we have // a file to deal with, or we can definitely say this is an exclusion... return true; } diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java b/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java index 8e59f48f..693acb1c 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java +++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java @@ -27,7 +27,9 @@ * A list of patterns to be matched * * @author Kristian Rosenvold + * @deprecated use {@code java.nio.filejava.nio.file.DirectoryStream.Filter} and related classes */ +@Deprecated public class MatchPatterns { private final MatchPattern[] patterns; diff --git a/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java b/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java index bd19067b..08d7a1cd 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java +++ b/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java @@ -33,7 +33,10 @@ * cleaned between two scan() invocations.

          * * @author Mark Struberg + * + * @deprecated use {@code java.nio.file.Files.walkFileTree()} and related classes */ +@Deprecated public interface ScanConductor { /** diff --git a/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java b/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java index 396ef6a3..b716e7c8 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java @@ -39,7 +39,9 @@ * @author Magesh Umasankar * @author Bruce Atherton * + * @deprecated use {@code java.nio.file.Files.walkFileTree()} and related classes */ +@Deprecated public final class SelectorUtils { diff --git a/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java b/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java index 5d48d4ac..3db835ae 100644 --- a/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java +++ b/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java @@ -23,9 +23,10 @@ import java.util.ArrayList; import java.util.List; -/** - * +/** + * @deprecated use {@code java.nio.file.FileVisitor} and related classes */ +@Deprecated public class WalkCollector implements DirectoryWalkListener { diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java index 421f635a..01110069 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java @@ -37,6 +37,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; +@SuppressWarnings( "deprecation" ) public class DirectoryScannerTest { private static final String[] NONE = new String[0]; @@ -214,7 +215,6 @@ public void followSymlinks() /* Creates a standard directory layout with symlinks and files. */ - @Test public void testSimpleExcludes() throws Exception @@ -243,7 +243,7 @@ public void testSimpleExcludes() /* expExclDirs */ NONE ); } - public void testIsSymLin() + public void testIsSymbolicLink() throws IOException { File file = new File( "." ); diff --git a/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java b/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java index f4c6b02e..81d4fad6 100644 --- a/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java +++ b/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java @@ -20,7 +20,6 @@ */ import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.utils.io.IOUtil; import org.junit.rules.TemporaryFolder; import java.io.*; @@ -71,20 +70,12 @@ public static void createLineBasedFile( File file, String[] data ) throw new IOException( "Cannot create file " + file + " as the parent directory does not exist" ); } - PrintWriter out = null; - try + try ( PrintWriter out = new PrintWriter( new OutputStreamWriter( new FileOutputStream( file ), "UTF-8" ) ) ) { - out = new PrintWriter( new OutputStreamWriter( new FileOutputStream( file ), "UTF-8" ) ); for ( String aData : data ) { out.println( aData ); } - out.close(); - out = null; - } - finally - { - IOUtil.close( out ); } } From b879ee53ad0c628e4500c52486223616d9f801c4 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 30 May 2020 10:53:00 -0400 Subject: [PATCH 158/265] [MSHARED-860] suppress deprecations and clean up test methods (#46) * suppress deprecations and clean up test methods * remove deprecated methods --- .../utils/xml/PrettyPrintXMLWriter.java | 6 +- .../shared/utils/XmlStreamReaderTest.java | 10 +-- .../shared/utils/io/MatchPatternTest.java | 2 +- .../shared/utils/io/MatchPatternsTest.java | 2 +- .../shared/utils/io/SelectorUtilsTest.java | 3 +- .../utils/testhelpers/ExceptionHelper.java | 67 ------------------- .../utils/testhelpers/FileTestHelper.java | 33 +++++---- .../utils/xml/PrettyPrintXmlWriterTest.java | 39 ++++------- 8 files changed, 41 insertions(+), 121 deletions(-) delete mode 100644 src/test/java/org/apache/maven/shared/utils/testhelpers/ExceptionHelper.java diff --git a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java index deb07d21..851cffbf 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java @@ -26,11 +26,9 @@ import org.apache.maven.shared.utils.Os; /** - * XMLWriter with nice indentation - */ -/** + * XMLWriter with nice indentation. + * * @author kama - * */ public class PrettyPrintXMLWriter implements XMLWriter diff --git a/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java b/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java index 3ffb98d3..2e305382 100644 --- a/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java +++ b/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java @@ -27,7 +27,8 @@ import junit.framework.ComparisonFailure; import junit.framework.TestCase; -import org.apache.maven.shared.utils.io.IOUtil; + +import org.apache.commons.io.IOUtils; import org.apache.maven.shared.utils.xml.XmlStreamReader; /** @@ -66,8 +67,7 @@ private static String createXmlContent( String text, String encoding ) return xmlDecl + "\n" + text + ""; } - private static void checkXmlContent( String xml, String encoding ) - throws IOException + private static void checkXmlContent( String xml, String encoding ) throws IOException { checkXmlContent( xml, encoding, null ); } @@ -76,7 +76,7 @@ private static void checkXmlContent( String xml, String encoding, byte[] bom ) t { byte[] xmlContent = xml.getBytes( encoding ); InputStream in = new ByteArrayInputStream( xmlContent ); - + if ( bom != null ) { in = new SequenceInputStream( new ByteArrayInputStream( bom ), in ); @@ -84,7 +84,7 @@ private static void checkXmlContent( String xml, String encoding, byte[] bom ) t XmlStreamReader reader = new XmlStreamReader( in ); assertEquals( encoding, reader.getEncoding() ); - String result = IOUtil.toString( reader ); + String result = IOUtils.toString( reader ); assertEquals( xml, result ); } diff --git a/src/test/java/org/apache/maven/shared/utils/io/MatchPatternTest.java b/src/test/java/org/apache/maven/shared/utils/io/MatchPatternTest.java index c7f4ff7b..6c7e11d3 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/MatchPatternTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/MatchPatternTest.java @@ -25,11 +25,11 @@ /** * @author Kristian Rosenvold */ +@SuppressWarnings( "deprecation" ) public class MatchPatternTest { @Test public void matchPath() - throws Exception { MatchPattern mp = MatchPattern.fromString( "ABC*" ); assertTrue( mp.matchPath( "ABCD", true ) ); diff --git a/src/test/java/org/apache/maven/shared/utils/io/MatchPatternsTest.java b/src/test/java/org/apache/maven/shared/utils/io/MatchPatternsTest.java index 1a5d5a68..84b41f96 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/MatchPatternsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/MatchPatternsTest.java @@ -26,11 +26,11 @@ /** * @author Kristian Rosenvold */ +@SuppressWarnings( "deprecation" ) public class MatchPatternsTest { @Test public void matches() - throws Exception { MatchPatterns from = MatchPatterns.from( "ABC**", "CDE**" ); assertTrue( from.matches( "ABCDE", true ) ); diff --git a/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java index ad4283fd..750015a7 100644 --- a/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java @@ -27,8 +27,8 @@ /** * Test the {@link SelectorUtils} class. - * */ +@SuppressWarnings( "deprecation" ) public class SelectorUtilsTest { @@ -67,7 +67,6 @@ public void testAntPatternStrings() assertAntDoesNotMatch( "/aaa/", "\\aaa\\bbb" ); } - private void assertAntDoesNotMatch( String pattern, String target ) { assertEquals( false, SelectorUtils.matchPatternStart( wrapWithAntHandler( pattern ), target ) ); diff --git a/src/test/java/org/apache/maven/shared/utils/testhelpers/ExceptionHelper.java b/src/test/java/org/apache/maven/shared/utils/testhelpers/ExceptionHelper.java deleted file mode 100644 index 8d153b4b..00000000 --- a/src/test/java/org/apache/maven/shared/utils/testhelpers/ExceptionHelper.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.apache.maven.shared.utils.testhelpers; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; - - -public class ExceptionHelper -{ - - /** - * A matcher that verifies that the a root cause of an exception is of the specified type. - * - * @param cause the type of exception that caused this. - * @return A matcher that verifies that the a root cause of an exception is of the specified type. - */ - public static Matcher hasCause( Class cause ) - { - return new HasCause( cause ); - } - - private static class HasCause - extends BaseMatcher - { - private final Class cause; - - public HasCause( Class cause ) - { - this.cause = cause; - } - - public boolean matches( Object item ) - { - Throwable throwable = (Throwable) item; - while ( throwable != null && !cause.isInstance( throwable ) ) - { - throwable = throwable.getCause(); - } - return cause.isInstance( throwable ); - } - - public void describeTo( Description description ) - { - description.appendText( "was caused by a " ).appendValue( cause ).appendText( " being thrown" ); - } - } -} diff --git a/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java b/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java index 81d4fad6..aa7323cd 100644 --- a/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java +++ b/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java @@ -19,20 +19,26 @@ * under the License. */ -import org.apache.maven.shared.utils.io.FileUtils; -import org.junit.rules.TemporaryFolder; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + +import org.apache.commons.io.FileUtils; -import java.io.*; +import org.junit.rules.TemporaryFolder; /** - * A few utility methods for file based tests + * A few utility methods for file based tests. */ public final class FileTestHelper { private FileTestHelper() { - // utility function doesn't need a public ct + // utility function doesn't need a public constructor } public static void generateTestData( OutputStream out, long size ) @@ -54,14 +60,12 @@ public static void generateTestFile( File testfile, int size ) testfile.delete(); } - OutputStream os = new FileOutputStream( testfile ); - generateTestData( os, size ); - os.flush(); - os.close(); + try ( OutputStream os = new FileOutputStream( testfile ) ) { + generateTestData( os, size ); + os.flush(); + } } - - public static void createLineBasedFile( File file, String[] data ) throws IOException { @@ -70,11 +74,12 @@ public static void createLineBasedFile( File file, String[] data ) throw new IOException( "Cannot create file " + file + " as the parent directory does not exist" ); } - try ( PrintWriter out = new PrintWriter( new OutputStreamWriter( new FileOutputStream( file ), "UTF-8" ) ) ) + try ( Writer out = new OutputStreamWriter( new FileOutputStream( file ), "UTF-8" ) ) { for ( String aData : data ) { - out.println( aData ); + out.write( aData ); + out.write( System.lineSeparator() ); } } } @@ -92,7 +97,7 @@ public static File newFile( TemporaryFolder folder, String filename ) if ( destination.exists() ) { - FileUtils.forceDelete( destination ); + FileUtils.deleteQuietly( destination ); } return destination; } diff --git a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java index 5679512f..4145cd04 100644 --- a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java +++ b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java @@ -1,8 +1,9 @@ package org.apache.maven.shared.utils.xml; -import java.io.IOException; -import javax.swing.text.html.HTML; -import java.io.StringWriter; +import static org.junit.Assert.fail; + +import java.io.File; +import java.io.FileOutputStream; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,13 +24,14 @@ * under the License. */ +import java.io.IOException; +import javax.swing.text.html.HTML; +import java.io.StringWriter; import org.apache.maven.shared.utils.Os; import org.apache.maven.shared.utils.StringUtils; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; /** @@ -40,26 +42,9 @@ */ public class PrettyPrintXmlWriterTest { - StringWriter w; - - PrettyPrintXMLWriter writer; - - @Before - public void before() - throws Exception - { - w = new StringWriter(); - writer = new PrettyPrintXMLWriter( w ); - } - - @After - public void after() - throws Exception - { - writer = null; - w = null; - } - + private StringWriter w = new StringWriter(); + private PrettyPrintXMLWriter writer = new PrettyPrintXMLWriter( w ); + @Test public void testDefaultPrettyPrintXMLWriter() throws IOException { @@ -178,12 +163,12 @@ private void writeXhtmlBody( XMLWriter writer ) throws IOException writer.endElement(); // Tag.BODY } - private String expectedResult( String lineSeparator ) + private static String expectedResult( String lineSeparator ) { return expectedResult( " ", lineSeparator ); } - private String expectedResult( String lineIndenter, String lineSeparator ) + private static String expectedResult( String lineIndenter, String lineSeparator ) { StringBuilder expected = new StringBuilder(); From ee3e27e6c3b2690a10c66f2824fafc42bc7d82c2 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 30 May 2020 17:22:50 -0400 Subject: [PATCH 159/265] update to Maven core 3.1.0 (#47) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c89f763..62199077 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder 7 - 3.0 + 3.1.0 From 7d7c4830ee3f6ef316c12213f93742ef089ff2bd Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 1 Jun 2020 08:04:59 -0400 Subject: [PATCH 160/265] replace deprecated method --- pom.xml | 6 ++++++ .../java/org/apache/maven/shared/utils/CaseTest.java | 2 +- .../org/apache/maven/shared/utils/StringUtilsTest.java | 9 +-------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 62199077..714a5200 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,12 @@ 3.8.1 test + + org.apache.commons + commons-text + 1.3 + test + com.google.code.findbugs jsr305 diff --git a/src/test/java/org/apache/maven/shared/utils/CaseTest.java b/src/test/java/org/apache/maven/shared/utils/CaseTest.java index 46e8055d..7eae3028 100644 --- a/src/test/java/org/apache/maven/shared/utils/CaseTest.java +++ b/src/test/java/org/apache/maven/shared/utils/CaseTest.java @@ -21,7 +21,7 @@ import java.util.Locale; -import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.junit.AfterClass; import org.junit.Assert; import org.junit.ComparisonFailure; diff --git a/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java index fdf4e384..505cf508 100644 --- a/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java @@ -24,9 +24,7 @@ import java.util.Iterator; import java.util.Map; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.TemporaryFolder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; @@ -34,17 +32,12 @@ /** * Test the {@link StringUtils} class. - * - * We don't need to test this + * * @author Mark Struberg */ public class StringUtilsTest { - @Rule - public TemporaryFolder tempFolder = new TemporaryFolder(); - - @Test( expected = NullPointerException.class ) public void testAbbreviate_NPE() { From 5c98cb9512d2bbdbeeb9f8b4392c7df349a5696d Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 7 Jun 2020 05:41:49 -0400 Subject: [PATCH 161/265] fix deprecated methods and warnings --- .../org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java | 1 - .../maven/shared/utils/xml/PrettyPrintXmlWriterTest.java | 5 ----- 2 files changed, 6 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java index 596e127d..8242208b 100644 --- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java @@ -103,7 +103,6 @@ public static Xpp3Dom build( @WillClose Reader reader, boolean trim ) { DocHandler docHandler = parseSax( new InputSource( reader ), trim ); reader.close(); - reader = null; return docHandler.result; } catch ( final IOException e ) diff --git a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java index 4145cd04..70f078c5 100644 --- a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java +++ b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java @@ -1,10 +1,5 @@ package org.apache.maven.shared.utils.xml; -import static org.junit.Assert.fail; - -import java.io.File; -import java.io.FileOutputStream; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file From 9eb17dd3cd3336e27114470ff29ee59e132594a6 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 8 Jun 2020 06:46:13 -0400 Subject: [PATCH 162/265] deprecate equals in favor of Objects.equals() (#50) --- .../maven/shared/utils/StringUtils.java | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 224c4706..4f56e1bf 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -220,7 +220,9 @@ public static boolean isNotBlank( @Nullable String str ) * @return true if the Strings are equal, case sensitive, or * both null * @see java.lang.String#equals(Object) + * @deprecated use {@code java.lang.Objects.equals()} */ + @Deprecated public static boolean equals( @Nullable String str1, @Nullable String str2 ) { return ( str1 == null ? str2 == null : str1.equals( str2 ) ); @@ -315,7 +317,7 @@ public static int lastIndexOfAny( String str, String... searchStrs ) /** *

          Gets a substring from the specified string avoiding exceptions.

          - *

          + * *

          A negative start position can be used to start n * characters from the end of the String.

          * @@ -351,7 +353,7 @@ public static String substring( String str, int start ) /** *

          Gets a substring from the specified String avoiding exceptions.

          - *

          + * *

          A negative start position can be used to start/end n * characters from the end of the String.

          * @@ -360,7 +362,7 @@ public static String substring( String str, int start ) * count back from the end of the string by this many characters * @param end the position to end at (exclusive), negative means * count back from the end of the String by this many characters - * @return substring from start position to end positon + * @return substring from start position to end position */ public static String substring( String str, int start, int end ) { @@ -406,7 +408,7 @@ public static String substring( String str, int start, int end ) /** *

          Gets the leftmost n characters of a String.

          - *

          + * *

          If n characters are not available, or the * String is null, the String will be returned without * an exception.

          @@ -434,7 +436,7 @@ public static String left( String str, int len ) /** *

          Gets the rightmost n characters of a String.

          - *

          + * *

          If n characters are not available, or the String * is null, the String will be returned without an * exception.

          @@ -462,7 +464,7 @@ public static String right( String str, int len ) /** *

          Gets n characters from the middle of a String.

          - *

          + * *

          If n characters are not available, the remainder * of the String will be returned without an exception. If the * String is null, null will be returned.

          @@ -504,7 +506,7 @@ public static String mid( String str, int pos, int len ) /** *

          Splits the provided text into a array, using whitespace as the * separator.

          - *

          + * *

          The separator is not included in the returned String array.

          * * @param str the String to parse @@ -516,9 +518,9 @@ public static String mid( String str, int pos, int len ) } /** - * @param text The text to be split. - * @param separator The separator at which the text will be split. - * @return The resulting array. + * @param text the text to be split + * @param separator the separator at which the text will be split + * @return the resulting array * @see #split(String, String, int) */ @Nonnull public static String[] split( @Nonnull String text, @Nullable String separator ) @@ -528,19 +530,19 @@ public static String mid( String str, int pos, int len ) /** *

          Splits the provided text into a array, based on a given separator.

          - *

          + * *

          The separator is not included in the returned String array. The * maximum number of splits to perform can be controlled. A null * separator causes splitting on whitespace.

          - *

          + * *

          This is useful for quickly splitting a String into * an array of tokens, instead of an enumeration of tokens (as * StringTokenizer does).

          * - * @param str The string to parse. - * @param separator Characters used as the delimiters. If + * @param str the string to parse + * @param separatorcCharacters used as the delimiters. If * null, splits on whitespace. - * @param max The maximum number of elements to include in the + * @param max the maximum number of elements to include in the * array. A zero or negative value implies no limit. * @return an array of parsed Strings */ @@ -2375,11 +2377,10 @@ public static String escape( @Nullable String source, @Nonnull final char[] esca } /** - * Remove all duplicate whitespace characters and line terminators are replaced with a single - * space. + * Remove all duplicate whitespace characters and replace line terminators with a single space. * * @param s a not null String - * @return a string with unique whitespace. + * @return a string with unique whitespace * */ @Nonnull public static String removeDuplicateWhitespace( @Nonnull String s ) From cd25a3712e54d7d79efb0ad743af32ee61f0f4f6 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 8 Jun 2020 06:47:37 -0400 Subject: [PATCH 163/265] deprecate defaultString since it's now in the JDK (#51) --- src/main/java/org/apache/maven/shared/utils/StringUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 4f56e1bf..24fd30a7 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -1888,7 +1888,9 @@ public static boolean isNumeric( String str ) * @param obj the Object to check * @return the passed in Object's toString, or blank if it was * null + * @deprecated use {@code java.lang.Objects.toString()} */ + @Deprecated @Nonnull public static String defaultString( Object obj ) { return defaultString( obj, "" ); @@ -1904,7 +1906,9 @@ public static boolean isNumeric( String str ) * null * @return the passed in string, or the default if it was * null + * @deprecated use {@code java.lang.Objects.toString()} */ + @Deprecated @Nonnull public static String defaultString( Object obj, @Nonnull String defaultString ) { return ( obj == null ) ? defaultString : obj.toString(); From be2a1a12adaf6b8ff95d0ee375320fec57390d48 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 8 Jun 2020 07:06:34 -0400 Subject: [PATCH 164/265] clean up JavaDoc (#52) --- .../maven/shared/utils/StringUtils.java | 179 +++++++++--------- 1 file changed, 85 insertions(+), 94 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java index 24fd30a7..613b1de4 100644 --- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java +++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java @@ -31,7 +31,7 @@ /** *

          Common String manipulation routines.

          - *

          + * *

          Originally from * Turbine, the * GenerationJavaCore library and Velocity. @@ -57,7 +57,7 @@ public class StringUtils *

          StringUtils instances should NOT be constructed in * standard programming. Instead, the class should be used as * StringUtils.trim(" foo ");.

          - *

          + * *

          This constructor is public to permit tools that require a JavaBean * manager to operate.

          */ @@ -97,13 +97,13 @@ public static String trim( String str ) } /** - *

          Deletes all whitespaces from a String.

          - *

          + *

          Deletes all whitespace from a String.

          + * *

          Whitespace is defined by * {@link Character#isWhitespace(char)}.

          * * @param str String target to delete whitespace from - * @return the String without whitespaces + * @return the String without whitespace * @throws NullPointerException */ @Nonnull public static String deleteWhitespace( @Nonnull String str ) @@ -134,7 +134,7 @@ public static boolean isNotEmpty( @Nullable String str ) /** *

          Checks if a (trimmed) String is null or empty.

          - *

          + * *

          Note: In future releases, this method will no longer trim the input string such that it works * complementary to {@link #isNotEmpty(String)}. Code that wants to test for whitespace-only strings should be * migrated to use {@link #isBlank(String)} instead.

          @@ -152,7 +152,7 @@ public static boolean isEmpty( @Nullable String str ) *

          * Checks if a String is whitespace, empty ("") or null. *

          - *

          + * * 

                * StringUtils.isBlank(null)      = true
      * StringUtils.isBlank("")        = true
@@ -188,7 +188,7 @@ public static boolean isBlank( @Nullable String str )
      * 
          
      * Checks if a String is not empty (""), not null and not whitespace only.
      * 
          
-     * 
          
+     * 
      * 
                * StringUtils.isNotBlank(null)      = false
      * StringUtils.isNotBlank("")        = false
@@ -211,7 +211,7 @@ public static boolean isNotBlank( @Nullable String str )
 
     /**
      * 
          Compares two Strings, returning true if they are equal.
          
-     * 
          
+     * 
      * 
          nulls are handled without exceptions. Two null
      * references are considered to be equal. The comparison is case sensitive.
          
      *
@@ -231,7 +231,7 @@ public static boolean equals( @Nullable String str1, @Nullable String str2 )
     /**
      * 
          Compares two Strings, returning true if they are equal ignoring
      * the case.
          
-     * 
          
+     * 
      * 
          Nulls are handled without exceptions. Two null
      * references are considered equal. Comparison is case insensitive.
          
      *
@@ -248,7 +248,7 @@ public static boolean equalsIgnoreCase( String str1, String str2 )
 
     /**
      * 
          Find the first index of any of a set of potential substrings.
          
-     * 
          
+     * 
      * 
          null String will return -1.
          
      *
      * @param str        the String to check
@@ -285,7 +285,7 @@ public static int indexOfAny( String str, String... searchStrs )
 
     /**
      * 
          Find the latest index of any of a set of potential substrings.
          
-     * 
          
+     * 
      * 
          null string will return -1.
          
      *
      * @param str        the String to check
@@ -598,7 +598,7 @@ public static String mid( String str, int pos, int len )
 
     /**
      * 
          Concatenates elements of an array into a single String.
          
-     * 
          
+     * 
      * 
          The difference from join is that concatenate has no delimiter.
          
      *
      * @param array the array of values to concatenate.
@@ -612,7 +612,7 @@ public static String mid( String str, int pos, int len )
     /**
      * 
          Joins the elements of the provided array into a single String
      * containing the provided list of elements.
          
-     * 
          
+     * 
      * 
          No delimiter is added before or after the list. A
      * null separator is the same as a blank String.
          
      *
@@ -644,7 +644,7 @@ public static String mid( String str, int pos, int len )
     /**
      * 
          Joins the elements of the provided Iterator into
      * a single String containing the provided elements.
          
-     * 
          
+     * 
      * 
          No delimiter is added before or after the list. A
      * null separator is the same as a blank String.
          
      *
@@ -675,7 +675,7 @@ public static String mid( String str, int pos, int len )
 
     /**
      * 
          Replace a char with another char inside a larger String, once.
          
-     * 
          
+     *
      * 
          A null reference passed to this method is a no-op.
          
      *
      * @param text text to search and replace in
@@ -691,7 +691,7 @@ public static String replaceOnce( @Nullable String text, char repl, char with )
 
     /**
      * 
          Replace all occurances of a char within another char.
          
-     * 
          
+     *
      * 
          A null reference passed to this method is a no-op.
          
      *
      * @param text text to search and replace in
@@ -708,7 +708,7 @@ public static String replace( @Nullable String text, char repl, char with )
     /**
      * 
          Replace a char with another char inside a larger String,
      * for the first max values of the search char.
          
-     * 
          
+     *
      * 
          A null reference passed to this method is a no-op.
          
      *
      * @param text text to search and replace in
@@ -724,7 +724,7 @@ public static String replace( @Nullable String text, char repl, char with, int m
 
     /**
      * 
          Replace a String with another String inside a larger String, once.
          
-     * 
          
+     *
      * 
          A null reference passed to this method is a no-op.
          
      *
      * @param text text to search and replace in
@@ -739,8 +739,8 @@ public static String replaceOnce( @Nullable String text, @Nullable String repl,
     }
 
     /**
-     * 
          Replace all occurances of a String within another String.
          
-     * 
          
+     * 
          Replace all occurrences of a String within another String.
          
+     * 
      * 
          A null reference passed to this method is a no-op.
          
      *
      * @param text text to search and replace in
@@ -757,7 +757,7 @@ public static String replace( @Nullable String text, @Nullable  String repl, @Nu
     /**
      * 
          Replace a String with another String inside a larger String,
      * for the first max values of the search String.
          
-     * 
          
+     *
      * 
          A null reference passed to this method is a no-op.
          
      *
      * @param text text to search and replace in
@@ -794,9 +794,9 @@ public static String replace( @Nullable String text, @Nullable String repl, @Nul
      *
      * @param text    String to do overlaying in
      * @param overlay String to overlay
-     * @param start   int to start overlaying at
-     * @param end     int to stop overlaying before
-     * @return String with overlayed text
+     * @param start   position to start overlaying at
+     * @param end     position to stop overlaying before
+     * @return String with overlaid text
      * @throws NullPointerException if text or overlay is null
      */
     @Nonnull public static String overlayString( @Nonnull String text, @Nonnull String overlay, int start, int end )
@@ -817,7 +817,7 @@ public static String replace( @Nullable String text, @Nullable String repl, @Nul
 
     /**
      * 
          Center a String in a larger String of size n.
          
-     * 
          
+     *
      * 
          Uses spaces as the value to buffer the String with.
      * Equivalent to center(str, size, " ").
          
      *
@@ -833,7 +833,7 @@ public static String replace( @Nullable String text, @Nullable String repl, @Nul
 
     /**
      * 
          Center a String in a larger String of size n.
          
-     * 
          
+     *
      * 
          Uses a supplied String as the value to buffer the String with.
          
      *
      * @param str   String to center
@@ -1006,7 +1006,7 @@ else if ( idx != -1 )
 
     /**
      * 
          Remove the last character from a String.
          
-     * 
          
+     *
      * 
          If the String ends in \r\n, then remove both
      * of them.
          
      *
@@ -1070,7 +1070,7 @@ else if ( idx != -1 )
 
     /**
      * 
          Escapes any values it finds into their String form.
          
-     * 
          
+     *
      * 
          So a tab becomes the characters '\\' and
      * 't'.
          
      *
@@ -1189,7 +1189,7 @@ else if ( ch < 32 )
 
     /**
      * 
          Right pad a String with spaces.
          
-     * 
          
+     *
      * 
          The String is padded to the size of n.
          
      *
      * @param str  String to repeat
@@ -1204,7 +1204,7 @@ else if ( ch < 32 )
 
     /**
      * 
          Right pad a String with a specified string.
          
-     * 
          
+     *
      * 
          The String is padded to the size of n.
          
      *
      * @param str   String to pad out
@@ -1226,7 +1226,7 @@ else if ( ch < 32 )
 
     /**
      * 
          Left pad a String with spaces.
          
-     * 
          
+     *
      * 
          The String is padded to the size of n.
          
      *
      * @param str  String to pad out
@@ -1276,7 +1276,7 @@ public static String strip( String str )
     /**
      * 
          Remove a specified String from the front and back of a
      * String.
          
-     * 
          
+     *
      * 
          If whitespace is wanted to be removed, used the
      * {@link #strip(java.lang.String)} method.
          
      *
@@ -1327,7 +1327,7 @@ public static String[] stripAll( String[] strs, @Nullable String delimiter )
 
     /**
      * 
          Strip any of a supplied String from the end of a String.
          
-     * 
          
+     *
      * 
          If the strip String is null, whitespace is
      * stripped.
          
      *
@@ -1362,7 +1362,7 @@ public static String stripEnd( String str, @Nullable String strip )
 
     /**
      * 
          Strip any of a supplied String from the start of a String.
          
-     * 
          
+     *
      * 
          If the strip String is null, whitespace is
      * stripped.
          
      *
@@ -1435,7 +1435,7 @@ public static String lowerCase( String str )
 
     /**
      * 
          Uncapitalise a String.
          
-     * 
          
+     *
      * 
          That is, convert the first character into lower-case.
      * null is returned as null.
          
      *
@@ -1467,7 +1467,7 @@ public static String uncapitalise( String str )
 
     /**
      * 
          Capitalise a String.
          
-     * 
          
+     *
      * 
          That is, convert the first character into title-case.
      * null is returned as null.
          
      *
@@ -1499,10 +1499,10 @@ public static String capitalise( String str )
 
     /**
      * 
          Swaps the case of String.
          
-     * 
          
+     *
      * 
          Properly looks after making sure the start of words
      * are Titlecase and not Uppercase.
          
-     * 
          
+     *
      * 
          null is returned as null.
          
      *
      * @param str the String to swap the case of
@@ -1556,10 +1556,10 @@ else if ( Character.isLowerCase( ch ) )
 
     /**
      * 
          Capitalise all the words in a String.
          
-     * 
          
+     *
      * 
          Uses {@link Character#isWhitespace(char)} as a
      * separator between words.
          
-     * 
          
+     *
      * 
          null will return null.
          
      *
      * @param str the String to capitalise
@@ -1597,10 +1597,10 @@ else if ( space )
 
     /**
      * 
          Uncapitalise all the words in a string.
          
-     * 
          
+     *
      * 
          Uses {@link Character#isWhitespace(char)} as a
      * separator between words.
          
-     * 
          
+     *
      * 
          null will return null.
          
      *
      * @param str the string to uncapitalise
@@ -1642,7 +1642,7 @@ else if ( space )
     /**
      * 
          Get the String that is nested in between two instances of the
      * same String.
          
-     * 
          
+     *
      * 
          If str is null, will
      * return null.
          
      *
@@ -1685,7 +1685,7 @@ public static String getNestedString( String str, @Nonnull String open, @Nonnull
 
     /**
      * 
          How many times is the substring in the larger String.
          
-     * 
          
+     *
      * 
          null returns 0.
          
      *
      * @param str the String to check
@@ -1718,7 +1718,7 @@ public static int countMatches( @Nullable String str, @Nonnull String sub )
 
     /**
      * 
          Checks if the String contains only Unicode letters.
          
-     * 
          
+     *
      * 
          null will return false.
      * An empty String will return true.
          
      *
@@ -1744,7 +1744,7 @@ public static boolean isAlpha( String str )
 
     /**
      * 
          Checks if the String contains only whitespace.
          
-     * 
          
+     *
      * 
          null will return false. An
      * empty String will return true.
          
      *
@@ -1771,7 +1771,7 @@ public static boolean isWhitespace( String str )
     /**
      * 
          Checks if the String contains only Unicode letters and
      * space (' ').
          
-     * 
          
+     *
      * 
          null will return false. An
      * empty String will return true.
          
      *
@@ -1798,7 +1798,7 @@ public static boolean isAlphaSpace( String str )
 
     /**
      * 
          Checks if the String contains only Unicode letters or digits.
          
-     * 
          
+     *
      * 
          null will return false. An empty
      * String will return true.
          
      *
@@ -1826,7 +1826,7 @@ public static boolean isAlphanumeric( String str )
     /**
      * 
          Checks if the String contains only Unicode letters, digits
      * or space (' ').
          
-     * 
          
+     *
      * 
          null will return false. An empty
      * String will return true.
          
      *
@@ -1853,7 +1853,7 @@ public static boolean isAlphanumericSpace( String str )
 
     /**
      * 
          Checks if the String contains only Unicode digits.
          
-     * 
          
+     *
      * 
          null will return false.
      * An empty String will return true.
          
      *
@@ -1919,7 +1919,7 @@ public static boolean isNumeric( String str )
 
     /**
      * 
          Reverse a String.
          
-     * 
          
+     *
      * 
          null String returns null.
          
      *
      * @param str the String to reverse
@@ -1936,7 +1936,7 @@ public static String reverse( String str )
 
     /**
      * 
          Reverses a String that is delimited by a specific character.
          
-     * 
          
+     *
      * 
          The Strings between the delimiters are not reversed.
      * Thus java.lang.String becomes String.lang.java (if the delimiter
      * is '.').
          
@@ -1956,8 +1956,6 @@ public static String reverse( String str )
 
     /**
      * 
          Reverses an array.
          
-     * 
          
-     * 
          TAKEN FROM CollectionsUtils.
          
      *
      * @param array the array to reverse
      */
@@ -2165,17 +2163,13 @@ public static String interpolate( String text, @Nonnull Map namespace )
     }
 
     /**
-     * Convert the first character of the given String to uppercase.
-     * This method will not trim of spaces!
-     * 
          
-     * 
          
-     * Attention: this method will currently throw a
-     * IndexOutOfBoundsException for empty strings!
-     * 
          
+     * Converts the first character of the given String to uppercase.
+     * This method does not trim spaces!
      *
      * @param data the String to get capitalized
      * @return data string with the first character transformed to uppercase
      * @throws NullPointerException if data is null
+     * @throws IndexOutOfBoundsException if data is empty
      */
     @Nonnull public static String capitalizeFirstLetter( @Nonnull String data )
     {
@@ -2192,17 +2186,14 @@ public static String interpolate( String text, @Nonnull Map namespace )
     }
 
     /**
-     * Convert the first character of the given String to lowercase.
-     * This method will not trim of spaces!
+     * Converts the first character of the given String to lowercase.
+     * This method does not trim spaces!
      * 
          
-     * 
          
-     * Attention: this method will currently throw a
-     * IndexOutOfBoundsException for empty strings!
-     * 
          
      *
      * @param data the String to get it's first character lower-cased.
      * @return data string with the first character transformed to lowercase
      * @throws NullPointerException if data is null
+     * @throws IndexOutOfBoundsException if data is empty
      */
     @Nonnull public static String lowercaseFirstLetter( @Nonnull String data )
     {
@@ -2218,7 +2209,7 @@ public static String interpolate( String text, @Nonnull Map namespace )
      * 
          
      * 'ThisIsIt' will become 'this-is-it'.
      *
-     * @param view The view.
+     * @param view the view
      * @return deHumped String
      */
     @Nonnull public static String addAndDeHump( @Nonnull String view )
@@ -2240,7 +2231,7 @@ public static String interpolate( String text, @Nonnull Map namespace )
 
     /**
      * 
          Quote and escape a String with the given character, handling null.
          
-     * 
          
+     * 
      * 
                * StringUtils.quoteAndEscape(null, *)    = null
      * StringUtils.quoteAndEscape("", *)      = ""
@@ -2264,9 +2255,9 @@ public static String quoteAndEscape( @Nullable String source, char quoteChar )
     /**
      * 
          Quote and escape a String with the given character, handling null.
          
      *
-     * @param source The source.
-     * @param quoteChar The quote character.
-     * @param quotingTriggers The quoting trigger.
+     * @param source the source
+     * @param quoteChar the quote character
+     * @param quotingTriggers the quoting trigger
      * @return the String quoted and escaped
      * @see #quoteAndEscape(String, char, char[], char[], char, boolean)
      * 
@@ -2277,11 +2268,11 @@ public static String quoteAndEscape( @Nullable String source, char quoteChar, @N
     }
 
     /**
-     * @param source The source.
-     * @param quoteChar The quote character.
-     * @param escapedChars The escaped characters.
-     * @param escapeChar The escape character.
-     * @param force true/false.
+     * @param source the source
+     * @param quoteChar the quote character
+     * @param escapedChars the escaped characters
+     * @param escapeChar the escape character
+     * @param force true/false
      * @return the String quoted and escaped
      * @see #quoteAndEscape(String, char, char[], char[], char, boolean)
      * 
@@ -2293,12 +2284,12 @@ public static String quoteAndEscape( @Nullable String source, char quoteChar,
     }
 
     /**
-     * @param source The source.
-     * @param quoteChar The quote character.
-     * @param escapedChars set of characters to escape.
-     * @param quotingTriggers The quoting trigger.
-     * @param escapeChar prefix for escaping a character.
-     * @param force true/false.
+     * @param source the source
+     * @param quoteChar the quote character
+     * @param escapedChars set of characters to escape
+     * @param quotingTriggers the quoting trigger
+     * @param escapeChar prefix for escaping a character
+     * @param force true/false
      * @return the String quoted and escaped
      */
     public static String quoteAndEscape( @Nullable String source, char quoteChar, @Nonnull final char[] escapedChars,
@@ -2347,9 +2338,9 @@ else if ( !escaped.equals( source ) )
     }
 
     /**
-     * @param source The source.
-     * @param escapedChars set of characters to escape.
-     * @param escapeChar prefix for escaping a character.
+     * @param source the source
+     * @param escapedChars set of characters to escape
+     * @param escapeChar prefix for escaping a character
      * @return the String escaped
      */
     public static String escape( @Nullable String source, @Nonnull final char[] escapedChars, char escapeChar )
@@ -2410,7 +2401,7 @@ public static String escape( @Nullable String source, @Nonnull final char[] esca
      * '\n', '\r' and '\r\n' with the system line separator.
      *
      * @param s a not null String
-     * @return a String that contains only System line separators.
+     * @return a String that contains only System line separators
      * @see #unifyLineSeparators(String, String)
      * 
      */
@@ -2425,7 +2416,7 @@ public static String unifyLineSeparators( @Nullable String s )
      *
      * @param s  a not null String
      * @param ls the wanted line separator ("\n" on UNIX), if null using the System line separator.
-     * @return a String that contains only System line separators.
+     * @return a String that contains only System line separators
      * @throws IllegalArgumentException if ls is not '\n', '\r' and '\r\n' characters.
      * 
      */
@@ -2476,9 +2467,9 @@ else if ( s.charAt( i ) == '\n' )
     /**
      * 
          Checks if String contains a search character, handling null.
      * This method uses {@link String#indexOf(int)}.
          
-     * 
          
+     * 
      * 
          A null or empty ("") String will return false.
          
-     * 
          
+     * 
      * 
                * StringUtils.contains(null, *)    = false
      * StringUtils.contains("", *)      = false
@@ -2500,9 +2491,9 @@ public static boolean contains( @Nullable String str, char searchChar )
     /**
      * 
          Checks if String contains a search String, handling null.
      * This method uses {@link String#indexOf(int)}.
          
-     * 
          
+     * 
      * 
          A null String will return false.
          
-     * 
          
+     * 
      * 
                * StringUtils.contains(null, *)     = false
      * StringUtils.contains(*, null)     = false
@@ -2526,7 +2517,7 @@ public static boolean contains( @Nullable String str, @Nullable String searchStr
      * 
          Checks if String ends with a search String, handling null.
          
      * 
          
      * 
          A null String will return false.
          
-     * 
          
+     *
      * 
                * StringUtils.endsWithIgnoreCase(null, *)     = false
      * StringUtils.endsWithIgnoreCase(*, null)     = false

From d63328f2b67ed407ab159fda04031792b6a374a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?=
 
Date: Tue, 9 Jun 2020 11:40:51 +0200
Subject: [PATCH 165/265] Restore space between referenced parameter and its
 description

---
 src/main/java/org/apache/maven/shared/utils/StringUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
index 613b1de4..b44a054f 100644
--- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
@@ -540,7 +540,7 @@ public static String mid( String str, int pos, int len )
      * StringTokenizer does).
          
      *
      * @param str       the string to parse
-     * @param separatorcCharacters used as the delimiters. If
+     * @param separator Characters used as the delimiters. If
      *                  null, splits on whitespace.
      * @param max       the maximum number of elements to include in the
      *                  array.  A zero or negative value implies no limit.

From 5a1ece544cf4b10b16f4fe915db33c22b0bd3095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?=
 
Date: Wed, 10 Jun 2020 11:26:03 +0200
Subject: [PATCH 166/265] Remove useless check

---
 .../java/org/apache/maven/shared/utils/cli/shell/Shell.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
index bec555e0..d2573048 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
@@ -102,7 +102,7 @@ void setShellArgs( String[] shellArgs )
      */
     String[] getShellArgs()
     {
-        if ( ( shellArgs == null ) || shellArgs.isEmpty() )
+        if ( shellArgs.isEmpty() )
         {
             return null;
         }

From 8159ddbf5fc3317b85609c785011d8032815def6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?=
 
Date: Wed, 10 Jun 2020 11:14:40 +0200
Subject: [PATCH 167/265] Remove unused containers

This closes #55
---
 .../shared/utils/xml/Xpp3DomBuilder.java      | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
index 8242208b..bfa77f37 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
@@ -24,7 +24,6 @@
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -193,14 +192,6 @@ private static class DocHandler
 
         private final List values = new ArrayList();
 
-        // Todo: Use these for something smart !
-        private final List warnings = new ArrayList();
-
-        private final List errors = new ArrayList();
-
-        private final List fatals = new ArrayList();
-
-
         Xpp3Dom result = null;
 
         private final boolean trim;
@@ -250,27 +241,6 @@ private void attachToParent( Xpp3Dom child )
             }
         }
 
-        @Override
-        public void warning( SAXParseException e )
-            throws SAXException
-        {
-            warnings.add( e );
-        }
-
-        @Override
-        public void error( SAXParseException e )
-            throws SAXException
-        {
-            errors.add( e );
-        }
-
-        @Override
-        public void fatalError( SAXParseException e )
-            throws SAXException
-        {
-            fatals.add( e );
-        }
-
         private Xpp3Dom pop()
         {
             int depth = elemStack.size() - 1;

From 76605ac236ee5fb64062581209e8ee941efcea77 Mon Sep 17 00:00:00 2001
From: Rob Oxspring 
Date: Wed, 27 May 2020 21:49:20 +0100
Subject: [PATCH 168/265] [MSHARED-431] Escape arguments including hash-signs

---
 .../org/apache/maven/shared/utils/cli/shell/BourneShell.java   | 2 +-
 .../apache/maven/shared/utils/cli/shell/BourneShellTest.java   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
index 1793cbb7..02586afd 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
@@ -34,7 +34,7 @@ public class BourneShell
     private static final char DOUBLE_QUOTATION = '"';
 
     private static final char[] BASH_QUOTING_TRIGGER_CHARS =
-        { ' ', '$', ';', '&', '|', '<', '>', '*', '?', '(', ')', '[', ']', '{', '}', '`' };
+        { ' ', '$', ';', '&', '|', '<', '>', '*', '?', '(', ')', '[', ']', '{', '}', '`', '#' };
 
     /**
      * Create instance of BourneShell.
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
index c83287c2..7d5c4565 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
@@ -186,13 +186,14 @@ public void testBourneShellQuotingCharacters()
         commandline.createArg().setValue( "{" );
         commandline.createArg().setValue( "}" );
         commandline.createArg().setValue( "`" );
+        commandline.createArg().setValue( "#" );
 
         List lines = commandline.getShell().getShellCommandLine( commandline.getArguments() );
         System.out.println( lines  );
 
         assertEquals( "/bin/sh", lines.get( 0 ) );
         assertEquals( "-c", lines.get( 1 ) );
-        assertEquals( "chmod \" \" \"|\" \"&&\" \"||\" \";\" \";;\" \"&\" \"()\" \"<\" \"<<\" \">\" \">>\" \"*\" \"?\" \"[\" \"]\" \"{\" \"}\" \"`\"",
+        assertEquals( "chmod \" \" \"|\" \"&&\" \"||\" \";\" \";;\" \"&\" \"()\" \"<\" \"<<\" \">\" \">>\" \"*\" \"?\" \"[\" \"]\" \"{\" \"}\" \"`\" \"#\"",
                       lines.get( 2 ) );
     }
 

From f751e614c09df8de1a080dc1153931f3f68991c9 Mon Sep 17 00:00:00 2001
From: Rob Oxspring 
Date: Thu, 28 May 2020 23:29:05 +0100
Subject: [PATCH 169/265] [MSHARED-297] - BourneShell unconditionally single
 quotes executable and arguments

Closes #40
---
 .../shared/utils/cli/shell/BourneShell.java   | 49 +++++++------------
 .../maven/shared/utils/cli/shell/Shell.java   | 39 ++++++++++-----
 .../utils/cli/shell/BourneShellTest.java      | 32 ++++++++----
 3 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
index 02586afd..33177889 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
@@ -23,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.maven.shared.utils.Os;
-import org.apache.maven.shared.utils.StringUtils;
 
 /**
  * @author Jason van Zyl
@@ -31,19 +30,16 @@
 public class BourneShell
     extends Shell
 {
-    private static final char DOUBLE_QUOTATION = '"';
-
-    private static final char[] BASH_QUOTING_TRIGGER_CHARS =
-        { ' ', '$', ';', '&', '|', '<', '>', '*', '?', '(', ')', '[', ']', '{', '}', '`', '#' };
 
     /**
      * Create instance of BourneShell.
      */
     public BourneShell()
     {
+        setUnconditionalQuoting( true );
         setShellCommand( "/bin/sh" );
-        setArgumentQuoteDelimiter( DOUBLE_QUOTATION );
-        setExecutableQuoteDelimiter( DOUBLE_QUOTATION );
+        setArgumentQuoteDelimiter( '\'' );
+        setExecutableQuoteDelimiter( '\'' );
         setSingleQuotedArgumentEscaped( true );
         setSingleQuotedExecutableEscaped( false );
         setQuotedExecutableEnabled( true );
@@ -59,7 +55,7 @@ public String getExecutable()
             return super.getExecutable();
         }
 
-        return unifyQuotes( super.getExecutable() );
+        return quoteOneItem( super.getExecutable(), true );
     }
 
     /** {@inheritDoc} */
@@ -112,47 +108,40 @@ protected String getExecutionPreamble()
         StringBuilder sb = new StringBuilder();
         sb.append( "cd " );
 
-        sb.append( unifyQuotes( dir ) );
+        sb.append( quoteOneItem( dir, false ) );
         sb.append( " && " );
 
         return sb.toString();
     }
 
-    /** {@inheritDoc} */
-    protected char[] getQuotingTriggerChars()
-    {
-        return BASH_QUOTING_TRIGGER_CHARS;
-    }
-
     /**
      * 
          Unify quotes in a path for the Bourne Shell.
          
      * 
          
      * 
          -     * BourneShell.unifyQuotes(null)                       = null
-     * BourneShell.unifyQuotes("")                         = (empty)
-     * BourneShell.unifyQuotes("/test/quotedpath'abc")     = /test/quotedpath\'abc
-     * BourneShell.unifyQuotes("/test/quoted path'abc")    = "/test/quoted path'abc"
-     * BourneShell.unifyQuotes("/test/quotedpath\"abc")    = "/test/quotedpath\"abc"
-     * BourneShell.unifyQuotes("/test/quoted path\"abc")   = "/test/quoted path\"abc"
-     * BourneShell.unifyQuotes("/test/quotedpath\"'abc")   = "/test/quotedpath\"'abc"
-     * BourneShell.unifyQuotes("/test/quoted path\"'abc")  = "/test/quoted path\"'abc"
+     * BourneShell.quoteOneItem(null)                       = null
+     * BourneShell.quoteOneItem("")                         = ''
+     * BourneShell.quoteOneItem("/test/quotedpath'abc")     = '/test/quotedpath'"'"'abc'
+     * BourneShell.quoteOneItem("/test/quoted path'abc")    = '/test/quoted pat'"'"'habc'
+     * BourneShell.quoteOneItem("/test/quotedpath\"abc")    = '/test/quotedpath"abc'
+     * BourneShell.quoteOneItem("/test/quoted path\"abc")   = '/test/quoted path"abc'
+     * BourneShell.quoteOneItem("/test/quotedpath\"'abc")   = '/test/quotedpath"'"'"'abc'
+     * BourneShell.quoteOneItem("/test/quoted path\"'abc")  = '/test/quoted path"'"'"'abc'
      * 
          
      *
      * @param path not null path.
      * @return the path unified correctly for the Bourne shell.
      */
-    private static String unifyQuotes( String path )
+    protected String quoteOneItem( String path, boolean isExecutable )
     {
         if ( path == null )
         {
             return null;
         }
 
-        if ( path.indexOf( ' ' ) == -1 && path.indexOf( '\'' ) != -1 && path.indexOf( '"' ) == -1 )
-        {
-            return StringUtils.escape( path );
-        }
-
-        return StringUtils.quoteAndEscape( path, '\"', BASH_QUOTING_TRIGGER_CHARS );
+        StringBuilder sb = new StringBuilder();
+        sb.append( "'" );
+        sb.append( path.replace( "'", "'\"'\"'" ) );
+        sb.append( "'" );
+        return sb.toString();
     }
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
index d2573048..c1e5dd0c 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
@@ -49,6 +49,8 @@ public class Shell
 
     private boolean quotedArgumentsEnabled = true;
 
+    private boolean unconditionalQuoting = false;
+
     private String executable;
 
     private String workingDir;
@@ -112,6 +114,19 @@ String[] getShellArgs()
         }
     }
 
+    protected String quoteOneItem( String inputString, boolean isExecutable )
+    {
+        char[] escapeChars = getEscapeChars( isSingleQuotedExecutableEscaped(), isDoubleQuotedExecutableEscaped() );
+        return StringUtils.quoteAndEscape(
+                inputString,
+                isExecutable ? getExecutableQuoteDelimiter() : getArgumentQuoteDelimiter(),
+                escapeChars,
+                getQuotingTriggerChars(),
+                '\\',
+                unconditionalQuoting
+        );
+    }
+
     /**
      * Get the command line for the provided executable and arguments in this shell
      *
@@ -144,15 +159,11 @@ List getRawCommandLine( String executableParameter, String... argumentsP
 
             if ( isQuotedExecutableEnabled() )
             {
-                char[] escapeChars =
-                    getEscapeChars( isSingleQuotedExecutableEscaped(), isDoubleQuotedExecutableEscaped() );
-
-                sb.append( StringUtils.quoteAndEscape( getExecutable(), getExecutableQuoteDelimiter(), escapeChars,
-                                                       getQuotingTriggerChars(), '\\', false ) );
+                sb.append( quoteOneItem( executableParameter, true ) );
             }
             else
             {
-                sb.append( getExecutable() );
+                sb.append( executableParameter );
             }
         }
         for ( String argument : argumentsParameter )
@@ -164,10 +175,7 @@ List getRawCommandLine( String executableParameter, String... argumentsP
 
             if ( isQuotedArgumentsEnabled() )
             {
-                char[] escapeChars = getEscapeChars( isSingleQuotedArgumentEscaped(), isDoubleQuotedArgumentEscaped() );
-
-                sb.append( StringUtils.quoteAndEscape( argument, getArgumentQuoteDelimiter(), escapeChars,
-                                                       getQuotingTriggerChars(), '\\', false ) );
+                sb.append( quoteOneItem( argument, false ) );
             }
             else
             {
@@ -284,7 +292,7 @@ public List getShellCommandLine( String... arguments )
             commandLine.addAll( getShellArgsList() );
         }
 
-        commandLine.addAll( getCommandLine( getExecutable(), arguments ) );
+        commandLine.addAll( getCommandLine( executable, arguments ) );
 
         return commandLine;
 
@@ -398,4 +406,13 @@ void setSingleQuotedExecutableEscaped( boolean singleQuotedExecutableEscaped )
         this.singleQuotedExecutableEscaped = singleQuotedExecutableEscaped;
     }
 
+    public boolean isUnconditionalQuoting()
+    {
+        return unconditionalQuoting;
+    }
+
+    public void setUnconditionalQuoting( boolean unconditionalQuoting )
+    {
+        this.unconditionalQuoting = unconditionalQuoting;
+    }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
index 7d5c4565..4fbcf841 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
@@ -44,7 +44,7 @@ public void testQuoteWorkingDirectoryAndExecutable()
 
         String executable = StringUtils.join( sh.getShellCommandLine( new String[]{} ).iterator(), " " );
 
-        assertEquals( "/bin/sh -c cd /usr/local/bin && chmod", executable );
+        assertEquals( "/bin/sh -c cd '/usr/local/bin' && 'chmod'", executable );
     }
 
     public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes()
@@ -56,7 +56,7 @@ public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes()
 
         String executable = StringUtils.join( sh.getShellCommandLine( new String[]{} ).iterator(), " " );
 
-        assertEquals( "/bin/sh -c cd \"/usr/local/\'something else\'\" && chmod", executable );
+        assertEquals( "/bin/sh -c cd '/usr/local/'\"'\"'something else'\"'\"'' && 'chmod'", executable );
     }
 
     public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes_BackslashFileSep()
@@ -68,7 +68,7 @@ public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes_Backsl
 
         String executable = StringUtils.join( sh.getShellCommandLine( new String[]{} ).iterator(), " " );
 
-        assertEquals( "/bin/sh -c cd \"\\usr\\local\\\'something else\'\" && chmod", executable );
+        assertEquals( "/bin/sh -c cd '\\usr\\local\\'\"'\"'something else'\"'\"'' && 'chmod'", executable );
     }
 
     public void testPreserveSingleQuotesOnArgument()
@@ -84,7 +84,7 @@ public void testPreserveSingleQuotesOnArgument()
 
         String cli = StringUtils.join( shellCommandLine.iterator(), " " );
         System.out.println( cli );
-        assertTrue( cli.endsWith( args[0] ) );
+        assertTrue( cli.endsWith( "'\"some arg with spaces\"'" ) );
     }
 
     public void testAddSingleQuotesOnArgumentWithSpaces()
@@ -100,7 +100,21 @@ public void testAddSingleQuotesOnArgumentWithSpaces()
 
         String cli = StringUtils.join( shellCommandLine.iterator(), " " );
         System.out.println( cli );
-        assertTrue( cli.endsWith( "\"" + args[0] + "\"" ) );
+        assertTrue( cli.endsWith("'some arg with spaces'"));
+    }
+
+    public void testAddArgumentWithSingleQuote()
+    {
+        Shell sh = newShell();
+
+        sh.setWorkingDirectory( "/usr/bin" );
+        sh.setExecutable( "chmod" );
+
+        String[] args = { "arg'withquote" };
+
+        List shellCommandLine = sh.getShellCommandLine( args );
+
+        assertEquals("cd '/usr/bin' && 'chmod' 'arg'\"'\"'withquote'", shellCommandLine.get(shellCommandLine.size() - 1));
     }
 
     public void testArgumentsWithSemicolon()
@@ -119,7 +133,7 @@ public void testArgumentsWithSemicolon()
 
         String cli = StringUtils.join( shellCommandLine.iterator(), " " );
         System.out.println( cli );
-        assertTrue( cli.endsWith( "\"" + args[0] + "\"" ) );
+        assertTrue( cli.endsWith( "';some&argwithunix$chars'" ) );
 
         Commandline commandline = new Commandline( newShell() );
         commandline.setExecutable( "chmod" );
@@ -132,7 +146,7 @@ public void testArgumentsWithSemicolon()
 
         assertEquals( "/bin/sh", lines.get( 0 ) );
         assertEquals( "-c", lines.get( 1 ) );
-        assertEquals( "chmod --password \";password\"", lines.get( 2 ) );
+        assertEquals( "'chmod' '--password' ';password'", lines.get( 2 ) );
 
         commandline = new Commandline( newShell() );
         commandline.setExecutable( "chmod" );
@@ -144,7 +158,7 @@ public void testArgumentsWithSemicolon()
 
         assertEquals( "/bin/sh", lines.get( 0) );
         assertEquals( "-c", lines.get( 1 ) );
-        assertEquals( "chmod --password \";password\"", lines.get( 2 ) );
+        assertEquals( "'chmod' '--password' ';password'", lines.get( 2 ) );
 
         commandline = new Commandline( new CmdShell() );
         commandline.getShell().setQuotedArgumentsEnabled( true );
@@ -193,7 +207,7 @@ public void testBourneShellQuotingCharacters()
 
         assertEquals( "/bin/sh", lines.get( 0 ) );
         assertEquals( "-c", lines.get( 1 ) );
-        assertEquals( "chmod \" \" \"|\" \"&&\" \"||\" \";\" \";;\" \"&\" \"()\" \"<\" \"<<\" \">\" \">>\" \"*\" \"?\" \"[\" \"]\" \"{\" \"}\" \"`\" \"#\"",
+        assertEquals( "'chmod' ' ' '|' '&&' '||' ';' ';;' '&' '()' '<' '<<' '>' '>>' '*' '?' '[' ']' '{' '}' '`' '#'",
                       lines.get( 2 ) );
     }
 

From 6798f3033c3c5144e52c5aa8e1be584ea97527d2 Mon Sep 17 00:00:00 2001
From: Rob Oxspring 
Date: Thu, 28 May 2020 23:50:09 +0100
Subject: [PATCH 170/265] [MSHARED-297] - Minor code cleanup

---
 .../shared/utils/cli/shell/BourneShell.java   | 13 ++---------
 .../maven/shared/utils/cli/shell/Shell.java   |  6 ++---
 .../utils/cli/CommandLineUtilsTest.java       |  5 ++---
 .../utils/cli/shell/BourneShellTest.java      | 22 ++++++-------------
 4 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
index 33177889..e3af6651 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
@@ -105,13 +105,8 @@ protected String getExecutionPreamble()
         }
 
         String dir = getWorkingDirectoryAsString();
-        StringBuilder sb = new StringBuilder();
-        sb.append( "cd " );
 
-        sb.append( quoteOneItem( dir, false ) );
-        sb.append( " && " );
-
-        return sb.toString();
+        return "cd " + quoteOneItem( dir, false ) + " && ";
     }
 
     /**
@@ -138,10 +133,6 @@ protected String quoteOneItem( String path, boolean isExecutable )
             return null;
         }
 
-        StringBuilder sb = new StringBuilder();
-        sb.append( "'" );
-        sb.append( path.replace( "'", "'\"'\"'" ) );
-        sb.append( "'" );
-        return sb.toString();
+        return "'" + path.replace( "'", "'\"'\"'" ) + "'";
     }
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
index c1e5dd0c..02681086 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
@@ -110,7 +110,7 @@ String[] getShellArgs()
         }
         else
         {
-            return shellArgs.toArray( new String[shellArgs.size()] );
+            return shellArgs.toArray( new String[0] );
         }
     }
 
@@ -146,7 +146,7 @@ List getCommandLine( String executableParameter, String... argumentsPara
      */
     List getRawCommandLine( String executableParameter, String... argumentsParameter )
     {
-        List commandLine = new ArrayList();
+        List commandLine = new ArrayList<>();
         StringBuilder sb = new StringBuilder();
 
         if ( executableParameter != null )
@@ -280,7 +280,7 @@ char getExecutableQuoteDelimiter()
     public List getShellCommandLine( String... arguments )
     {
 
-        List commandLine = new ArrayList();
+        List commandLine = new ArrayList<>();
 
         if ( getShellCommand() != null )
         {
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
index 50d9336c..079d0d16 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
@@ -148,8 +148,8 @@ public void givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs
     public void givenAnEscapedSingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped()
         throws Exception
     {
-        final String command = "echo \"let\\\'s go\"";
-        final String[] expected = new String[] { "echo", "let\\\'s go" };
+        final String command = "echo \"let\\'s go\"";
+        final String[] expected = new String[] { "echo", "let\\'s go"};
         assertCmdLineArgs( expected, command );
     }
 
@@ -168,5 +168,4 @@ private void assertCmdLineArgs( final String[] expected, final String cmdLine )
         assertEquals( expected.length, actual.length );
         assertEquals( Arrays.asList( expected ), Arrays.asList( actual ) );
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
index 4fbcf841..199f36e4 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
@@ -42,7 +42,7 @@ public void testQuoteWorkingDirectoryAndExecutable()
         sh.setWorkingDirectory( "/usr/local/bin" );
         sh.setExecutable( "chmod" );
 
-        String executable = StringUtils.join( sh.getShellCommandLine( new String[]{} ).iterator(), " " );
+        String executable = StringUtils.join( sh.getShellCommandLine().iterator(), " " );
 
         assertEquals( "/bin/sh -c cd '/usr/local/bin' && 'chmod'", executable );
     }
@@ -54,7 +54,7 @@ public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes()
         sh.setWorkingDirectory( "/usr/local/'something else'" );
         sh.setExecutable( "chmod" );
 
-        String executable = StringUtils.join( sh.getShellCommandLine( new String[]{} ).iterator(), " " );
+        String executable = StringUtils.join( sh.getShellCommandLine().iterator(), " " );
 
         assertEquals( "/bin/sh -c cd '/usr/local/'\"'\"'something else'\"'\"'' && 'chmod'", executable );
     }
@@ -66,7 +66,7 @@ public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes_Backsl
         sh.setWorkingDirectory( "\\usr\\local\\'something else'" );
         sh.setExecutable( "chmod" );
 
-        String executable = StringUtils.join( sh.getShellCommandLine( new String[]{} ).iterator(), " " );
+        String executable = StringUtils.join( sh.getShellCommandLine().iterator(), " " );
 
         assertEquals( "/bin/sh -c cd '\\usr\\local\\'\"'\"'something else'\"'\"'' && 'chmod'", executable );
     }
@@ -78,9 +78,7 @@ public void testPreserveSingleQuotesOnArgument()
         sh.setWorkingDirectory( "/usr/bin" );
         sh.setExecutable( "chmod" );
 
-        final String[] args = { "\"some arg with spaces\"" };
-
-        List shellCommandLine = sh.getShellCommandLine( args );
+        List shellCommandLine = sh.getShellCommandLine("\"some arg with spaces\"");
 
         String cli = StringUtils.join( shellCommandLine.iterator(), " " );
         System.out.println( cli );
@@ -94,9 +92,7 @@ public void testAddSingleQuotesOnArgumentWithSpaces()
         sh.setWorkingDirectory( "/usr/bin" );
         sh.setExecutable( "chmod" );
 
-        String[] args = { "some arg with spaces" };
-
-        List shellCommandLine = sh.getShellCommandLine( args );
+        List shellCommandLine = sh.getShellCommandLine("some arg with spaces");
 
         String cli = StringUtils.join( shellCommandLine.iterator(), " " );
         System.out.println( cli );
@@ -110,9 +106,7 @@ public void testAddArgumentWithSingleQuote()
         sh.setWorkingDirectory( "/usr/bin" );
         sh.setExecutable( "chmod" );
 
-        String[] args = { "arg'withquote" };
-
-        List shellCommandLine = sh.getShellCommandLine( args );
+        List shellCommandLine = sh.getShellCommandLine("arg'withquote");
 
         assertEquals("cd '/usr/bin' && 'chmod' 'arg'\"'\"'withquote'", shellCommandLine.get(shellCommandLine.size() - 1));
     }
@@ -127,9 +121,7 @@ public void testArgumentsWithSemicolon()
         sh.setWorkingDirectory( "/usr/bin" );
         sh.setExecutable( "chmod" );
 
-        String[] args = { ";some&argwithunix$chars" };
-
-        List shellCommandLine = sh.getShellCommandLine( args );
+        List shellCommandLine = sh.getShellCommandLine(";some&argwithunix$chars");
 
         String cli = StringUtils.join( shellCommandLine.iterator(), " " );
         System.out.println( cli );

From dda9e1480f4f51120f619dfd302ed0d10807dfa5 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 17 Jul 2020 09:44:24 -0400
Subject: [PATCH 171/265] [MSHARED-904] update test dependencies for Maven 3.1
 (#57)

* update test dependencies
* commons-lang not used
* declare plexus
---
 pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 714a5200..c348c54c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,12 +90,6 @@
       commons-io
       2.6
     
-    
-      org.apache.commons
-      commons-lang3
-      3.8.1
-      test
-    
     
       org.apache.commons
       commons-text
@@ -120,13 +114,19 @@
     
       org.codehaus.plexus
       plexus-container-default
-      1.7.1
+      2.1.0
+      provided
+    
+    
+      org.codehaus.plexus
+      plexus-utils
+      3.0.10
       provided
     
     
       org.apache.maven.plugin-testing
       maven-plugin-testing-harness
-      2.1
+      3.1.0
       test
     
   

From 914d9755b157f337dfb76e90f6b0331f834096d6 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Mon, 20 Jul 2020 12:57:03 +0000
Subject: [PATCH 172/265] remove call to deprecated method (#58)

* remove call to deprecated method
---
 .../apache/maven/shared/utils/xml/Xpp3DomBuilder.java    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
index bfa77f37..00f6f0b9 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.shared.utils.io.IOUtil;
 import org.apache.maven.shared.utils.xml.pull.XmlPullParserException;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -95,10 +94,10 @@ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding
      * @return the built dom
      * @throws XmlPullParserException in case of an error
      */
-    public static Xpp3Dom build( @WillClose Reader reader, boolean trim )
+    public static Xpp3Dom build( @WillClose Reader in, boolean trim )
         throws XmlPullParserException
     {
-        try
+        try ( Reader reader = in )  
         {
             DocHandler docHandler = parseSax( new InputSource( reader ), trim );
             reader.close();
@@ -108,10 +107,6 @@ public static Xpp3Dom build( @WillClose Reader reader, boolean trim )
         {
             throw new XmlPullParserException( e );
         }
-        finally
-        {
-            IOUtil.close( reader );
-        }
     }
 
     private static DocHandler parseSax( @Nonnull InputSource inputSource, boolean trim )

From 5ff997cac035ac7d2ab84bbd2c695c6e60798400 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Mon, 20 Jul 2020 13:18:06 +0000
Subject: [PATCH 173/265] [MSHARED-848] deprecate XmlStreamReader (#59)

* deprecate XmlStreamReader
* deprecate newXmlReader methods in favor of apache commons
---
 .../maven/shared/utils/ReaderFactory.java     | 11 +++--
 .../shared/utils/xml/XmlStreamReader.java     | 41 ++++++++++---------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java b/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
index 4ec103a9..a92a1bd9 100644
--- a/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
+++ b/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
@@ -110,8 +110,9 @@ public class ReaderFactory
      * @param in not null input stream
      * @return an XML reader instance for the input stream
      * @throws IOException if any
-     * @see XmlStreamReader
+     * @deprecated use org.apache.commons.io.input.XmlStreamReader instead
      */
+    @Deprecated
     public static Reader newXmlReader( @Nonnull InputStream in )
         throws IOException
     {
@@ -124,8 +125,9 @@ public static Reader newXmlReader( @Nonnull InputStream in )
      * @param file not null file
      * @return an XML reader instance for the input file
      * @throws IOException if any
-     * @see XmlStreamReader
+     * @deprecated use org.apache.commons.io.input.XmlStreamReader instead
      */
+    @Deprecated
     public static Reader newXmlReader( @Nonnull File file )
         throws IOException
     {
@@ -135,11 +137,12 @@ public static Reader newXmlReader( @Nonnull File file )
     /**
      * Create a new Reader with XML encoding detection rules.
      *
-     * @param url not null url
+     * @param url not null URL
      * @return an XML reader instance for the input URL
      * @throws IOException if any
-     * @see XmlStreamReader
+     * @deprecated use {@code org.apache.commons.io.input.XmlStreamReader} instead
      */
+    @Deprecated
     public static Reader newXmlReader( @Nonnull URL url )
         throws IOException
     {
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
index 11a57774..6990d4f3 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
@@ -29,8 +29,9 @@
 import java.util.regex.Pattern;
 
 /**
- * 
+ * @deprecated use org.apache.commons.io.input.XmlStreamReader instead
  */
+@Deprecated
 public class XmlStreamReader
         extends Reader
 {
@@ -56,7 +57,7 @@ public static String getDefaultEncoding()
 
     /**
      * @param file The file to create it from.
-     * @throws IOException in case of an error.
+     * @throws IOException in case of an error
      */
     public XmlStreamReader( File file )
             throws IOException
@@ -66,7 +67,7 @@ public XmlStreamReader( File file )
 
     /**
      * @param is {@link InputStream}
-     * @throws IOException in case of an error.
+     * @throws IOException in case of an error
      */
     public XmlStreamReader( InputStream is )
             throws IOException
@@ -77,8 +78,8 @@ public XmlStreamReader( InputStream is )
     /**
      * @param is {@link InputStream}
      * @param lenient yes/no
-     * @throws IOException in case of an error.
-     * @throws XmlStreamReaderException in case of an error.
+     * @throws IOException in case of an error
+     * @throws XmlStreamReaderException in case of an error
      */
     public XmlStreamReader( InputStream is, boolean lenient )
             throws IOException, XmlStreamReaderException
@@ -88,7 +89,7 @@ public XmlStreamReader( InputStream is, boolean lenient )
 
     /**
      * @param url {@link URL}
-     * @throws IOException in case of error.
+     * @throws IOException in case of error
      */
     public XmlStreamReader( URL url )
             throws IOException
@@ -97,8 +98,8 @@ public XmlStreamReader( URL url )
     }
 
     /**
-     * @param conn The URL connection {@link URLConnection}.
-     * @throws IOException in case of error.
+     * @param conn The URL connection {@link URLConnection}
+     * @throws IOException in case of error
      */
     public XmlStreamReader( URLConnection conn )
             throws IOException
@@ -108,8 +109,8 @@ public XmlStreamReader( URLConnection conn )
 
     /**
      * @param is {@link InputStream}
-     * @param httpContentType content type.
-     * @throws IOException in case of error.
+     * @param httpContentType content type
+     * @throws IOException in case of error
      */
     public XmlStreamReader( InputStream is, String httpContentType )
             throws IOException
@@ -119,11 +120,11 @@ public XmlStreamReader( InputStream is, String httpContentType )
 
     /**
      * @param is {@link InputStream}
-     * @param httpContentType content type.
-     * @param lenient yes/no.
-     * @param defaultEncoding The default encoding.
-     * @throws IOException in case of error.
-     * @throws XmlStreamReaderException in case of error.
+     * @param httpContentType content type
+     * @param lenient yes/no
+     * @param defaultEncoding the default encoding
+     * @throws IOException in case of error
+     * @throws XmlStreamReaderException in case of error
      */
     public XmlStreamReader( InputStream is, String httpContentType, boolean lenient, String defaultEncoding )
             throws IOException, XmlStreamReaderException
@@ -136,10 +137,10 @@ public XmlStreamReader( InputStream is, String httpContentType, boolean lenient,
 
     /**
      * @param is {@link InputStream}
-     * @param httpContentType content type.
-     * @param lenient yes/no.
-     * @throws IOException in case of error.
-     * @throws XmlStreamReaderException in case of error.
+     * @param httpContentType content type
+     * @param lenient yes/no
+     * @throws IOException in case of error
+     * @throws XmlStreamReaderException in case of error
      */
     public XmlStreamReader( InputStream is, String httpContentType, boolean lenient )
             throws IOException, XmlStreamReaderException
@@ -148,7 +149,7 @@ public XmlStreamReader( InputStream is, String httpContentType, boolean lenient
     }
 
     /**
-     * @return The current encoding.
+     * @return the current encoding
      */
     public String getEncoding()
     {

From d1acca0bfaa7eda578f522f8d7851af074dbaa1c Mon Sep 17 00:00:00 2001
From: Dennis Lundberg 
Date: Fri, 24 Jul 2020 09:35:11 +0200
Subject: [PATCH 174/265] Bump version to 3.3.1 in preparation for release. In
 2017 a release attempt was made for version 3.3.0, but it was later revoked.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c348c54c..32f2d652 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.3.0-SNAPSHOT
+  3.3.1-SNAPSHOT
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins

From b3f78c16715d237b2d915d5cb963eef18b0d9fd2 Mon Sep 17 00:00:00 2001
From: Dennis Lundberg 
Date: Fri, 24 Jul 2020 14:50:25 +0200
Subject: [PATCH 175/265] [maven-release-plugin] prepare release
 maven-shared-utils-3.3.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 32f2d652..d8e432cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.3.1-SNAPSHOT
+  3.3.1
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -36,7 +36,7 @@
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
-    HEAD
+    maven-shared-utils-3.3.1
  
   
     jira

From 60d005240b324e08661471fe6b0db981e2a0bd58 Mon Sep 17 00:00:00 2001
From: Dennis Lundberg 
Date: Fri, 24 Jul 2020 14:50:57 +0200
Subject: [PATCH 176/265] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d8e432cf..28d79ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.3.1
+  3.3.2-SNAPSHOT
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -36,7 +36,7 @@
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
-    maven-shared-utils-3.3.1
+    HEAD
  
   
     jira

From 5460b13f6f4230d5ddce3fe8ffb241ab42254346 Mon Sep 17 00:00:00 2001
From: Dennis Lundberg 
Date: Fri, 24 Jul 2020 15:14:48 +0200
Subject: [PATCH 177/265] [maven-release-plugin] prepare release
 maven-shared-utils-3.3.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 28d79ccb..d77e4870 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.3.2-SNAPSHOT
+  3.3.2
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -36,7 +36,7 @@
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
-    HEAD
+    maven-shared-utils-3.3.2
  
   
     jira

From abdc90ccc36326dc6ee61ac497d2005e9e6637ef Mon Sep 17 00:00:00 2001
From: Dennis Lundberg 
Date: Fri, 24 Jul 2020 15:15:09 +0200
Subject: [PATCH 178/265] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d77e4870..d30dd998 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.3.2
+  3.3.3-SNAPSHOT
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -36,7 +36,7 @@
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
-    maven-shared-utils-3.3.2
+    HEAD
  
   
     jira

From cc010396156386d95e2acbc28f7aba32590243a2 Mon Sep 17 00:00:00 2001
From: Dennis Lundberg 
Date: Fri, 24 Jul 2020 15:29:02 +0200
Subject: [PATCH 179/265] [maven-release-plugin] prepare release
 maven-shared-utils-3.3.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d30dd998..667cc7b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.3.3-SNAPSHOT
+  3.3.3
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -36,7 +36,7 @@
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
-    HEAD
+    maven-shared-utils-3.3.3
  
   
     jira

From 893c54956f8fd6b2f5cb061a488813249c60dc19 Mon Sep 17 00:00:00 2001
From: Dennis Lundberg 
Date: Fri, 24 Jul 2020 15:29:21 +0200
Subject: [PATCH 180/265] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 667cc7b8..c2c6a7fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.3.3
+  3.3.4-SNAPSHOT
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -36,7 +36,7 @@
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
-    maven-shared-utils-3.3.3
+    HEAD
  
   
     jira

From 683465b5052c476c1e1184e5b39c7f24d1fe1187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= 
Date: Sat, 25 Jul 2020 08:25:38 +0200
Subject: [PATCH 181/265] [MSHARED-879] add dedicated output timestamp for
 Reproducible Builds

without this, inherited value from parent is used: it works for getting
Reproducible Builds, but is not as accurate as value from current POM
that is updated during release process
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c2c6a7fc..55126984 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 
   
     RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder
-
+    2020-04-04T09:03:59Z
     7
     3.1.0
   

From 1a015f162e8bb6472ecc3d9b1ded3006ea048041 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 14 Aug 2020 08:22:56 -0400
Subject: [PATCH 182/265] [MSHARED-951] fix exception handling (#61)

* fix exception handling
* fix @param name
---
 .../shared/utils/xml/Xpp3DomBuilder.java      | 24 +++++++++----------
 .../shared/utils/xml/Xpp3DomBuilderTest.java  | 23 +++++++++++++++++-
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
index 00f6f0b9..9493a98f 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
@@ -46,8 +46,8 @@ public class Xpp3DomBuilder
 
     /**
      * @param reader {@link Reader}
-     * @return the built dom.
-     * @throws XmlPullParserException in case of an error.
+     * @return the built DOM
+     * @throws XmlPullParserException in case of an error
      */
     public static Xpp3Dom build( @WillClose @Nonnull Reader reader )
         throws XmlPullParserException
@@ -57,9 +57,9 @@ public static Xpp3Dom build( @WillClose @Nonnull Reader reader )
 
     /**
      * @param is {@link InputStream}
-     * @param encoding The encoding.
-     * @return the built dom.
-     * @throws XmlPullParserException in case of an error.
+     * @param encoding the encoding
+     * @return the built DOM
+     * @throws XmlPullParserException in case of an error
      */
     public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding )
         throws XmlPullParserException
@@ -69,10 +69,10 @@ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding
 
     /**
      * @param is {@link InputStream}
-     * @param encoding The encoding.
-     * @param trim true/false.
-     * @return the built dom.
-     * @throws XmlPullParserException in case of an error.
+     * @param encoding the encoding
+     * @param trim true/false
+     * @return the built DOM
+     * @throws XmlPullParserException in case of an error
      */
     public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding, boolean trim )
         throws XmlPullParserException
@@ -84,14 +84,14 @@ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding
         }
         catch ( UnsupportedEncodingException e )
         {
-            throw new RuntimeException( e );
+            throw new XmlPullParserException( e );
         }
     }
 
     /**
-     * @param reader {@link Reader}
+     * @param in {@link Reader}
      * @param trim true/false
-     * @return the built dom
+     * @return the built DOM
      * @throws XmlPullParserException in case of an error
      */
     public static Xpp3Dom build( @WillClose Reader in, boolean trim )
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java b/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
index 9aaca9f1..a236ede3 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
@@ -24,11 +24,16 @@
 
 import org.junit.Test;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 
@@ -42,7 +47,7 @@ public class Xpp3DomBuilderTest
 
     private static final String xmlDeclaration = "\n";
 
-        @Test
+    @Test
     public void selfClosingTag()
         throws Exception
     {
@@ -57,6 +62,22 @@ public void selfClosingTag()
         assertEquals( "check DOMs match", expected, dom1Str );
     }
 
+    @Test
+    public void testUnrecognizedEncoding()
+    {
+
+        byte[] data = "".getBytes(StandardCharsets.UTF_8);
+        InputStream in = new ByteArrayInputStream( data );
+        try {
+            Xpp3DomBuilder.build( in , "nosuch encoding" );
+            fail();
+        } catch ( XmlPullParserException expected ) {
+            assertTrue( expected.getCause() instanceof UnsupportedEncodingException );
+        }
+
+    }
+
+    
     @Test
     public void trimming()
         throws Exception

From 9161f1e12078bd979008ed4d34816d6414359e35 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sat, 15 Aug 2020 07:36:40 -0400
Subject: [PATCH 183/265] [MSHARED-954] Deprecate platform dependent
 unifyLineSeparators method (#63)

* deprecate unifyLineSeparators
---
 .../java/org/apache/maven/shared/utils/StringUtils.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
index b44a054f..b0906e0c 100644
--- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
@@ -2403,8 +2403,12 @@ public static String escape( @Nullable String source, @Nonnull final char[] esca
      * @param s a not null String
      * @return a String that contains only System line separators
      * @see #unifyLineSeparators(String, String)
-     * 
+     * @deprecated this method produces platform dependent code and contributes to 
+     *     non-reproducible builds. In the context of Maven, this is almost never what's needed.
+     *     Remove calls to this method and do not replace them. That is, change
+     *     {@code Stringutils.unifyLineSeparators(s)} with simply {@code s}.
      */
+    @Deprecated
     public static String unifyLineSeparators( @Nullable String s )
     {
         return unifyLineSeparators( s, System.getProperty( "line.separator" ) );

From 6852024afaac81e635a765dc1394e786920ff40a Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Mon, 24 Aug 2020 12:11:29 +0000
Subject: [PATCH 184/265] [MSHARED-952] make PrettyPrintXmlWriter platform
 independent (#62)

* make test platform independent
* remove broken links
* fix skipped test
* make PrettyPrintXmlWriter platform independent
---
 .../utils/xml/PrettyPrintXMLWriter.java       |  5 ++-
 .../shared/utils/xml/Xpp3DomBuilder.java      |  2 --
 .../utils/xml/PrettyPrintXmlWriterTest.java   | 15 ++++----
 .../shared/utils/xml/Xpp3DomBuilderTest.java  | 36 +++++++++----------
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java
index 851cffbf..b0d1a7d7 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java
@@ -23,7 +23,6 @@
 import java.io.PrintWriter;
 import java.io.Writer;
 import java.util.ArrayList;
-import org.apache.maven.shared.utils.Os;
 
 /**
  * XMLWriter with nice indentation.
@@ -101,7 +100,7 @@ public PrettyPrintXMLWriter( Writer writer )
      */
     public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent, String encoding, String doctype )
     {
-        this( writer, lineIndent.toCharArray(), Os.LINE_SEP.toCharArray(), encoding, doctype );
+        this( writer, lineIndent.toCharArray(), "\n".toCharArray(), encoding, doctype );
     }
 
     /**
@@ -122,7 +121,7 @@ public PrettyPrintXMLWriter( Writer writer, String lineIndent, String encoding,
      */
     public PrettyPrintXMLWriter( PrintWriter writer, String encoding, String doctype )
     {
-        this( writer, DEFAULT_LINE_INDENT, Os.LINE_SEP.toCharArray(), encoding, doctype );
+        this( writer, DEFAULT_LINE_INDENT, "\n".toCharArray(), encoding, doctype );
     }
 
     /**
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
index 9493a98f..2b8f4ab6 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
@@ -208,8 +208,6 @@ public void startElement( String uri, String localName, String qName, Attributes
             attachToParent( child );
             pushOnStack( child );
 
-            // Todo: Detecting tags that close immediately seem to be impossible in sax ?
-            // http://stackoverflow.com/questions/12968390/detecting-self-closing-tags-in-sax
             values.add( new StringBuilder() );
 
             int size = attributes.getLength();
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
index 70f078c5..4830f433 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
@@ -24,7 +24,6 @@
 import javax.swing.text.html.HTML;
 import java.io.StringWriter;
 
-import org.apache.maven.shared.utils.Os;
 import org.apache.maven.shared.utils.StringUtils;
 import org.junit.Assert;
 import org.junit.Test;
@@ -51,7 +50,7 @@ public void testDefaultPrettyPrintXMLWriter() throws IOException
 
         writer.endElement(); // Tag.HTML
 
-        Assert.assertEquals( expectedResult( Os.LINE_SEP ), w.toString() );
+        Assert.assertEquals( expectedResult(), w.toString() );
     }
 
     @Test
@@ -67,7 +66,7 @@ public void testPrettyPrintXMLWriterWithGivenLineSeparator() throws IOException
 
         writer.endElement(); // Tag.HTML
 
-        Assert.assertEquals( expectedResult( "\n" ), w.toString() );
+        Assert.assertEquals( expectedResult(), w.toString() );
     }
 
     @Test
@@ -83,7 +82,7 @@ public void testPrettyPrintXMLWriterWithGivenLineIndenter() throws IOException
 
         writer.endElement(); // Tag.HTML
 
-        Assert.assertEquals( expectedResult( "    ", Os.LINE_SEP ), w.toString() );
+        Assert.assertEquals( expectedResult( "    " ), w.toString() );
     }
 
     @Test
@@ -158,13 +157,15 @@ private void writeXhtmlBody( XMLWriter writer ) throws IOException
         writer.endElement(); // Tag.BODY
     }
 
-    private static String expectedResult( String lineSeparator )
+    private static String expectedResult()
     {
-        return expectedResult( "  ", lineSeparator );
+        return expectedResult( "  " );
     }
 
-    private static String expectedResult( String lineIndenter, String lineSeparator )
+    private static String expectedResult( String lineIndenter )
     {
+        
+        String lineSeparator = "\n";
         StringBuilder expected = new StringBuilder();
 
         expected.append( "" ).append( lineSeparator );
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java b/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
index a236ede3..cef681e5 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
@@ -19,9 +19,8 @@
  * under the License.
  */
 
-import org.apache.maven.shared.utils.StringUtils;
 import org.apache.maven.shared.utils.xml.pull.XmlPullParserException;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
@@ -43,16 +42,13 @@
 public class Xpp3DomBuilderTest
 {
 
-    private static final String LS = System.getProperty( "line.separator" );
-
-    private static final String xmlDeclaration = "\n";
+    private static final String XML_DECLARATION = "\n";
 
     @Test
     public void selfClosingTag()
         throws Exception
     {
 
-        // Todo:  http://stackoverflow.com/questions/12968390/detecting-self-closing-tags-in-sax
         String domString = selfClosingTagSource();
 
         Xpp3Dom dom = Xpp3DomBuilder.build( new StringReader( domString ) );
@@ -97,11 +93,15 @@ public void trimming()
         assertEquals( "  preserve space  ", dom.getChild( "element6" ).getValue() );
     }
 
-    @Test(expected = XmlPullParserException.class)
-    public void malformedXml()
+    @Test
+    public void testMalformedXml()
     {
-        Xpp3DomBuilder.build( new StringReader( "" + createDomString() ) );
-        fail( "We're supposed to fail" );
+        try {
+            Xpp3DomBuilder.build( new StringReader( "" + createDomString() ) );
+            fail( "We're supposed to fail" );
+        } catch (XmlPullParserException ex) {
+            Assert.assertNotNull( ex.getMessage() );
+        }
     }
 
     @Test
@@ -137,9 +137,9 @@ private static String getAttributeEncodedString()
     {
         StringBuilder domString = new StringBuilder();
         domString.append( "" );
-        domString.append( LS );
+        domString.append( "\n" );
         domString.append( "  bar" );
-        domString.append( LS );
+        domString.append( "\n" );
         domString.append( "" );
 
         return domString.toString();
@@ -161,13 +161,13 @@ private static String getExpectedString()
     {
         StringBuilder domString = new StringBuilder();
         domString.append( "" );
-        domString.append( LS );
+        domString.append( "\n" );
         domString.append( "  \"msg\"" );
-        domString.append( LS );
+        domString.append( "\n" );
         domString.append( "  <b>\"msg\"</b>" );
-        domString.append( LS );
+        domString.append( "\n" );
         domString.append( "  <b>\"msg\"</b>" );
-        domString.append( LS );
+        domString.append( "\n" );
         domString.append( "" );
         return domString.toString();
     }
@@ -195,12 +195,12 @@ private static String selfClosingTagSource()
         buf.append( "  \n" );
         buf.append( "  \n" );
         buf.append( "" );
-        return StringUtils.unifyLineSeparators( buf.toString() );
+        return buf.toString();
     }
 
     private static String expectedSelfClosingTag()
     {
-        return StringUtils.unifyLineSeparators( xmlDeclaration + selfClosingTagSource() );
+        return XML_DECLARATION + selfClosingTagSource();
     }
 
 }

From 5b66de0a12831e27bc42f972b99c6c0678e3a3d9 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Mon, 24 Aug 2020 13:29:24 +0000
Subject: [PATCH 185/265] [MSHARED-954] fix JavaDoc typos (#64)

* fix JavaDoc typos
* Oxford comma
---
 .../java/org/apache/maven/shared/utils/StringUtils.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
index b0906e0c..b70cdae8 100644
--- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
@@ -2398,7 +2398,7 @@ public static String escape( @Nullable String source, @Nonnull final char[] esca
 
     /**
      * Parses the given String and replaces all occurrences of
-     * '\n', '\r' and '\r\n' with the system line separator.
+     * '\n', '\r', and "\r\n" with the system line separator.
      *
      * @param s a not null String
      * @return a String that contains only System line separators
@@ -2406,7 +2406,7 @@ public static String escape( @Nullable String source, @Nonnull final char[] esca
      * @deprecated this method produces platform dependent code and contributes to 
      *     non-reproducible builds. In the context of Maven, this is almost never what's needed.
      *     Remove calls to this method and do not replace them. That is, change
-     *     {@code Stringutils.unifyLineSeparators(s)} with simply {@code s}.
+     *     {@code Stringutils.unifyLineSeparators(s)} to simply {@code s}.
      */
     @Deprecated
     public static String unifyLineSeparators( @Nullable String s )
@@ -2419,9 +2419,9 @@ public static String unifyLineSeparators( @Nullable String s )
      * '\n', '\r' and '\r\n' with the system line separator.
      *
      * @param s  a not null String
-     * @param ls the wanted line separator ("\n" on UNIX), if null using the System line separator.
+     * @param ls the wanted line separator ("\n" on UNIX), if null using the System line separator
      * @return a String that contains only System line separators
-     * @throws IllegalArgumentException if ls is not '\n', '\r' and '\r\n' characters.
+     * @throws IllegalArgumentException if ls is not '\n', '\r', or "\r\n"
      * 
      */
     public static String unifyLineSeparators( @Nullable String s, @Nullable String ls )

From f07db5af11bd70ca1d31d0fa43d84acc7b27df53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= 
Date: Fri, 28 Aug 2020 12:54:47 +0200
Subject: [PATCH 186/265] update ASF CI url

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6ddc421d..1c376af9 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,8 @@ Contributing to [Apache Maven Shared Utils](https://maven.apache.org/shared/mave
 [![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MSHARED.json)][jira]
 [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license]
 [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.shared/maven-shared-utils.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.shared/maven-shared-utils)
-[![Jenkins Status](https://img.shields.io/jenkins/s/https/builds.apache.org/job/maven-box/job/maven-shared-utils/job/master.svg)][build]
-[![Jenkins tests](https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-box/job/maven-shared-utils/job/master.svg)][test-results]
+[![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-builds.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master.svg)][build]
+[![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-builds.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master.svg)][test-results]
 
 
 You have found a bug or you have an idea for a cool new feature? Contributing
@@ -95,5 +95,5 @@ Additional Resources
 [code-style]: https://maven.apache.org/developers/conventions/code.html
 [cla]: https://www.apache.org/licenses/#clas
 [maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index
-[test-results]: https://builds.apache.org/job/maven-box/job/maven-shared-utils/job/master/lastCompletedBuild/testReport/
-[build]: https://builds.apache.org/job/maven-box/job/maven-shared-utils/job/master/
+[test-results]: https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master/lastCompletedBuild/testReport/
+[build]: https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master/

From 08ceaa59cf6f644c6c7bb18541e62c61bac53516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= 
Date: Sat, 29 Aug 2020 15:45:56 +0200
Subject: [PATCH 187/265] update ASF CI url

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 55126984..f354b42b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
   
   
     Jenkins
-    https://builds.apache.org/job/maven-box/job/maven-shared-utils/
+    https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/
   
   
     

From a0ad92ad35d5adafcf56df3f96051d8e65c23a3c Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 25 Sep 2020 09:30:37 -0400
Subject: [PATCH 188/265] fix a few JavaDoc errors

---
 .../maven/shared/utils/io/FileUtils.java      | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index a3be324c..f1947827 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -69,8 +69,8 @@
  * 
          
  * 
          File-related methods
          
  * 
          
- * There are methods to  create a {@link #toFile File from a URL}, copy a
- * copy a {@link #copyFile File to another File},
+ * There are methods to create a {@link #toFile File from a URL}, copy a
+ * {@link #copyFile File to another File},
  * copy a {@link #copyURLToFile URL's contents to a File},
  * as well as methods to {@link #deleteDirectory(File) delete} and {@link #cleanDirectory(File)
  * clean} a directory.
@@ -741,7 +741,7 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
      * @throws IllegalArgumentException      if destinationDirectory isn't a directory
      * @throws IOException                   if source does not exist, the file in
      *                                       destinationDirectory cannot be written to, or an IO error
-     *                                       occurs during copying.
+     *                                       occurs during copying
      * @deprecated use {@code org.apache.commons.io.FileUtils.copyFileToDirectory()}
      */
     @Deprecated
@@ -791,11 +791,11 @@ private static void copyFileToDirectoryIfModified( @Nonnull final File source,
      * @param source      an existing non-directory File to copy bytes from
      * @param destination a non-directory File to write bytes to (possibly
      *                    overwriting)
-     * @throws IOException  if source does not exist, destination cannot be
-     *                      written to, or an IO error occurs during copying
+     * @throws IOException if source does not exist, destination cannot be
+     *                     written to, or an IO error occurs during copying
      * @throws java.io.FileNotFoundException if destination is a directory
-     * @deprecated use {@code java.nio.Files.copy(source.toPath(), destination.toPath(), CopyOptions.NOFOLLOW_LINKS,
-     *     CopyOptions.REPLACE_EXISTING)}
+     * @deprecated use {@code java.nio.Files.copy(source.toPath(), destination.toPath(), LinkOption.NOFOLLOW_LINKS,
+     *     StandardCopyOption.REPLACE_EXISTING)}
      */
     @Deprecated
     public static void copyFile( @Nonnull final File source, @Nonnull final File destination )
@@ -873,7 +873,7 @@ private static void doCopyFile( @Nonnull File source, @Nonnull File destination
      * @param source      An existing non-directory File to copy bytes from.
      * @param destination A non-directory File to write bytes to (possibly
      *                    overwriting).
-     * @return true if no problem occured
+     * @return true if no problem occurred
      * @throws IOException if source does not exist, destination cannot be
      *                     written to, or an IO error occurs during copying.
      */
@@ -895,9 +895,9 @@ private static boolean copyFileIfModified( @Nonnull final File source, @Nonnull
      * The directories up to destination will be created if they don't already exist.
      * destination will be overwritten if it already exists.
      *
-     * @param source      A URL to copy bytes from.
-     * @param destination A non-directory File to write bytes to (possibly
-     *                    overwriting).
+     * @param source      a URL to copy bytes from
+     * @param destination a non-directory File to write bytes to (possibly
+     *                    overwriting)
      * @throws IOException if
      *                     
            
      *                     
          • source URL cannot be opened
            • 
@@ -905,7 +905,7 @@ private static boolean copyFileIfModified( @Nonnull final File source, @Nonnull
      *                     
          • an IO error occurs during copying
            • 
      *                     
          
      * @deprecated use {@code java.nio.Files.copy(source.openStream(), destination.toPath(),
-     *     CopyOptions.REPLACE_EXISTING)}
+     *     StandardCopyOption.REPLACE_EXISTING)}
      */
     public static void copyURLToFile( @Nonnull final URL source, @Nonnull final File destination )
         throws IOException
@@ -918,10 +918,10 @@ public static void copyURLToFile( @Nonnull final URL source, @Nonnull final File
      * The directories up to destination will be created if they don't already exist.
      * destination will be overwritten if it already exists.
      *
-     * @param source      An {@link InputStream} to copy bytes from. This stream is
+     * @param source      an {@link InputStream} to copy bytes from. This stream is
      *                    guaranteed to be closed.
-     * @param destination A non-directory File to write bytes to (possibly
-     *                    overwriting).
+     * @param destination a non-directory File to write bytes to (possibly
+     *                    overwriting)
      * @throws IOException if
      *                     
            
      *                     
          • source cannot be opened
            • 
@@ -929,7 +929,7 @@ public static void copyURLToFile( @Nonnull final URL source, @Nonnull final File
      *                     
          • an I/O error occurs during copying
            • 
      *                     
          
      * @deprecated use {@code java.nio.Files.copy(source, destination.toPath(),
-     *     CopyOptions.REPLACE_EXISTING)}
+     *     StandardCopyOption.REPLACE_EXISTING)}
      */
     @Deprecated
     private static void copyStreamToFile( @Nonnull @WillClose final InputStream source,
@@ -972,7 +972,7 @@ private static void copyStreamToFile( @Nonnull @WillClose final InputStream sour
      * 
          
      *
      * @param path the path to normalize
-     * @return the normalized String, or null if too many ..'s.
+     * @return the normalized String, or null if too many ..'s
      * @deprecated use {@code org.apache.commons.io.FileNameUtils.normalize()}
      */
     @Deprecated
@@ -1026,8 +1026,7 @@ private static void copyStreamToFile( @Nonnull @WillClose final InputStream sour
      * relative (doesn't start with /), it will be resolved relative to
      * baseFile, otherwise it is treated as a normal root-relative path.
      *
-     * @param baseFile Where to resolve filename from, if filename is
-     *                 relative.
+     * @param baseFile where to resolve filename from, if filename is relative
      * @param filename absolute or relative file path to resolve
      * @return the canonical File of filename
      */

From e07ce88105d5f03d597810f9ed08c223a1a07492 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sun, 18 Oct 2020 19:05:43 +0000
Subject: [PATCH 189/265] sdeps: update JUnit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f354b42b..59a4f29d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
     
       junit
       junit
-      4.13
+      4.13.1
       test
     
     

From 360fd973130d4e80bbb0df2e6b30b7a54ec5f324 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz 
Date: Wed, 25 Nov 2020 22:48:46 +0100
Subject: [PATCH 190/265] [MSHARED-962] Upgrade org.fusesource.jansi:jansi from
 1.13 to 2.0.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 59a4f29d..87cee137 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
     
       org.fusesource.jansi
       jansi
-      1.13
+      2.0.1
       true
     
     

From c6ae1438bc08fe202fbd699af324ce1a81396dc9 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet 
Date: Thu, 21 Jan 2021 20:54:43 +0100
Subject: [PATCH 191/265] [MSHARED-973]    Upgrade jansi to 2.2.0

Signed-off-by: rfscholte 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 87cee137..f548340c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
     
       org.fusesource.jansi
       jansi
-      2.0.1
+      2.2.0
       true
     
     

From 6853e1adad6221341618e66fb549df3913aec88f Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 22 Jan 2021 06:09:58 -0500
Subject: [PATCH 192/265] remove unreachable catch block

---
 .../maven/shared/utils/cli/CommandLineUtils.java   | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
index 2ffcfb24..65e88b29 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
@@ -584,8 +584,8 @@ else if ( " ".equals( nextTok ) )
     }
 
     /**
-     * @param line The line
-     * @return The concatenate lines.
+     * @param line the lines
+     * @return the concatenated lines, quoted and escaped, separated by spaces
      */
     public static String toString( String... line )
     {
@@ -595,7 +595,6 @@ public static String toString( String... line )
             return "";
         }
 
-        // path containing one or more elements
         final StringBuilder result = new StringBuilder();
         for ( int i = 0; i < line.length; i++ )
         {
@@ -603,14 +602,7 @@ public static String toString( String... line )
             {
                 result.append( ' ' );
             }
-            try
-            {
-                result.append( StringUtils.quoteAndEscape( line[i], '\"' ) );
-            }
-            catch ( Exception e )
-            {
-                System.err.println( "Error quoting argument: " + e.getMessage() );
-            }
+            result.append( StringUtils.quoteAndEscape( line[i], '\"' ) );
         }
         return result.toString();
     }

From 58cc4496c7ab45cc0da544fb65be0ac4bb6d878c Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 22 Jan 2021 06:18:37 -0500
Subject: [PATCH 193/265] deprecate methods that have been obsolete since Java
 1.5

---
 .../apache/maven/shared/utils/cli/CommandLineUtils.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
index 2ffcfb24..e01a574c 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
@@ -421,9 +421,9 @@ public Integer call()
      * with case-insensitive environment variables like Windows, all variable names will be normalized to upper case.
      *
      * @return The shell environment variables, can be empty but never null.
-     * @see System#getenv() System.getenv() API, new in JDK 5.0, to get the same result
-     *      since 2.0.2 System#getenv() will be used if available in the current running jvm.
+     * @deprecated use System#getenv()
      */
+    @Deprecated
     public static Properties getSystemEnvVars()
     {
         return getSystemEnvVars( !Os.isFamily( Os.FAMILY_WINDOWS ) );
@@ -435,9 +435,9 @@ public static Properties getSystemEnvVars()
      *
      * @param caseSensitive Whether environment variable keys should be treated case-sensitively.
      * @return Properties object of (possibly modified) envar keys mapped to their values.
-     * @see System#getenv() System.getenv() API, new in JDK 5.0, to get the same result
-     *      since 2.0.2 System#getenv() will be used if available in the current running jvm.
+     * @deprecated use System#getenv()
      */
+    @Deprecated
     public static Properties getSystemEnvVars( boolean caseSensitive )
     {
         Map envs = System.getenv();

From aa3950250656ebe69d55dad59676f6f027822186 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 22 Jan 2021 06:37:18 -0500
Subject: [PATCH 194/265] libraries should not communicate directly with the
 end user

---
 .../org/apache/maven/shared/utils/cli/Commandline.java | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
index db137708..879e8c3a 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
@@ -482,15 +482,7 @@ public void setLine( String line ) throws CommandLineException
             {
                 return;
             }
-            try
-            {
-                parts = CommandLineUtils.translateCommandline( line );
-            }
-            catch ( CommandLineException e )
-            {
-                System.err.println( "Error translating Commandline." );
-                throw( e );
-            }
+            parts = CommandLineUtils.translateCommandline( line );
         }
 
         /**

From 183cc979d4d1e6bca40333ebced18e72a70d9e99 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 22 Jan 2021 06:41:30 -0500
Subject: [PATCH 195/265] clean up Javadoc

---
 .../java/org/apache/maven/shared/utils/cli/Arg.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Arg.java b/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
index e0eccf3a..094cbba6 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
@@ -27,24 +27,24 @@
 public interface Arg
 {
     /**
-     * @param value Set the value.
+     * @param value the value to be set
      */
     void setValue( String value );
 
     /**
-     * @param line The line of arguments.
+     * @param line the line of arguments
      */
     void setLine( String line ) throws CommandLineException;
 
     /**
-     * @param value The file to be set.
+     * @param file the file to be set
      */
-    void setFile( File value );
+    void setFile( File file );
 
     /**
-     * To mask the argument value when a command line ask to print his arguments.
+     * Whether to hide the argument value when a command line prints the arguments.
      *
-     * @param mask new state of the {@code maks} property
+     * @param mask new state of the {@code mask} property
      * @since 0.6
      */
     void setMask( boolean mask );

From 016988361a597d639d5e476d8700d7c94b6d10ce Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 22 Jan 2021 18:01:48 +0000
Subject: [PATCH 196/265] clean up comments (#73)

---
 .../maven/shared/utils/cli/Commandline.java   | 94 +++++++++----------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
index 879e8c3a..1f89fbe9 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
@@ -70,16 +70,15 @@ public class Commandline
 {
     private final List arguments = new Vector();
 
-    //protected Vector envVars = new Vector();
-    // synchronized added to preserve synchronize of Vector class
     private final Map envVars = Collections.synchronizedMap( new LinkedHashMap() );
 
     private Shell shell;
 
     /**
      * Create a new command line object.
-     * Shell is autodetected from operating system
-     * @param shell The shell instance.
+     * Shell is autodetected from operating system.
+     * 
+     * @param shell the shell instance
      */
     public Commandline( Shell shell )
     {
@@ -88,9 +87,9 @@ public Commandline( Shell shell )
 
     /**
      * Create a new command line object.
-     * Shell is autodetected from operating system
+     * Shell is autodetected from operating system.
      *
-     * @param toProcess The command to process
+     * @param toProcess the command to process
      */
     public Commandline( String toProcess ) throws CommandLineException
     {
@@ -108,7 +107,7 @@ public Commandline( String toProcess ) throws CommandLineException
 
     /**
      * Create a new command line object.
-     * Shell is autodetected from operating system
+     * Shell is autodetected from operating system.
      */
     public Commandline()
     {
@@ -116,7 +115,7 @@ public Commandline()
     }
 
     /**
-     * 
          Sets the shell or command-line interpretor for the detected operating system,
+     * 
          Sets the shell or command-line interpreter for the detected operating system,
      * and the shell arguments.
          
      */
     private void setDefaultShell()
@@ -140,13 +139,9 @@ private void setDefaultShell()
     }
 
     /**
-     * Creates an argument object.
-     * 
          
-     * 
          Each commandline object has at most one instance of the
-     * argument class.  This method calls
-     * this.createArgument(false).
          
+     * Creates an empty argument object and inserts it at the end of the argument list.
      *
-     * @return the argument object.
+     * @return the argument object
      */
     public Arg createArg()
     {
@@ -154,14 +149,11 @@ public Arg createArg()
     }
 
     /**
-     * Creates an argument object and adds it to our list of args.
-     * 
          
-     * 
          Each commandline object has at most one instance of the
-     * argument class.
          
+     * Creates an argument object and adds it to the list of args.
      *
      * @param insertAtStart if true, the argument is inserted at the
-     *                      beginning of the list of args, otherwise it is appended.
-     * @return The arguments.
+     *                      beginning of the list of args. Otherwise it is appended.
+     * @return the argument
      */
     public Arg createArg( boolean insertAtStart )
     {
@@ -179,7 +171,8 @@ public Arg createArg( boolean insertAtStart )
 
     /**
      * Sets the executable to run.
-     * @param executable The executable.
+     * 
+     * @param executable the executable
      */
     public void setExecutable( String executable )
     {
@@ -187,7 +180,7 @@ public void setExecutable( String executable )
     }
 
     /**
-     * @return The executable.
+     * @return the executable
      */
     public String getExecutable()
     {
@@ -196,7 +189,7 @@ public String getExecutable()
     }
 
     /**
-     * @param line The arguments.
+     * @param line the arguments
      */
     public void addArguments( String... line )
     {
@@ -207,9 +200,10 @@ public void addArguments( String... line )
     }
 
     /**
-     * Add an environment variable
-     * @param name The name of the environment variable.
-     * @param value The appropriate value.
+     * Add an environment variable.
+     * 
+     * @param name the name of the environment variable
+     * @param value the appropriate value
      */
     public void addEnvironment( String name, String value )
     {
@@ -218,7 +212,7 @@ public void addEnvironment( String name, String value )
     }
 
     /**
-     * Add system environment variables
+     * Add system environment variables.
      */
     public void addSystemEnvironment()
     {
@@ -235,8 +229,9 @@ public void addSystemEnvironment()
     }
 
     /**
-     * Return the list of environment variables
-     * @return an array of all environment variables.
+     * Return the list of environment variables.
+     * 
+     * @return an array of all environment variables
      */
     public String[] getEnvironmentVariables()
     {
@@ -254,7 +249,8 @@ public String[] getEnvironmentVariables()
 
     /**
      * Returns the executable and all defined arguments.
-     * @return an array of all arguments incl. executable.
+     * 
+     * @return an array of all arguments including the executable
      */
     public String[] getCommandline()
     {
@@ -272,7 +268,7 @@ public String[] getCommandline()
     }
 
     /**
-     * @return the shell, executable and all defined arguments without masking any arguments.
+     * @return the shell, executable and all defined arguments without masking any arguments
      */
     private String[] getShellCommandline()
     {
@@ -280,7 +276,7 @@ private String[] getShellCommandline()
     }
 
     /**
-     * @param mask flag to mask any arguments (having his {@code mask} field to {@code true}).
+     * @param mask flag to mask any arguments (having his {@code mask} field to {@code true})
      * @return the shell, executable and all defined arguments with masking some arguments if
      * {@code mask} parameter is on
      */
@@ -302,10 +298,10 @@ public String[] getArguments()
 
     /**
      * Returns all arguments defined by addLine,
-     * addValue or the argument object.
+     * addValue, or the argument object.
      *
-     * @param mask flag to mask any arguments (having his {@code mask} field to {@code true}).
-     * @return an array of arguments.
+     * @param mask flag to mask any arguments (having his {@code mask} field to {@code true})
+     * @return an array of arguments
      */
     public String[] getArguments( boolean mask )
     {
@@ -355,7 +351,8 @@ public Object clone()
 
     /**
      * Sets working directory.
-     * @param path The to be set as working directory.
+     * 
+     * @param path the working directory
      */
     public void setWorkingDirectory( String path )
     {
@@ -363,8 +360,9 @@ public void setWorkingDirectory( String path )
     }
 
     /**
-     * Sets execution directory.
-     * @param workingDirectory The working directory.
+     * Sets working directory.
+     * 
+     * @param workingDirectory the working directory
      */
     public void setWorkingDirectory( File workingDirectory )
     {
@@ -372,7 +370,7 @@ public void setWorkingDirectory( File workingDirectory )
     }
 
     /**
-     * @return The working directory.
+     * @return the working directory
      */
     public File getWorkingDirectory()
     {
@@ -388,17 +386,16 @@ public void clearArgs()
     }
 
     /**
-     * Executes the command.
-     * @return The process.
-     * @throws CommandLineException in case of errors.
+     * Execute the command.
+     * 
+     * @return the process
+     * @throws CommandLineException in case of errors
      */
     public Process execute()
         throws CommandLineException
     {
         Process process;
 
-        //addEnvironment( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
-
         String[] environment = getEnvironmentVariables();
 
         File workingDir = shell.getWorkingDirectory();
@@ -434,7 +431,7 @@ else if ( !workingDir.isDirectory() )
     }
 
     /**
-     * Allows to set the shell to be used in this command line.
+     * Set the shell to be used for this command line.
      *
      * @param shell the shell
      */
@@ -445,7 +442,8 @@ void setShell( Shell shell )
 
     /**
      * Get the shell to be used in this command line.
-     * @return the shell.
+     * 
+     * @return the shell
      */
     public Shell getShell()
     {
@@ -453,7 +451,7 @@ public Shell getShell()
     }
 
     /**
-     * 
+     * A single command line argument
      */
     public static class Argument
         implements Arg
@@ -502,7 +500,7 @@ public void setMask( boolean mask )
         }
 
         /**
-         * @return The parts.
+         * @return the parts
          */
         private String[] getParts()
         {

From e6249ce6a57590b73e1e666a83593afb04fd1d0a Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sun, 14 Feb 2021 16:46:10 +0000
Subject: [PATCH 197/265] move plexus-utils to scope test (#79)

* move plexus-utils to scope test
* update plexus-utils
* fix generics
---
 pom.xml                                                    | 6 +++---
 .../org/apache/maven/shared/utils/io/FileUtilsTest.java    | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index f548340c..5aef5d8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,13 +120,13 @@
     
       org.codehaus.plexus
       plexus-utils
-      3.0.10
-      provided
+      3.3.0
+      test
     
     
       org.apache.maven.plugin-testing
       maven-plugin-testing-harness
-      3.1.0
+      3.3.0
       test
     
   
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 9fa7c85e..c692a38a 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -12,6 +12,7 @@
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeThat;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.maven.shared.utils.Os;
 import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
 import org.codehaus.plexus.util.InterpolationFilterReader;
@@ -653,9 +654,9 @@ public void copyFileWithFilteringAndNewerDestinationAndMatchingContent()
         );
     }
 
-    private FileUtils.FilterWrapper[] wrappers( String key, String value )
+    private static FileUtils.FilterWrapper[] wrappers( String key, String value )
     {
-        final Map map = new HashMap<>();
+        final Map map = new HashMap<>();
         map.put( key, value );
         return new FileUtils.FilterWrapper[]
             {
@@ -688,7 +689,7 @@ private static void assertFileContent( @Nonnull File file, @Nonnull String expec
             assertEquals(
                 "Expected " + file.getPath() + " to contain: " + expected,
                 expected,
-                IOUtil.toString( in )
+                IOUtils.toString( in )
             );
         }
     }

From ab2cc9348b3f60c7fdcc8167432ab9d519346fba Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 26 Feb 2021 14:01:19 +0000
Subject: [PATCH 198/265] Test, fix, and deprecate buggy copyDirectory methods
 (#80)

Unignore copyDirectory tests and fix broken behavior that caused them to be ignored. Deprecate these methods in favor of better maintained and documented Apache Commons IO methods from which they were copied and pasted 10+ years ago.
---
 .../maven/shared/utils/io/FileUtils.java      |  58 ++++--
 .../maven/shared/utils/io/FileUtilsTest.java  | 189 +++---------------
 2 files changed, 73 insertions(+), 174 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index f1947827..4612b37f 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.commons.io.IOUtils;
 import org.apache.maven.shared.utils.Os;
 import org.apache.maven.shared.utils.StringUtils;
 
@@ -52,13 +53,14 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Random;
 
 /**
  * This class provides basic facilities for manipulating files and file paths.
- * 
          
+ *
  * 
          Path-related methods
          
- * 
          
+ * 
  * 
          Methods exist to retrieve the components of a typical file path. For example
  * /www/hosted/mysite/index.html, can be broken into:
  * 
            
@@ -68,13 +70,12 @@
  * 
            
  * 
            
  * 
            File-related methods
            
- * 
            
+ * 
  * There are methods to create a {@link #toFile File from a URL}, copy a
  * {@link #copyFile File to another File},
  * copy a {@link #copyURLToFile URL's contents to a File},
  * as well as methods to {@link #deleteDirectory(File) delete} and {@link #cleanDirectory(File)
  * clean} a directory.
- * 
            
  * 
            
  * Common {@link java.io.File} manipulation routines.
  * 
            
@@ -89,7 +90,6 @@
  * @author Christoph.Reck
  * @author Peter Donald
  * @author Jeff Turner
- *
  */
 public class FileUtils
 {
@@ -633,7 +633,7 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
         try ( InputStream input1 = new FileInputStream( file1 );
             InputStream  input2 = new FileInputStream( file2 ) )
         { 
-            return IOUtil.contentEquals( input1, input2 );
+            return IOUtils.contentEquals( input1, input2 );
         }
     }
 
@@ -750,7 +750,7 @@ public static void copyFileToDirectory( @Nonnull final File source, @Nonnull fin
     {
         if ( destinationDirectory.exists() && !destinationDirectory.isDirectory() )
         {
-            throw new IllegalArgumentException( "Destination is not a directory" );
+            throw new IOException( "Destination is not a directory" );
         }
 
         copyFile( source, new File( destinationDirectory, source.getName() ) );
@@ -1022,9 +1022,9 @@ private static void copyStreamToFile( @Nonnull @WillClose final InputStream sour
     }
 
     /**
-     * Resolve a file filename to it's canonical form. If filename is
-     * relative (doesn't start with /), it will be resolved relative to
-     * baseFile, otherwise it is treated as a normal root-relative path.
+     * Resolve a file filename to its canonical form. If filename is
+     * relative (doesn't start with /), it is resolved relative to
+     * baseFile. Otherwise it is treated as a normal root-relative path.
      *
      * @param baseFile where to resolve filename from, if filename is relative
      * @param filename absolute or relative file path to resolve
@@ -1605,14 +1605,30 @@ public static List getFiles( @Nonnull File directory, @Nullable String inc
     /**
      * Copy the contents of a directory into another one.
      *
-     * @param sourceDirectory      the source directory
-     * @param destinationDirectory the target directory
+     * @param sourceDirectory the source directory. If the source does not exist,
+     *     the method simply returns.
+     * @param destinationDirectory the target directory; will be created if it doesn't exist
      * @throws IOException if any
+     * @deprecated use {@code org.apache.commons.io.FileUtils.copyDirectory()}
      */
+    @Deprecated
     public static void copyDirectory( @Nonnull File sourceDirectory, @Nonnull File destinationDirectory )
         throws IOException
     {
-        copyDirectory( sourceDirectory, destinationDirectory, "**", null );
+        Objects.requireNonNull( sourceDirectory );
+        Objects.requireNonNull( destinationDirectory );
+        if ( destinationDirectory.equals( sourceDirectory ) )
+        {
+            throw new IOException( "Can't copy directory " + sourceDirectory + " to itself." );
+        }
+        else if ( !destinationDirectory.exists() )
+        {
+            if ( !destinationDirectory.mkdirs() )
+            {
+                throw new IOException( "Can't create directory " + destinationDirectory );
+            }
+        }
+        copyDirectoryStructure( sourceDirectory, destinationDirectory );
     }
 
     /**
@@ -1622,9 +1638,11 @@ public static void copyDirectory( @Nonnull File sourceDirectory, @Nonnull File d
      * @param destinationDirectory the target directory
      * @param includes             Ant include pattern
      * @param excludes             Ant exclude pattern
-     * @throws IOException if any
+     * @throws IOException if the source is a file or cannot be copied
      * @see #getFiles(File, String, String)
+     * @deprecated use {@code org.apache.commons.io.FileUtils.copyDirectory()}
      */
+    @Deprecated
     public static void copyDirectory( @Nonnull File sourceDirectory, @Nonnull File destinationDirectory,
                                       @Nullable String includes, @Nullable String excludes )
         throws IOException
@@ -1633,6 +1651,10 @@ public static void copyDirectory( @Nonnull File sourceDirectory, @Nonnull File d
         {
             return;
         }
+        else if ( !sourceDirectory.isDirectory() )
+        {
+            throw new IOException( sourceDirectory + " is not a directory." );
+        }
 
         List files = getFiles( sourceDirectory, includes, excludes );
 
@@ -1651,8 +1673,8 @@ public static void copyDirectory( @Nonnull File sourceDirectory, @Nonnull File d
      * 
          • The sourceDirectory must exist.
      * 
          
      *
-     * @param sourceDirectory      the source dir
-     * @param destinationDirectory the target dir
+     * @param sourceDirectory the existing directory to be copied
+     * @param destinationDirectory the new directory to be created
      * @throws IOException if any
      * @deprecated use {@code org.apache.commons.io.FileUtils.copyDirectory()}
      */
@@ -1686,7 +1708,7 @@ private static void copyDirectoryStructure( @Nonnull File sourceDirectory, @Nonn
 
         if ( !sourceDirectory.exists() )
         {
-            throw new IOException( "Source directory doesn't exists (" + sourceDirectory.getAbsolutePath() + ")." );
+            throw new IOException( "Source directory doesn't exist (" + sourceDirectory.getAbsolutePath() + ")." );
         }
 
         File[] files = sourceDirectory.listFiles();
@@ -2123,7 +2145,7 @@ public static boolean isSymbolicLinkForSure( @Nonnull final File file )
      * @return the linked file
      * @throws IOException in case of an error
      * @see {@code java.nio.file.Files.createSymbolicLink(Path)} which creates a new
-     *         symbolic link but does not replace exsiting symbolic links
+     *         symbolic link but does not replace existing symbolic links
      */
     @Nonnull public static File createSymbolicLink( @Nonnull File symlink,  @Nonnull File target )
             throws IOException
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index c692a38a..4dfa4fa4 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -122,7 +122,7 @@ public void setUp()
         createFile( testFile2, testFile2Size );
     }
 
-    void createFile( File file, long size )
+    private static void createFile( File file, long size )
         throws IOException
     {
         if ( !file.getParentFile().exists() )
@@ -140,7 +140,7 @@ void createFile( File file, long size )
     /**
      * Assert that the content of a file is equal to that in a byte[].
      */
-    void assertEqualContent( byte[] b0, File file )
+    private void assertEqualContent( byte[] b0, File file )
         throws IOException
     {
         int count = 0, numRead = 0;
@@ -155,16 +155,16 @@ void assertEqualContent( byte[] b0, File file )
             assertThat( "Different number of bytes: ", count, is( b0.length ) );
             for ( int i = 0; i < count; i++ )
             {
-                assertThat( "byte " + i + " differs", b1[i], is( b0[i] ) );
+                assertEquals( "byte " + i + " differs", b1[i], b0[i] );
             }
         }
     }
 
-    void deleteFile( File file )
+    private void deleteFile( File file )
     {
         if ( file.exists() )
         {
-            assertThat( "Couldn't delete file: " + file, file.delete(), is( true ) );
+            assertTrue( "Couldn't delete file: " + file, file.delete() );
         }
     }
 
@@ -784,9 +784,7 @@ public void copyFile2()
     }
 
     @Test
-    @Ignore( "Commons test case that is failing for plexus" )
-    public void copyToSelf()
-        throws Exception
+    public void copyToSelf() throws IOException
     {
         File destination = new File( tempFolder.getRoot(), "copy3.txt" );
         //Prepare a test file
@@ -796,33 +794,6 @@ public void copyToSelf()
     }
 
     @Test
-    @Ignore( "Commons test case that is failing for plexus" )
-    public void copyDirectoryToDirectory_NonExistingDest()
-        throws Exception
-    {
-        createFile( testFile1, 1234 );
-        createFile( testFile2, 4321 );
-        File srcDir = tempFolder.getRoot();
-        File subDir = new File( srcDir, "sub" );
-        subDir.mkdir();
-        File subFile = new File( subDir, "A.txt" );
-        FileUtils.fileWrite( subFile, "UTF8", "HELLO WORLD" );
-        File destDir = new File( System.getProperty( "java.io.tmpdir" ), "tmp-FileUtilsTestCase" );
-        FileUtils.deleteDirectory( destDir );
-        File actualDestDir = new File( destDir, srcDir.getName() );
-
-        FileUtils.copyDirectory( srcDir, destDir );
-
-        assertThat( "Check exists", destDir.exists(), is( true ) );
-        assertThat( "Check exists", actualDestDir.exists(), is( true ) );
-        assertThat( "Check size", FileUtils.sizeOfDirectory( actualDestDir ),
-                    is( FileUtils.sizeOfDirectory( srcDir ) ) );
-        assertThat( new File( actualDestDir, "sub/A.txt" ).exists(), is( true ) );
-        FileUtils.deleteDirectory( destDir );
-    }
-
-    @Test
-    @Ignore( "Commons test case that is failing for plexus" )
     public void copyDirectoryToNonExistingDest()
         throws Exception
     {
@@ -838,130 +809,34 @@ public void copyDirectoryToNonExistingDest()
 
         FileUtils.copyDirectory( srcDir, destDir );
 
-        assertThat( "Check exists", destDir.exists(), is( true ) );
-        assertThat( "Check size", FileUtils.sizeOfDirectory( destDir ), is( FileUtils.sizeOfDirectory( srcDir ) ) );
-        assertThat( new File( destDir, "sub/A.txt" ).exists(), is( true ) );
+        assertTrue( destDir.exists() );
+        assertEquals( FileUtils.sizeOfDirectory( destDir ), FileUtils.sizeOfDirectory( srcDir ) );
+        assertTrue( new File( destDir, "sub/A.txt" ).exists() );
         FileUtils.deleteDirectory( destDir );
     }
 
     @Test
-    @Ignore( "Commons test case that is failing for plexus" )
-    public void copyDirectoryToExistingDest()
-        throws Exception
+    public void copyDirectoryToExistingDest() throws IOException
     {
         createFile( testFile1, 1234 );
         createFile( testFile2, 4321 );
         File srcDir = tempFolder.getRoot();
         File subDir = new File( srcDir, "sub" );
-        subDir.mkdir();
+        assertTrue( subDir.mkdir() );
         File subFile = new File( subDir, "A.txt" );
         FileUtils.fileWrite( subFile, "UTF8", "HELLO WORLD" );
         File destDir = new File( System.getProperty( "java.io.tmpdir" ), "tmp-FileUtilsTestCase" );
         FileUtils.deleteDirectory( destDir );
-        destDir.mkdirs();
+        assertTrue ( destDir.mkdirs() );
 
         FileUtils.copyDirectory( srcDir, destDir );
 
-        assertThat( FileUtils.sizeOfDirectory( destDir ), is( FileUtils.sizeOfDirectory( srcDir ) ) );
-        assertThat( new File( destDir, "sub/A.txt" ).exists(), is( true ) );
-    }
-
-    /**
-     * Test for IO-141
-     */
-    @Test
-    @Ignore( "Commons test case that is failing for plexus" )
-    public void copyDirectoryToChild()
-        throws Exception
-    {
-        File grandParentDir = new File( tempFolder.getRoot(), "grandparent" );
-        File parentDir = new File( grandParentDir, "parent" );
-        File childDir = new File( parentDir, "child" );
-        createFilesForTestCopyDirectory( grandParentDir, parentDir, childDir );
-
-        long expectedCount =
-            FileUtils.getFileAndDirectoryNames( grandParentDir, null, null, true, true, true, true ).size()
-                + FileUtils.getFileAndDirectoryNames( parentDir, null, null, true, true, true, true ).size();
-        long expectedSize = FileUtils.sizeOfDirectory( grandParentDir ) + FileUtils.sizeOfDirectory( parentDir );
-        FileUtils.copyDirectory( parentDir, childDir );
-        assertThat(
-            1L * FileUtils.getFileAndDirectoryNames( grandParentDir, null, null, true, true, true, true ).size(),
-            is( expectedCount ) );
-        assertThat( FileUtils.sizeOfDirectory( grandParentDir ), is( expectedSize ) );
-    }
-
-    /**
-     * Test for IO-141
-     */
-    @Test
-    @Ignore( "Commons test case that is failing for plexus" )
-    public void copyDirectoryToGrandChild()
-        throws Exception
-    {
-        File grandParentDir = new File( tempFolder.getRoot(), "grandparent" );
-        File parentDir = new File( grandParentDir, "parent" );
-        File childDir = new File( parentDir, "child" );
-        createFilesForTestCopyDirectory( grandParentDir, parentDir, childDir );
-
-        long expectedCount =
-            ( FileUtils.getFileAndDirectoryNames( grandParentDir, null, null, true, true, true, true ).size() * 2 );
-        long expectedSize = ( FileUtils.sizeOfDirectory( grandParentDir ) * 2 );
-        FileUtils.copyDirectory( grandParentDir, childDir );
-        assertThat(
-            1L * FileUtils.getFileAndDirectoryNames( grandParentDir, null, null, true, true, true, true ).size(),
-            is( expectedCount ) );
-        assertThat( FileUtils.sizeOfDirectory( grandParentDir ), is( expectedSize ) );
-    }
-
-    /**
-     * Test for IO-217 FileUtils.copyDirectoryToDirectory makes infinite loops
-     */
-    @Test
-    public void copyDirectoryToItself()
-        throws Exception
-    {
-        File dir = new File( tempFolder.getRoot(), "itself" );
-        dir.mkdirs();
-        FileUtils.copyDirectory( dir, dir );
-        assertThat( FileUtils.getFileAndDirectoryNames( dir, null, null, true, true, true, true ).size(), is( 1 ) );
-    }
-
-    private void createFilesForTestCopyDirectory( File grandParentDir, File parentDir, File childDir )
-        throws Exception
-    {
-        File childDir2 = new File( parentDir, "child2" );
-        File grandChildDir = new File( childDir, "grandChild" );
-        File grandChild2Dir = new File( childDir2, "grandChild2" );
-        File file1 = new File( grandParentDir, "file1.txt" );
-        File file2 = new File( parentDir, "file2.txt" );
-        File file3 = new File( childDir, "file3.txt" );
-        File file4 = new File( childDir2, "file4.txt" );
-        File file5 = new File( grandChildDir, "file5.txt" );
-        File file6 = new File( grandChild2Dir, "file6.txt" );
-        FileUtils.deleteDirectory( grandParentDir );
-        grandChildDir.mkdirs();
-        grandChild2Dir.mkdirs();
-        FileUtils.fileWrite( file1, "UTF8", "File 1 in grandparent" );
-        FileUtils.fileWrite( file2, "UTF8", "File 2 in parent" );
-        FileUtils.fileWrite( file3, "UTF8", "File 3 in child" );
-        FileUtils.fileWrite( file4, "UTF8", "File 4 in child2" );
-        FileUtils.fileWrite( file5, "UTF8", "File 5 in grandChild" );
-        FileUtils.fileWrite( file6, "UTF8", "File 6 in grandChild2" );
+        assertEquals( FileUtils.sizeOfDirectory( destDir ), FileUtils.sizeOfDirectory( srcDir ) );
+        assertTrue( new File( destDir, "sub/A.txt" ).exists() );
     }
 
     @Test
-    @Ignore( "Commons test case that is failing for plexus" )
-    public void copyDirectoryErrors()
-        throws Exception
-    {
-        try
-        {
-            FileUtils.copyDirectory( null, null );
-            fail();
-        }
-        catch ( NullPointerException ex )
-        {
-        }
+    public void copyDirectoryErrors_nullDestination() throws IOException {
         try
         {
             FileUtils.copyDirectory( new File( "a" ), null );
@@ -970,41 +845,43 @@ public void copyDirectoryErrors()
         catch ( NullPointerException ex )
         {
         }
+    }
+
+    @Test
+    public void copyDirectoryErrors_copyToSelf() {
         try
         {
-            FileUtils.copyDirectory( null, new File( "a" ) );
-            fail();
-        }
-        catch ( NullPointerException ex )
-        {
-        }
-        try
-        {
-            FileUtils.copyDirectory( new File( "doesnt-exist" ), new File( "a" ) );
+            FileUtils.copyDirectory( tempFolder.getRoot(), tempFolder.getRoot() );
             fail();
         }
         catch ( IOException ex )
         {
         }
+    }
+
+    @Test
+    public void copyDirectoryErrors()
+        throws IOException
+    {
         try
         {
-            FileUtils.copyDirectory( testFile1, new File( "a" ) );
+            FileUtils.copyDirectory( null, null );
             fail();
         }
-        catch ( IOException ex )
+        catch ( NullPointerException ex )
         {
         }
         try
         {
-            FileUtils.copyDirectory( tempFolder.getRoot(), testFile1 );
+            FileUtils.copyDirectory( null, new File( "a" ) );
             fail();
         }
-        catch ( IOException ex )
+        catch ( NullPointerException ex )
         {
         }
         try
         {
-            FileUtils.copyDirectory( tempFolder.getRoot(), tempFolder.getRoot() );
+            FileUtils.copyDirectory( tempFolder.getRoot(), testFile1 );
             fail();
         }
         catch ( IOException ex )
@@ -1020,9 +897,9 @@ public void forceDeleteAFile1()
     {
         File destination = new File( tempFolder.getRoot(), "copy1.txt" );
         destination.createNewFile();
-        assertThat( "Copy1.txt doesn't exist to delete", destination.exists(), is( true ) );
+        assertTrue( "Copy1.txt doesn't exist to delete", destination.exists() );
         FileUtils.forceDelete( destination );
-        assertThat( "Check No Exist", !destination.exists(), is( true ) );
+        assertFalse( destination.exists() );
     }
 
     @Test

From 8b8d586c996225816581b0c176ee918982a58944 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Tue, 29 Dec 2020 11:15:30 +0100
Subject: [PATCH 199/265] [MSHARED-969] Environment variable with null value

---
 pom.xml                                       |  3 ++
 .../maven/shared/utils/cli/Commandline.java   | 11 +++---
 .../utils/cli/CommandLineUtilsTest.java       | 39 +++++++++++++++++++
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5aef5d8a..ce50ec2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,9 @@
         maven-surefire-plugin
         
           false
+          
+            TestValue
+          
         
       
     
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
index 1f89fbe9..ffc0c25a 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
@@ -236,15 +236,16 @@ public void addSystemEnvironment()
     public String[] getEnvironmentVariables()
     {
         addSystemEnvironment();
-        String[] environmentVars = new String[envVars.size()];
-        int i = 0;
+        List environmentVars = new ArrayList<>();
         for ( String name : envVars.keySet() )
         {
             String value = envVars.get( name );
-            environmentVars[i] = name + "=" + value;
-            i++;
+            if ( value != null )
+            {
+                environmentVars.add( name + "=" + value );
+            }
         }
-        return environmentVars;
+        return environmentVars.toArray( new String[0] );
     }
 
     /**
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
index 079d0d16..81b29971 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
@@ -19,6 +19,9 @@
  * under the License.
  */
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItemInArray;
+import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -168,4 +171,40 @@ private void assertCmdLineArgs( final String[] expected, final String cmdLine )
         assertEquals( expected.length, actual.length );
         assertEquals( Arrays.asList( expected ), Arrays.asList( actual ) );
     }
+
+    @Test
+    public void environmentVariableWithNullShouldNotBeSet() {
+
+        Commandline commandline = new Commandline();
+        commandline.addEnvironment("TEST_NULL_ENV", null);
+
+        String[] environmentVariables = commandline.getEnvironmentVariables();
+
+        assertNotNull( environmentVariables );
+        assertThat( environmentVariables, not( hasItemInArray( "TEST_NULL_ENV=null" ) ) );
+    }
+
+    @Test
+    public void environmentVariableFromSystemIsCopied() {
+
+        Commandline commandline = new Commandline();
+
+        String[] environmentVariables = commandline.getEnvironmentVariables();
+
+        assertNotNull(environmentVariables);
+        assertThat(environmentVariables, hasItemInArray( "TEST_SHARED_ENV=TestValue" ) );
+    }
+
+    @Test
+    public void environmentVariableFromSystemIsRemoved() {
+
+        Commandline commandline = new Commandline();
+        commandline.addEnvironment("TEST_SHARED_ENV", null);
+
+        String[] environmentVariables = commandline.getEnvironmentVariables();
+
+        assertNotNull(environmentVariables);
+        assertThat(environmentVariables, not ( hasItemInArray( "TEST_SHARED_ENV=TestValue" ) ) );
+    }
+
 }

From 81a813bb8a6bb3dbe5e177a3df2a9c08f899be2d Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 22 Jan 2021 06:33:45 -0500
Subject: [PATCH 200/265] Windows 9X is long dead

---
 .../org/apache/maven/shared/utils/cli/Commandline.java | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
index ffc0c25a..f430332a 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
@@ -34,7 +34,6 @@
 import org.apache.maven.shared.utils.StringUtils;
 import org.apache.maven.shared.utils.cli.shell.BourneShell;
 import org.apache.maven.shared.utils.cli.shell.CmdShell;
-import org.apache.maven.shared.utils.cli.shell.CommandShell;
 import org.apache.maven.shared.utils.cli.shell.Shell;
 
 /**
@@ -123,14 +122,7 @@ private void setDefaultShell()
         //If this is windows set the shell to command.com or cmd.exe with correct arguments.
         if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
         {
-            if ( Os.isFamily( Os.FAMILY_WIN9X ) )
-            {
-                setShell( new CommandShell() );
-            }
-            else
-            {
-                setShell( new CmdShell() );
-            }
+            setShell( new CmdShell() );
         }
         else
         {

From f94bb250dcddcddadc610aa7cc28d7b07a9697ed Mon Sep 17 00:00:00 2001
From: Guillaume Nodet 
Date: Thu, 21 Jan 2021 16:29:59 +0100
Subject: [PATCH 201/265] [MNG-6915] Add a helper method to get the terminal
 width

---
 .../shared/utils/logging/MessageUtils.java    | 18 ++++++++++++
 .../utils/logging/MessageUtilsTest.java       | 29 +++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
index 74b85a42..dab346f5 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
@@ -201,4 +201,22 @@ public void run()
             Runtime.getRuntime().addShutdownHook( shutdownHook );
         }
     }
+
+    /**
+     * Get the terminal width or -1 if the width cannot be determined.
+     *
+     * @return the terminal width
+     */
+    public static int getTerminalWidth()
+    {
+        if ( JANSI )
+        {
+            int width = AnsiConsole.getTerminalWidth();
+            return width > 0 ? width : -1;
+        }
+        else
+        {
+            return -1;
+        }
+    }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
index a53c4d96..e80fe38c 100644
--- a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
@@ -22,9 +22,18 @@
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
 
+import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 
+import org.fusesource.jansi.AnsiColors;
+import org.fusesource.jansi.AnsiConsole;
+import org.fusesource.jansi.AnsiMode;
+import org.fusesource.jansi.AnsiPrintStream;
+import org.fusesource.jansi.AnsiType;
+import org.fusesource.jansi.io.AnsiOutputStream;
 import org.junit.Test;
 
 public class MessageUtilsTest
@@ -45,4 +54,24 @@ public void testSystem()
             System.setOut( currentOut );
         }
     }
+
+    @Test
+    public void testTerminalWidth()
+    {
+        AnsiOutputStream.WidthSupplier width = new AnsiOutputStream.WidthSupplier()
+        {
+            @Override
+            public int getTerminalWidth()
+            {
+                return 33;
+            }
+        };
+        AnsiOutputStream aos = new AnsiOutputStream( new ByteArrayOutputStream(), width, AnsiMode.Default,
+                null, AnsiType.Emulation, AnsiColors.Colors256, StandardCharsets.UTF_8,
+                null, null, false );
+        AnsiConsole.systemInstall();
+        AnsiConsole.out = new AnsiPrintStream( aos, true );
+        assertEquals( 33, MessageUtils.getTerminalWidth() );
+        AnsiConsole.systemUninstall();
+    }
 }

From 0bb44cdc9541beeb9c78927c663d16b6d737eb09 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet 
Date: Wed, 2 Dec 2020 07:49:27 +0100
Subject: [PATCH 202/265] [MNG-6380] Use the new jansi AnsiMode to control the
 whether ansi sequences are stripped or let through

---
 .../shared/utils/logging/MessageUtils.java    | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
index 74b85a42..8b0d9cee 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
@@ -21,6 +21,7 @@
 
 import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.AnsiConsole;
+import org.fusesource.jansi.AnsiMode;
 
 /**
  * Colored message utils, to manage colors consistently across plugins (only if Maven version is at least 3.5.0).
@@ -81,17 +82,13 @@ public static void systemUninstall()
             // hook can only set when JANSI is true 
             if ( shutdownHook != null )
             {
-                // if out and system_out are same instance again, ansi is assumed to be uninstalled 
-                if ( AnsiConsole.out == AnsiConsole.system_out )
+                try
                 {
-                    try
-                    {
-                        Runtime.getRuntime().removeShutdownHook( shutdownHook );
-                    }
-                    catch ( IllegalStateException ex )
-                    {
-                        // ignore - VM is already shutting down
-                    }
+                    Runtime.getRuntime().removeShutdownHook( shutdownHook );
+                }
+                catch ( IllegalStateException ex )
+                {
+                    // ignore - VM is already shutting down
                 }
             }
         }
@@ -113,7 +110,19 @@ public static void setColorEnabled( boolean flag )
     {
         if ( JANSI )
         {
+            AnsiConsole.out().setMode( flag ? AnsiMode.Force : AnsiMode.Strip );
             Ansi.setEnabled( flag );
+            System.setProperty( AnsiConsole.JANSI_MODE,
+                    flag ? AnsiConsole.JANSI_MODE_FORCE : AnsiConsole.JANSI_MODE_STRIP );
+            boolean installed = AnsiConsole.isInstalled();
+            while ( AnsiConsole.isInstalled() )
+            {
+                AnsiConsole.systemUninstall();
+            }
+            if ( installed )
+            {
+                AnsiConsole.systemInstall();
+            }
         }
     }
 
@@ -194,7 +203,10 @@ public void run()
                 {
                     synchronized ( STARTUP_SHUTDOWN_MONITOR )
                     {
-                        doSystemUninstall();
+                        while ( AnsiConsole.isInstalled() )
+                        {
+                            doSystemUninstall();
+                        }
                     }
                 }
             };

From 5097ceefd24fc83e005bdfa4e254975b025733ad Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sat, 23 Jan 2021 07:45:51 -0500
Subject: [PATCH 203/265] remove unused plexus dependency

---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce50ec2f..5fc16dcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,12 +111,6 @@
       ${mavenVersion}
       test
               
-    
-      org.codehaus.plexus
-      plexus-container-default
-      2.1.0
-      provided
-    
     
       org.codehaus.plexus
       plexus-utils

From 8f31df7af9383d278fc5513729e1bdcf254fd997 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 16 Apr 2021 17:14:09 -0400
Subject: [PATCH 204/265] update to JUnit 4.13.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5fc16dcc..0a75ed0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
     
       junit
       junit
-      4.13.1
+      4.13.2
       test
     
     

From 1461e4de42c324a71decfefe0c51a6f80f05f9e2 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sat, 23 Jan 2021 07:45:51 -0500
Subject: [PATCH 205/265] Revert "remove unused plexus dependency"

This reverts commit 5097ceefd24fc83e005bdfa4e254975b025733ad.
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0a75ed0a..7516b15e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,12 @@
       ${mavenVersion}
       test
     
+    
+      org.codehaus.plexus
+      plexus-container-default
+      2.1.0
+      provided
+    
     
       org.codehaus.plexus
       plexus-utils

From 4e93c5621ef45c7cf6a03d96ca7a3c45ac4e2062 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Wed, 21 Apr 2021 11:46:52 +0000
Subject: [PATCH 206/265] [SUREFIRE-1556] fail fast on empty element names
 (#11)

* fail fast on empty element names
---
 .../utils/xml/PrettyPrintXMLWriter.java       | 52 +++++++++++--------
 .../maven/shared/utils/xml/XMLWriter.java     | 26 ++++++----
 .../utils/xml/PrettyPrintXmlWriterTest.java   | 19 +++++--
 3 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java
index b0d1a7d7..f38c1abd 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java
@@ -60,7 +60,7 @@ public class PrettyPrintXMLWriter
 
     /**
      * @param writer not null
-     * @param lineIndent could be null, but the normal way is some spaces.
+     * @param lineIndent can be null, but the normal way is some spaces
      */
     public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent )
     {
@@ -69,7 +69,7 @@ public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent )
 
     /**
      * @param writer not null
-     * @param lineIndent could be null, but the normal way is some spaces.
+     * @param lineIndent can be null, but the normal way is some spaces.
      */
     public PrettyPrintXMLWriter( Writer writer, String lineIndent )
     {
@@ -94,9 +94,9 @@ public PrettyPrintXMLWriter( Writer writer )
 
     /**
      * @param writer not null
-     * @param lineIndent could be null, but the normal way is some spaces.
-     * @param encoding could be null or invalid.
-     * @param doctype could be null.
+     * @param lineIndent can be null, but the normal way is some spaces
+     * @param encoding can be null or invalid
+     * @param doctype can be null
      */
     public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent, String encoding, String doctype )
     {
@@ -105,9 +105,9 @@ public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent, String encod
 
     /**
      * @param writer not null
-     * @param lineIndent could be null, but the normal way is some spaces.
-     * @param encoding could be null or invalid.
-     * @param doctype could be null.
+     * @param lineIndent can be null, but the normal way is some spaces
+     * @param encoding can be null or invalid
+     * @param doctype can be null
      */
     public PrettyPrintXMLWriter( Writer writer, String lineIndent, String encoding, String doctype )
     {
@@ -116,8 +116,8 @@ public PrettyPrintXMLWriter( Writer writer, String lineIndent, String encoding,
 
     /**
      * @param writer not null
-     * @param encoding could be null or invalid.
-     * @param doctype could be null.
+     * @param encoding can be null or invalid
+     * @param doctype can be null
      */
     public PrettyPrintXMLWriter( PrintWriter writer, String encoding, String doctype )
     {
@@ -126,8 +126,8 @@ public PrettyPrintXMLWriter( PrintWriter writer, String encoding, String doctype
 
     /**
      * @param writer not null
-     * @param encoding could be null or invalid.
-     * @param doctype could be null.
+     * @param encoding can be null or invalid
+     * @param doctype can be null
      */
     public PrettyPrintXMLWriter( Writer writer, String encoding, String doctype )
     {
@@ -136,10 +136,10 @@ public PrettyPrintXMLWriter( Writer writer, String encoding, String doctype )
 
     /**
      * @param writer not null
-     * @param lineIndent could be null, but the normal way is some spaces.
-     * @param lineSeparator could be null, but the normal way is valid line separator
-     * @param encoding could be null or the encoding to use.
-     * @param doctype could be null.
+     * @param lineIndent can be null, but the normal way is some spaces.
+     * @param lineSeparator can be null, but the normal way is valid line separator
+     * @param encoding can be null or the encoding to use.
+     * @param doctype can be null
      */
     public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent, String lineSeparator, String encoding,
                                  String doctype )
@@ -149,10 +149,10 @@ public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent, String lineS
 
     /**
      * @param writer        not null
-     * @param lineIndent    could be null, but the normal way is some spaces.
-     * @param lineSeparator could be null, but the normal way is valid line separator
-     * @param encoding      could be null or the encoding to use.
-     * @param doctype       could be null.
+     * @param lineIndent    can be null, but the normal way is some spaces
+     * @param lineSeparator can be null, but the normal way is valid line separator
+     * @param encoding      can be null or the encoding to use
+     * @param doctype       can be null
      */
     private PrettyPrintXMLWriter( PrintWriter writer, char[] lineIndent, char[] lineSeparator, String encoding,
                                   String doctype )
@@ -211,7 +211,7 @@ public void setDocType( String docType )
     }
 
     /**
-     * @param lineSeparator The line separator to be used.
+     * @param lineSeparator the line separator to be output
      */
     public void setLineSeparator( String lineSeparator )
     {
@@ -224,7 +224,7 @@ public void setLineSeparator( String lineSeparator )
     }
 
     /**
-     * @param lineIndentParameter The line indent parameter.
+     * @param lineIndentParameter the line indent parameter
      */
     public void setLineIndenter( String lineIndentParameter )
     {
@@ -239,6 +239,12 @@ public void setLineIndenter( String lineIndentParameter )
     /** {@inheritDoc} */
     public void startElement( String elementName ) throws IOException
     {
+        
+        if ( elementName.isEmpty() )
+        {
+            throw new IllegalArgumentException( "Element name cannot be empty" );
+        }
+        
         boolean firstLine = ensureDocumentStarted();
 
         completePreviouslyOpenedElement();
@@ -325,7 +331,7 @@ public void endElement() throws IOException
     }
 
     /**
-     * Write the documents if not already done.
+     * Write the document if not already done.
      *
      * @return true if the document headers have freshly been written.
      */
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java
index 0daad8bc..32a56d26 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XMLWriter.java
@@ -30,7 +30,7 @@ public interface XMLWriter
 
     /**
      * Sets the encoding of the document.
-     * If not set, UTF-8 is being used
+     * If not set, UTF-8 is used.
      *
      * @param encoding the encoding
      * @throws IllegalStateException if the generation of the document has already started
@@ -38,7 +38,7 @@ public interface XMLWriter
     void setEncoding( String encoding );
 
     /**
-     * Sets the docType of the document.
+     * Sets the DOCTYPE of the document.
      *
      * @param docType the docType
      * @throws IllegalStateException if the generation of the document has already started
@@ -48,15 +48,17 @@ public interface XMLWriter
 
     /**
      * Start an XML Element tag.
-     * @param name The name of the tag.
-     * @throws IOException if starting the element fails.
+     * 
+     * @param name the name of the tag
+     * @throws IOException if starting the element fails
      */
     void startElement( String name ) throws IOException;
 
 
     /**
      * Add a XML attribute to the current XML Element.
-     * This method must get called immediately after {@link #startElement(String)}
+     * This method must get called immediately after {@link #startElement(String)}.
+     * 
      * @param key The key of the attribute.
      * @param value The value of the attribute.
      * @throws IllegalStateException if no element tag is currently in process
@@ -65,8 +67,9 @@ public interface XMLWriter
     void addAttribute( String key, String value ) throws IOException;
 
     /**
-     * Add a value text to the current element tag
-     * This will perform XML escaping to guarantee valid content
+     * Add text to the current element tag.
+     * This performs XML escaping to guarantee well-formed content.
+     * 
      * @param text The text which should be written.
      * @throws IllegalStateException if no element tag got started yet
      * @throws IOException if writing the text fails.
@@ -74,10 +77,11 @@ public interface XMLWriter
     void writeText( String text ) throws IOException;
 
     /**
-     * Add a preformatted markup to the current element tag
-     * @param text The text which should be written.
-     * @throws IllegalStateException if no element tag got started yet
-     * @throws IOException if writing the markup fails.
+     * Add preformatted markup to the current element tag.
+     * 
+     * @param text the text which should be written
+     * @throws IllegalStateException if no element tag is started yet
+     * @throws IOException if writing the markup fails
      */
     void writeMarkup( String text ) throws IOException;
 
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
index 4830f433..d0611119 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
@@ -20,9 +20,8 @@
  */
 
 import java.io.IOException;
-
-import javax.swing.text.html.HTML;
 import java.io.StringWriter;
+import javax.swing.text.html.HTML;
 
 import org.apache.maven.shared.utils.StringUtils;
 import org.junit.Assert;
@@ -32,13 +31,25 @@
  * Test of {@link PrettyPrintXMLWriter}
  *
  * @author Vincent Siveton
- *
  */
 public class PrettyPrintXmlWriterTest
 {
-    private StringWriter w = new StringWriter();
+    private StringWriter w = new StringWriter();;
     private PrettyPrintXMLWriter writer = new PrettyPrintXMLWriter( w );
     
+    @Test
+    public void testNoStartTag() throws IOException
+    {
+        
+        try {
+            writer.startElement( "" );
+            Assert.fail( "allowed empty name" );
+        } catch ( IllegalArgumentException ex ) {
+            Assert.assertEquals( "Element name cannot be empty", ex.getMessage() );
+        }
+        
+    }
+    
     @Test
     public void testDefaultPrettyPrintXMLWriter() throws IOException
     {

From 9f40037bfb04d54dd997a9ab837390045c9a4348 Mon Sep 17 00:00:00 2001
From: Maarten Mulders 
Date: Fri, 23 Apr 2021 17:37:00 +0200
Subject: [PATCH 207/265] [NOJIRA] Javadoc cleanup in preparation of release

Closes #85.
---
 .../org/apache/maven/shared/utils/Os.java     |  4 +-
 .../apache/maven/shared/utils/PathTool.java   | 14 ++--
 .../maven/shared/utils/StringUtils.java       | 34 ++++------
 .../apache/maven/shared/utils/cli/Arg.java    |  1 +
 .../maven/shared/utils/cli/Commandline.java   |  9 ++-
 .../shared/utils/cli/StreamConsumer.java      |  9 ++-
 .../utils/cli/javatool/AbstractJavaTool.java  |  4 +-
 .../cli/javatool/AbstractJavaToolRequest.java |  2 +-
 .../shared/utils/cli/javatool/JavaTool.java   | 33 ++++-----
 .../utils/cli/javatool/JavaToolException.java | 11 ++-
 .../utils/cli/javatool/JavaToolRequest.java   | 16 ++---
 .../utils/cli/javatool/JavaToolResult.java    |  2 +-
 .../shared/utils/cli/shell/BourneShell.java   |  1 -
 .../shared/utils/cli/shell/CmdShell.java      |  2 -
 .../maven/shared/utils/cli/shell/Shell.java   |  2 +-
 .../shared/utils/introspection/ClassMap.java  | 13 ++--
 .../ReflectionValueExtractor.java             |  7 +-
 .../shared/utils/io/DirectoryScanner.java     | 68 +++++++++++--------
 .../maven/shared/utils/io/FileUtils.java      | 61 ++++++++---------
 .../apache/maven/shared/utils/io/IOUtil.java  | 34 +++++-----
 .../maven/shared/utils/io/MatchPattern.java   |  6 +-
 .../maven/shared/utils/io/MatchPatterns.java  |  5 +-
 .../maven/shared/utils/io/ScanConductor.java  |  2 -
 .../maven/shared/utils/io/SelectorUtils.java  | 17 +++--
 .../utils/logging/AnsiMessageBuilder.java     | 16 ++---
 .../utils/logging/LoggerLevelRenderer.java    | 28 ++++----
 .../shared/utils/logging/MessageBuilder.java  | 30 ++++++++
 .../shared/utils/logging/MessageUtils.java    | 13 ++--
 .../utils/logging/PlainMessageBuilder.java    | 16 ++---
 .../shared/utils/xml/XmlReaderException.java  | 29 +++-----
 .../utils/xml/XmlStreamReaderException.java   | 10 ++-
 .../utils/xml/PrettyPrintXmlWriterTest.java   |  2 +-
 32 files changed, 253 insertions(+), 248 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/Os.java b/src/main/java/org/apache/maven/shared/utils/Os.java
index c4c5f33b..a2c3d529 100644
--- a/src/main/java/org/apache/maven/shared/utils/Os.java
+++ b/src/main/java/org/apache/maven/shared/utils/Os.java
@@ -26,12 +26,10 @@
 
 /**
  * 
          Condition that tests the OS type.
          
- * 
          
  * 
          This class got copied over from Apache ANT.
  * Even the version from plexus-utils was
- * only an ANT fork!
          
+ * only an ANT fork!
  * The last time it got copied was on 2011-08-12
          
- * 
          
  * 
          When merging changes please take care of the special
  * OS_FAMILY handling in this version of Os.java!
          
  *
diff --git a/src/main/java/org/apache/maven/shared/utils/PathTool.java b/src/main/java/org/apache/maven/shared/utils/PathTool.java
index 28bc3083..2a0b0fe5 100644
--- a/src/main/java/org/apache/maven/shared/utils/PathTool.java
+++ b/src/main/java/org/apache/maven/shared/utils/PathTool.java
@@ -26,12 +26,13 @@
 import javax.annotation.Nullable;
 
 /**
- * Path tool contains static methods to assist in determining path-related
- * information such as relative paths.
- * 
          
+ * 
          Path tool contains static methods to assist in determining path-related
+ * information such as relative paths.
          
+ * 
          
  * This class originally got developed at Apache Anakia and later maintained
  * in maven-utils of Apache Maven-1.
  * Some external fixes by Apache Committers have been applied later.
+ * 
          
  */
 public class PathTool
 {
@@ -55,9 +56,9 @@ public PathTool()
      * file separators.  The relative path returned is formed using
      * forward slashes as it is expected this path is to be used as a
      * link in a web page (again mimicking Anakia's behavior).
-     * 
          
+     * 
          
      * This method is thread-safe.
-     * 
          
+     * 
          
      * 
                * PathTool.getRelativePath( null, null )                                   = ""
      * PathTool.getRelativePath( null, "/usr/local/java/bin" )                  = ""
@@ -111,8 +112,7 @@ public static String getRelativePath( @Nullable String basedir, @Nullable String
     }
 
     /**
-     * This method can calculate the relative path between two pathes on a file system.
-     * 
          
+     * 
          This method can calculate the relative path between two paths on a file system.
          
      * 
                * PathTool.getRelativeFilePath( null, null )                                   = ""
      * PathTool.getRelativeFilePath( null, "/usr/local/java/bin" )                  = ""
diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
index b70cdae8..de4a1e88 100644
--- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
@@ -104,7 +104,6 @@ public static String trim( String str )
      *
      * @param str String target to delete whitespace from
      * @return the String without whitespace
-     * @throws NullPointerException
      */
     @Nonnull public static String deleteWhitespace( @Nonnull String str )
     {
@@ -122,7 +121,7 @@ public static String trim( String str )
 
     /**
      * 
          Checks if a String is non null and is
-     * not empty (length > 0).
          
+     * not empty (length > 0).
          
      *
      * @param str the String to check
      * @return true if the String is non-null, and not length zero
@@ -816,7 +815,7 @@ public static String replace( @Nullable String text, @Nullable String repl, @Nul
     //--------------------------------------------------------------------------
 
     /**
-     * 
          Center a String in a larger String of size n.
          
+     * 
          Center a String in a larger String of size n.
          
      *
      * 
          Uses spaces as the value to buffer the String with.
      * Equivalent to center(str, size, " ").
          
@@ -1174,7 +1173,7 @@ else if ( ch < 32 )
      * @param str    String to repeat
      * @param repeat number of times to repeat str
      * @return String with repeated String
-     * @throws NegativeArraySizeException if repeat < 0
+     * @throws NegativeArraySizeException if repeat < 0
      * @throws NullPointerException       if str is null
      */
     @Nonnull public static String repeat( @Nonnull String str, int repeat )
@@ -1979,14 +1978,12 @@ private static void reverseArray( @Nonnull String... array )
     //--------------------------------------------------------------------------
 
     /**
-     * Turn "Now is the time for all good men" into "Now is the time for..."
-     * 
          
-     * Specifically:
-     * 
          
-     * If str is less than max characters long, return it.
+     * 
          Turn "Now is the time for all good men" into "Now is the time for..."
          
+     * 
          Specifically:
          
+     * 
          If str is less than max characters long, return it.
      * Else abbreviate it to (substring(str, 0, max-3) + "...").
      * If maxWidth is less than 3, throw an IllegalArgumentException.
-     * In no case will it return a string of length greater than maxWidth.
+     * In no case will it return a string of length greater than maxWidth.
          
      * 
      * @param s The string to be abbreviated.
      * @param maxWidth maximum length of result string
@@ -1999,12 +1996,13 @@ private static void reverseArray( @Nonnull String... array )
 
     /**
      * Turn "Now is the time for all good men" into "...is the time for..."
-     * 
          
+     * 
          
      * Works like abbreviate(String, int), but allows you to specify a "left edge"
      * offset.  Note that this left edge is not necessarily going to be the leftmost
      * character in the result, or the first
      * character following the ellipses, but it will appear somewhere in the result.
      * In no case will it return a string of length greater than maxWidth.
+     * 
          
      * 
      * @param s        String to abbreviate.
      * @param offset   left edge of source string
@@ -2051,8 +2049,9 @@ private static void reverseArray( @Nonnull String... array )
      * Compare two strings, and return the portion where they differ.
      * (More precisely, return the remainder of the second string,
      * starting from where it's different from the first.)
-     * 
          
-     * E.g. strdiff("i am a machine", "i am a robot") -> "robot"
+     * 
          
+     * E.g. strdiff("i am a machine", "i am a robot") → "robot"
+     * 
          
      *
      * @param s1 The first string.
      * @param s2 The second string.
@@ -2071,7 +2070,7 @@ public static String difference( @Nonnull String s1, @Nonnull String s2 )
     /**
      * Compare two strings, and return the index at which the strings begin to differ.
      * 
          
-     * E.g. strdiff("i am a machine", "i am a robot") -> 7
+     * E.g. strdiff("i am a machine", "i am a robot") → 7
      * 
          
      *
      * @param s1 The first string.
@@ -2188,7 +2187,6 @@ public static String interpolate( String text, @Nonnull Map namespace )
     /**
      * Converts the first character of the given String to lowercase.
      * This method does not trim spaces!
-     * 
          
      *
      * @param data the String to get it's first character lower-cased.
      * @return data string with the first character transformed to lowercase
@@ -2205,9 +2203,8 @@ public static String interpolate( String text, @Nonnull Map namespace )
     }
 
     /**
-     * Take the input string and un-camel-case it.
-     * 
          
-     * 'ThisIsIt' will become 'this-is-it'.
+     * 
          Take the input string and un-camel-case it.
          
+     * 
          'ThisIsIt' will become 'this-is-it'.
          
      *
      * @param view the view
      * @return deHumped String
@@ -2519,7 +2516,6 @@ public static boolean contains( @Nullable String str, @Nullable String searchStr
 
     /**
      * 
          Checks if String ends with a search String, handling null.
          
-     * 
          
      * 
          A null String will return false.
          
      *
      * 
          diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Arg.java b/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
index 094cbba6..62f14ea6 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
@@ -33,6 +33,7 @@ public interface Arg
 
     /**
      * @param line the line of arguments
+     * @throws CommandLineException in case of unbalanced quotes.
      */
     void setLine( String line ) throws CommandLineException;
 
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
index f430332a..e03e905c 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
@@ -37,15 +37,14 @@
 import org.apache.maven.shared.utils.cli.shell.Shell;
 
 /**
- * 
          
+ * 
          
  * Commandline objects help handling command lines specifying processes to
  * execute.
  * 
          
- * 
          
+ * 
          
  * The class can be used to define a command line as nested elements or as a
  * helper to define a command line by an application.
  * 
          
- * 
          
  * 
  * <someelement>
          
  *   <acommandline executable="/executable/to/run">
          
@@ -55,8 +54,7 @@
  *   </acommandline>
          
  * </someelement>
          
  *           
- * 
          
- * 
          
+ * 
          
  * The element someelement must provide a method
  * createAcommandline which returns an instance of this class.
  * 
          
@@ -89,6 +87,7 @@ public Commandline( Shell shell )
      * Shell is autodetected from operating system.
      *
      * @param toProcess the command to process
+     * @throws CommandLineException in case of unbalanced quotes.
      */
     public Commandline( String toProcess ) throws CommandLineException
     {
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java
index 0cde961e..d64fba96 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java
@@ -22,12 +22,11 @@
 import java.io.IOException;
 
 /**
- * Works in concert with the StreamPumper class to
+ * 
          Works in concert with the StreamPumper class to
  * allow implementations to gain access to the lines being
- * "Pumped".
- * 
          
- * Please note that implementations of this interface can be expected to be
- * called from arbitrary threads and must therefore be threadsafe.
+ * "Pumped".
          
+ * 
          Please note that implementations of this interface can be expected to be
+ * called from arbitrary threads and must therefore be threadsafe.
          
  *
  * @author Florin Vancea
  * @author Paul Julius
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
index 22826802..738f660d 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
@@ -36,9 +36,9 @@
 /**
  * Abstract implementation of a {@link JavaTool}.
  *
- * @author Tony Chemit 
+ * @author Tony Chemit
  * @since 0.5
- * @param 
+ * @param  Tool-specific request type
  */
 public abstract class AbstractJavaTool
     extends AbstractLogEnabled
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolRequest.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolRequest.java
index 6e18178a..597041b4 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolRequest.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaToolRequest.java
@@ -24,7 +24,7 @@
 /**
  * Abstract implementation of a {@link JavaToolRequest}.
  *
- * @author Tony Chemit 
+ * @author Tony Chemit
  * @since 0.5
  */
 public class AbstractJavaToolRequest
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java
index b4bc3a9a..78b01701 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaTool.java
@@ -20,26 +20,23 @@
  */
 
 /**
- * Describes a java tool, means a executable available in the jdk.
- * 
          
- * The name of the tool ({@link #getJavaToolName()}) reflects the name of the executable that should exists as an
- * executable in the jdk, like {@code jarsigner, keytool, javadoc, ...}.
- * 
          
- * An abstract implementation of the {@link JavaTool} named {@link AbstractJavaTool} use the command line API to execute
- * any user requests of this tool.
+ * 
          Describes a java tool, means a executable available in the jdk.
          
+ * 
          The name of the tool ({@link #getJavaToolName()}) reflects the name of the executable that should exists as an
+ * executable in the jdk, like {@code jarsigner, keytool, javadoc, ...}.
          
+ * 
          An abstract implementation of the {@link JavaTool} named {@link AbstractJavaTool} use the command line API to
+ * execute any user requests of this tool.
          
  *
- * @author Tony Chemit 
+ * @author Tony Chemit
  * @since 0.5
- * @param 
+ * @param  Tool-specific request type
  */
 public interface JavaTool
 {
 
     /**
-     * Return the name of the java tool. This is exactly the name (without his extension) of the executable to
-     * find in the {@code jdk/bin} directory.
-     * 
          
-     * For example: {@code jarsigner, keytool, javadoc, ...}
+     * 
          Return the name of the java tool. This is exactly the name (without his extension) of the executable to
+     * find in the {@code jdk/bin} directory.
          
+     * 
          For example: {@code jarsigner, keytool, javadoc, ...}
          
      *
      * @return the name of the java tool.
      */
@@ -55,13 +52,11 @@ public interface JavaTool
     void setToolchain( Object toolchain );
 
     /**
-     * Execute the input request and then returns the result of the execution.
-     * 
          
-     * If could not create the java tool invocation, a {@link JavaToolException} will be thrown.
-     * 
          
-     * If execution fails, then the result will have a none-zero {@link JavaToolResult#getExitCode()} and his
+     * 
          Execute the input request and then returns the result of the execution.
          
+     * 
          If could not create the java tool invocation, a {@link JavaToolException} will be thrown.
          
+     * 
          If execution fails, then the result will have a none-zero {@link JavaToolResult#getExitCode()} and his
      * {@link JavaToolResult#getExecutionException()} will be filled with the error, otherwise the exist code will be
-     * zero.
+     * zero.
          
      *
      * @param request the request to perform
      * @return the result of the tool execution
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java
index fa10b33b..fb9d6946 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolException.java
@@ -20,13 +20,12 @@
  */
 
 /**
- * Signals an error during the construction of the command line used to invoke java tool, e.g. illegal invocation
- * arguments.
- * 
          
- * This should not be confused with a failure of the invoked java tool build itself which will be reported by means of a
- * non-zero exit code.
+ * 
          Signals an error during the construction of the command line used to invoke java tool, e.g. illegal invocation
+ * arguments.
          
+ * 
          This should not be confused with a failure of the invoked java tool build itself which will be reported by means
+ * of a non-zero exit code.
          
  *
- * @author Tony Chemit 
+ * @author Tony Chemit
  *
  * @see JavaToolResult#getExitCode()
  * @since 0.5
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolRequest.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolRequest.java
index 7227774c..6ad86b14 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolRequest.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolRequest.java
@@ -24,27 +24,25 @@
 /**
  * Specifies the minimum parameters used to control a {@link JavaTool} invocation.
  *
- * @author Tony Chemit 
+ * @author Tony Chemit
  * @since 0.5
  */
 public interface JavaToolRequest
 {
 
     /**
-     * Gets the value of the {@code systemOutStreamConsumer} field.
-     * 
          
-     * This option field if filled is used by the commandline tool to consume system ouput stream of the jarsigner
-     * command.
+     * 
          Gets the value of the {@code systemOutStreamConsumer} field.
          
+     * 
          This option field if filled is used by the commandline tool to consume system ouput stream of the jarsigner
+     * command.
          
      *
      * @return the value of the {@code systemOutStreamConsumer} field.
      */
     StreamConsumer getSystemOutStreamConsumer();
 
     /**
-     * Gets the value of the {@code systemErrorStreamConsumer} field.
-     * 
          
-     * This option field if filled is used by the commandline tool to consume system error stream of the jarsigner
-     * command.
+     * 
          Gets the value of the {@code systemErrorStreamConsumer} field.
          
+     * 
          This option field if filled is used by the commandline tool to consume system error stream of the jarsigner
+     * command.
          
      *
      * @return the value of the {@code systemErrorStreamConsumer} field.
      */
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolResult.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolResult.java
index f3a6a77e..deb830e8 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolResult.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/JavaToolResult.java
@@ -25,7 +25,7 @@
 /**
  * Describes the result of a {@link JavaTool} invocation.
  *
- * @author Tony Chemit 
+ * @author Tony Chemit
  * @since 0.5
  */
 public class JavaToolResult
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
index e3af6651..f04864ea 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java
@@ -111,7 +111,6 @@ protected String getExecutionPreamble()
 
     /**
      * 
          Unify quotes in a path for the Bourne Shell.
          
-     * 
          
      * 
                * BourneShell.quoteOneItem(null)                       = null
      * BourneShell.quoteOneItem("")                         = ''
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java
index 04aa6de1..06b7df73 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java
@@ -51,7 +51,6 @@ public CmdShell()
      * 
          
      * From cmd.exe /? output:
      * 
          
-     * 
          
      * 
                *      If /C or /K is specified, then the remainder of the command line after
      *      the switch is processed as a command line, where the following logic is
@@ -74,7 +73,6 @@ public CmdShell()
      *      remove the last quote character on the command line, preserving
      *      any text after the last quote character.
      * 
          
-     * 
          
      * 
          
      * Always quoting the entire command line, regardless of these conditions
      * appears to make Windows processes invoke successfully.
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
index 02681086..47ec0dab 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
@@ -28,7 +28,7 @@
 
 /**
  * Class that abstracts the Shell functionality,
- * with subclasses for shells that behave particularly, like
          
+ * with subclasses for shells that behave particularly, like
  * 
  * 
            
  * 
          • command.com
            • 
diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java b/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
index 19b17322..357eab45 100644
--- a/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
+++ b/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
@@ -79,16 +79,13 @@ Class getCachedClass()
     }
 
     /**
-     * Find a Method using the methodKey
-     * provided.
-     * 
            
-     * Look in the methodMap for an entry.  If found,
+     * 
            Find a Method using the methodKey provided.
            
+     * 
            Look in the methodMap for an entry. If found,
      * it'll either be a CACHE_MISS, in which case we
      * simply give up, or it'll be a Method, in which
-     * case, we return it.
-     * 
            
-     * If nothing is found, then we must actually go
-     * and introspect the method from the MethodMap.
+     * case, we return it.
            
+     * 
            If nothing is found, then we must actually go
+     * and introspect the method from the MethodMap.
            
      * @param name Method name.
      * @param params Method parameters.
      * @return The found method.
diff --git a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
index 963c9829..cf007cc7 100644
--- a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
+++ b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
@@ -36,7 +36,6 @@
 /**
  * 
            Using simple dotted expressions to extract the values from an Object instance,
  * For example we might want to extract a value like: project.build.sourceDirectory
            
- * 
            
  * 
            The implementation supports indexed, nested and mapped properties similar to the JSP way.
            
  *
  * @author Jason van Zyl 
@@ -146,14 +145,13 @@ private ReflectionValueExtractor()
 
     /**
      * 
            The implementation supports indexed, nested and mapped properties.
            
-     * 
            
      * 
              
      * 
            • nested properties should be defined by a dot, i.e. "user.address.street"
              • 
      * 
            • indexed properties (java.util.List or array instance) should be contains (\\w+)\\[(\\d+)\\]
      * pattern, i.e. "user.addresses[1].street"
              • 
      * 
            • mapped properties should be contains (\\w+)\\((.+)\\) pattern,
      *  i.e. "user.addresses(myAddress).street"
              • 
-     * 
                
+     * 
              
      *
      * @param expression not null expression
      * @param root       not null object
@@ -170,14 +168,13 @@ public static Object evaluate( @Nonnull String expression, @Nullable Object root
      * 
              
      * The implementation supports indexed, nested and mapped properties.
      * 
              
-     * 
              
      * 
                
      * 
              • nested properties should be defined by a dot, i.e. "user.address.street"
                • 
      * 
              • indexed properties (java.util.List or array instance) should be contains (\\w+)\\[(\\d+)\\]
      * pattern, i.e. "user.addresses[1].street"
                • 
      * 
              • mapped properties should be contains (\\w+)\\((.+)\\) pattern, i.e.
      * "user.addresses(myAddress).street"
                • 
-     * 
                  
+     * 
                
      *
      * @param expression not null expression
      * @param root not null object
diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
index 5d03525e..bd8bd7d9 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
@@ -32,56 +32,62 @@
 import javax.annotation.Nullable;
 
 /**
- * Class for scanning a directory for files/directories which match certain criteria.
- * 
                
+ * 
                Class for scanning a directory for files/directories which match certain criteria.
                
+ * 
                
  * These criteria consist of selectors and patterns which have been specified. With the selectors you can select which
  * files you want to have included. Files which are not selected are excluded. With patterns you can include or exclude
  * files based on their filename.
- * 
                
+ * 
                
+ * 
                
  * The idea is simple. A given directory is recursively scanned for all files and directories. Each file/directory is
  * matched against a set of selectors, including special support for matching against filenames with include and and
  * exclude patterns. Only files/directories which match at least one pattern of the include pattern list or other file
  * selector, and don't match any pattern of the exclude pattern list or fail to match against a required selector will
  * be placed in the list of files/directories found.
- * 
                
+ * 
                
+ * 
                
  * When no list of include patterns is supplied, "**" will be used, which means that everything will be matched. When no
  * list of exclude patterns is supplied, an empty list is used, such that nothing will be excluded. When no selectors
  * are supplied, none are applied.
- * 
                
+ * 
                
+ * 
                
  * The filename pattern matching is done as follows: The name to be matched is split up in path segments. A path segment
  * is the name of a directory or file, which is bounded by File.separator ('/' under UNIX, '\' under
  * Windows). For example, "abc/def/ghi/xyz.java" is split up in the segments "abc", "def","ghi" and "xyz.java". The same
  * is done for the pattern against which should be matched.
- * 
                
+ * 
                
+ * 
                
  * The segments of the name and the pattern are then matched against each other. When '**' is used for a path segment in
  * the pattern, it matches zero or more path segments of the name.
- * 
                
+ * 
                
+ * 
                
  * There is a special case regarding the use of File.separators at the beginning of the pattern and the
  * string to match:
                
  * When a pattern starts with a File.separator, the string to match must also start with a
  * File.separator. When a pattern does not start with a File.separator, the string to match
  * may not start with a File.separator. When one of these rules is not obeyed, the string will not match.
- * 
                
+ * 
                
+ * 
                
  * When a name path segment is matched against a pattern path segment, the following special characters can be used:
                
  * '*' matches zero or more characters
                
  * '?' matches one character.
- * 
                
+ * 
                
+ * 
                
  * Examples:
- * 
                
- * "**\*.class" matches all .class files/dirs in a directory tree.
- * 
                
- * "test\a??.java" matches all files/dirs which start with an 'a', then two more characters and then ".java", in a
- * directory called test.
- * 
                
- * "**" matches everything in a directory tree.
- * 
                
- * "**\test\**\XYZ*" matches all files/dirs which start with "XYZ" and where there is a parent directory called test
- * (e.g. "abc\test\def\ghi\XYZ123").
- * 
                
+ * 
                  
+ * 
                • "**\*.class" matches all .class files/dirs in a directory tree.
                  • 
+ * 
                • "test\a??.java" matches all files/dirs which start with an 'a', then two more characters and then ".java", in a
+ * directory called test.
                  • 
+ * 
                • "**" matches everything in a directory tree.
                  • 
+ * 
                • "**\test\**\XYZ*" matches all files/dirs which start with "XYZ" and where there is a parent directory called test
+ * (e.g. "abc\test\def\ghi\XYZ123").
                  • 
+ * 
                
+ * 
                
  * Case sensitivity may be turned off if necessary. By default, it is turned on.
- * 
                
+ * 
                
+ * 
                
  * Example of usage:
- * 
                
+ * 
                
  * 
                  * String[] includes = { "**\\*.class" };
  * String[] excludes = { "modules\\*\\**" };
@@ -98,11 +104,13 @@
  *     System.out.println( files[i] );
  * }
  * 
                
- * 
                
+ * 
                
  * This will scan a directory called test for .class files, but excludes all files in all proper subdirectories of a
  * directory called "modules"
- * 
                
+ * 
                
+ * 
                
  * This class must not be used from multiple Threads concurrently!
+ * 
                
  *
  * @author Arnout J. Kuiper ajkuiper@wxs.nl
  * @author Magesh Umasankar
@@ -295,8 +303,9 @@ public void setFollowSymlinks( final boolean followSymlinks )
     /**
      * Sets the list of include patterns to use. All '/' and '\' characters are replaced by
      * File.separatorChar, so the separator used need not match File.separatorChar.
-     * 
                
+     * 
                
      * When a pattern ends with a '/' or '\', "**" is appended.
+     * 
                
      *
      * @param includes A list of include patterns. May be null, indicating that all files should be
      *                 included. If a non-null list is given, all elements must be non-null.
@@ -326,8 +335,9 @@ public void setIncludes( final String... includes )
     /**
      * Sets the list of exclude patterns to use. All '/' and '\' characters are replaced by
      * File.separatorChar, so the separator used need not match File.separatorChar.
-     * 
                
+     * 
                
      * When a pattern ends with a '/' or '\', "**" is appended.
+     * 
                
      *
      * @param excludes A list of exclude patterns. May be null, indicating that no files should be
      *                 excluded. If a non-null list is given, all elements must be non-null.
@@ -431,13 +441,15 @@ public void scan()
      * a previously captured list of files.
      * This method will not look for a changed in content but sole in the
      * list of files given.
-     * 
                
+     * 
                
      * The method will compare the given array of file Strings with the result
      * of the last directory scan. It will execute a {@link #scan()} if no
      * result of a previous scan could be found.
-     * 
                
+     * 
                
+     * 
                
      * The result of the diff can be queried by the methods
      * {@link DirectoryScanResult#getFilesAdded()} and {@link DirectoryScanResult#getFilesRemoved()}
+     * 
                
      *
      * @param oldFiles the list of previously captured files names.
      * @return the result of the directory scan.
diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index 4612b37f..4d80e180 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -61,28 +61,28 @@
  *
  * 
                Path-related methods
                
  * 
- * 
                Methods exist to retrieve the components of a typical file path. For example
+ * Methods exist to retrieve the components of a typical file path. For example
  * /www/hosted/mysite/index.html, can be broken into:
  * 
                  
  * 
                • /www/hosted/mysite/index -- retrievable through {@link #removeExtension}
                  • 
  * 
                • html -- retrievable through {@link #getExtension}
                  • 
  * 
                
- * 
                
- * 
                
+ *
  * 
                File-related methods
                
  * 
- * There are methods to create a {@link #toFile File from a URL}, copy a
+ * 
                There are methods to create a {@link #toFile File from a URL}, copy a
  * {@link #copyFile File to another File},
  * copy a {@link #copyURLToFile URL's contents to a File},
  * as well as methods to {@link #deleteDirectory(File) delete} and {@link #cleanDirectory(File)
  * clean} a directory.
- * 
                
- * Common {@link java.io.File} manipulation routines.
- * 
                
+ * 
                
+ * 
                Common {@link java.io.File} manipulation routines.
                
+ * 
                
  * Taken from the commons-utils repo.
  * Also code from Alexandria's FileUtils.
  * And from Avalon Excalibur's IO.
  * And from Ant.
+ * 
                
  *
  * @author Kevin A. Burton
  * @author Scott Sanders
@@ -482,8 +482,8 @@ public static void fileDelete( @Nonnull String fileName )
 
     /**
      * Given a directory and an array of extensions return an array of compliant files.
-     * 
                
-     * The given extensions should be like "java" and not like ".java".
+     *
+     * 
                The given extensions should be like "java" and not like ".java".
                
      *
      * @param directory  the path of the directory
      * @param extensions an array of expected extensions
@@ -688,9 +688,9 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
     /**
      * Remove extension from a path. E.g.
      * 
                -     * foo.txt    --> foo
-     * a\b\c.jpg --> a\b\c
-     * a\b\c     --> a\b\c
+     * foo.txt    → foo
+     * a\b\c.jpg  → a\b\c
+     * a\b\c      → a\b\c
      * 
                
      *
      * @param filename the path of the file
@@ -715,9 +715,9 @@ public static boolean contentEquals( @Nonnull final File file1, @Nonnull final F
      * Get extension from a path. E.g.
      *
      * 
                -     * foo.txt    --> "txt"
-     * a\b\c.jpg --> "jpg"
-     * a\b\c     --> ""
+     * foo.txt    → "txt"
+     * a\b\c.jpg  → "jpg"
+     * a\b\c      → ""
      * 
                
      *
      * @param filename the path of the file
@@ -962,13 +962,13 @@ private static void copyStreamToFile( @Nonnull @WillClose final InputStream sour
      * root.
      * Eg:
      * 
                -     * /foo//               -->     /foo/
-     * /foo/./              -->     /foo/
-     * /foo/../bar          -->     /bar
-     * /foo/../bar/         -->     /bar/
-     * /foo/../bar/../baz   -->     /baz
-     * //foo//./bar         -->     /foo/bar
-     * /../                 -->     null
+     * /foo//               →     /foo/
+     * /foo/./              →     /foo/
+     * /foo/../bar          →     /bar
+     * /foo/../bar/         →     /bar/
+     * /foo/../bar/../baz   →     /baz
+     * //foo//./bar         →     /foo/bar
+     * /../                 →     null
      * 
                
      *
      * @param path the path to normalize
@@ -1666,8 +1666,7 @@ else if ( !sourceDirectory.isDirectory() )
 
     /**
      * Copies an entire directory structure.
-     * 
                
-     * Note:
+     * 
                Note:
                
      * 
                  
      * 
                • It will include empty directories.
      * 
                • The sourceDirectory must exist.
@@ -1766,7 +1765,6 @@ else if ( file.isDirectory() )
 
     /**
      * Renames a file, even if that involves crossing file system boundaries.
-     * 
                  
      * 
                  This will remove to (if it exists), ensure that
      * to's parent directory exists and move
      * from, which involves deleting from as
@@ -1804,8 +1802,7 @@ public static void rename( @Nonnull File from, @Nonnull File to )
     }
 
     /**
-     * Create a temporary file in a given directory.
-     * 
                  
+     * 
                  Create a temporary file in a given directory.
                  
      * 
                  The file denoted by the returned abstract pathname did not
      * exist before this method was invoked, any subsequent invocation
      * of this method will yield a different file name.
                  
@@ -1859,7 +1856,7 @@ private static int positiveRandom( Random rand )
     }
 
     /**
-     * If wrappers is null or empty, the file will be copied only if to.lastModified() < from.lastModified()
+     * If wrappers is null or empty, the file will be copied only if to.lastModified() < from.lastModified()
      *
      * @param from     the file to copy
      * @param to       the destination file
@@ -1887,7 +1884,7 @@ public abstract static class FilterWrapper
     }
 
     /**
-     * If wrappers is null or empty, the file will be copy only if to.lastModified() < from.lastModified() or if
+     * If wrappers is null or empty, the file will be copy only if to.lastModified() < from.lastModified() or if
      * overwrite is true
      *
      * @param from the file to copy
@@ -1895,7 +1892,7 @@ public abstract static class FilterWrapper
      * @param encoding the file output encoding (only if wrappers is not empty)
      * @param wrappers array of {@link FilterWrapper}
      * @param overwrite if true and wrappers is null or empty, the file will be copied even if
-     *         to.lastModified() < from.lastModified()
+     *         to.lastModified() < from.lastModified()
      * @throws IOException if an IO error occurs during copying or filtering
      */
     public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable String encoding,
@@ -2144,8 +2141,8 @@ public static boolean isSymbolicLinkForSure( @Nonnull final File file )
      * @param target the target
      * @return the linked file
      * @throws IOException in case of an error
-     * @see {@code java.nio.file.Files.createSymbolicLink(Path)} which creates a new
-     *         symbolic link but does not replace existing symbolic links
+     * @see Files#createSymbolicLink(Path, Path, FileAttribute[]) which creates a new symbolic link but does
+     * not replace existing symbolic links
      */
     @Nonnull public static File createSymbolicLink( @Nonnull File symlink,  @Nonnull File target )
             throws IOException
diff --git a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java
index 11f1bdd4..534a4a02 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java
@@ -37,12 +37,12 @@
 import java.nio.channels.Channel;
 
 /**
- * General IO Stream manipulation.
+ * 
                  General IO Stream manipulation.
                  
  * 
                  
  * This class provides static utility methods for input/output operations, particularly buffered
  * copying between sources (InputStream, Reader, String and
  * byte[]) and destinations (OutputStream, Writer,
- * String and byte[]).
+ * String and byte[]).
                  
  * 
  * 
                  Unless otherwise noted, these copy methods do not flush or close the
  * streams. Often, doing so would require making non-portable assumptions about the streams' origin
@@ -837,7 +837,7 @@ public static boolean contentEquals( @Nonnull final InputStream input1, @Nonnull
     // ----------------------------------------------------------------------
 
     /**
-     * Closes a {@code Channel} suppressing any {@code IOException}.
+     * 
                  Closes a {@code Channel} suppressing any {@code IOException}.
                  
      * 
                  
      * Note: The use case justifying this method is a shortcoming of the Java language up to but not including
      * Java 7. For any code targeting Java 7 or later use of this method is highly discouraged and the
@@ -847,7 +847,8 @@ public static boolean contentEquals( @Nonnull final InputStream input1, @Nonnull
      * {@code finally} block incorrectly by using this method.
      * 
                  
      * 
                  
-     * Example:
                  
+     * Example:
+     * 
                  
      * 
                        * // Introduce variables for the resources and initialize them to null. This cannot throw an exception.
      * Closeable resource1 = null;
@@ -921,7 +922,6 @@ public static boolean contentEquals( @Nonnull final InputStream input1, @Nonnull
      *     // }
      * }
      * 
                  
-     * 
                  
      *
      * @param channel The channel to close or {@code null}.
      * @deprecated use try-with-resources
@@ -943,7 +943,7 @@ public static void close( @Nullable Channel channel )
     }
 
     /**
-     * Closes an {@code InputStream} suppressing any {@code IOException}.
+     * 
                  Closes an {@code InputStream} suppressing any {@code IOException}.
                  
      * 
                  
      * Note: The use case justifying this method is a shortcoming of the Java language up to but not including
      * Java 7. For any code targeting Java 7 or later use of this method is highly discouraged and the
@@ -953,7 +953,8 @@ public static void close( @Nullable Channel channel )
      * {@code finally} block incorrectly by using this method.
      * 
                  
      * 
                  
-     * Example:
                  
+     * Example:
+     * 
                  
      * 
                        * // Introduce variables for the resources and initialize them to null. This cannot throw an exception.
      * Closeable resource1 = null;
@@ -1027,7 +1028,6 @@ public static void close( @Nullable Channel channel )
      *     // }
      * }
      * 
                  
-     * 
                  
      *
      * @param inputStream The stream to close or {@code null}.
      * @deprecated use try-with-resources
@@ -1049,7 +1049,7 @@ public static void close( @Nullable InputStream inputStream )
     }
 
     /**
-     * Closes an {@code OutputStream} suppressing any {@code IOException}.
+     * 
                  Closes an {@code OutputStream} suppressing any {@code IOException}.
                  
      * 
                  
      * Note: The use case justifying this method is a shortcoming of the Java language up to but not including
      * Java 7. For any code targeting Java 7 or later use of this method is highly discouraged and the
@@ -1059,7 +1059,8 @@ public static void close( @Nullable InputStream inputStream )
      * {@code finally} block incorrectly by using this method.
      * 
                  
      * 
                  
-     * Example:
                  
+     * Example:
+     * 
                  
      * 
                        * // Introduce variables for the resources and initialize them to null. This cannot throw an exception.
      * Closeable resource1 = null;
@@ -1133,7 +1134,6 @@ public static void close( @Nullable InputStream inputStream )
      *     // }
      * }
      * 
                  
-     * 
                  
      *
      * @param outputStream The stream to close or {@code null}.
      * @deprecated use try-with-resources
@@ -1155,7 +1155,7 @@ public static void close( @Nullable OutputStream outputStream )
     }
 
     /**
-     * Closes a {@code Reader} suppressing any {@code IOException}.
+     * 
                  Closes a {@code Reader} suppressing any {@code IOException}.
                  
      * 
                  
      * Note: The use case justifying this method is a shortcoming of the Java language up to but not including
      * Java 7. For any code targeting Java 7 or later use of this method is highly discouraged and the
@@ -1165,7 +1165,8 @@ public static void close( @Nullable OutputStream outputStream )
      * {@code finally} block incorrectly by using this method.
      * 
                  
      * 
                  
-     * Example:
                  
+     * Example:
+     * 
                  
      * 
                        * // Introduce variables for the resources and initialize them to null. This cannot throw an exception.
      * Closeable resource1 = null;
@@ -1239,7 +1240,6 @@ public static void close( @Nullable OutputStream outputStream )
      *     // }
      * }
      * 
                  
-     * 
                  
      *
      * @param reader The reader to close or {@code null}.
      * @deprecated use try-with-resources
@@ -1261,7 +1261,7 @@ public static void close( @Nullable Reader reader )
     }
 
     /**
-     * Closes a {@code Writer} suppressing any {@code IOException}.
+     * 
                  Closes a {@code Writer} suppressing any {@code IOException}.
                  
      * 
                  
      * Note: The use case justifying this method is a shortcoming of the Java language up to but not including
      * Java 7. For any code targeting Java 7 or later use of this method is highly discouraged and the
@@ -1271,7 +1271,8 @@ public static void close( @Nullable Reader reader )
      * {@code finally} block incorrectly by using this method.
      * 
                  
      * 
                  
-     * Example:
                  
+     * Example:
+     * 
                  
      * 
                        * // Introduce variables for the resources and initialize them to null. This cannot throw an exception.
      * Closeable resource1 = null;
@@ -1345,7 +1346,6 @@ public static void close( @Nullable Reader reader )
      *     // }
      * }
      * 
                  
-     * 
                  
      *
      * @param writer The writer to close or {@code null}.
      * @deprecated use try-with-resources
diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
index 8abff427..bdce10d7 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
@@ -28,9 +28,9 @@
 import javax.annotation.Nonnull;
 
 /**
- * Describes a match target for SelectorUtils.
- * 
                  
- * Significantly more efficient than using strings, since re-evaluation and re-tokenizing is avoided.
+ * 
                  Describes a match target for SelectorUtils.
                  
+ * 
                  
+ * Significantly more efficient than using strings, since re-evaluation and re-tokenizing is avoided.
                  
  *
  * @author Kristian Rosenvold
  * @deprecated use {@code java.nio.filejava.nio.file.DirectoryStream.Filter} and related classes
diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java b/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
index 693acb1c..638586f2 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
@@ -40,9 +40,8 @@ private MatchPatterns( @Nonnull MatchPattern... patterns )
     }
 
     /**
-     * Checks these MatchPatterns against a specified string.
-     * 
                  
-     * Uses far less string tokenization than any of the alternatives.
+     * 
                  Checks these MatchPatterns against a specified string.
                  
+     * 
                  Uses far less string tokenization than any of the alternatives.
                  
      *
      * @param name            The name to look for
      * @param isCaseSensitive If the comparison is case sensitive
diff --git a/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java b/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java
index 08d7a1cd..0a0d82d7 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java
@@ -23,12 +23,10 @@
 
 /**
  * 
                  Visitor pattern for the DirectoryScanner. A ScanConductor controls the scanning process.
                  
- * 
                  
  * 
                  Create an instance and pass it to
  * {@link org.apache.maven.shared.utils.io.DirectoryScanner#setScanConductor(ScanConductor)}.
  * You will get notified about every visited directory and file. You can use the {@link ScanAction}
  * to control what should happen next.
                  
- * 
                  
  * 
                  A ScanConductor might also store own information but users must make sure that the state gets
  * cleaned between two scan() invocations.
                  
  *
diff --git a/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java b/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
index b716e7c8..56a43992 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
@@ -73,12 +73,12 @@ private SelectorUtils()
     }
 
     /**
-     * Tests whether or not a given path matches the start of a given
-     * pattern up to the first "**".
-     * 
                  
+     * 
                  Tests whether or not a given path matches the start of a given
+     * pattern up to the first "**".
                  
+     * 
                  
      * This is not a general purpose test and should only be used if you
      * can live with false positives. For example, pattern=**\a
-     * and str=b will yield true.
+     * and str=b will yield true.
                  
      *
      * @param pattern The pattern to match against. Must not be
      *                null.
@@ -93,12 +93,11 @@ public static boolean matchPatternStart( String pattern, String str )
     }
 
     /**
-     * Tests whether or not a given path matches the start of a given
-     * pattern up to the first "**".
-     * 
                  
-     * This is not a general purpose test and should only be used if you
+     * 
                  Tests whether or not a given path matches the start of a given
+     * pattern up to the first "**".
                  
+     * 
                  This is not a general purpose test and should only be used if you
      * can live with false positives. For example, pattern=**\a
-     * and str=b will yield true.
+     * and str=b will yield true.
                  
      *
      * @param pattern         The pattern to match against. Must not be
      *                        null.
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
index 2d59bc9d..7f442397 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
@@ -50,24 +50,24 @@ class AnsiMessageBuilder
         this.ansi = ansi;
     }
 
-    public String debug( String level )
+    public String debug( String message )
     {
-        return Style.DEBUG.apply( ansi ).a( level ).reset().toString();
+        return Style.DEBUG.apply( ansi ).a( message ).reset().toString();
     }
 
-    public String info( String level )
+    public String info( String message )
     {
-        return Style.INFO.apply( ansi ).a( level ).reset().toString();
+        return Style.INFO.apply( ansi ).a( message ).reset().toString();
     }
 
-    public String warning( String level )
+    public String warning( String message )
     {
-        return Style.WARNING.apply( ansi ).a( level ).reset().toString();
+        return Style.WARNING.apply( ansi ).a( message ).reset().toString();
     }
 
-    public String error( String level )
+    public String error( String message )
     {
-        return Style.ERROR.apply( ansi ).a( level ).reset().toString();
+        return Style.ERROR.apply( ansi ).a( message ).reset().toString();
     }
 
     public AnsiMessageBuilder success( Object message )
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java b/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java
index 9dac0eb1..6caa797b 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java
@@ -28,26 +28,30 @@
 public interface LoggerLevelRenderer
 {
     /**
-     * Render DEBUG level.
-     * By default, bold cyan
+     * Render a message at DEBUG level.
+     * @param message the message to render.
+     * @return the formatted message.
      */
-    String debug( String level );
+    String debug( String message );
     
     /**
-     * Render INFO level.
-     * By default, bold blue
+     * Render a message at INFO level.
+     * @param message the message to render.
+     * @return the formatted message.
      */
-    String info( String level );
+    String info( String message );
     
     /**
-     * Render WARNING level.
-     * By default, bold yellow
+     * Render a message at WARNING level.
+     * @param message the message to render.
+     * @return the formatted message.
      */
-    String warning( String level );
+    String warning( String message );
     
     /**
-     * Render ERROR level.
-     * By default, bold red
+     * Render a message at ERROR level.
+     * @param message the message to render.
+     * @return the formatted message.
      */
-    String error( String level );
+    String error( String message );
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
index 060e824e..649c0860 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
@@ -29,36 +29,48 @@ public interface MessageBuilder
     /**
      * Append message content in success style.
      * By default, bold green
+     * @param message the message to append
+     * @return the current builder
      */
     MessageBuilder success( Object message );
     
     /**
      * Append message content in warning style.
      * By default, bold yellow
+     * @param message the message to append
+     * @return the current builder
      */
     MessageBuilder warning( Object message );
     
     /**
      * Append message content in failure style.
      * By default, bold red
+     * @param message the message to append
+     * @return the current builder
      */
     MessageBuilder failure( Object message );
 
     /**
      * Append message content in strong style.
      * By default, bold
+     * @param message the message to append
+     * @return the current builder
      */
     MessageBuilder strong( Object message );
     
     /**
      * Append message content in mojo style.
      * By default, green
+     * @param message the message to append
+     * @return the current builder
      */
     MessageBuilder mojo( Object message );
     
     /**
      * Append message content in project style.
      * By default, cyan
+     * @param message the message to append
+     * @return the current builder
      */
     MessageBuilder project( Object message );
     
@@ -67,37 +79,55 @@ public interface MessageBuilder
     //
     /**
      * Append content to the message buffer.
+     * @param value the content to append
+     * @param offset the index of the first {@code char} to append
+     * @param len the number of {@code char}s to append
+     * @return the current builder
      */
     MessageBuilder a( char[] value, int offset, int len );
 
     /**
      * Append content to the message buffer.
+     * @param value the content to append
+     * @return the current builder
      */
     MessageBuilder a( char[] value );
 
     /**
      * Append content to the message buffer.
+     * @param value the content to append
+     * @param start the starting index of the subsequence to be appended
+     * @param end the end index of the subsequence to be appended
+     * @return the current builder
      */
     MessageBuilder a( CharSequence value, int start, int end );
 
     /**
      * Append content to the message buffer.
+     * @param value the content to append
+     * @return the current builder
      */
     MessageBuilder a( CharSequence value );
 
     /**
      * Append content to the message buffer.
+     * @param value the content to append
+     * @return the current builder
      */
     MessageBuilder a( Object value );
 
     /**
      * Append newline to the message buffer.
+     * @return the current builder
      */
     MessageBuilder newline();
 
     /**
      * Append formatted content to the buffer.
      * @see String#format(String, Object...)
+     * @param pattern a format string
+     * @param args arguments referenced by the format specifiers in the format string.
+     * @return the current builder
      */
     MessageBuilder format( String pattern, Object... args );
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
index 090b6a00..f28058b7 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
@@ -46,7 +46,7 @@ public class MessageUtils
         boolean jansi = true;
         try
         {
-            // JAnsi is provided by Maven core since 3.5.0
+            // Jansi is provided by Maven core since 3.5.0
             Class.forName( "org.fusesource.jansi.Ansi" );
         }
         catch ( ClassNotFoundException cnfe )
@@ -79,7 +79,7 @@ public static void systemUninstall()
         {
             doSystemUninstall();
 
-            // hook can only set when JANSI is true 
+            // hook can only set when Jansi is true
             if ( shutdownHook != null )
             {
                 try
@@ -103,8 +103,8 @@ private static void doSystemUninstall()
     }
 
     /**
-     * Enables message color (if JAnsi is available).
-     * @param flag
+     * Enables message color (if Jansi is available).
+     * @param flag to enable Jansi
      */
     public static void setColorEnabled( boolean flag )
     {
@@ -127,7 +127,8 @@ public static void setColorEnabled( boolean flag )
     }
 
     /**
-     * Is message color enabled: 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.
+     * @return whether colored messages are enabled
      */
     public static boolean isColorEnabled()
     {
@@ -145,6 +146,7 @@ public static MessageBuilder buffer()
 
     /**
      * Create a message buffer with defined String builder.
+     * @param builder initial content of the message buffer
      * @return a new buffer
      */
     public static MessageBuilder buffer( StringBuilder builder )
@@ -154,6 +156,7 @@ public static MessageBuilder buffer( StringBuilder builder )
 
     /**
      * Create a message buffer with an internal buffer of defined size.
+     * @param size size of the buffer
      * @return a new buffer
      */
     public static MessageBuilder buffer( int size )
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
index 6a7b56e1..5ff48844 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
@@ -42,24 +42,24 @@ class PlainMessageBuilder
         buffer = new StringBuilder( size );
     }
 
-    public String debug( String level )
+    public String debug( String message )
     {
-        return a( level ).toString();
+        return a( message ).toString();
     }
 
-    public String info( String level )
+    public String info( String message )
     {
-        return a( level ).toString();
+        return a( message ).toString();
     }
 
-    public String warning( String level )
+    public String warning( String message )
     {
-        return a( level ).toString();
+        return a( message ).toString();
     }
 
-    public String error( String level )
+    public String error( String message )
     {
-        return a( level ).toString();
+        return a( message ).toString();
     }
 
     public PlainMessageBuilder success( Object message )
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
index f1bc0c6f..5ee48a01 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
@@ -23,12 +23,11 @@
 import java.io.InputStream;
 
 /**
- * The XmlReaderException is thrown by the XmlReader constructors if the charset encoding can not be determined
- * according to the XML 1.0 specification and RFC 3023.
- * 
                  
- * The exception returns the unconsumed InputStream to allow the application to do an alternate processing with the
- * stream. Note that the original InputStream given to the XmlReader cannot be used as that one has been already read.
- * 
                  
+ * 
                  The XmlReaderException is thrown by the XmlReader constructors if the charset encoding can not be determined
+ * according to the XML 1.0 specification and RFC 3023.
                  
+ * 
                  The exception returns the unconsumed InputStream to allow the application to do an alternate processing with the
+ * stream. Note that the original InputStream given to the XmlReader cannot be used as that one has been already
+ * read.
                  
  *
  * @author Alejandro Abdelnur
  * @version revision 1.1 taken on 26/06/2007 from Rome (see https://rome.dev.java.net/source/browse/rome/src/java/com/sun/syndication/io/XmlReaderException.java)
@@ -54,10 +53,8 @@ class XmlReaderException
     private final InputStream is;
 
     /**
-     * Creates an exception instance if the charset encoding could not be determined.
-     * 
                  
-     * Instances of this exception are thrown by the XmlReader.
-     * 
                  
+     * 
                  Creates an exception instance if the charset encoding could not be determined.
                  
+     * 
                  Instances of this exception are thrown by the XmlReader.
                  
      *
      * @param msg         message describing the reason for the exception.
      * @param bomEnc      BOM encoding.
@@ -71,10 +68,8 @@ class XmlReaderException
     }
 
     /**
-     * Creates an exception instance if the charset encoding could not be determined.
-     * 
                  
-     * Instances of this exception are thrown by the XmlReader.
-     * 
                  
+     * 
                  Creates an exception instance if the charset encoding could not be determined.
                  
+     * 
                  Instances of this exception are thrown by the XmlReader.
                  
      *
      * @param msg         message describing the reason for the exception.
      * @param ctMime      MIME type in the content-type.
@@ -98,7 +93,6 @@ class XmlReaderException
 
     /**
      * Returns the BOM encoding found in the InputStream.
-     * 
                  
      *
      * @return the BOM encoding, null if none.
      */
@@ -109,7 +103,6 @@ public String getBomEncoding()
 
     /**
      * Returns the encoding guess based on the first bytes of the InputStream.
-     * 
                  
      *
      * @return the encoding guess, null if it couldn't be guessed.
      */
@@ -120,7 +113,6 @@ public String getXmlGuessEncoding()
 
     /**
      * Returns the encoding found in the XML prolog of the InputStream.
-     * 
                  
      *
      * @return the encoding of the XML prolog, null if none.
      */
@@ -131,7 +123,6 @@ public String getXmlEncoding()
 
     /**
      * Returns the MIME type in the content-type used to attempt determining the encoding.
-     * 
                  
      *
      * @return the MIME type in the content-type, null if there was not content-type or the encoding detection did not
      *         involve HTTP.
@@ -143,7 +134,6 @@ public String getContentTypeMime()
 
     /**
      * Returns the encoding in the content-type used to attempt determining the encoding.
-     * 
                  
      *
      * @return the encoding in the content-type, null if there was not content-type, no encoding in it or the encoding
      *         detection did not involve HTTP.
@@ -156,7 +146,6 @@ public String getContentTypeEncoding()
     /**
      * Returns the unconsumed InputStream to allow the application to do an alternate encoding detection on the
      * InputStream.
-     * 
                  
      *
      * @return the unconsumed InputStream.
      */
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
index eeabae53..992b833c 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
@@ -22,13 +22,11 @@
 import java.io.InputStream;
 
 /**
- * The XmlStreamReaderException is thrown by the XmlStreamReader constructors if the charset encoding can not be
- * determined according to the XML 1.0 specification and RFC 3023.
- * 
                  
- * The exception returns the unconsumed InputStream to allow the application to do an alternate processing with the
+ * 
                  The XmlStreamReaderException is thrown by the XmlStreamReader constructors if the charset encoding can not be
+ * determined according to the XML 1.0 specification and RFC 3023.
                  
+ * 
                  The exception returns the unconsumed InputStream to allow the application to do an alternate processing with the
  * stream. Note that the original InputStream given to the XmlStreamReader cannot be used as that one has been already
- * read.
- * 
                  
+ * read.
                  
  *
  * @author Alejandro Abdelnur
  * @version revision 1.1 taken on 26/06/2007 from Rome (see
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
index d0611119..fdf81302 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
@@ -34,7 +34,7 @@
  */
 public class PrettyPrintXmlWriterTest
 {
-    private StringWriter w = new StringWriter();;
+    private StringWriter w = new StringWriter();
     private PrettyPrintXMLWriter writer = new PrettyPrintXMLWriter( w );
     
     @Test

From 17091d82508deb9b7067f3434ba16f660ffc5023 Mon Sep 17 00:00:00 2001
From: Maarten Mulders 
Date: Mon, 26 Apr 2021 15:54:15 +0200
Subject: [PATCH 208/265] [maven-release-plugin] prepare release
 maven-shared-utils-3.3.4

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7516b15e..8faf21da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.3.4-SNAPSHOT
+  3.3.4
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -36,7 +36,7 @@
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
-    HEAD
+    maven-shared-utils-3.3.4
  
   
     jira
@@ -61,7 +61,7 @@
 
   
     RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder
-    2020-04-04T09:03:59Z
+    2021-04-26T13:53:43Z
     7
     3.1.0
   

From f45fc4edf74b02b05851d5f9ad7d92d6dede90b5 Mon Sep 17 00:00:00 2001
From: Maarten Mulders 
Date: Mon, 26 Apr 2021 15:54:26 +0200
Subject: [PATCH 209/265] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8faf21da..ff9236c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.3.4
+  3.3.5-SNAPSHOT
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -36,7 +36,7 @@
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
-    maven-shared-utils-3.3.4
+    HEAD
  
   
     jira
@@ -61,7 +61,7 @@
 
   
     RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder
-    2021-04-26T13:53:43Z
+    2021-04-26T13:54:25Z
     7
     3.1.0
   

From 7d30e7c02824b9f8f30976e58e617950b050ee7f Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Mon, 26 Apr 2021 21:01:29 +0000
Subject: [PATCH 210/265] avoid reusing fixtures (#86)

* avoid reusing fixtures
---
 .../shared/utils/xml/XmlWriterUtilTest.java   | 107 ++++++++----------
 1 file changed, 48 insertions(+), 59 deletions(-)

diff --git a/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java b/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
index a22cece1..9a050da3 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
@@ -20,6 +20,7 @@
  */
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
 import org.apache.maven.shared.utils.StringUtils;
@@ -51,17 +52,6 @@ protected void setUp()
         xmlWriter = new PrettyPrintXMLWriter( writer );
     }
 
-    /** {@inheritDoc} */
-    protected void tearDown()
-        throws Exception
-    {
-        super.tearDown();
-
-        xmlWriter = null;
-        writer = null;
-        output = null;
-    }
-
     /**
      * Test method for {@link org.apache.maven.shared.utils.xml.XmlWriterUtil#writeLineBreak(XMLWriter)}.
      *
@@ -72,8 +62,7 @@ public void testWriteLineBreakXMLWriter()
     {
         XmlWriterUtil.writeLineBreak( xmlWriter );
         writer.close();
-        System.out.println( "output = " + output.toString() + "x");
-        assertTrue( StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) == 1 );
+        assertEquals( 1, StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) );
     }
 
     /**
@@ -86,7 +75,7 @@ public void testWriteLineBreakXMLWriterInt()
     {
         XmlWriterUtil.writeLineBreak( xmlWriter, 10 );
         writer.close();
-        assertTrue( StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) == 10 );
+        assertEquals( 10, StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) );
     }
 
     /**
@@ -99,9 +88,9 @@ public void testWriteLineBreakXMLWriterIntInt()
     {
         XmlWriterUtil.writeLineBreak( xmlWriter, 10, 2 );
         writer.close();
-        assertTrue( StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) == 10 );
-        assertTrue( StringUtils.countMatches( output.toString(), StringUtils
-            .repeat( " ", 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE ) ) == 1 );
+        assertEquals( 10, StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) );
+        assertEquals( 1, StringUtils.countMatches( output.toString(), StringUtils
+            .repeat( " ", 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE ) ) );
     }
 
     /**
@@ -114,8 +103,8 @@ public void testWriteLineBreakXMLWriterIntIntInt()
     {
         XmlWriterUtil.writeLineBreak( xmlWriter, 10, 2, 4 );
         writer.close();
-        assertTrue( StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) == 10 );
-        assertTrue( StringUtils.countMatches( output.toString(), StringUtils.repeat( " ", 2 * 4 ) ) == 1 );
+        assertEquals( 10, StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) );
+        assertEquals( 1, StringUtils.countMatches( output.toString(), StringUtils.repeat( " ", 2 * 4 ) ) );
     }
 
     /**
@@ -131,7 +120,7 @@ public void testWriteCommentLineBreakXMLWriter()
         StringBuilder sb = new StringBuilder();
         sb.append( "" ).append( XmlWriterUtil.LS );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() );
+        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() );
     }
 
     /**
@@ -145,10 +134,9 @@ public void testWriteCommentLineBreakXMLWriterInt()
         XmlWriterUtil.writeCommentLineBreak( xmlWriter, 20 );
         writer.close();
         assertEquals( output.toString(), "" + XmlWriterUtil.LS );
+    }
 
-        tearDown();
-        setUp();
-
+    public void testWriteCommentLineBreak() throws IOException {
         XmlWriterUtil.writeCommentLineBreak( xmlWriter, 10 );
         writer.close();
         assertEquals( output.toString(), output.toString(), "" + XmlWriterUtil.LS );
@@ -167,30 +155,29 @@ public void testWriteCommentXMLWriterString()
         StringBuffer sb = new StringBuffer();
         sb.append( "" ).append( XmlWriterUtil.LS );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() );
-
-        tearDown();
-        setUp();
+        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() );
+    }
 
+    
+    public void testWriteComment() throws IOException {
         XmlWriterUtil.writeComment( xmlWriter,
                                     "hellooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" );
         writer.close();
-        sb = new StringBuffer();
+        StringBuffer sb = new StringBuffer();
         sb.append( "" )
             .append( XmlWriterUtil.LS );
         assertEquals( output.toString(), sb.toString() );
         assertTrue( output.toString().length() >= XmlWriterUtil.DEFAULT_COLUMN_LINE );
-
-        tearDown();
-        setUp();
-
+    }
+    
+    public void testWriteComment_2() throws IOException {
         XmlWriterUtil.writeComment( xmlWriter, "hello\nworld" );
         writer.close();
-        sb = new StringBuffer();
+        StringBuffer sb = new StringBuffer();
         sb.append( "" ).append( XmlWriterUtil.LS );
         sb.append( "" ).append( XmlWriterUtil.LS );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() ) );
+        assertEquals( output.toString().length(), 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() ) );
     }
 
     /**
@@ -209,21 +196,22 @@ public void testWriteCommentXMLWriterStringInt()
         sb.append( indent );
         sb.append( "" ).append( XmlWriterUtil.LS );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() + 2
+        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() + 2
             * XmlWriterUtil.DEFAULT_INDENTATION_SIZE );
 
-        tearDown();
-        setUp();
-
+    }
+    
+    public void testWriteComment_3() throws IOException {
+        String indent = StringUtils.repeat( " ", 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE );
         XmlWriterUtil.writeComment( xmlWriter, "hello\nworld", 2 );
         writer.close();
-        sb = new StringBuffer();
+        StringBuffer sb = new StringBuffer();
         sb.append( indent );
         sb.append( "" ).append( XmlWriterUtil.LS );
         sb.append( indent );
         sb.append( "" ).append( XmlWriterUtil.LS );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() ) + 2 * indent.length() );
+        assertEquals( output.toString().length(), 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() ) + 2 * indent.length() );
     }
 
     /**
@@ -242,14 +230,15 @@ public void testWriteCommentXMLWriterStringIntInt()
         sb.append( repeat );
         sb.append( "" ).append( XmlWriterUtil.LS );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() + 2 * 4 );
-
-        tearDown();
-        setUp();
-
+        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() + 2 * 4 );
+    }
+    
+    
+    public void testWriteCommentXMLWriterStringIntInt_2() throws IOException {
+        String repeat = StringUtils.repeat( " ", 2 * 4 );
         XmlWriterUtil.writeComment( xmlWriter, "hello\nworld", 2, 4 );
         writer.close();
-        sb = new StringBuffer();
+        StringBuffer sb = new StringBuffer();
         sb.append( repeat );
         sb.append( "" ).append( XmlWriterUtil.LS );
         sb.append( repeat );
@@ -275,13 +264,14 @@ public void testWriteCommentXMLWriterStringIntIntInt()
         sb.append( "" ).append( XmlWriterUtil.LS );
         assertEquals( output.toString(), sb.toString() );
         assertTrue( output.toString().length() == 50 - 1 + XmlWriterUtil.LS.length() + 2 * 4 );
-
-        tearDown();
-        setUp();
-
+    }
+    
+    public void testWriteCommentXMLWriterStringIntIntInt_2() throws IOException
+    {
+        String indent = StringUtils.repeat( " ", 2 * 4 );
         XmlWriterUtil.writeComment( xmlWriter, "hello", 2, 4, 10 );
         writer.close();
-        sb = new StringBuffer();
+        StringBuffer sb = new StringBuffer();
         sb.append( indent );
         sb.append( "" ).append( XmlWriterUtil.LS );
         assertEquals( output.toString(), sb.toString() );
@@ -305,17 +295,16 @@ public void testWriteCommentTextXMLWriterStringInt()
         sb.append( "" ).append( XmlWriterUtil.LS );
         sb.append( XmlWriterUtil.LS );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == 3 * ( 80 - 1 + XmlWriterUtil.LS.length() ) + 2 * XmlWriterUtil.LS.length() );
-
-        tearDown();
-        setUp();
-
+        assertEquals( output.toString().length(), 3 * ( 80 - 1 + XmlWriterUtil.LS.length() ) + 2 * XmlWriterUtil.LS.length() );
+    }
+    
+    public void testWriteCommentTextXMLWriterStringInt_2() throws IOException {
         String indent = StringUtils.repeat( " ", 2 * 2 );
 
         XmlWriterUtil.writeCommentText( xmlWriter, "hello world with end of line\n and "
             + "loooooooooooooooooooooooooooooooooooooooooooooooooooooonnnnnnnnnnong line", 2 );
         writer.close();
-        sb = new StringBuffer();
+        StringBuffer sb = new StringBuffer();
         sb.append( XmlWriterUtil.LS );
         sb.append( indent ).append( "" )
             .append( XmlWriterUtil.LS );
@@ -358,7 +347,7 @@ public void testWriteCommentTextXMLWriterStringIntInt()
         sb.append( XmlWriterUtil.LS );
         sb.append( indent );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == 3 * ( 80 - 1 + XmlWriterUtil.LS.length() ) + 4 * 2 * 4 + 2 * XmlWriterUtil.LS.length() );
+        assertEquals( output.toString().length(), 3 * ( 80 - 1 + XmlWriterUtil.LS.length() ) + 4 * 2 * 4 + 2 * XmlWriterUtil.LS.length() );
     }
 
     /**
@@ -381,7 +370,7 @@ public void testWriteCommentTextXMLWriterStringIntIntInt()
         sb.append( XmlWriterUtil.LS );
         sb.append( indent );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == 3 * ( 50 - 1 + XmlWriterUtil.LS.length() ) + 4 * 2 * 4 + 2 * XmlWriterUtil.LS.length() );
+        assertEquals( output.toString().length(), 3 * ( 50 - 1 + XmlWriterUtil.LS.length() ) + 4 * 2 * 4 + 2 * XmlWriterUtil.LS.length() );
     }
 
     /**

From 1285a156a173be446213dc39d5e196ee7b7d4ed2 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak 
Date: Fri, 30 Apr 2021 12:45:25 +0200
Subject: [PATCH 211/265]     Add GH actions

    As they provide nice (and quick) feedback about issues
    and problems with the build.
---
 .github/workflows/maven.yml | 49 +++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 00000000..eb39c5d8
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,49 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Java CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up cache for ~/.m2/repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: maven-${{ matrix.os }}-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            maven-${{ matrix.os }}-
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Build with Maven
+        run: mvn clean verify -e -B -V

From 1e6748cc36464c6899c43d6acaea8156d0956391 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak 
Date: Sat, 1 May 2021 20:56:24 +0200
Subject: [PATCH 212/265] [MSHARED-983] Drop plexus container default (#87)

* Drop plexus container default

The complete container was only here to make use of AbstractLogEnabled
ancient class, that uses ancient logging.

Drop it.

* Up major version

As this change is not API compatible
---
 pom.xml                                       | 26 ++++++++++---------
 .../utils/cli/javatool/AbstractJavaTool.java  | 10 +++++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff9236c4..daf55b01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.3.5-SNAPSHOT
+  4.0.0-SNAPSHOT
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -67,12 +67,25 @@
   
 
   
+    
+      org.slf4j
+      slf4j-api
+      1.7.25
+    
+
     
       org.fusesource.jansi
       jansi
       2.2.0
       true
     
+
+    
+      commons-io
+      commons-io
+      2.6
+    
+
     
       junit
       junit
@@ -85,11 +98,6 @@
       2.2
       test
     
-    
-      commons-io
-      commons-io
-      2.6
-    
     
       org.apache.commons
       commons-text
@@ -111,12 +119,6 @@
       ${mavenVersion}
       test
     
-    
-      org.codehaus.plexus
-      plexus-container-default
-      2.1.0
-      provided
-    
     
       org.codehaus.plexus
       plexus-utils
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
index 738f660d..971b9626 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
@@ -25,7 +25,8 @@
 import org.apache.maven.shared.utils.cli.CommandLineUtils;
 import org.apache.maven.shared.utils.cli.Commandline;
 import org.apache.maven.shared.utils.cli.StreamConsumer;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.InputStream;
@@ -41,9 +42,9 @@
  * @param  Tool-specific request type
  */
 public abstract class AbstractJavaTool
-    extends AbstractLogEnabled
     implements JavaTool
 {
+    private final Logger logger = LoggerFactory.getLogger( getClass() );
 
     /**
      * The java tool name to find out in the jdk.
@@ -79,6 +80,11 @@ protected AbstractJavaTool( String javaToolName )
     protected abstract Commandline createCommandLine( Request request, String javaToolFileLocation )
         throws JavaToolException;
 
+    protected Logger getLogger()
+    {
+        return logger;
+    }
+
     /**
      * {@inheritDoc}
      */

From ff58583c0c4ffc34de52567f78bca99d65e14d24 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sun, 2 May 2021 16:07:12 +0000
Subject: [PATCH 213/265] remove two unused non-public exception classes (#89)

---
 .../shared/utils/xml/XmlReaderException.java  | 156 ------------------
 .../shared/utils/xml/XmlStreamReader.java     |   9 +-
 .../utils/xml/XmlStreamReaderException.java   |  79 ---------
 3 files changed, 3 insertions(+), 241 deletions(-)
 delete mode 100644 src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
 delete mode 100644 src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
deleted file mode 100644
index 5ee48a01..00000000
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlReaderException.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.apache.maven.shared.utils.xml;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * 
                  The XmlReaderException is thrown by the XmlReader constructors if the charset encoding can not be determined
- * according to the XML 1.0 specification and RFC 3023.
                  
- * 
                  The exception returns the unconsumed InputStream to allow the application to do an alternate processing with the
- * stream. Note that the original InputStream given to the XmlReader cannot be used as that one has been already
- * read.
                  
- *
- * @author Alejandro Abdelnur
- * @version revision 1.1 taken on 26/06/2007 from Rome (see https://rome.dev.java.net/source/browse/rome/src/java/com/sun/syndication/io/XmlReaderException.java)
- */
-class XmlReaderException
-    extends IOException
-{
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 5044326391409597950L;
-
-    private final String bomEncoding;
-
-    private final String xmlGuessEncoding;
-
-    private final String xmlEncoding;
-
-    private final String contentTypeMime;
-
-    private final String contentTypeEncoding;
-
-    private final InputStream is;
-
-    /**
-     * 
                  Creates an exception instance if the charset encoding could not be determined.
                  
-     * 
                  Instances of this exception are thrown by the XmlReader.
                  
-     *
-     * @param msg         message describing the reason for the exception.
-     * @param bomEnc      BOM encoding.
-     * @param xmlGuessEnc XML guess encoding.
-     * @param xmlEnc      XML prolog encoding.
-     * @param is          the unconsumed InputStream.
-     */
-    XmlReaderException( String msg, String bomEnc, String xmlGuessEnc, String xmlEnc, InputStream is )
-    {
-        this( msg, null, null, bomEnc, xmlGuessEnc, xmlEnc, is );
-    }
-
-    /**
-     * 
                  Creates an exception instance if the charset encoding could not be determined.
                  
-     * 
                  Instances of this exception are thrown by the XmlReader.
                  
-     *
-     * @param msg         message describing the reason for the exception.
-     * @param ctMime      MIME type in the content-type.
-     * @param ctEnc       encoding in the content-type.
-     * @param bomEnc      BOM encoding.
-     * @param xmlGuessEnc XML guess encoding.
-     * @param xmlEnc      XML prolog encoding.
-     * @param is          the unconsumed InputStream.
-     */
-    XmlReaderException( String msg, String ctMime, String ctEnc, String bomEnc, String xmlGuessEnc,
-                               String xmlEnc, InputStream is )
-    {
-        super( msg );
-        contentTypeMime = ctMime;
-        contentTypeEncoding = ctEnc;
-        bomEncoding = bomEnc;
-        xmlGuessEncoding = xmlGuessEnc;
-        xmlEncoding = xmlEnc;
-        this.is = is;
-    }
-
-    /**
-     * Returns the BOM encoding found in the InputStream.
-     *
-     * @return the BOM encoding, null if none.
-     */
-    public String getBomEncoding()
-    {
-        return bomEncoding;
-    }
-
-    /**
-     * Returns the encoding guess based on the first bytes of the InputStream.
-     *
-     * @return the encoding guess, null if it couldn't be guessed.
-     */
-    public String getXmlGuessEncoding()
-    {
-        return xmlGuessEncoding;
-    }
-
-    /**
-     * Returns the encoding found in the XML prolog of the InputStream.
-     *
-     * @return the encoding of the XML prolog, null if none.
-     */
-    public String getXmlEncoding()
-    {
-        return xmlEncoding;
-    }
-
-    /**
-     * Returns the MIME type in the content-type used to attempt determining the encoding.
-     *
-     * @return the MIME type in the content-type, null if there was not content-type or the encoding detection did not
-     *         involve HTTP.
-     */
-    public String getContentTypeMime()
-    {
-        return contentTypeMime;
-    }
-
-    /**
-     * Returns the encoding in the content-type used to attempt determining the encoding.
-     *
-     * @return the encoding in the content-type, null if there was not content-type, no encoding in it or the encoding
-     *         detection did not involve HTTP.
-     */
-    public String getContentTypeEncoding()
-    {
-        return contentTypeEncoding;
-    }
-
-    /**
-     * Returns the unconsumed InputStream to allow the application to do an alternate encoding detection on the
-     * InputStream.
-     *
-     * @return the unconsumed InputStream.
-     */
-    public InputStream getInputStream()
-    {
-        return is;
-    }
-}
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
index 6990d4f3..da58a0ba 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
@@ -79,10 +79,9 @@ public XmlStreamReader( InputStream is )
      * @param is {@link InputStream}
      * @param lenient yes/no
      * @throws IOException in case of an error
-     * @throws XmlStreamReaderException in case of an error
      */
     public XmlStreamReader( InputStream is, boolean lenient )
-            throws IOException, XmlStreamReaderException
+            throws IOException
     {
         reader = new org.apache.commons.io.input.XmlStreamReader( is, lenient, staticDefaultEncoding );
     }
@@ -124,10 +123,9 @@ public XmlStreamReader( InputStream is, String httpContentType )
      * @param lenient yes/no
      * @param defaultEncoding the default encoding
      * @throws IOException in case of error
-     * @throws XmlStreamReaderException in case of error
      */
     public XmlStreamReader( InputStream is, String httpContentType, boolean lenient, String defaultEncoding )
-            throws IOException, XmlStreamReaderException
+            throws IOException
     {
         reader = new org.apache.commons.io.input.XmlStreamReader( is, httpContentType, lenient,
                 ( defaultEncoding == null )
@@ -140,10 +138,9 @@ public XmlStreamReader( InputStream is, String httpContentType, boolean lenient,
      * @param httpContentType content type
      * @param lenient yes/no
      * @throws IOException in case of error
-     * @throws XmlStreamReaderException in case of error
      */
     public XmlStreamReader( InputStream is, String httpContentType, boolean lenient )
-            throws IOException, XmlStreamReaderException
+            throws IOException
     {
         this( is, httpContentType, lenient, null );
     }
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
deleted file mode 100644
index 992b833c..00000000
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReaderException.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.apache.maven.shared.utils.xml;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.InputStream;
-
-/**
- * 
                  The XmlStreamReaderException is thrown by the XmlStreamReader constructors if the charset encoding can not be
- * determined according to the XML 1.0 specification and RFC 3023.
                  
- * 
                  The exception returns the unconsumed InputStream to allow the application to do an alternate processing with the
- * stream. Note that the original InputStream given to the XmlStreamReader cannot be used as that one has been already
- * read.
                  
- *
- * @author Alejandro Abdelnur
- * @version revision 1.1 taken on 26/06/2007 from Rome (see
- *          https://rome.dev.java.net/source/browse/rome/src/java/com/sun/syndication/io/XmlReaderException.java)
- */
-class XmlStreamReaderException
-    extends XmlReaderException
-{
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 1007947701939672080L;
-
-    /**
-     * Creates an exception instance if the charset encoding could not be determined.
-     * 
                  
-     * Instances of this exception are thrown by the XmlReader.
-     * 
                  
-     *
-     * @param msg         message describing the reason for the exception.
-     * @param bomEnc      BOM encoding.
-     * @param xmlGuessEnc XML guess encoding.
-     * @param xmlEnc      XML prolog encoding.
-     * @param is          the unconsumed InputStream.
-     */
-    XmlStreamReaderException( String msg, String bomEnc, String xmlGuessEnc, String xmlEnc, InputStream is )
-    {
-        super( msg, bomEnc, xmlGuessEnc, xmlEnc, is );
-    }
-
-    /**
-     * Creates an exception instance if the charset encoding could not be determined.
-     * 
                  
-     * Instances of this exception are thrown by the XmlReader.
-     * 
                  
-     *
-     * @param msg         message describing the reason for the exception.
-     * @param ctMime      MIME type in the content-type.
-     * @param ctEnc       encoding in the content-type.
-     * @param bomEnc      BOM encoding.
-     * @param xmlGuessEnc XML guess encoding.
-     * @param xmlEnc      XML prolog encoding.
-     * @param is          the unconsumed InputStream.
-     */
-    XmlStreamReaderException( String msg, String ctMime, String ctEnc, String bomEnc, String xmlGuessEnc,
-                                     String xmlEnc, InputStream is )
-    {
-        super( msg, ctMime, ctEnc, bomEnc, xmlGuessEnc, xmlEnc, is );
-    }
-}

From 5b1706211be0be129952aa65d6655a93212c970b Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sun, 2 May 2021 12:23:55 -0400
Subject: [PATCH 214/265] cleanup large chunks of unused YAGNI code and support
 accurate exception handling

---
 .../maven/shared/utils/xml/XMLEncode.java     | 350 ++++--------------
 1 file changed, 80 insertions(+), 270 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java b/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java
index 0d6ecd16..5c2d10f7 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java
@@ -20,7 +20,6 @@
  */
 
 import java.io.IOException;
-import java.io.StringWriter;
 import java.io.Writer;
 
 /**
@@ -35,210 +34,114 @@ final class XMLEncode
 
     private static final char DEFAULT_QUOTE_CHAR = '"';
 
-    /**
-     * Checks if this text purely consists of the white space characters
-     * ' ',  TAB, NEWLINE.
-     */
-    public static boolean isWhiteSpace( String text )
-    {
-        for ( int i = 0; i < text.length(); i++ )
-        {
-            char c = text.charAt( i );
-            if ( !Character.isWhitespace( c ) )
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Makes any text fit into XML attributes.
-     */
-    public static String xmlEncodeTextForAttribute( String text, char quoteChar )
-    {
-        if ( text == null )
-        {
-            return null;
-        }
-        return xmlEncodeTextAsPCDATA( text, true, quoteChar );
-    }
-
-    /**
-     * Encodes text as XML in the most suitable way, either CDATA block or PCDATA.
-     */
-    public static String xmlEncodeText( String text )
+    static void xmlEncodeText( String text, Writer writer ) throws IOException
     {
         if ( text == null )
         {
-            return null;
+            return;
         }
-        StringWriter writer = new StringWriter( text.length() * 2 );
-        xmlEncodeText( text, writer );
-        return writer.toString();
-    }
 
-    public static void xmlEncodeText( String text, Writer writer )
-    {
-        if ( text == null )
+        if ( !needsEncoding( text ) )
         {
+            writer.write( text );
             return;
         }
-        try
+        else
         {
-            if ( !needsEncoding( text ) )
-            {
-                writer.write( text );
-                return;
-            }
-            else
+            // only encode as cdata if is is longer than CDATA block overhead:
+            if ( text.length() > CDATA_BLOCK_THRESHOLD_LENGTH )
             {
-                // only encode as cdata if is is longer than CDATA block overhead:
-                if ( text.length() > CDATA_BLOCK_THRESHOLD_LENGTH )
+                String cdata = xmlEncodeTextAsCDATABlock( text );
+                if ( cdata != null )
                 {
-                    String cdata = xmlEncodeTextAsCDATABlock( text );
-                    if ( cdata != null )
-                    {
-                        writer.write( cdata );
-                        return;
-                    }
+                    writer.write( cdata );
+                    return;
                 }
             }
         }
-        catch ( IOException e )
-        {
-            throw new RuntimeException( e );
-        }
+
         // if every thing else fails, do it the save way...
         xmlEncodeTextAsPCDATA( text, false, DEFAULT_QUOTE_CHAR, writer );
     }
 
-    /**
-     * Encodes any text as PCDATA.
-     */
-    public static String xmlEncodeTextAsPCDATA( String text )
+    static void xmlEncodeTextAsPCDATA( String text, boolean forAttribute, char quoteChar, Writer n ) throws IOException
     {
         if ( text == null )
         {
-            return null;
+            return;
         }
-        return xmlEncodeTextAsPCDATA( text, false );
-    }
-
-    /**
-     * Encodes any text as PCDATA.
-     *
-     * @param forAttribute if you want
-     *                     quotes and apostrophes specially treated for attributes
-     */
-    public static String xmlEncodeTextAsPCDATA( String text, boolean forAttribute )
-    {
-        return xmlEncodeTextAsPCDATA( text, forAttribute, DEFAULT_QUOTE_CHAR );
-    }
 
-    /**
-     * Encodes any text as PCDATA.
-     *
-     * @param forAttribute if you want
-     *                     quotes and apostrophes specially treated for attributes
-     * @param quoteChar    if this is for attributes this char is used to quote the attribute value
-     */
-    public static String xmlEncodeTextAsPCDATA( String text, boolean forAttribute, char quoteChar )
-    {
-        if ( text == null )
+        int length = text.length();
+        if ( forAttribute )
         {
-            return null;
+            n.append( quoteChar );
         }
-        StringWriter writer = new StringWriter( text.length() * 2 );
-        xmlEncodeTextAsPCDATA( text, forAttribute, quoteChar, writer );
-        return writer.toString();
-    }
 
-    public static void xmlEncodeTextAsPCDATA( String text, boolean forAttribute, char quoteChar, Writer n )
-    {
-        if ( text == null )
-        {
-            return;
-        }
-        try
+        for ( int i = 0; i < length; i++ )
         {
-            char c;
-            int length = text.length();
-            if ( forAttribute )
-            {
-                n.append( quoteChar );
-            }
-
-            for ( int i = 0; i < length; i++ )
+            char c = text.charAt( i );
+            switch ( c )
             {
-                c = text.charAt( i );
-                switch ( c )
-                {
-                    case '&':
-                        n.append( "&" );
-                        break;
-                    case '<':
-                        n.append( "<" );
-                        break;
-                    case '>': // FIX for sourceforge bug #802520 ("]]>" needs encoding)
-                        n.append( ">" );
-                        break;
-                    case '"':
-                        if ( forAttribute )
-                        {
-                            n.append( """ );
-                        }
-                        else
-                        {
-                            n.append( c );
-                        }
-                        break;
-                    case '\'':
-                        if ( forAttribute )
-                        {
-                            n.append( "'" );
-                        }
-                        else
-                        {
-                            n.append( c );
-                        }
-                        break;
-                    case '\r':
-                        if ( forAttribute )
-                        {
-                            if ( i == ( length - 1 ) || text.charAt( i + 1 ) != '\n' )
-                            {
-                                n.append( "
" );
-                            }
-                        }
-                        else
-                        {
-                            n.append( c );
-                        }
-                        // but skip the \r in \r\n
-
-                        break;
-                    case '\n':
-                        if ( forAttribute )
+                case '&':
+                    n.append( "&" );
+                    break;
+                case '<':
+                    n.append( "<" );
+                    break;
+                case '>': // FIX for sourceforge bug #802520 ("]]>" needs encoding)
+                    n.append( ">" );
+                    break;
+                case '"':
+                    if ( forAttribute )
+                    {
+                        n.append( """ );
+                    }
+                    else
+                    {
+                        n.append( c );
+                    }
+                    break;
+                case '\'':
+                    if ( forAttribute )
+                    {
+                        n.append( "'" );
+                    }
+                    else
+                    {
+                        n.append( c );
+                    }
+                    break;
+                case '\r':
+                    if ( forAttribute )
+                    {
+                        if ( i == ( length - 1 ) || text.charAt( i + 1 ) != '\n' )
                         {
-                            n.append( "
" );
+                            n.append( "
" );
                         }
-                        break;
-
-                    default:
+                    }
+                    else
+                    {
                         n.append( c );
-                        break;
-                }
-            }
+                    }
+                    // but skip the \r in \r\n
 
-            if ( forAttribute )
-            {
-                n.append( quoteChar );
+                    break;
+                case '\n':
+                    if ( forAttribute )
+                    {
+                        n.append( "
" );
+                    }
+                    break;
+
+                default:
+                    n.append( c );
+                    break;
             }
         }
-        catch ( IOException e )
+
+        if ( forAttribute )
         {
-            throw new RuntimeException( e );
+            n.append( quoteChar );
         }
 
     }
@@ -246,13 +149,13 @@ public static void xmlEncodeTextAsPCDATA( String text, boolean forAttribute, cha
     /**
      * Returns string as CDATA block if possible, otherwise null.
      */
-    public static String xmlEncodeTextAsCDATABlock( String text )
+    private static String xmlEncodeTextAsCDATABlock( String text )
     {
         if ( text == null )
         {
             return null;
         }
-        if ( isCompatibleWithCDATABlock( text ) )
+        if ( !text.contains( "]]>" ) )
         {
             return "";
         }
@@ -265,28 +168,16 @@ public static String xmlEncodeTextAsCDATABlock( String text )
     /**
      * Checks if this text needs encoding in order to be represented in XML.
      */
-    public static boolean needsEncoding( String text )
-    {
-        return needsEncoding( text, false );
-    }
-
-    /**
-     * Checks if this text needs encoding in order to be represented in XML.
-     * 
                  
-     * Set checkForAttr if you want to check for storability in
-     * an attribute.
-     */
-    public static boolean needsEncoding( String data, boolean checkForAttr )
+    private static boolean needsEncoding( String text )
     {
-        if ( data == null )
+        if ( text == null )
         {
             return false;
         }
-        char c;
-        for ( int i = 0; i < data.length(); i++ )
+        for ( int i = 0; i < text.length(); i++ )
         {
-            c = data.charAt( i );
-            if ( c == '&' || c == '<' || ( checkForAttr && ( c == '"' || c == '\'' ) ) )
+            char c = text.charAt( i );
+            if ( c == '&' || c == '<' )
             {
                 return true;
             }
@@ -294,85 +185,4 @@ public static boolean needsEncoding( String data, boolean checkForAttr )
         return false;
     }
 
-    /**
-     * Can this text be stored into a CDATA block?
-     */
-    public static boolean isCompatibleWithCDATABlock( String text )
-    {
-        return text != null && ( !text.contains( "]]>" ) );
-    }
-
-    /**
-     * Make CDATA out of possibly encoded PCDATA. 
                  
-     * E.g. make '&' out of '&amp;'
-     */
-    public static String xmlDecodeTextToCDATA( String pcdata )
-    {
-        if ( pcdata == null )
-        {
-            return null;
-        }
-        char c, c1, c2, c3, c4, c5;
-        StringBuilder n = new StringBuilder( pcdata.length() );
-        for ( int i = 0; i < pcdata.length(); i++ )
-        {
-            c = pcdata.charAt( i );
-            if ( c == '&' )
-            {
-                c1 = lookAhead( 1, i, pcdata );
-                c2 = lookAhead( 2, i, pcdata );
-                c3 = lookAhead( 3, i, pcdata );
-                c4 = lookAhead( 4, i, pcdata );
-                c5 = lookAhead( 5, i, pcdata );
-
-                if ( c1 == 'a' && c2 == 'm' && c3 == 'p' && c4 == ';' )
-                {
-                    n.append( "&" );
-                    i += 4;
-                }
-                else if ( c1 == 'l' && c2 == 't' && c3 == ';' )
-                {
-                    n.append( "<" );
-                    i += 3;
-                }
-                else if ( c1 == 'g' && c2 == 't' && c3 == ';' )
-                {
-                    n.append( ">" );
-                    i += 3;
-                }
-                else if ( c1 == 'q' && c2 == 'u' && c3 == 'o' && c4 == 't' && c5 == ';' )
-                {
-                    n.append( "\"" );
-                    i += 5;
-                }
-                else if ( c1 == 'a' && c2 == 'p' && c3 == 'o' && c4 == 's' && c5 == ';' )
-                {
-                    n.append( "'" );
-                    i += 5;
-                }
-                else
-                {
-                    n.append( "&" );
-                }
-            }
-            else
-            {
-                n.append( c );
-            }
-        }
-        return n.toString();
-    }
-
-    private static char lookAhead( int la, int offset, String data )
-    {
-        try
-        {
-            return data.charAt( offset + la );
-        }
-        catch ( StringIndexOutOfBoundsException e )
-        {
-            return 0x0;
-        }
-    }
-
 }

From 02325f14661be9b5b992eca27c84c263c83430ef Mon Sep 17 00:00:00 2001
From: Tamas Cservenak 
Date: Mon, 3 May 2021 08:59:01 +0200
Subject: [PATCH 215/265] Update actions/java-setup to v2

---
 .github/workflows/maven.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index eb39c5d8..4d7fff4e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -41,9 +41,10 @@ jobs:
             maven-${{ matrix.os }}-
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          java-version: '8'
+          distribution: 'adopt'
 
       - name: Build with Maven
         run: mvn clean verify -e -B -V

From 48e1564e8d572fb2a6ce5668b9b405ea35f5cee9 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Mon, 3 May 2021 10:09:13 +0000
Subject: [PATCH 216/265] [MSHARED-985] XmlWriterUtil platform independent and
 consistent (#91)

* make XmlWriterUtil platform independent and consistent with its documentation
---
 .../maven/shared/utils/xml/XmlWriterUtil.java |  43 ++++---
 .../shared/utils/xml/XmlWriterUtilTest.java   | 118 +++++++++---------
 2 files changed, 82 insertions(+), 79 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java
index d9dd49e3..7d84d91a 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java
@@ -32,6 +32,9 @@ public class XmlWriterUtil
 {
     /** The vm line separator */
     public static final String LS = System.getProperty( "line.separator" );
+    
+    /** Platform independent line separator */
+    private static final String CRLF = "\r\n";
 
     /** The default line indenter size i.e. 2. */
     public static final int DEFAULT_INDENTATION_SIZE = 2;
@@ -43,7 +46,7 @@ public class XmlWriterUtil
      * Convenience method to write one CRLF.
      *
      * @param writer not null writer
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeLineBreak( XMLWriter writer ) throws IOException
     {
@@ -55,13 +58,13 @@ public static void writeLineBreak( XMLWriter writer ) throws IOException
      *
      * @param writer not null
      * @param repeat positive number
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeLineBreak( XMLWriter writer, int repeat ) throws IOException
     {
         for ( int i = 0; i < repeat; i++ )
         {
-            writer.writeMarkup( LS );
+            writer.writeMarkup( CRLF );
         }
     }
 
@@ -73,7 +76,7 @@ public static void writeLineBreak( XMLWriter writer, int repeat ) throws IOExcep
      * @param indent positive number
      * @see #DEFAULT_INDENTATION_SIZE
      * @see #writeLineBreak(XMLWriter, int, int, int)
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeLineBreak( XMLWriter writer, int repeat, int indent ) throws IOException
     {
@@ -87,7 +90,7 @@ public static void writeLineBreak( XMLWriter writer, int repeat, int indent ) th
      * @param repeat The number of repetitions of the indent
      * @param indent positive number
      * @param indentSize positive number
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeLineBreak( XMLWriter writer, int repeat, int indent, int indentSize ) throws IOException
     {
@@ -112,7 +115,7 @@ public static void writeLineBreak( XMLWriter writer, int repeat, int indent, int
      * @param writer not null
      * @see #DEFAULT_COLUMN_LINE
      * @see #writeCommentLineBreak(XMLWriter, int)
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeCommentLineBreak( XMLWriter writer ) throws IOException
     {
@@ -124,7 +127,7 @@ public static void writeCommentLineBreak( XMLWriter writer ) throws IOException
      *
      * @param writer not null
      * @param columnSize positive number
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeCommentLineBreak( XMLWriter writer, int columnSize ) throws IOException
     {
@@ -133,18 +136,18 @@ public static void writeCommentLineBreak( XMLWriter writer, int columnSize ) thr
             columnSize = DEFAULT_COLUMN_LINE;
         }
 
-        writer.writeMarkup( "" + LS );
+        writer.writeMarkup( "" + CRLF );
     }
 
     /**
-     * Convenience method to write XML comment line. The comment is splitted to have a size of
+     * Convenience method to write XML comment line. The comment is split to have a size of
      * 80.
      *
      * @param writer not null
      * @param comment The comment to write
      * @see #DEFAULT_INDENTATION_SIZE
      * @see #writeComment(XMLWriter, String, int, int)
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeComment( XMLWriter writer, String comment ) throws IOException
     {
@@ -160,7 +163,7 @@ public static void writeComment( XMLWriter writer, String comment ) throws IOExc
      * @param indent positive number
      * @see #DEFAULT_INDENTATION_SIZE
      * @see #writeComment(XMLWriter, String, int, int)
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeComment( XMLWriter writer, String comment, int indent ) throws IOException
     {
@@ -177,7 +180,7 @@ public static void writeComment( XMLWriter writer, String comment, int indent )
      * @param indentSize positive number
      * @see #DEFAULT_COLUMN_LINE
      * @see #writeComment(XMLWriter, String, int, int, int)
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeComment( XMLWriter writer, String comment, int indent, int indentSize ) throws IOException
     {
@@ -193,7 +196,7 @@ public static void writeComment( XMLWriter writer, String comment, int indent, i
      * @param indent positive number
      * @param indentSize positive number
      * @param columnSize positive number
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeComment( XMLWriter writer, String comment, int indent, int indentSize, int columnSize )
         throws IOException
@@ -220,7 +223,7 @@ public static void writeComment( XMLWriter writer, String comment, int indent, i
 
         String indentation = StringUtils.repeat( " ", indent * indentSize );
         int magicNumber = indentation.length() + columnSize - "-->".length() - 1;
-        String[] sentences = StringUtils.split( comment, LS );
+        String[] sentences = StringUtils.split( comment, CRLF );
 
         StringBuffer line = new StringBuffer( indentation + "" ).append( LS );
+                        line.append( "-->" ).append( CRLF );
                         writer.writeMarkup( line.toString() );
                     }
                     line = new StringBuffer( indentation + "" ).append( LS );
+        line.append( "-->" ).append( CRLF );
 
         writer.writeMarkup( line.toString() );
     }
@@ -275,7 +278,7 @@ public static void writeComment( XMLWriter writer, String comment, int indent, i
      * @param comment The comment to write
      * @see #DEFAULT_INDENTATION_SIZE
      * @see #writeCommentText(XMLWriter, String, int, int)
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeCommentText( XMLWriter writer, String comment ) throws IOException
     {
@@ -292,7 +295,7 @@ public static void writeCommentText( XMLWriter writer, String comment ) throws I
      * @param indent positive number
      * @see #DEFAULT_INDENTATION_SIZE
      * @see #writeCommentText(XMLWriter, String, int, int)
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeCommentText( XMLWriter writer, String comment, int indent ) throws IOException
     {
@@ -309,7 +312,7 @@ public static void writeCommentText( XMLWriter writer, String comment, int inden
      * @param indentSize positive number
      * @see #DEFAULT_COLUMN_LINE
      * @see #writeCommentText(XMLWriter, String, int, int, int)
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeCommentText( XMLWriter writer, String comment, int indent, int indentSize )
         throws IOException
@@ -327,7 +330,7 @@ public static void writeCommentText( XMLWriter writer, String comment, int inden
      * @param indent positive number
      * @param indentSize positive number
      * @param columnSize positive number
-     * @throws IOException if writing fails.
+     * @throws IOException if writing fails
      */
     public static void writeCommentText( XMLWriter writer, String comment, int indent, int indentSize, int columnSize )
         throws IOException
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java b/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
index 9a050da3..433e5feb 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
@@ -62,7 +62,7 @@ public void testWriteLineBreakXMLWriter()
     {
         XmlWriterUtil.writeLineBreak( xmlWriter );
         writer.close();
-        assertEquals( 1, StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) );
+        assertEquals( 1, StringUtils.countMatches( output.toString(), "\r\n" ) );
     }
 
     /**
@@ -75,7 +75,7 @@ public void testWriteLineBreakXMLWriterInt()
     {
         XmlWriterUtil.writeLineBreak( xmlWriter, 10 );
         writer.close();
-        assertEquals( 10, StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) );
+        assertEquals( 10, StringUtils.countMatches( output.toString(), "\r\n" ) );
     }
 
     /**
@@ -88,7 +88,7 @@ public void testWriteLineBreakXMLWriterIntInt()
     {
         XmlWriterUtil.writeLineBreak( xmlWriter, 10, 2 );
         writer.close();
-        assertEquals( 10, StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) );
+        assertEquals( 10, StringUtils.countMatches( output.toString(), "\r\n" ) );
         assertEquals( 1, StringUtils.countMatches( output.toString(), StringUtils
             .repeat( " ", 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE ) ) );
     }
@@ -103,7 +103,7 @@ public void testWriteLineBreakXMLWriterIntIntInt()
     {
         XmlWriterUtil.writeLineBreak( xmlWriter, 10, 2, 4 );
         writer.close();
-        assertEquals( 10, StringUtils.countMatches( output.toString(), XmlWriterUtil.LS ) );
+        assertEquals( 10, StringUtils.countMatches( output.toString(), "\r\n" ) );
         assertEquals( 1, StringUtils.countMatches( output.toString(), StringUtils.repeat( " ", 2 * 4 ) ) );
     }
 
@@ -118,9 +118,9 @@ public void testWriteCommentLineBreakXMLWriter()
         XmlWriterUtil.writeCommentLineBreak( xmlWriter );
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() );
+        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() );
     }
 
     /**
@@ -133,13 +133,13 @@ public void testWriteCommentLineBreakXMLWriterInt()
     {
         XmlWriterUtil.writeCommentLineBreak( xmlWriter, 20 );
         writer.close();
-        assertEquals( output.toString(), "" + XmlWriterUtil.LS );
+        assertEquals( output.toString(), "" + "\r\n" );
     }
 
     public void testWriteCommentLineBreak() throws IOException {
         XmlWriterUtil.writeCommentLineBreak( xmlWriter, 10 );
         writer.close();
-        assertEquals( output.toString(), output.toString(), "" + XmlWriterUtil.LS );
+        assertEquals( output.toString(), output.toString(), "" + "\r\n" );
     }
 
     /**
@@ -153,9 +153,9 @@ public void testWriteCommentXMLWriterString()
         XmlWriterUtil.writeComment( xmlWriter, "hello" );
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() );
+        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() );
     }
 
     
@@ -165,7 +165,7 @@ public void testWriteComment() throws IOException {
         writer.close();
         StringBuffer sb = new StringBuffer();
         sb.append( "" )
-            .append( XmlWriterUtil.LS );
+            .append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
         assertTrue( output.toString().length() >= XmlWriterUtil.DEFAULT_COLUMN_LINE );
     }
@@ -174,10 +174,10 @@ public void testWriteComment_2() throws IOException {
         XmlWriterUtil.writeComment( xmlWriter, "hello\nworld" );
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( "" ).append( XmlWriterUtil.LS );
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() ) );
+        assertEquals( output.toString().length(), 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() ) );
     }
 
     /**
@@ -194,9 +194,9 @@ public void testWriteCommentXMLWriterStringInt()
         writer.close();
         StringBuffer sb = new StringBuffer();
         sb.append( indent );
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() + 2
+        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() + 2
             * XmlWriterUtil.DEFAULT_INDENTATION_SIZE );
 
     }
@@ -207,11 +207,11 @@ public void testWriteComment_3() throws IOException {
         writer.close();
         StringBuffer sb = new StringBuffer();
         sb.append( indent );
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         sb.append( indent );
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() ) + 2 * indent.length() );
+        assertEquals( output.toString().length(), 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() ) + 2 * indent.length() );
     }
 
     /**
@@ -228,9 +228,9 @@ public void testWriteCommentXMLWriterStringIntInt()
         writer.close();
         StringBuffer sb = new StringBuffer();
         sb.append( repeat );
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() + 2 * 4 );
+        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() + 2 * 4 );
     }
     
     
@@ -240,11 +240,11 @@ public void testWriteCommentXMLWriterStringIntInt_2() throws IOException {
         writer.close();
         StringBuffer sb = new StringBuffer();
         sb.append( repeat );
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         sb.append( repeat );
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + XmlWriterUtil.LS.length() ) + 2 * repeat.length() );
+        assertTrue( output.toString().length() == 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() ) + 2 * repeat.length() );
     }
 
     /**
@@ -261,9 +261,9 @@ public void testWriteCommentXMLWriterStringIntIntInt()
         writer.close();
         StringBuffer sb = new StringBuffer();
         sb.append( indent );
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == 50 - 1 + XmlWriterUtil.LS.length() + 2 * 4 );
+        assertTrue( output.toString().length() == 50 - 1 + "\r\n".length() + 2 * 4 );
     }
     
     public void testWriteCommentXMLWriterStringIntIntInt_2() throws IOException
@@ -273,7 +273,7 @@ public void testWriteCommentXMLWriterStringIntIntInt_2() throws IOException
         writer.close();
         StringBuffer sb = new StringBuffer();
         sb.append( indent );
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
         assertTrue( output.toString().length() >= 10 + 2 * 4 );
     }
@@ -289,13 +289,13 @@ public void testWriteCommentTextXMLWriterStringInt()
         XmlWriterUtil.writeCommentText( xmlWriter, "hello", 0 );
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( XmlWriterUtil.LS );
-        sb.append( "" ).append( XmlWriterUtil.LS );
-        sb.append( "" ).append( XmlWriterUtil.LS );
-        sb.append( "" ).append( XmlWriterUtil.LS );
-        sb.append( XmlWriterUtil.LS );
+        sb.append( "\r\n" );
+        sb.append( "" ).append( "\r\n" );
+        sb.append( "" ).append( "\r\n" );
+        sb.append( "" ).append( "\r\n" );
+        sb.append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), 3 * ( 80 - 1 + XmlWriterUtil.LS.length() ) + 2 * XmlWriterUtil.LS.length() );
+        assertEquals( output.toString().length(), 3 * ( 80 - 1 + "\r\n".length() ) + 2 * "\r\n".length() );
     }
     
     public void testWriteCommentTextXMLWriterStringInt_2() throws IOException {
@@ -305,20 +305,20 @@ public void testWriteCommentTextXMLWriterStringInt_2() throws IOException {
             + "loooooooooooooooooooooooooooooooooooooooooooooooooooooonnnnnnnnnnong line", 2 );
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( XmlWriterUtil.LS );
+        sb.append( "\r\n" );
         sb.append( indent ).append( "" )
-            .append( XmlWriterUtil.LS );
+            .append( "\r\n" );
         sb.append( indent ).append( "" )
-            .append( XmlWriterUtil.LS );
+            .append( "\r\n" );
         sb.append( indent ).append( "" )
-            .append( XmlWriterUtil.LS );
+            .append( "\r\n" );
         sb.append( indent ).append( "" )
-            .append( XmlWriterUtil.LS );
+            .append( "\r\n" );
         sb.append( indent ).append( "" )
-            .append( XmlWriterUtil.LS );
+            .append( "\r\n" );
         sb.append( indent ).append( "" )
-            .append( XmlWriterUtil.LS );
-        sb.append( XmlWriterUtil.LS );
+            .append( "\r\n" );
+        sb.append( "\r\n" );
         sb.append( indent );
         assertEquals( output.toString(), sb.toString() );
     }
@@ -337,17 +337,17 @@ public void testWriteCommentTextXMLWriterStringIntInt()
         XmlWriterUtil.writeCommentText( xmlWriter, "hello", 2, 4 );
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( XmlWriterUtil.LS );
+        sb.append( "\r\n" );
         sb.append( indent ).append( "" )
-            .append( XmlWriterUtil.LS );
+            .append( "\r\n" );
         sb.append( indent ).append( "" )
-            .append( XmlWriterUtil.LS );
+            .append( "\r\n" );
         sb.append( indent ).append( "" )
-            .append( XmlWriterUtil.LS );
-        sb.append( XmlWriterUtil.LS );
+            .append( "\r\n" );
+        sb.append( "\r\n" );
         sb.append( indent );
         assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), 3 * ( 80 - 1 + XmlWriterUtil.LS.length() ) + 4 * 2 * 4 + 2 * XmlWriterUtil.LS.length() );
+        assertEquals( output.toString().length(), 3 * ( 80 - 1 + "\r\n".length() ) + 4 * 2 * 4 + 2 * "\r\n".length() );
     }
 
     /**
@@ -363,14 +363,14 @@ public void testWriteCommentTextXMLWriterStringIntIntInt()
         XmlWriterUtil.writeCommentText( xmlWriter, "hello", 2, 4, 50 );
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( XmlWriterUtil.LS );
-        sb.append( indent ).append( "" ).append( XmlWriterUtil.LS );
-        sb.append( indent ).append( "" ).append( XmlWriterUtil.LS );
-        sb.append( indent ).append( "" ).append( XmlWriterUtil.LS );
-        sb.append( XmlWriterUtil.LS );
+        sb.append( "\r\n" );
+        sb.append( indent ).append( "" ).append( "\r\n" );
+        sb.append( indent ).append( "" ).append( "\r\n" );
+        sb.append( indent ).append( "" ).append( "\r\n" );
+        sb.append( "\r\n" );
         sb.append( indent );
         assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), 3 * ( 50 - 1 + XmlWriterUtil.LS.length() ) + 4 * 2 * 4 + 2 * XmlWriterUtil.LS.length() );
+        assertEquals( output.toString().length(), 3 * ( 50 - 1 + "\r\n".length() ) + 4 * 2 * 4 + 2 * "\r\n".length() );
     }
 
     /**
@@ -384,7 +384,7 @@ public void testWriteCommentNull()
         XmlWriterUtil.writeComment( xmlWriter, null );
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
     }
 
@@ -399,7 +399,7 @@ public void testWriteCommentShort()
         XmlWriterUtil.writeComment( xmlWriter, "This is a short text" );
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
     }
 
@@ -416,10 +416,10 @@ public void testWriteCommentLong()
             + "and documentation from a central piece of information." );
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( "" ).append( XmlWriterUtil.LS );
-        sb.append( "" ).append( XmlWriterUtil.LS );
-        sb.append( "" ).append( XmlWriterUtil.LS );
-        sb.append( "" ).append( XmlWriterUtil.LS );
+        sb.append( "" ).append( "\r\n" );
+        sb.append( "" ).append( "\r\n" );
+        sb.append( "" ).append( "\r\n" );
+        sb.append( "" ).append( "\r\n" );
         assertEquals( output.toString(), sb.toString() );
     }
 }

From 20086c4e19fad70b1eb0cde70d61867fb2f0b993 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Wed, 2 Jun 2021 11:19:22 -0400
Subject: [PATCH 217/265] fix double typo

---
 .../java/org/apache/maven/shared/utils/io/MatchPattern.java     | 2 +-
 .../java/org/apache/maven/shared/utils/io/MatchPatterns.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
index bdce10d7..60606573 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
@@ -33,7 +33,7 @@
  * Significantly more efficient than using strings, since re-evaluation and re-tokenizing is avoided.
                  
  *
  * @author Kristian Rosenvold
- * @deprecated use {@code java.nio.filejava.nio.file.DirectoryStream.Filter} and related classes
+ * @deprecated use {@code java.nio.file.DirectoryStream.Filter} and related classes
  */
 @Deprecated
 public class MatchPattern
diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java b/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
index 638586f2..90c71802 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
@@ -27,7 +27,7 @@
  * A list of patterns to be matched
  *
  * @author Kristian Rosenvold
- * @deprecated use {@code java.nio.filejava.nio.file.DirectoryStream.Filter} and related classes
+ * @deprecated use {@code java.nio.file.DirectoryStream.Filter} and related classes
  */
 @Deprecated
 public class MatchPatterns

From 4dd9b90faed6d31019a7062045443964ed19f6fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= 
Date: Sun, 25 Jul 2021 15:43:22 +0200
Subject: [PATCH 218/265] update CI url

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1c376af9..f5528645 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,8 @@ Contributing to [Apache Maven Shared Utils](https://maven.apache.org/shared/mave
 [![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MSHARED.json)][jira]
 [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license]
 [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.shared/maven-shared-utils.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.shared/maven-shared-utils)
-[![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-builds.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master.svg)][build]
-[![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-builds.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master.svg)][test-results]
+[![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master.svg)][build]
+[![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master.svg)][test-results]
 
 
 You have found a bug or you have an idea for a cool new feature? Contributing
@@ -95,5 +95,5 @@ Additional Resources
 [code-style]: https://maven.apache.org/developers/conventions/code.html
 [cla]: https://www.apache.org/licenses/#clas
 [maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index
-[test-results]: https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master/lastCompletedBuild/testReport/
-[build]: https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master/
+[test-results]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master/lastCompletedBuild/testReport/
+[build]: https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master/

From 0e4aa7569ad335b7f14eb529573d815717f5537b Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Mon, 3 Jan 2022 09:17:13 +0100
Subject: [PATCH 219/265] GitHub Shared Actions

---
 .../workflows/{maven.yml => maven-verify.yml} | 35 ++++---------------
 1 file changed, 6 insertions(+), 29 deletions(-)
 rename .github/workflows/{maven.yml => maven-verify.yml} (52%)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven-verify.yml
similarity index 52%
rename from .github/workflows/maven.yml
rename to .github/workflows/maven-verify.yml
index 4d7fff4e..bbd77865 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven-verify.yml
@@ -15,36 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: Java CI
+name: Verify
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
 
 jobs:
   build:
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-      fail-fast: false
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up cache for ~/.m2/repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: maven-${{ matrix.os }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            maven-${{ matrix.os }}-
-
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-
-      - name: Build with Maven
-        run: mvn clean verify -e -B -V
+    name: Verify
+    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2

From 89b81b6e49505352fe89599354156730a524ee55 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Mon, 3 Jan 2022 09:33:52 +0100
Subject: [PATCH 220/265] (doc) Fix javadoc

---
 src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index 4d80e180..79c96b3a 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -59,7 +59,7 @@
 /**
  * This class provides basic facilities for manipulating files and file paths.
  *
- * 
                  Path-related methods
                  
+ * 
                  Path-related methods
                  
  * 
  * Methods exist to retrieve the components of a typical file path. For example
  * /www/hosted/mysite/index.html, can be broken into:
@@ -68,7 +68,7 @@
  * 
                • html -- retrievable through {@link #getExtension}
                  • 
  * 
                
  *
- * 
                File-related methods
                
+ * 
                File-related methods
                
  * 
  * 
                There are methods to create a {@link #toFile File from a URL}, copy a
  * {@link #copyFile File to another File},

From ad8dd6ac0a974c0040a5ffd3203b0fd31733d2d2 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Mon, 3 Jan 2022 18:12:15 +0100
Subject: [PATCH 221/265] [MSHARED-1014] Optionally inherit system environment
 variables by Commandline

---
 .../maven/shared/utils/cli/Commandline.java   | 38 ++++++++++++++++---
 .../utils/cli/CommandLineUtilsTest.java       | 34 ++++++++++-------
 2 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
index e03e905c..2d5d63c8 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
@@ -65,12 +65,14 @@
 public class Commandline
     implements Cloneable
 {
-    private final List arguments = new Vector();
+    private final List arguments = new Vector<>();
 
     private final Map envVars = Collections.synchronizedMap( new LinkedHashMap() );
 
     private Shell shell;
 
+    private boolean shellEnvironmentInherited = true;
+
     /**
      * Create a new command line object.
      * Shell is autodetected from operating system.
@@ -198,14 +200,13 @@ public void addArguments( String... line )
      */
     public void addEnvironment( String name, String value )
     {
-        //envVars.add( name + "=" + value );
         envVars.put( name, value );
     }
 
     /**
      * Add system environment variables.
      */
-    public void addSystemEnvironment()
+    private void addSystemEnvironment()
     {
         Properties systemEnvVars = CommandLineUtils.getSystemEnvVars();
 
@@ -226,7 +227,11 @@ public void addSystemEnvironment()
      */
     public String[] getEnvironmentVariables()
     {
-        addSystemEnvironment();
+        if ( isShellEnvironmentInherited() )
+        {
+            addSystemEnvironment();
+        }
+
         List environmentVars = new ArrayList<>();
         for ( String name : envVars.keySet() )
         {
@@ -297,7 +302,7 @@ public String[] getArguments()
      */
     public String[] getArguments( boolean mask )
     {
-        List result = new ArrayList( arguments.size() * 2 );
+        List result = new ArrayList<>( arguments.size() * 2 );
         for ( Arg argument : arguments )
         {
             Argument arg = (Argument) argument;
@@ -377,6 +382,29 @@ public void clearArgs()
         arguments.clear();
     }
 
+    /**
+     * Indicates whether the environment variables of the current process
+     * should are propagated to the executing Command.
+     * By default, the current environment variables are inherited by the new Command line execution.
+     *
+     * @return true if the environment variables should be propagated, false otherwise.
+     */
+    public boolean isShellEnvironmentInherited()
+    {
+        return shellEnvironmentInherited;
+    }
+
+    /**
+     * Specifies whether the environment variables of the current process should be propagated to the executing Command.
+     *
+     * @param shellEnvironmentInherited true if the environment variables should be propagated,
+     *            false otherwise.
+     */
+    public void setShellEnvironmentInherited( boolean shellEnvironmentInherited )
+    {
+        this.shellEnvironmentInherited = shellEnvironmentInherited;
+    }
+
     /**
      * Execute the command.
      * 
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
index 81b29971..fdc83b0a 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
@@ -56,9 +56,8 @@ public void testGetSystemEnvVarsCaseInsensitive()
 
     @Test
     public void testEnsureCaseSensitivity()
-        throws Exception
     {
-        Map data = new HashMap();
+        Map data = new HashMap<>();
         data.put( "abz", "cool" );
         assertTrue( CommandLineUtils.ensureCaseSensitivity( data, false ).containsKey( "ABZ" ) );
         assertTrue( CommandLineUtils.ensureCaseSensitivity( data, true ).containsKey( "abz" ) );
@@ -69,7 +68,6 @@ public void testEnsureCaseSensitivity()
      */
     @Test
     public void testGetSystemEnvVarsWindows()
-        throws Exception
     {
         if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
         {
@@ -103,14 +101,9 @@ public void testTranslateCommandline()
         assertCmdLineArgs( new String[] { "foo", " ' ", "bar" }, "foo \" ' \" bar" );
     }
 
-
     @Test
-    public void givenASingleQuoteMarkInArgument_whenExecutingCode_thenNoExceptionIsThrown() throws Exception {
-        new Commandline("echo \"let's go\"").execute();
-    }
-
-    @Test
-    public void givenADoubleQuoteMarkInArgument_whenExecutingCode_thenCommandLineExceptionIsThrown() throws Exception {
+    public void givenADoubleQuoteMarkInArgument_whenExecutingCode_thenCommandLineExceptionIsThrown()
+    {
         try {
             new Commandline("echo \"let\"s go\"").execute();
         } catch (CommandLineException e) {
@@ -124,8 +117,7 @@ public void givenADoubleQuoteMarkInArgument_whenExecutingCode_thenCommandLineExc
     @Test
     public void givenASingleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Returned() throws Exception {
         final Process p = new Commandline("echo \"let's go\"").execute();
-        // Note, this sleep should be removed when java version reaches Java 8
-        Thread.sleep(1000);
+        p.waitFor();
         assertEquals(0, p.exitValue());
     }
 
@@ -160,7 +152,9 @@ public void givenAnEscapedSingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs
     public void givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenNoExceptionIsThrown()
         throws Exception
     {
-        new Commandline( "echo \"let\\\"s go\"" ).execute();
+        Process p = new Commandline( "echo \"let\\\"s go\"" ).execute();
+        p.waitFor();
+        assertEquals(0, p.exitValue());
     }
 
     private void assertCmdLineArgs( final String[] expected, final String cmdLine )
@@ -185,7 +179,7 @@ public void environmentVariableWithNullShouldNotBeSet() {
     }
 
     @Test
-    public void environmentVariableFromSystemIsCopied() {
+    public void environmentVariableFromSystemIsCopiedByDefault() {
 
         Commandline commandline = new Commandline();
 
@@ -195,6 +189,18 @@ public void environmentVariableFromSystemIsCopied() {
         assertThat(environmentVariables, hasItemInArray( "TEST_SHARED_ENV=TestValue" ) );
     }
 
+    @Test
+    public void environmentVariableFromSystemIsNotCopiedIfInheritedIsFalse() {
+
+        Commandline commandline = new Commandline();
+        commandline.setShellEnvironmentInherited( false );
+
+        String[] environmentVariables = commandline.getEnvironmentVariables();
+
+        assertNotNull(environmentVariables);
+        assertEquals(0, environmentVariables.length );
+    }
+
     @Test
     public void environmentVariableFromSystemIsRemoved() {
 

From 412b279a9b24d4ae08889743dd9e6fb275d12973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?=
 <11896137+pzygielo@users.noreply.github.com>
Date: Fri, 11 Mar 2022 14:52:13 +0100
Subject: [PATCH 222/265] (doc) Throw more descriptive NPEx (#95)

---
 .../shared/utils/io/DirectoryScanner.java     | 13 +++++++
 .../shared/utils/io/DirectoryScannerTest.java | 36 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
index bd8bd7d9..8f92fd2b 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
@@ -321,6 +321,10 @@ public void setIncludes( final String... includes )
             this.includes = new String[includes.length];
             for ( int i = 0; i < includes.length; i++ )
             {
+                if ( includes[i] == null )
+                {
+                    throw new NullPointerException( messageForNullListElement( "includes" ) );
+                }
                 String pattern;
                 pattern = includes[i].trim().replace( '/', File.separatorChar ).replace( '\\', File.separatorChar );
                 if ( pattern.endsWith( File.separator ) )
@@ -353,6 +357,10 @@ public void setExcludes( final String... excludes )
             this.excludes = new String[excludes.length];
             for ( int i = 0; i < excludes.length; i++ )
             {
+                if ( excludes[i] == null )
+                {
+                    throw new NullPointerException( messageForNullListElement( "excludes" ) );
+                }
                 String pattern;
                 pattern = excludes[i].trim().replace( '/', File.separatorChar ).replace( '\\', File.separatorChar );
                 if ( pattern.endsWith( File.separator ) )
@@ -364,6 +372,11 @@ public void setExcludes( final String... excludes )
         }
     }
 
+    private static String messageForNullListElement( String listName )
+    {
+        return "If a non-null " + listName + " list is given, all elements must be non-null";
+    }
+
     /**
      * @param scanConductor {@link #scanConductor}
      */
diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
index 01110069..9dffdad5 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
@@ -25,6 +25,7 @@
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
@@ -128,6 +129,41 @@ public void testSimpleIncludes()
                 /* expExclDirs     */ NONE );
     }
 
+    @Rule
+    public ExpectedException xcludesNPExRule = ExpectedException.none();
+
+    @Test
+    public void testIncludesWithNull()
+        throws Exception
+    {
+        testXcludesWithNull( new String[]{ null }, null, "includes" );
+    }
+
+    @Test
+    public void testExcludesWithNull()
+        throws Exception
+    {
+        testXcludesWithNull( null, new String[]{ null }, "excludes" );
+    }
+
+    private void testXcludesWithNull( String[] includes, String[] excludes, String listName )
+        throws Exception
+    {
+        createTestData();
+        xcludesNPExRule.expect( NullPointerException.class );
+        xcludesNPExRule.expectMessage( "If a non-null " + listName + " list is given, all elements must be non-null" );
+
+        fitScanTest( true, true, true,
+                /* includes        */ includes,
+                /* excludes        */ excludes,
+                /* expInclFiles    */ new String[]{ "file3.dat", "folder1/file5.dat" },
+                /* expInclDirs     */ NONE,
+                /* expNotInclFiles */ new String[]{ "file1.txt", "file2.txt", "folder1/file4.txt" },
+                /* expNotInclDirs  */ new String[]{ "", "folder1" },
+                /* expExclFiles    */ NONE,
+                /* expExclDirs     */ NONE );
+    }
+
     @Test
     public void checkSymlinkBehaviour()
     {

From e838d1ae06c15e2d36830896fa75cd30568d73ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Haisman?= 
Date: Sat, 11 Jun 2022 11:20:19 +0200
Subject: [PATCH 223/265] Fix typo in DirectoryScanner.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cannonical → canonical
---
 .../java/org/apache/maven/shared/utils/io/DirectoryScanner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
index 8f92fd2b..468e226f 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
@@ -762,7 +762,7 @@ private String[] doNotFollowSymbolicLinks( final File dir, final String vpath, S
             catch ( final IOException ioe )
             {
                 final String msg =
-                    "IOException caught while checking " + "for links, couldn't get cannonical path!";
+                    "IOException caught while checking " + "for links, couldn't get canonical path!";
                 // will be caught and redirected to Ant's logging system
                 System.err.println( msg );
                 noLinks.add( newfile );

From 1fa7a4c9dea71d430d4fade4d52f8261108c66e2 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Tue, 21 Jun 2022 01:15:37 +0200
Subject: [PATCH 224/265] Cleanup unneeded dependencies

---
 pom.xml                                          | 16 ----------------
 .../ReflectionValueExtractorTest.java            | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index daf55b01..fcfc09ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,6 @@
     RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder
     2021-04-26T13:54:25Z
     7
-    3.1.0
   
 
   
@@ -110,27 +109,12 @@
       3.0.2
       provided
     
-    
-    
-      org.apache.maven
-      maven-core
-      ${mavenVersion}
-      test
-    
     
       org.codehaus.plexus
       plexus-utils
       3.3.0
       test
     
-    
-      org.apache.maven.plugin-testing
-      maven-plugin-testing-harness
-      3.3.0
-      test
-    
   
 
   
diff --git a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
index 1c9a0e26..775ddc48 100644
--- a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
@@ -24,8 +24,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
 import junit.framework.TestCase;
 
 /**
@@ -353,6 +351,8 @@ public static class Project
 
         private Map artifactMap = new HashMap();
 
+        private String description;
+
         public void setModelVersion( String modelVersion )
         {
             this.modelVersion = modelVersion;
@@ -461,6 +461,16 @@ public Map getArtifactMap()
         {
             return artifactMap;
         }
+
+        public void setDescription( String description )
+        {
+            this.description = description;
+        }
+
+        public String getDescription()
+        {
+            return description;
+        }
     }
 
 
@@ -517,7 +527,7 @@ public Object getValue()
     public void testRootPropertyRegression()
         throws Exception
     {
-        MavenProjectStub project = new MavenProjectStub(  );
+        Project project = new Project();
         project.setDescription( "c:\\\\org\\apache\\test" );
         Object evalued  = ReflectionValueExtractor.evaluate( "description", project );
         assertNotNull( evalued );

From 2bf1e034b06557830b9e2bfe0689f1b93ea5fbd0 Mon Sep 17 00:00:00 2001
From: Olivier Lamy 
Date: Thu, 21 Jul 2022 20:57:40 +1000
Subject: [PATCH 225/265] some upgrade and dependabot

Signed-off-by: Olivier Lamy 
---
 .github/dependabot.yml                | 27 +++++++++++++++++++++++++++
 .github/release-drafter.yml           | 19 +++++++++++++++++++
 .github/workflows/maven-verify.yml    |  2 +-
 .github/workflows/release-drafter.yml | 25 +++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/release-drafter.yml
 create mode 100644 .github/workflows/release-drafter.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..778ea2af
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 00000000..247b6e15
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+_extends: maven-gh-actions-shared
+tag-template: maven-shared-utils-$NEXT_MINOR_VERSION
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index bbd77865..4d67fdcf 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -24,4 +24,4 @@ on:
 jobs:
   build:
     name: Verify
-    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2
+    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
new file mode 100644
index 00000000..58e5ee49
--- /dev/null
+++ b/.github/workflows/release-drafter.yml
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+   
+name: Release Drafter
+on:
+  push:
+    branches:
+      - master
+jobs:
+   update_release_draft:
+      uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v2

From cbd1acd141c7cdc80fe3750ef89a1127c10578bb Mon Sep 17 00:00:00 2001
From: Konrad Windszus 
Date: Mon, 25 Jul 2022 14:56:06 +0200
Subject: [PATCH 226/265] [MSHARED-1107] Make copyFile succeed with source file
 having lastModified() = 0

Also check for existence of destination file before overwriting.

This closes #105
---
 .../maven/shared/utils/io/FileUtils.java      |  2 +-
 .../maven/shared/utils/io/FileUtilsTest.java  | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index 79c96b3a..100ad819 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -1901,7 +1901,7 @@ public static void copyFile( @Nonnull File from, @Nonnull File to, @Nullable Str
     {
         if ( wrappers == null || wrappers.length == 0 )
         {
-            if ( overwrite || to.lastModified() < from.lastModified() )
+            if ( overwrite || !to.exists() || to.lastModified() < from.lastModified() )
             {
                 copyFile( from, to );
             }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 4dfa4fa4..1f7daba3 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -439,6 +439,30 @@ public void copyFileWithNoFiltersAndNoDestination()
         assertFileContent( to, "Hello World!" );
     }
 
+    @Test
+    public void copyFileWithNoFiltersAndLastModifiedDateOfZeroAndNoDestination()
+        throws Exception
+    {
+        File from = write(
+            "from.txt",
+            MODIFIED_YESTERDAY,
+            "Hello World!"
+        );
+        File to = new File(
+            tempFolder.getRoot(),
+            "to.txt"
+        );
+
+        from.setLastModified( 0 );
+        FileUtils.copyFile( from, to, null, ( FileUtils.FilterWrapper[] ) null);
+
+        assertTrue(
+            "to.txt did not exist so should have been written",
+            to.lastModified() >= MODIFIED_TODAY
+        );
+        assertFileContent( to, "Hello World!" );
+    }
+
     @Test
     public void copyFileWithNoFiltersAndOutdatedDestination()
             throws Exception

From 5b78029657e60b71daa596914ec1cf48057af732 Mon Sep 17 00:00:00 2001
From: Michael Osipov 
Date: Mon, 25 Jul 2022 15:40:09 +0200
Subject: [PATCH 227/265] Fix formatting

---
 .../maven/shared/utils/io/FileUtilsTest.java  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 1f7daba3..51cfb177 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -430,7 +430,7 @@ public void copyFileWithNoFiltersAndNoDestination()
             "to.txt"
         );
 
-        FileUtils.copyFile( from, to, null, ( FileUtils.FilterWrapper[] ) null);
+        FileUtils.copyFile( from, to, null, (FileUtils.FilterWrapper[]) null );
 
         assertTrue(
             "to.txt did not exist so should have been written",
@@ -454,7 +454,7 @@ public void copyFileWithNoFiltersAndLastModifiedDateOfZeroAndNoDestination()
         );
 
         from.setLastModified( 0 );
-        FileUtils.copyFile( from, to, null, ( FileUtils.FilterWrapper[] ) null);
+        FileUtils.copyFile( from, to, null, (FileUtils.FilterWrapper[]) null );
 
         assertTrue(
             "to.txt did not exist so should have been written",
@@ -478,7 +478,7 @@ public void copyFileWithNoFiltersAndOutdatedDestination()
             "Older content"
         );
 
-        FileUtils.copyFile( from, to, null, ( FileUtils.FilterWrapper[] ) null);
+        FileUtils.copyFile( from, to, null, (FileUtils.FilterWrapper[]) null );
 
         assertTrue(
             "to.txt was outdated so should have been overwritten",
@@ -502,7 +502,7 @@ public void copyFileWithNoFiltersAndNewerDestination()
             "Older content"
         );
 
-        FileUtils.copyFile( from, to, null, ( FileUtils.FilterWrapper[] ) null);
+        FileUtils.copyFile( from, to, null, (FileUtils.FilterWrapper[]) null );
 
         assertTrue(
             "to.txt was newer so should have been left alone",
@@ -526,7 +526,7 @@ public void copyFileWithNoFiltersAndNewerDestinationButForcedOverwrite()
             "Older content"
         );
 
-        FileUtils.copyFile( from, to, null, null, true);
+        FileUtils.copyFile( from, to, null, null, true );
 
         assertTrue(
             "to.txt was newer but the overwrite should have been forced",
@@ -695,7 +695,7 @@ public Reader getReader( Reader reader )
             };
     }
 
-    private File write( @Nonnull String name, long lastModified, @Nonnull String text) throws IOException
+    private File write( @Nonnull String name, long lastModified, @Nonnull String text ) throws IOException
     {
         final File file = new File( tempFolder.getRoot(), name );
         try ( final Writer writer = new FileWriter( file ) ) {
@@ -744,7 +744,7 @@ public void deleteFile()
         assertThat( "Check Exist", destination.exists(), is( false ) );
     }
 
-    @Test(expected = IOException.class)
+    @Test( expected = IOException.class )
     public void deleteFileNofile()
         throws Exception
     {
@@ -1035,7 +1035,7 @@ public void fileUtils()
         File file1 = new File( tempFolder.getRoot(), "test.txt" );
         String filename = file1.getAbsolutePath();
 
-        //Create test file on-the-fly (used to be in CVS)
+        //Create test file on-the-fly
         try ( OutputStream out = new java.io.FileOutputStream( file1 ) )
         {
             out.write( "This is a test".getBytes( "UTF-8" ) );
@@ -1571,7 +1571,7 @@ public void extensionWindowsNonRootPathOnWindows()
     }
 
     @Test
-    @Ignore("Wait until we can run with assembly 2.5 which will support symlinks properly")
+    @Ignore( "Wait until we can run with assembly 2.5 which will support symlinks properly" )
     public void isASymbolicLink()
         throws IOException
     {
@@ -1579,16 +1579,16 @@ public void isASymbolicLink()
         assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
 
         File file = new File( "src/test/resources/symlinks/src/symDir" );
-        assertTrue(FileUtils.isSymbolicLink(file  ));
+        assertTrue( FileUtils.isSymbolicLink( file ) );
     }
 
     @Test
-    @Ignore("Wait until we can run with assembly 2.5 which will support symlinks properly")
+    @Ignore( "Wait until we can run with assembly 2.5 which will support symlinks properly" )
     public void notASymbolicLink()
         throws IOException
     {
         File file = new File( "src/test/resources/symlinks/src/" );
-        assertFalse(FileUtils.isSymbolicLink(file  ));
+        assertFalse( FileUtils.isSymbolicLink( file ) );
     }
 
     @Test

From 8822bea7d21d53b106a696fd95f10c494ce20c7a Mon Sep 17 00:00:00 2001
From: Konrad Windszus 
Date: Mon, 25 Jul 2022 15:34:29 +0200
Subject: [PATCH 228/265] [MSHARED-1109] MessageUtilsTest fails on unsupported
 platforms (e.g., Apple Silicon or HP-UX/IA64)

This closes #106
---
 .../utils/logging/MessageUtilsTest.java       | 44 ++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
index e80fe38c..2780f8b1 100644
--- a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
@@ -23,6 +23,7 @@
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeNoException;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -46,12 +47,24 @@ public void testSystem()
         {
             MessageUtils.systemInstall();
             assertThat( System.out, not( sameInstance( currentOut ) ) );
-            MessageUtils.systemUninstall();
             assertThat( System.out, sameInstance( currentOut ) );
         }
+        catch( LinkageError e )
+        {
+            assumeNoException( "JAnsi not supported for this platform", e );
+        }
         finally
         {
-            System.setOut( currentOut );
+            try
+            {
+                // uninstall is always necessary due to https://github.com/fusesource/jansi/issues/242 
+                // but might throw exceptions
+                MessageUtils.systemUninstall();
+            }
+            catch ( Throwable t )
+            {
+                // ignore any thrown exception like NPE here
+            }
         }
     }
 
@@ -69,9 +82,28 @@ public int getTerminalWidth()
         AnsiOutputStream aos = new AnsiOutputStream( new ByteArrayOutputStream(), width, AnsiMode.Default,
                 null, AnsiType.Emulation, AnsiColors.Colors256, StandardCharsets.UTF_8,
                 null, null, false );
-        AnsiConsole.systemInstall();
-        AnsiConsole.out = new AnsiPrintStream( aos, true );
-        assertEquals( 33, MessageUtils.getTerminalWidth() );
-        AnsiConsole.systemUninstall();
+        try
+        {
+            AnsiConsole.systemInstall();
+            AnsiConsole.out = new AnsiPrintStream( aos, true );
+            assertEquals( 33, MessageUtils.getTerminalWidth() );
+        }
+        catch( LinkageError e )
+        {
+            assumeNoException( "JAnsi not supported for this platform", e );
+        }
+        finally
+        {
+            try
+            {
+                // uninstall is always necessary due to https://github.com/fusesource/jansi/issues/242 
+                // but might throw exceptions
+                AnsiConsole.systemUninstall();
+            }
+            catch ( Throwable t )
+            {
+                // ignore any thrown exception like NPE here
+            }
+        }
     }
 }

From 385fa0861ce122dff2f170f0561b9d72fa2406cd Mon Sep 17 00:00:00 2001
From: Konrad Windszus 
Date: Wed, 8 Jun 2022 14:57:19 +0200
Subject: [PATCH 229/265] [MSHARED-1079] Improve Javadoc of MessageBuilder, add
 #build() and deprecate #toString()

This closes #96
---
 .../utils/logging/AnsiMessageBuilder.java     |  6 +++++
 .../shared/utils/logging/MessageBuilder.java  | 23 ++++++++++++++++++-
 .../utils/logging/PlainMessageBuilder.java    |  6 +++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
index 7f442397..f7eed76e 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
@@ -150,6 +150,12 @@ public AnsiMessageBuilder format( String pattern, Object... args )
 
     @Override
     public String toString()
+    {
+        return build();
+    }
+
+    @Override
+    public String build()
     {
         return ansi.toString();
     }
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
index 649c0860..5060bd11 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
@@ -19,8 +19,13 @@
  * under the License.
  */
 
+import java.util.Formatter;
+
 /**
  * Message builder that supports configurable styling.
+ * An instance of this interface can be retrieved with {@link MessageUtils#buffer()}.
+ * After the message has been constructed with any of the append methods its content can be retrieved
+ * with {@link #build()}.
  * @see MessageUtils
  * @since 3.1.0
  */
@@ -125,9 +130,25 @@ public interface MessageBuilder
     /**
      * Append formatted content to the buffer.
      * @see String#format(String, Object...)
-     * @param pattern a format string
+     * @param pattern a format string according to the {@link Formatter} syntax
      * @param args arguments referenced by the format specifiers in the format string.
      * @return the current builder
      */
     MessageBuilder format( String pattern, Object... args );
+
+    /**
+     * Get the message constructed by this builder.
+     * The underlying buffer is not reset with this method, i.e. if you continue using this builder you just
+     * append content to the existing one.
+     * @return the message
+     * @since 4.0.0
+     */
+    String build();
+
+    /**
+     * Same as {@link MessageBuilder#build()}.
+     * @deprecated Rather use {@link MessageBuilder#build()}
+     */
+    @Deprecated
+    String toString();
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
index 5ff48844..ce788262 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
@@ -136,6 +136,12 @@ public PlainMessageBuilder format( String pattern, Object... args )
 
     @Override
     public String toString()
+    {
+        return build();
+    }
+
+    @Override
+    public String build()
     {
         return buffer.toString();
     }

From 86b9ed07ef337b49ddce26224a2061d2e6e8bb85 Mon Sep 17 00:00:00 2001
From: Michael Osipov 
Date: Mon, 25 Jul 2022 18:45:58 +0200
Subject: [PATCH 230/265] [MSHARED-986] XmlStreamWriter is pointless (deprecate
 it)

---
 .../org/apache/maven/shared/utils/xml/XmlStreamWriter.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamWriter.java
index 2923faf5..f36dc505 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamWriter.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamWriter.java
@@ -24,9 +24,9 @@
 import java.io.OutputStream;
 
 /**
- * We just wrap the commons StreamWriter to not get into troubles
- * by exposing shaded commons-io packages
+ * @deprecated use org.apache.commons.io.input.XmlStreamWriter instead
  */
+@Deprecated
 public class XmlStreamWriter
     extends org.apache.commons.io.output.XmlStreamWriter
 {

From 6229597402fbc7e6da88e0aacbb277aff930f41e Mon Sep 17 00:00:00 2001
From: Michael Osipov 
Date: Mon, 25 Jul 2022 19:03:19 +0200
Subject: [PATCH 231/265] [MSHARED-1111] Upgrade Maven Parent to 36, Maven to
 3.2.5 and to Java 8

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fcfc09ba..0bf65c20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   
     org.apache.maven.shared
     maven-shared-components
-    34
+    36
   
 
   maven-shared-utils
@@ -62,7 +62,8 @@
   
     RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder
     2021-04-26T13:54:25Z
-    7
+    8
+    3.2.5
   
 
   

From b0bedef47a8cc24816a324026d9ff9f6ba0b860d Mon Sep 17 00:00:00 2001
From: Michael Osipov 
Date: Mon, 25 Jul 2022 19:05:10 +0200
Subject: [PATCH 232/265] [MSHARED-1110] Upgrade components

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0bf65c20..bcae7c1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,20 +70,20 @@
     
       org.slf4j
       slf4j-api
-      1.7.25
+      1.7.36
     
 
     
       org.fusesource.jansi
       jansi
-      2.2.0
+      2.4.0
       true
     
 
     
       commons-io
       commons-io
-      2.6
+      2.11.0
     
 
     
@@ -113,7 +113,7 @@
     
       org.codehaus.plexus
       plexus-utils
-      3.3.0
+      3.4.2
       test
     
   

From 873ebb0e3c718d3dc2ceb095f8cb99a89faa7918 Mon Sep 17 00:00:00 2001
From: Konrad Windszus 
Date: Mon, 25 Jul 2022 20:00:47 +0200
Subject: [PATCH 233/265] [MSHARED-1109] fix broken IT after previous
 refactoring

This closes #107
---
 .../org/apache/maven/shared/utils/logging/MessageUtilsTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
index 2780f8b1..972ceaee 100644
--- a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
@@ -47,7 +47,6 @@ public void testSystem()
         {
             MessageUtils.systemInstall();
             assertThat( System.out, not( sameInstance( currentOut ) ) );
-            assertThat( System.out, sameInstance( currentOut ) );
         }
         catch( LinkageError e )
         {
@@ -66,6 +65,7 @@ public void testSystem()
                 // ignore any thrown exception like NPE here
             }
         }
+        assertThat( System.out, sameInstance( currentOut ) );
     }
 
     @Test

From 28c8ce627255a69b59aa7b3e6f794b7f5a872ea8 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Tue, 26 Jul 2022 13:05:43 +0200
Subject: [PATCH 234/265] [MSHARED-1113] Downgrade m-resource-p to 3.1.0

due to https://issues.apache.org/jira/browse/MSHARED-1112
---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index bcae7c1f..f49935c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,6 +119,18 @@
   
 
   
+    
+      
+        
+          
+          
+          org.apache.maven.plugins
+          maven-resources-plugin
+          3.1.0
+        
+      
+    
+
     
       
         org.codehaus.mojo

From b7694b150db3bf77ed7823fcd55aa7187197dae9 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Tue, 26 Jul 2022 13:29:53 +0200
Subject: [PATCH 235/265] [MSHARED-1116] Drop findbugs-maven-plugin from
 configuration

Not present in parent, no execution section, inactive
---
 findbugs-exclude.xml | 83 --------------------------------------------
 pom.xml              |  7 ----
 2 files changed, 90 deletions(-)
 delete mode 100755 findbugs-exclude.xml

diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
deleted file mode 100755
index 0fc3f261..00000000
--- a/findbugs-exclude.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-    
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-          
-          
-        
-        
-    
-    
-        
-        
-          
-          
-          
-          
-          
-          
-          
-        
-        
-    
-    
-        
-        
-        
-    
-    
-        
-        
-           
-           
-           
-        
-        
-    
-    
-        
-        
-    
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f49935c5..7d726911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,13 +132,6 @@
     
 
     
-      
-        org.codehaus.mojo
-        findbugs-maven-plugin
-        
-          findbugs-exclude.xml
-        
-      
       
         org.apache.rat
         apache-rat-plugin

From a9ac97bd82d9eefbc730985dcf8616a71de02289 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Jul 2022 16:24:00 +0000
Subject: [PATCH 236/265] Bump maven-shared-components from 36 to 37

Bumps [maven-shared-components](https://github.com/apache/maven-parent) from 36 to 37.
- [Release notes](https://github.com/apache/maven-parent/releases)
- [Commits](https://github.com/apache/maven-parent/commits)

---
updated-dependencies:
- dependency-name: org.apache.maven.shared:maven-shared-components
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7d726911..6f5d7351 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   
     org.apache.maven.shared
     maven-shared-components
-    36
+    37
   
 
   maven-shared-utils

From f4b0384a7f1f9c0de7cae7910b437a62a6abfb5d Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Wed, 27 Jul 2022 19:42:32 +0200
Subject: [PATCH 237/265] Fix jenkins url

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6f5d7351..31bc4573 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
   
   
     Jenkins
-    https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/
+    https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/
   
   
     

From 40af11237c90f684f490d23fc8fb8eafa2549d58 Mon Sep 17 00:00:00 2001
From: Joerg Kubitz 
Date: Mon, 22 Aug 2022 18:21:52 +0200
Subject: [PATCH 238/265] [MSHARED-1122] FileUtils: avoid getCanonicalPath()

Use java.nio.Files.isSameFile() to compare path. Since JDK 12
getCanonicalPath() is not cached anymore and very slow on windows.
---
 src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index 100ad819..2b87b50f 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -815,7 +815,7 @@ public static void copyFile( @Nonnull final File source, @Nonnull final File des
         }
 
         //check source != destination, see PLXUTILS-10
-        if ( source.getCanonicalPath().equals( destination.getCanonicalPath() ) )
+        if ( destination.exists() && Files.isSameFile( source.toPath(), destination.toPath() ) )
         {
             //if they are equal, we can exit the method without doing any work
             return;

From 25532658debe5bf2c55df7a61e6c6ad388640469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= 
Date: Wed, 2 Nov 2022 18:02:53 +0100
Subject: [PATCH 239/265] add Reproducible Builds badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f5528645..3f907f69 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ Contributing to [Apache Maven Shared Utils](https://maven.apache.org/shared/mave
 [![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MSHARED.json)][jira]
 [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license]
 [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.shared/maven-shared-utils.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.shared/maven-shared-utils)
+[![Reproducible Builds](https://img.shields.io/badge/Reproducible_Builds-ok-green?labelColor=blue)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/shared/maven-shared-utils/README.md)
 [![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master.svg)][build]
 [![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-shared-utils/job/master.svg)][test-results]
 

From 47fd7b7ffb9a6dc248d3862176e6b812163117fb Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sat, 3 Dec 2022 14:43:59 -0500
Subject: [PATCH 240/265] deprecate join methods now available in Java 8 String
 class (#127)

---
 .../java/org/apache/maven/shared/utils/StringUtils.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
index de4a1e88..a355e2e7 100644
--- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
@@ -618,7 +618,9 @@ public static String mid( String str, int pos, int len )
      * @param array     the array of values to join together
      * @param separator the separator character to use
      * @return the joined String
+     * @deprecated use java.lang.String.join() instead
      */
+    @Deprecated
     @Nonnull public static String join( @Nonnull Object[] array, @Nullable String separator )
     {
         if ( separator == null )
@@ -650,7 +652,9 @@ public static String mid( String str, int pos, int len )
      * @param iterator  the Iterator of values to join together
      * @param separator the separator character to use
      * @return the joined String
+     * @deprecated use java.lang.String.join() instead
      */
+    @Deprecated
     @Nonnull public static String join( @Nonnull Iterator iterator, String separator )
     {
         if ( separator == null )
@@ -689,7 +693,7 @@ public static String replaceOnce( @Nullable String text, char repl, char with )
     }
 
     /**
-     * 
                Replace all occurances of a char within another char.
                
+     * 
                Replace all occurrences of a char within a string with another char.
                
      *
      * 
                A null reference passed to this method is a no-op.
                
      *

From 5647c669078228cfa745534efa8e825ee994d6a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 3 Dec 2022 19:47:21 +0000
Subject: [PATCH 241/265] Bump commons-text from 1.3 to 1.10.0 (#119)

Bumps commons-text from 1.3 to 1.10.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-text
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 31bc4573..5e4cd7bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
     
       org.apache.commons
       commons-text
-      1.3
+      1.10.0
       test
     
     

From f4383c55f77ad4480f146481bf3192bc52c3af30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 3 Dec 2022 19:48:59 +0000
Subject: [PATCH 242/265] Bump plexus-utils from 3.4.2 to 3.5.0 (#120)

Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.4.2...plexus-utils-3.5.0)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-utils
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5e4cd7bc..bb8752fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
     
       org.codehaus.plexus
       plexus-utils
-      3.4.2
+      3.5.0
       test
     
   

From c0024829b40f20d758c28192f07b9c3fd04223ba Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sun, 1 Jan 2023 20:03:22 +0000
Subject: [PATCH 243/265] [MSHARED-1172] Deprecate redundant isEmptyString
 method (#123)

deprecate a string utility method that doesn't belong in this package and is duplicated in 72 other places
---
 .../apache/maven/shared/utils/xml/Xpp3DomUtils.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java
index 1b10dc8c..985c5592 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java
@@ -148,15 +148,15 @@ private static boolean isMergeChildren( Xpp3Dom dominant )
     }
 
     /**
-     * @param str The string to be checked.
-     * @return true in case string is empty false otherwise.
+     * @deprecated use str == null || String.isBlank(str) (Java 11+) 
+     *             or org.apache.commons.lang3.StringUtils.isBlank(str)
+     * @param str the string to be checked
+     * @return true if the string is null, empty, or whitespace only; false otherwise
      */
+    @Deprecated
     public static boolean isEmpty( String str )
     {
         return str == null || str.trim().length() == 0;
     }
 
-
-
-
 }

From 0c1a7d4115e17ab318c48ec7e65775a67dc65198 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Feb 2023 20:03:05 +0000
Subject: [PATCH 244/265] Bump apache/maven-gh-actions-shared from 2 to 3

Bumps [apache/maven-gh-actions-shared](https://github.com/apache/maven-gh-actions-shared) from 2 to 3.
- [Release notes](https://github.com/apache/maven-gh-actions-shared/releases)
- [Commits](https://github.com/apache/maven-gh-actions-shared/commits/v3)

---
updated-dependencies:
- dependency-name: apache/maven-gh-actions-shared
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 .github/workflows/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 58e5ee49..b44872cf 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -22,4 +22,4 @@ on:
       - master
 jobs:
    update_release_draft:
-      uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v2
+      uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v3

From d188459af59382014b196cf4053ac30e480c318c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Mar 2023 22:00:41 +0100
Subject: [PATCH 245/265] [MSHARED-1197] Bump plexus-utils from 3.5.0 to 3.5.1
 (#132)

Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.5.0...plexus-utils-3.5.1)

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bb8752fb..2f5e6e3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
     
       org.codehaus.plexus
       plexus-utils
-      3.5.0
+      3.5.1
       test
     
   

From 673509e6a7ec98232356f8913af14d570ac92e48 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Thu, 9 Mar 2023 15:47:08 -0500
Subject: [PATCH 246/265] remove debugging output that should not appear in a
 passing test (#135)

---
 .../maven/shared/utils/cli/shell/BourneShellTest.java    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
index 199f36e4..8032ae2d 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
@@ -81,7 +81,6 @@ public void testPreserveSingleQuotesOnArgument()
         List shellCommandLine = sh.getShellCommandLine("\"some arg with spaces\"");
 
         String cli = StringUtils.join( shellCommandLine.iterator(), " " );
-        System.out.println( cli );
         assertTrue( cli.endsWith( "'\"some arg with spaces\"'" ) );
     }
 
@@ -95,7 +94,6 @@ public void testAddSingleQuotesOnArgumentWithSpaces()
         List shellCommandLine = sh.getShellCommandLine("some arg with spaces");
 
         String cli = StringUtils.join( shellCommandLine.iterator(), " " );
-        System.out.println( cli );
         assertTrue( cli.endsWith("'some arg with spaces'"));
     }
 
@@ -114,8 +112,6 @@ public void testAddArgumentWithSingleQuote()
     public void testArgumentsWithSemicolon()
     {
 
-        System.out.println( "---- semi colon tests ----" );
-
         Shell sh = newShell();
 
         sh.setWorkingDirectory( "/usr/bin" );
@@ -124,7 +120,6 @@ public void testArgumentsWithSemicolon()
         List shellCommandLine = sh.getShellCommandLine(";some&argwithunix$chars");
 
         String cli = StringUtils.join( shellCommandLine.iterator(), " " );
-        System.out.println( cli );
         assertTrue( cli.endsWith( "';some&argwithunix$chars'" ) );
 
         Commandline commandline = new Commandline( newShell() );
@@ -134,7 +129,6 @@ public void testArgumentsWithSemicolon()
         commandline.createArg().setValue( ";password" );
 
         List lines = commandline.getShell().getShellCommandLine( commandline.getArguments() );
-        System.out.println( lines  );
 
         assertEquals( "/bin/sh", lines.get( 0 ) );
         assertEquals( "-c", lines.get( 1 ) );
@@ -146,7 +140,6 @@ public void testArgumentsWithSemicolon()
         commandline.createArg().setValue( "--password" );
         commandline.createArg().setValue( ";password" );
         lines = commandline.getShell().getShellCommandLine( commandline.getArguments() );
-        System.out.println( lines );
 
         assertEquals( "/bin/sh", lines.get( 0) );
         assertEquals( "-c", lines.get( 1 ) );
@@ -157,7 +150,6 @@ public void testArgumentsWithSemicolon()
         commandline.createArg().setValue( "--password" );
         commandline.createArg().setValue( ";password" );
         lines = commandline.getShell().getShellCommandLine( commandline.getArguments() );
-        System.out.println( lines );
 
         assertEquals( "cmd.exe", lines.get( 0 ) );
         assertEquals( "/X", lines.get( 1 ) );
@@ -195,7 +187,6 @@ public void testBourneShellQuotingCharacters()
         commandline.createArg().setValue( "#" );
 
         List lines = commandline.getShell().getShellCommandLine( commandline.getArguments() );
-        System.out.println( lines  );
 
         assertEquals( "/bin/sh", lines.get( 0 ) );
         assertEquals( "-c", lines.get( 1 ) );

From 85a768d74a33db6be3a0892295da79236bdd98df Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sat, 11 Mar 2023 06:40:21 -0500
Subject: [PATCH 247/265] Deprecate newXmlWriter (#131)

XmlStreamWriter is deprecated so the factory mwthods that create one should be too.
@hboutemy
---
 .../java/org/apache/maven/shared/utils/WriterFactory.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/apache/maven/shared/utils/WriterFactory.java b/src/main/java/org/apache/maven/shared/utils/WriterFactory.java
index e81cceed..f7c5d90c 100644
--- a/src/main/java/org/apache/maven/shared/utils/WriterFactory.java
+++ b/src/main/java/org/apache/maven/shared/utils/WriterFactory.java
@@ -110,7 +110,9 @@ public class WriterFactory
      * @return an XML writer instance for the output stream
      * @throws IOException if any
      * @see XmlStreamWriter
+     * @deprecated use org.apache.commons.io.input.XmlStreamWriter instead
      */
+    @Deprecated
     public static XmlStreamWriter newXmlWriter( @Nonnull OutputStream out )
         throws IOException
     {
@@ -124,7 +126,9 @@ public static XmlStreamWriter newXmlWriter( @Nonnull OutputStream out )
      * @return an XML writer instance for the output file
      * @throws IOException if any
      * @see XmlStreamWriter
+     * @deprecated use org.apache.commons.io.input.XmlStreamWriter instead
      */
+    @Deprecated
     public static XmlStreamWriter newXmlWriter( @Nonnull File file )
         throws IOException
     {

From c75a4ee4e7cec7a1b6871d1ab97947526c27824d Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sun, 12 Mar 2023 07:40:08 -0400
Subject: [PATCH 248/265] [MSHARED-1196] Bump maven-shared-components from 37
 to 39 (#134)

* update parent to 39
---
 pom.xml                                       |   20 +-
 .../org/apache/maven/shared/utils/Os.java     |  239 +-
 .../apache/maven/shared/utils/PathTool.java   |  193 +-
 .../maven/shared/utils/PropertyUtils.java     |  117 +-
 .../maven/shared/utils/ReaderFactory.java     |   60 +-
 .../maven/shared/utils/StringUtils.java       | 1446 ++++----
 .../maven/shared/utils/WriterFactory.java     |   53 +-
 .../utils/cli/AbstractStreamHandler.java      |   28 +-
 .../apache/maven/shared/utils/cli/Arg.java    |   17 +-
 .../shared/utils/cli/CommandLineCallable.java |   10 +-
 .../utils/cli/CommandLineException.java       |   19 +-
 .../cli/CommandLineTimeOutException.java      |   17 +-
 .../shared/utils/cli/CommandLineUtils.java    |  468 ++-
 .../maven/shared/utils/cli/Commandline.java   |  295 +-
 .../shared/utils/cli/DefaultConsumer.java     |   18 +-
 .../shared/utils/cli/ShutdownHookUtils.java   |   39 +-
 .../shared/utils/cli/StreamConsumer.java      |    8 +-
 .../maven/shared/utils/cli/StreamFeeder.java  |   91 +-
 .../maven/shared/utils/cli/StreamPumper.java  |   84 +-
 .../utils/cli/WriterStreamConsumer.java       |   18 +-
 .../utils/cli/javatool/AbstractJavaTool.java  |  215 +-
 .../cli/javatool/AbstractJavaToolRequest.java |   19 +-
 .../shared/utils/cli/javatool/JavaTool.java   |   11 +-
 .../utils/cli/javatool/JavaToolException.java |   17 +-
 .../utils/cli/javatool/JavaToolRequest.java   |   10 +-
 .../utils/cli/javatool/JavaToolResult.java    |   24 +-
 .../shared/utils/cli/shell/BourneShell.java   |   71 +-
 .../shared/utils/cli/shell/CmdShell.java      |   32 +-
 .../shared/utils/cli/shell/CommandShell.java  |   16 +-
 .../maven/shared/utils/cli/shell/Shell.java   |  226 +-
 .../shared/utils/introspection/ClassMap.java  |  264 +-
 .../introspection/IntrospectionException.java |   22 +-
 .../shared/utils/introspection/MethodMap.java |  212 +-
 .../ReflectionValueExtractor.java             |  296 +-
 .../shared/utils/io/DirectoryScanResult.java  |   21 +-
 .../shared/utils/io/DirectoryScanner.java     |  529 ++-
 .../utils/io/DirectoryWalkListener.java       |   16 +-
 .../maven/shared/utils/io/FileUtils.java      | 1298 +++----
 .../apache/maven/shared/utils/io/IOUtil.java  |  390 +--
 .../maven/shared/utils/io/Java7Support.java   |   44 +-
 .../maven/shared/utils/io/MatchPattern.java   |  108 +-
 .../maven/shared/utils/io/MatchPatterns.java  |   46 +-
 .../maven/shared/utils/io/ScanConductor.java  |   17 +-
 .../maven/shared/utils/io/SelectorUtils.java  |  487 +--
 .../maven/shared/utils/io/WalkCollector.java  |   32 +-
 .../utils/logging/AnsiMessageBuilder.java     |  116 +-
 .../utils/logging/LoggerLevelRenderer.java    |   22 +-
 .../shared/utils/logging/MessageBuilder.java  |   43 +-
 .../shared/utils/logging/MessageUtils.java    |  130 +-
 .../utils/logging/PlainMessageBuilder.java    |  111 +-
 .../maven/shared/utils/logging/Style.java     |  157 +-
 .../shared/utils/logging/package-info.java    |   16 +-
 .../utils/xml/PrettyPrintXMLWriter.java       |  247 +-
 .../maven/shared/utils/xml/XMLEncode.java     |  137 +-
 .../maven/shared/utils/xml/XMLWriter.java     |   30 +-
 .../shared/utils/xml/XmlStreamReader.java     |   83 +-
 .../shared/utils/xml/XmlStreamWriter.java     |   20 +-
 .../maven/shared/utils/xml/XmlWriterUtil.java |  195 +-
 .../maven/shared/utils/xml/Xpp3Dom.java       |  241 +-
 .../shared/utils/xml/Xpp3DomBuilder.java      |  234 +-
 .../maven/shared/utils/xml/Xpp3DomUtils.java  |  115 +-
 .../maven/shared/utils/xml/Xpp3DomWriter.java |   53 +-
 .../xml/pull/XmlPullParserException.java      |   34 +-
 .../apache/maven/shared/utils/CaseTest.java   |  142 +-
 .../org/apache/maven/shared/utils/OsTest.java |  195 +-
 .../maven/shared/utils/PathToolTest.java      |  127 +-
 .../maven/shared/utils/PropertyUtilsTest.java |  162 +-
 .../maven/shared/utils/StringUtilsTest.java   | 2053 ++++-------
 .../shared/utils/XmlStreamReaderTest.java     |  178 +-
 .../utils/cli/CommandLineUtilsTest.java       |  136 +-
 .../utils/cli/shell/BourneShellTest.java      |  232 +-
 .../utils/exceptionutils/TestException.java   |   24 +-
 .../TestExceptionWithDetail.java              |   18 +-
 .../ReflectionValueExtractorTest.java         |  414 +--
 .../shared/utils/io/DirectoryScannerTest.java |  474 ++-
 .../maven/shared/utils/io/FileUtilsTest.java  | 1828 ++++------
 .../maven/shared/utils/io/IOUtilTest.java     | 3083 +++++++----------
 .../shared/utils/io/MatchPatternTest.java     |   19 +-
 .../shared/utils/io/MatchPatternsTest.java    |   21 +-
 .../shared/utils/io/SelectorUtilsTest.java    |   73 +-
 .../shared/utils/io/SymlinkTestSetup.java     |   63 +-
 .../utils/logging/AnsiMessageBuilderTest.java |   75 +-
 .../utils/logging/MessageUtilsTest.java       |  204 +-
 .../utils/testhelpers/FileTestHelper.java     |   62 +-
 .../utils/xml/PrettyPrintXmlWriterTest.java   |  196 +-
 .../shared/utils/xml/XmlWriterUtilTest.java   |  425 +--
 .../shared/utils/xml/Xpp3DomBuilderTest.java  |  174 +-
 .../shared/utils/xml/pull/Xpp3DomTest.java    |  273 +-
 88 files changed, 8076 insertions(+), 12222 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2f5e6e3f..c19bdcdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-
+
 " + CRLF );
+        writer.writeMarkup("" + CRLF);
     }
 
     /**
@@ -149,9 +138,8 @@ public static void writeCommentLineBreak( XMLWriter writer, int columnSize ) thr
      * @see #writeComment(XMLWriter, String, int, int)
      * @throws IOException if writing fails
      */
-    public static void writeComment( XMLWriter writer, String comment ) throws IOException
-    {
-        writeComment( writer, comment, 0, DEFAULT_INDENTATION_SIZE );
+    public static void writeComment(XMLWriter writer, String comment) throws IOException {
+        writeComment(writer, comment, 0, DEFAULT_INDENTATION_SIZE);
     }
 
     /**
@@ -165,9 +153,8 @@ public static void writeComment( XMLWriter writer, String comment ) throws IOExc
      * @see #writeComment(XMLWriter, String, int, int)
      * @throws IOException if writing fails
      */
-    public static void writeComment( XMLWriter writer, String comment, int indent ) throws IOException
-    {
-        writeComment( writer, comment, indent, DEFAULT_INDENTATION_SIZE );
+    public static void writeComment(XMLWriter writer, String comment, int indent) throws IOException {
+        writeComment(writer, comment, indent, DEFAULT_INDENTATION_SIZE);
     }
 
     /**
@@ -182,11 +169,10 @@ public static void writeComment( XMLWriter writer, String comment, int indent )
      * @see #writeComment(XMLWriter, String, int, int, int)
      * @throws IOException if writing fails
      */
-    public static void writeComment( XMLWriter writer, String comment, int indent, int indentSize ) throws IOException
-    {
-        writeComment( writer, comment, indent, indentSize, DEFAULT_COLUMN_LINE );
+    public static void writeComment(XMLWriter writer, String comment, int indent, int indentSize) throws IOException {
+        writeComment(writer, comment, indent, indentSize, DEFAULT_COLUMN_LINE);
     }
-    
+
     /**
      * Convenience method to write XML comment line. The comment is split to have a size of
      * columnSize and is indented by indent using indentSize.
@@ -198,76 +184,62 @@ public static void writeComment( XMLWriter writer, String comment, int indent, i
      * @param columnSize positive number
      * @throws IOException if writing fails
      */
-    public static void writeComment( XMLWriter writer, String comment, int indent, int indentSize, int columnSize )
-        throws IOException
-    {
-        if ( comment == null )
-        {
+    public static void writeComment(XMLWriter writer, String comment, int indent, int indentSize, int columnSize)
+            throws IOException {
+        if (comment == null) {
             comment = "null";
         }
 
-        if ( indent < 0 )
-        {
+        if (indent < 0) {
             indent = 0;
         }
 
-        if ( indentSize < 0 )
-        {
+        if (indentSize < 0) {
             indentSize = 0;
         }
 
-        if ( columnSize < 0 )
-        {
+        if (columnSize < 0) {
             columnSize = DEFAULT_COLUMN_LINE;
         }
 
-        String indentation = StringUtils.repeat( " ", indent * indentSize );
+        String indentation = StringUtils.repeat(" ", indent * indentSize);
         int magicNumber = indentation.length() + columnSize - "-->".length() - 1;
-        String[] sentences = StringUtils.split( comment, CRLF );
-
-        StringBuffer line = new StringBuffer( indentation + "" ).append( CRLF );
-                        writer.writeMarkup( line.toString() );
+                        line.append("-->").append(CRLF);
+                        writer.writeMarkup(line.toString());
                     }
-                    line = new StringBuffer( indentation + "" ).append( CRLF );
+        line.append("-->").append(CRLF);
 
-        writer.writeMarkup( line.toString() );
+        writer.writeMarkup(line.toString());
     }
 
     /**
@@ -280,9 +252,8 @@ public static void writeComment( XMLWriter writer, String comment, int indent, i
      * @see #writeCommentText(XMLWriter, String, int, int)
      * @throws IOException if writing fails
      */
-    public static void writeCommentText( XMLWriter writer, String comment ) throws IOException
-    {
-        writeCommentText( writer, comment, 0, DEFAULT_INDENTATION_SIZE );
+    public static void writeCommentText(XMLWriter writer, String comment) throws IOException {
+        writeCommentText(writer, comment, 0, DEFAULT_INDENTATION_SIZE);
     }
 
     /**
@@ -297,9 +268,8 @@ public static void writeCommentText( XMLWriter writer, String comment ) throws I
      * @see #writeCommentText(XMLWriter, String, int, int)
      * @throws IOException if writing fails
      */
-    public static void writeCommentText( XMLWriter writer, String comment, int indent ) throws IOException
-    {
-        writeCommentText( writer, comment, indent, DEFAULT_INDENTATION_SIZE );
+    public static void writeCommentText(XMLWriter writer, String comment, int indent) throws IOException {
+        writeCommentText(writer, comment, indent, DEFAULT_INDENTATION_SIZE);
     }
 
     /**
@@ -314,10 +284,9 @@ public static void writeCommentText( XMLWriter writer, String comment, int inden
      * @see #writeCommentText(XMLWriter, String, int, int, int)
      * @throws IOException if writing fails
      */
-    public static void writeCommentText( XMLWriter writer, String comment, int indent, int indentSize )
-        throws IOException
-    {
-        writeCommentText( writer, comment, indent, indentSize, DEFAULT_COLUMN_LINE );
+    public static void writeCommentText(XMLWriter writer, String comment, int indent, int indentSize)
+            throws IOException {
+        writeCommentText(writer, comment, indent, indentSize, DEFAULT_COLUMN_LINE);
     }
 
     /**
@@ -332,34 +301,30 @@ public static void writeCommentText( XMLWriter writer, String comment, int inden
      * @param columnSize positive number
      * @throws IOException if writing fails
      */
-    public static void writeCommentText( XMLWriter writer, String comment, int indent, int indentSize, int columnSize )
-        throws IOException
-    {
-        if ( indent < 0 )
-        {
+    public static void writeCommentText(XMLWriter writer, String comment, int indent, int indentSize, int columnSize)
+            throws IOException {
+        if (indent < 0) {
             indent = 0;
         }
 
-        if ( indentSize < 0 )
-        {
+        if (indentSize < 0) {
             indentSize = 0;
         }
 
-        if ( columnSize < 0 )
-        {
+        if (columnSize < 0) {
             columnSize = DEFAULT_COLUMN_LINE;
         }
 
-        writeLineBreak( writer, 1 );
+        writeLineBreak(writer, 1);
 
-        writer.writeMarkup( StringUtils.repeat( " ", indent * indentSize ) );
-        writeCommentLineBreak( writer, columnSize );
+        writer.writeMarkup(StringUtils.repeat(" ", indent * indentSize));
+        writeCommentLineBreak(writer, columnSize);
 
-        writeComment( writer, comment, indent, indentSize, columnSize );
+        writeComment(writer, comment, indent, indentSize, columnSize);
 
-        writer.writeMarkup( StringUtils.repeat( " ", indent * indentSize ) );
-        writeCommentLineBreak( writer, columnSize );
+        writer.writeMarkup(StringUtils.repeat(" ", indent * indentSize));
+        writeCommentLineBreak(writer, columnSize);
 
-        writeLineBreak( writer, 1, indent, indentSize );
+        writeLineBreak(writer, 1, indent, indentSize);
     }
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
index 1b2f1b66..40b7b633 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.xml;
+
+import javax.annotation.Nonnull;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -28,16 +29,12 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
-
 /**
  * A reimplementation of Plexus Xpp3Dom based on the public interface of Plexus Xpp3Dom.
  *
  * @author Kristian Rosenvold
  */
-public class Xpp3Dom
-    implements Iterable
-{
+public class Xpp3Dom implements Iterable {
     private static final long serialVersionUID = 2567894443061173996L;
 
     private String name; // plexus: protected
@@ -64,7 +61,7 @@ public class Xpp3Dom
      */
     public static final String CHILDREN_COMBINATION_APPEND = "append";
 
-    @SuppressWarnings( "UnusedDeclaration" )
+    @SuppressWarnings("UnusedDeclaration")
     private static final String DEFAULT_CHILDREN_COMBINATION_MODE = CHILDREN_COMBINATION_MERGE; // plexus: public
 
     /**
@@ -75,15 +72,15 @@ public class Xpp3Dom
     /**
      * The attributes which identifies override.
      */
-    public static final String SELF_COMBINATION_OVERRIDE = "override";  // plexus: public
+    public static final String SELF_COMBINATION_OVERRIDE = "override"; // plexus: public
 
     /**
      * The attribute which identifies merge
      */
     public static final String SELF_COMBINATION_MERGE = "merge";
 
-    @SuppressWarnings( "UnusedDeclaration" )
-    private static final String DEFAULT_SELF_COMBINATION_MODE = SELF_COMBINATION_MERGE;  // plexus: public
+    @SuppressWarnings("UnusedDeclaration")
+    private static final String DEFAULT_SELF_COMBINATION_MODE = SELF_COMBINATION_MERGE; // plexus: public
 
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
     private static final Xpp3Dom[] EMPTY_DOM_ARRAY = new Xpp3Dom[0];
@@ -91,8 +88,7 @@ public class Xpp3Dom
     /**
      * @param name The name of the instance.
      */
-    public Xpp3Dom( String name )
-    {
+    public Xpp3Dom(String name) {
         this.name = name;
         childList = new ArrayList();
         childMap = new HashMap();
@@ -102,9 +98,8 @@ public Xpp3Dom( String name )
      * Create instance.
      * @param source The source.
      */
-    public Xpp3Dom( Xpp3Dom source )
-    {
-        this( source, source.getName() );
+    public Xpp3Dom(Xpp3Dom source) {
+        this(source, source.getName());
     }
 
     /**
@@ -112,132 +107,114 @@ public Xpp3Dom( Xpp3Dom source )
      * @param src The source Dom.
      * @param name The name of the Dom.
      */
-    public Xpp3Dom( @Nonnull Xpp3Dom src, String name )
-    {
+    public Xpp3Dom(@Nonnull Xpp3Dom src, String name) {
         this.name = name;
 
         int size = src.getChildCount();
-        childList = new ArrayList( size );
+        childList = new ArrayList(size);
         childMap = new HashMap();
 
-        setValue( src.getValue() );
+        setValue(src.getValue());
 
-        for ( String attributeName : src.getAttributeNames() )
-        {
-            setAttribute( attributeName, src.getAttribute( attributeName ) );
+        for (String attributeName : src.getAttributeNames()) {
+            setAttribute(attributeName, src.getAttribute(attributeName));
         }
 
-        for ( Xpp3Dom xpp3Dom : src.getChildren() )
-        {
-            addChild( new Xpp3Dom( xpp3Dom ) );
+        for (Xpp3Dom xpp3Dom : src.getChildren()) {
+            addChild(new Xpp3Dom(xpp3Dom));
         }
     }
 
     /**
      * @return The current name.
      */
-    public String getName()
-    {
+    public String getName() {
         return name;
     }
 
     /**
      * @return The current value.
      */
-    @Nonnull public String getValue()
-    {
+    @Nonnull
+    public String getValue() {
         return value;
     }
 
     /**
      * @param value The value to be set.
      */
-    public void setValue( @Nonnull String value )
-    {
+    public void setValue(@Nonnull String value) {
         this.value = value;
     }
 
-
     /**
      * @return The array of attribute names.
      */
-    public String[] getAttributeNames()
-    {
+    public String[] getAttributeNames() {
         boolean isNothing = attributes == null || attributes.isEmpty();
-        return isNothing ? EMPTY_STRING_ARRAY :  attributes.keySet().toArray( new String[attributes.size()] );
+        return isNothing ? EMPTY_STRING_ARRAY : attributes.keySet().toArray(new String[attributes.size()]);
     }
 
-
     /**
      * @param nameParameter The name of the attribute.
      * @return The attribute value.
      */
-    public String getAttribute( String nameParameter )
-    {
-        return this.attributes != null ? this.attributes.get( nameParameter ) : null;
+    public String getAttribute(String nameParameter) {
+        return this.attributes != null ? this.attributes.get(nameParameter) : null;
     }
 
     /**
      * @param nameParameter The name of the attribute.
      * @param valueParameter The value of the attribute.
      */
-    public void setAttribute( @Nonnull String nameParameter, @Nonnull String valueParameter )
-    {
-        if ( valueParameter == null )
-        {
-            throw new NullPointerException( "value can not be null" );
+    public void setAttribute(@Nonnull String nameParameter, @Nonnull String valueParameter) {
+        if (valueParameter == null) {
+            throw new NullPointerException("value can not be null");
         }
-        if ( nameParameter == null )
-        {
-            throw new NullPointerException( "name can not be null" );
+        if (nameParameter == null) {
+            throw new NullPointerException("name can not be null");
         }
-        if ( attributes == null )
-        {
+        if (attributes == null) {
             attributes = new HashMap();
         }
 
-        attributes.put( nameParameter, valueParameter );
+        attributes.put(nameParameter, valueParameter);
     }
 
     /**
      * @param i The index to be selected.
      * @return The child selected by index.
      */
-    public Xpp3Dom getChild( int i )
-    {
-        return childList.get( i );
+    public Xpp3Dom getChild(int i) {
+        return childList.get(i);
     }
 
     /**
      * @param nameParameter The name of the child.
      * @return The child selected by name.
      */
-    public Xpp3Dom getChild( String nameParameter )
-    {
-        return childMap.get( nameParameter );
+    public Xpp3Dom getChild(String nameParameter) {
+        return childMap.get(nameParameter);
     }
 
     /**
      * @param child The child to be added.
      */
-    public void addChild( Xpp3Dom child )
-    {
-        child.setParent( this );
-        childList.add( child );
-        childMap.put( child.getName(), child );
+    public void addChild(Xpp3Dom child) {
+        child.setParent(this);
+        childList.add(child);
+        childMap.put(child.getName(), child);
     }
 
     /**
      * @return The array of childs.
      */
-    public Xpp3Dom[] getChildren()
-    {
+    public Xpp3Dom[] getChildren() {
         boolean isNothing = childList == null || childList.isEmpty();
-        return isNothing ? EMPTY_DOM_ARRAY : childList.toArray( new Xpp3Dom[childList.size()] );
+        return isNothing ? EMPTY_DOM_ARRAY : childList.toArray(new Xpp3Dom[childList.size()]);
     }
 
-    private List getChildrenList()
-    {
+    private List getChildrenList() {
         boolean isNothing = childList == null || childList.isEmpty();
         return isNothing ? Collections.emptyList() : childList;
     }
@@ -246,26 +223,19 @@ private List getChildrenList()
      * @param nameParameter The name of the child.
      * @return The array of the Dom.
      */
-    public Xpp3Dom[] getChildren( String nameParameter )
-    {
-        List children = getChildrenList( nameParameter );
-        return children.toArray( new Xpp3Dom[children.size()] );
+    public Xpp3Dom[] getChildren(String nameParameter) {
+        List children = getChildrenList(nameParameter);
+        return children.toArray(new Xpp3Dom[children.size()]);
     }
 
-    List getChildrenList( String nameParameter )
-    {
-        if ( childList == null )
-        {
+    List getChildrenList(String nameParameter) {
+        if (childList == null) {
             return Collections.emptyList();
-        }
-        else
-        {
+        } else {
             ArrayList children = new ArrayList();
-            for ( Xpp3Dom aChildList : childList )
-            {
-                if ( nameParameter.equals( aChildList.getName() ) )
-                {
-                    children.add( aChildList );
+            for (Xpp3Dom aChildList : childList) {
+                if (nameParameter.equals(aChildList.getName())) {
+                    children.add(aChildList);
                 }
             }
             return children;
@@ -275,10 +245,8 @@ List getChildrenList( String nameParameter )
     /**
      * @return The number of childs.
      */
-    public int getChildCount()
-    {
-        if ( childList == null )
-        {
+    public int getChildCount() {
+        if (childList == null) {
             return 0;
         }
 
@@ -288,27 +256,24 @@ public int getChildCount()
     /**
      * @param i The child to be removed.
      */
-    public void removeChild( int i )
-    {
-        Xpp3Dom child = childList.remove( i );
-        childMap.values().remove( child );
-        child.setParent( null );
+    public void removeChild(int i) {
+        Xpp3Dom child = childList.remove(i);
+        childMap.values().remove(child);
+        child.setParent(null);
     }
 
     /**
      * @return The current parent.
      */
-    public Xpp3Dom getParent()
-    {
+    public Xpp3Dom getParent() {
         return parent;
     }
 
     /**
      * @param parent Set the parent.
      */
-    public void setParent( Xpp3Dom parent )
-    {
-       this.parent = parent;
+    public void setParent(Xpp3Dom parent) {
+        this.parent = parent;
     }
 
     /**
@@ -317,9 +282,8 @@ public void setParent( Xpp3Dom parent )
      * @param childMergeOverride true if child merge will take precedence false otherwise.
      * @return The merged Xpp3Dom.
      */
-    public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMergeOverride )
-    {
-        return Xpp3DomUtils.mergeXpp3Dom( dominant, recessive, childMergeOverride );
+    public static Xpp3Dom mergeXpp3Dom(Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMergeOverride) {
+        return Xpp3DomUtils.mergeXpp3Dom(dominant, recessive, childMergeOverride);
     }
 
     /**
@@ -327,88 +291,73 @@ public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive, Boolean
      * @param recessive The recessive part.
      * @return The merged Xpp3Dom.
      */
-    public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive )
-    {
-        return Xpp3DomUtils.mergeXpp3Dom( dominant, recessive );
+    public static Xpp3Dom mergeXpp3Dom(Xpp3Dom dominant, Xpp3Dom recessive) {
+        return Xpp3DomUtils.mergeXpp3Dom(dominant, recessive);
     }
 
     /** {@inheritDoc} */
-    public boolean equals( Object obj )
-    {
-        if ( obj == this )
-        {
+    public boolean equals(Object obj) {
+        if (obj == this) {
             return true;
         }
 
-        if ( !( obj instanceof Xpp3Dom ) )
-        {
+        if (!(obj instanceof Xpp3Dom)) {
             return false;
         }
 
         Xpp3Dom dom = (Xpp3Dom) obj;
 
-        return !( name == null ? dom.name != null : !name.equals( dom.name ) )
-            && !( value == null ? dom.value != null : !value.equals( dom.value ) )
-            && !( attributes == null ? dom.attributes != null : !attributes.equals( dom.attributes ) )
-            && !( childList == null ? dom.childList != null : !childList.equals( dom.childList ) );
+        return !(name == null ? dom.name != null : !name.equals(dom.name))
+                && !(value == null ? dom.value != null : !value.equals(dom.value))
+                && !(attributes == null ? dom.attributes != null : !attributes.equals(dom.attributes))
+                && !(childList == null ? dom.childList != null : !childList.equals(dom.childList));
     }
 
     /** {@inheritDoc} */
-    public int hashCode()
-    {
+    public int hashCode() {
         int result = 17;
-        result = 37 * result + ( name != null ? name.hashCode() : 0 );
-        result = 37 * result + ( value != null ? value.hashCode() : 0 );
-        result = 37 * result + ( attributes != null ? attributes.hashCode() : 0 );
-        result = 37 * result + ( childList != null ? childList.hashCode() : 0 );
+        result = 37 * result + (name != null ? name.hashCode() : 0);
+        result = 37 * result + (value != null ? value.hashCode() : 0);
+        result = 37 * result + (attributes != null ? attributes.hashCode() : 0);
+        result = 37 * result + (childList != null ? childList.hashCode() : 0);
         return result;
     }
 
     /** {@inheritDoc} */
-    public String toString()
-    {
-        try
-        {
+    public String toString() {
+        try {
             StringWriter writer = new StringWriter();
-            Xpp3DomWriter.write( getPrettyPrintXMLWriter( writer ), this );
+            Xpp3DomWriter.write(getPrettyPrintXMLWriter(writer), this);
             return writer.toString();
-        }
-        catch ( final IOException e )
-        {
+        } catch (final IOException e) {
             // JDK error in StringWriter.
-            throw (AssertionError) new AssertionError( "Unexpected IOException from StringWriter." ).initCause( e );
+            throw (AssertionError) new AssertionError("Unexpected IOException from StringWriter.").initCause(e);
         }
     }
 
     /**
      * @return Unescaped string.
      */
-    public String toUnescapedString()
-    {
-        try
-        {
+    public String toUnescapedString() {
+        try {
             StringWriter writer = new StringWriter();
-            Xpp3DomWriter.write( getPrettyPrintXMLWriter( writer ), this, false );
+            Xpp3DomWriter.write(getPrettyPrintXMLWriter(writer), this, false);
             return writer.toString();
-        }
-        catch ( final IOException e )
-        {
+        } catch (final IOException e) {
             // JDK error in StringWriter.
-            throw (AssertionError) new AssertionError( "Unexpected IOException from StringWriter." ).initCause( e );
+            throw (AssertionError) new AssertionError("Unexpected IOException from StringWriter.").initCause(e);
         }
     }
 
-    private PrettyPrintXMLWriter getPrettyPrintXMLWriter( StringWriter writer )
-    {
-        return new PrettyPrintXMLWriter( writer, "UTF-8", null );
+    private PrettyPrintXMLWriter getPrettyPrintXMLWriter(StringWriter writer) {
+        return new PrettyPrintXMLWriter(writer, "UTF-8", null);
     }
 
     /**
      * @param str The string to be checked.
      * @return true if the string is not empty (length > 0) and not null.
      */
-    public static boolean isNotEmpty( String str )
-    {
+    public static boolean isNotEmpty(String str) {
         return str != null && str.length() > 0;
     }
 
@@ -416,14 +365,12 @@ public static boolean isNotEmpty( String str )
      * @param str The string to be checked.
      * @return true if the string is empty or null.
      */
-    public static boolean isEmpty( String str )
-    {
+    public static boolean isEmpty(String str) {
         return str == null || str.trim().length() == 0;
     }
 
     /** {@inheritDoc} */
-    public Iterator iterator()
-    {
+    public Iterator iterator() {
         return getChildrenList().iterator();
     }
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
index 2b8f4ab6..640a9c4a 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,13 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import org.apache.maven.shared.utils.xml.pull.XmlPullParserException;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
+package org.apache.maven.shared.utils.xml;
 
 import javax.annotation.Nonnull;
 import javax.annotation.WillClose;
@@ -37,11 +29,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.maven.shared.utils.xml.pull.XmlPullParserException;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+
 /**
  * @author Kristian Rosenvold
  */
-public class Xpp3DomBuilder
-{
+public class Xpp3DomBuilder {
     private static final boolean DEFAULT_TRIM = true;
 
     /**
@@ -49,10 +47,8 @@ public class Xpp3DomBuilder
      * @return the built DOM
      * @throws XmlPullParserException in case of an error
      */
-    public static Xpp3Dom build( @WillClose @Nonnull Reader reader )
-        throws XmlPullParserException
-    {
-        return build( reader, DEFAULT_TRIM );
+    public static Xpp3Dom build(@WillClose @Nonnull Reader reader) throws XmlPullParserException {
+        return build(reader, DEFAULT_TRIM);
     }
 
     /**
@@ -61,10 +57,8 @@ public static Xpp3Dom build( @WillClose @Nonnull Reader reader )
      * @return the built DOM
      * @throws XmlPullParserException in case of an error
      */
-    public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding )
-        throws XmlPullParserException
-    {
-        return build( is, encoding, DEFAULT_TRIM );
+    public static Xpp3Dom build(@WillClose InputStream is, @Nonnull String encoding) throws XmlPullParserException {
+        return build(is, encoding, DEFAULT_TRIM);
     }
 
     /**
@@ -74,17 +68,13 @@ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding
      * @return the built DOM
      * @throws XmlPullParserException in case of an error
      */
-    public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding, boolean trim )
-        throws XmlPullParserException
-    {
-        try
-        {
-            Reader reader = new InputStreamReader( is, encoding );
-            return build( reader, trim );
-        }
-        catch ( UnsupportedEncodingException e )
-        {
-            throw new XmlPullParserException( e );
+    public static Xpp3Dom build(@WillClose InputStream is, @Nonnull String encoding, boolean trim)
+            throws XmlPullParserException {
+        try {
+            Reader reader = new InputStreamReader(is, encoding);
+            return build(reader, trim);
+        } catch (UnsupportedEncodingException e) {
+            throw new XmlPullParserException(e);
         }
     }
 
@@ -94,95 +84,63 @@ public static Xpp3Dom build( @WillClose InputStream is, @Nonnull String encoding
      * @return the built DOM
      * @throws XmlPullParserException in case of an error
      */
-    public static Xpp3Dom build( @WillClose Reader in, boolean trim )
-        throws XmlPullParserException
-    {
-        try ( Reader reader = in )  
-        {
-            DocHandler docHandler = parseSax( new InputSource( reader ), trim );
+    public static Xpp3Dom build(@WillClose Reader in, boolean trim) throws XmlPullParserException {
+        try (Reader reader = in) {
+            DocHandler docHandler = parseSax(new InputSource(reader), trim);
             reader.close();
             return docHandler.result;
-        }
-        catch ( final IOException e )
-        {
-            throw new XmlPullParserException( e );
+        } catch (final IOException e) {
+            throw new XmlPullParserException(e);
         }
     }
 
-    private static DocHandler parseSax( @Nonnull InputSource inputSource, boolean trim )
-        throws XmlPullParserException
-    {
-        try
-        {
-            DocHandler ch = new DocHandler( trim );
+    private static DocHandler parseSax(@Nonnull InputSource inputSource, boolean trim) throws XmlPullParserException {
+        try {
+            DocHandler ch = new DocHandler(trim);
             XMLReader parser = createXmlReader();
-            parser.setContentHandler( ch );
-            parser.parse( inputSource );
+            parser.setContentHandler(ch);
+            parser.parse(inputSource);
             return ch;
-        }
-        catch ( IOException e )
-        {
-            throw new XmlPullParserException( e );
-        }
-        catch ( SAXException e )
-        {
-            throw new XmlPullParserException( e );
+        } catch (IOException e) {
+            throw new XmlPullParserException(e);
+        } catch (SAXException e) {
+            throw new XmlPullParserException(e);
         }
     }
 
-
-    private static XMLReader createXmlReader()
-        throws SAXException
-    {
-        XMLReader comSunXmlReader = instantiate( "com.sun.org.apache.xerces.internal.parsers.SAXParser" );
-        if ( comSunXmlReader != null )
-        {
+    private static XMLReader createXmlReader() throws SAXException {
+        XMLReader comSunXmlReader = instantiate("com.sun.org.apache.xerces.internal.parsers.SAXParser");
+        if (comSunXmlReader != null) {
             return comSunXmlReader;
         }
 
         String key = "org.xml.sax.driver";
-        String oldParser = System.getProperty( key );
-        System.clearProperty( key ); // There's a "slight" problem with this an parallel maven: It does not work ;)
+        String oldParser = System.getProperty(key);
+        System.clearProperty(key); // There's a "slight" problem with this an parallel maven: It does not work ;)
 
-        try
-        {
+        try {
             return org.xml.sax.helpers.XMLReaderFactory.createXMLReader();
-        }
-        finally
-        {
-            if ( oldParser != null )
-            {
-                System.setProperty( key, oldParser );
+        } finally {
+            if (oldParser != null) {
+                System.setProperty(key, oldParser);
             }
         }
-
     }
 
-    private static XMLReader instantiate( String s )
-    {
-        try
-        {
-            Class aClass = Thread.currentThread().getContextClassLoader().loadClass( s );
+    private static XMLReader instantiate(String s) {
+        try {
+            Class aClass = Thread.currentThread().getContextClassLoader().loadClass(s);
             return (XMLReader) aClass.newInstance();
-        }
-        catch ( ClassNotFoundException e )
-        {
-            return  null;
-        }
-        catch ( InstantiationException e )
-        {
-            return  null;
-        }
-        catch ( IllegalAccessException e )
-        {
-            return  null;
+        } catch (ClassNotFoundException e) {
+            return null;
+        } catch (InstantiationException e) {
+            return null;
+        } catch (IllegalAccessException e) {
+            return null;
         }
     }
 
-
-    private static class DocHandler
-        extends DefaultHandler
-    {
+    private static class DocHandler extends DefaultHandler {
         private final List elemStack = new ArrayList();
 
         private final List values = new ArrayList();
@@ -193,96 +151,78 @@ private static class DocHandler
 
         private boolean spacePreserve = false;
 
-        DocHandler( boolean trim )
-        {
+        DocHandler(boolean trim) {
             this.trim = trim;
         }
 
         @Override
-        public void startElement( String uri, String localName, String qName, Attributes attributes )
-            throws SAXException
-        {
+        public void startElement(String uri, String localName, String qName, Attributes attributes)
+                throws SAXException {
             spacePreserve = false;
-            Xpp3Dom child = new Xpp3Dom( localName );
+            Xpp3Dom child = new Xpp3Dom(localName);
 
-            attachToParent( child );
-            pushOnStack( child );
+            attachToParent(child);
+            pushOnStack(child);
 
-            values.add( new StringBuilder() );
+            values.add(new StringBuilder());
 
             int size = attributes.getLength();
-            for ( int i = 0; i < size; i++ )
-            {
-                String name = attributes.getQName( i );
-                String value = attributes.getValue( i );
-                child.setAttribute( name, value );
-                spacePreserve = spacePreserve || ( "xml:space".equals( name ) && "preserve".equals( value ) );
+            for (int i = 0; i < size; i++) {
+                String name = attributes.getQName(i);
+                String value = attributes.getValue(i);
+                child.setAttribute(name, value);
+                spacePreserve = spacePreserve || ("xml:space".equals(name) && "preserve".equals(value));
             }
         }
 
-        private boolean pushOnStack( Xpp3Dom child )
-        {
-            return elemStack.add( child );
+        private boolean pushOnStack(Xpp3Dom child) {
+            return elemStack.add(child);
         }
 
-        private void attachToParent( Xpp3Dom child )
-        {
+        private void attachToParent(Xpp3Dom child) {
             int depth = elemStack.size();
-            if ( depth > 0 )
-            {
-                elemStack.get( depth - 1 ).addChild( child );
+            if (depth > 0) {
+                elemStack.get(depth - 1).addChild(child);
             }
         }
 
-        private Xpp3Dom pop()
-        {
+        private Xpp3Dom pop() {
             int depth = elemStack.size() - 1;
-            return elemStack.remove( depth );
+            return elemStack.remove(depth);
         }
 
         @Override
-        public void endElement( String uri, String localName, String qName )
-            throws SAXException
-        {
+        public void endElement(String uri, String localName, String qName) throws SAXException {
             int depth = elemStack.size() - 1;
 
             Xpp3Dom element = pop();
 
             /* this Object could be null if it is a singleton tag */
-            Object accumulatedValue = values.remove( depth );
+            Object accumulatedValue = values.remove(depth);
 
-            if ( element.getChildCount() == 0 )
-            {
-                if ( accumulatedValue == null )
-                {
-                    element.setValue( "" ); // null in xpp3dom, but we don't do that around here
-                }
-                else
-                {
-                    element.setValue( accumulatedValue.toString() );
+            if (element.getChildCount() == 0) {
+                if (accumulatedValue == null) {
+                    element.setValue(""); // null in xpp3dom, but we don't do that around here
+                } else {
+                    element.setValue(accumulatedValue.toString());
                 }
             }
 
-            if ( depth == 0 )
-            {
+            if (depth == 0) {
                 result = element;
             }
         }
 
         @Override
-        public void characters( char[] ch, int start, int length )
-            throws SAXException
-        {
-            String text = new String( ch, start, length );
-            appendToTopValue( ( trim && !spacePreserve ) ? text.trim() : text );
+        public void characters(char[] ch, int start, int length) throws SAXException {
+            String text = new String(ch, start, length);
+            appendToTopValue((trim && !spacePreserve) ? text.trim() : text);
         }
 
-        private void appendToTopValue( String toAppend )
-        {
+        private void appendToTopValue(String toAppend) {
             // noinspection MismatchedQueryAndUpdateOfStringBuilder
-            StringBuilder stringBuilder = values.get( values.size() - 1 );
-            stringBuilder.append( toAppend );
+            StringBuilder stringBuilder = values.get(values.size() - 1);
+            stringBuilder.append(toAppend);
         }
     }
-
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java
index 985c5592..d6d066c6 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.xml;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -25,19 +24,17 @@
 import java.util.Map;
 
 /**
- * 
+ *
  */
-public class Xpp3DomUtils
-{
+public class Xpp3DomUtils {
     /**
      * @param dominant {@link Xpp3Dom}
      * @param recessive {@link Xpp3Dom}
      * @param childMergeOverride true/false.
      * @return Merged dom.
      */
-    public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMergeOverride )
-    {
-        return dominant != null ? merge( dominant, recessive, childMergeOverride ) : recessive;
+    public static Xpp3Dom mergeXpp3Dom(Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMergeOverride) {
+        return dominant != null ? merge(dominant, recessive, childMergeOverride) : recessive;
     }
 
     /**
@@ -45,9 +42,8 @@ public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive, Boolean
      * @param recessive {@link Xpp3Dom}
      * @return Merged dom.
      */
-    public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive )
-    {
-        return dominant != null ? merge( dominant, recessive, null ) : recessive;
+    public static Xpp3Dom mergeXpp3Dom(Xpp3Dom dominant, Xpp3Dom recessive) {
+        return dominant != null ? merge(dominant, recessive, null) : recessive;
     }
 
     /**
@@ -56,107 +52,84 @@ public static Xpp3Dom mergeXpp3Dom( Xpp3Dom dominant, Xpp3Dom recessive )
      * @param childMergeOverride true/false.
      * @return Merged dom.
      */
-    public static Xpp3Dom merge( Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMergeOverride )
-    {
-        if ( recessive == null || isCombineSelfOverride( dominant ) )
-        {
+    public static Xpp3Dom merge(Xpp3Dom dominant, Xpp3Dom recessive, Boolean childMergeOverride) {
+        if (recessive == null || isCombineSelfOverride(dominant)) {
             return dominant;
         }
 
-        if ( isEmpty( dominant.getValue() ) )
-        {
-            dominant.setValue( recessive.getValue() );
+        if (isEmpty(dominant.getValue())) {
+            dominant.setValue(recessive.getValue());
         }
 
-        for ( String attr : recessive.getAttributeNames() )
-        {
-            if ( isEmpty( dominant.getAttribute( attr ) ) )
-            {
-                dominant.setAttribute( attr, recessive.getAttribute( attr ) );
+        for (String attr : recessive.getAttributeNames()) {
+            if (isEmpty(dominant.getAttribute(attr))) {
+                dominant.setAttribute(attr, recessive.getAttribute(attr));
             }
         }
 
-        if ( recessive.getChildCount() > 0 )
-        {
-            boolean mergeChildren = isMergeChildren( dominant, childMergeOverride );
+        if (recessive.getChildCount() > 0) {
+            boolean mergeChildren = isMergeChildren(dominant, childMergeOverride);
 
-            if ( mergeChildren )
-            {
-                Map> commonChildren = getCommonChildren( dominant, recessive );
-                for ( Xpp3Dom recessiveChild : recessive )
-                {
-                    Iterator it = commonChildren.get( recessiveChild.getName() );
-                    if ( it == null )
-                    {
-                        dominant.addChild( new Xpp3Dom( recessiveChild ) );
-                    }
-                    else if ( it.hasNext() )
-                    {
+            if (mergeChildren) {
+                Map> commonChildren = getCommonChildren(dominant, recessive);
+                for (Xpp3Dom recessiveChild : recessive) {
+                    Iterator it = commonChildren.get(recessiveChild.getName());
+                    if (it == null) {
+                        dominant.addChild(new Xpp3Dom(recessiveChild));
+                    } else if (it.hasNext()) {
                         Xpp3Dom dominantChild = it.next();
-                        merge( dominantChild, recessiveChild, childMergeOverride );
+                        merge(dominantChild, recessiveChild, childMergeOverride);
                     }
                 }
-            }
-            else
-            {
+            } else {
                 Xpp3Dom[] dominantChildren = dominant.getChildren();
                 dominant.childList.clear();
-                for ( Xpp3Dom child : recessive )
-                {
-                    dominant.addChild( new Xpp3Dom( child ) );
+                for (Xpp3Dom child : recessive) {
+                    dominant.addChild(new Xpp3Dom(child));
                 }
 
-                for ( Xpp3Dom aDominantChildren : dominantChildren )
-                {
-                    dominant.addChild( aDominantChildren );
+                for (Xpp3Dom aDominantChildren : dominantChildren) {
+                    dominant.addChild(aDominantChildren);
                 }
             }
         }
         return dominant;
     }
 
-    private static Map> getCommonChildren( Xpp3Dom dominant, Xpp3Dom recessive )
-    {
+    private static Map> getCommonChildren(Xpp3Dom dominant, Xpp3Dom recessive) {
         Map> commonChildren = new HashMap>();
 
-        for ( String childName : recessive.childMap.keySet() )
-        {
-            List dominantChildren = dominant.getChildrenList( childName );
-            if ( dominantChildren.size() > 0 )
-            {
-                commonChildren.put( childName, dominantChildren.iterator() );
+        for (String childName : recessive.childMap.keySet()) {
+            List dominantChildren = dominant.getChildrenList(childName);
+            if (dominantChildren.size() > 0) {
+                commonChildren.put(childName, dominantChildren.iterator());
             }
         }
         return commonChildren;
     }
 
-    private static boolean isCombineSelfOverride( Xpp3Dom xpp3Dom )
-    {
-        String selfMergeMode = xpp3Dom.getAttribute( Xpp3Dom.SELF_COMBINATION_MODE_ATTRIBUTE );
-        return Xpp3Dom.SELF_COMBINATION_OVERRIDE.equals( selfMergeMode );
+    private static boolean isCombineSelfOverride(Xpp3Dom xpp3Dom) {
+        String selfMergeMode = xpp3Dom.getAttribute(Xpp3Dom.SELF_COMBINATION_MODE_ATTRIBUTE);
+        return Xpp3Dom.SELF_COMBINATION_OVERRIDE.equals(selfMergeMode);
     }
 
-    private static boolean isMergeChildren( Xpp3Dom dominant, Boolean override )
-    {
-        return override != null ? override : !isMergeChildren( dominant );
+    private static boolean isMergeChildren(Xpp3Dom dominant, Boolean override) {
+        return override != null ? override : !isMergeChildren(dominant);
     }
 
-    private static boolean isMergeChildren( Xpp3Dom dominant )
-    {
+    private static boolean isMergeChildren(Xpp3Dom dominant) {
         return Xpp3Dom.CHILDREN_COMBINATION_APPEND.equals(
-            dominant.getAttribute( Xpp3Dom.CHILDREN_COMBINATION_MODE_ATTRIBUTE ) );
+                dominant.getAttribute(Xpp3Dom.CHILDREN_COMBINATION_MODE_ATTRIBUTE));
     }
 
     /**
-     * @deprecated use str == null || String.isBlank(str) (Java 11+) 
+     * @deprecated use str == null || String.isBlank(str) (Java 11+)
      *             or org.apache.commons.lang3.StringUtils.isBlank(str)
      * @param str the string to be checked
      * @return true if the string is null, empty, or whitespace only; false otherwise
      */
     @Deprecated
-    public static boolean isEmpty( String str )
-    {
+    public static boolean isEmpty(String str) {
         return str == null || str.trim().length() == 0;
     }
-
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java
index b390c545..f4924985 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.xml;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -26,16 +25,14 @@
 /**
  * @author Brett Porter
  */
-public class Xpp3DomWriter
-{
+public class Xpp3DomWriter {
     /**
      * @param writer {@link Writer}
      * @param dom {@link Xpp3Dom}
      * @throws IOException if writing fails.
      */
-    public static void write( Writer writer, Xpp3Dom dom ) throws IOException
-    {
-        write( new PrettyPrintXMLWriter( writer ), dom );
+    public static void write(Writer writer, Xpp3Dom dom) throws IOException {
+        write(new PrettyPrintXMLWriter(writer), dom);
     }
 
     /**
@@ -43,9 +40,8 @@ public static void write( Writer writer, Xpp3Dom dom ) throws IOException
      * @param dom {@link Xpp3Dom}
      * @throws IOException if writing fails.
      */
-    public static void write( PrintWriter writer, Xpp3Dom dom ) throws IOException
-    {
-        write( new PrettyPrintXMLWriter( writer ), dom );
+    public static void write(PrintWriter writer, Xpp3Dom dom) throws IOException {
+        write(new PrettyPrintXMLWriter(writer), dom);
     }
 
     /**
@@ -53,9 +49,8 @@ public static void write( PrintWriter writer, Xpp3Dom dom ) throws IOException
      * @param dom {@link Xpp3Dom}
      * @throws IOException if writing fails.
      */
-    public static void write( XMLWriter xmlWriter, Xpp3Dom dom ) throws IOException
-    {
-        write( xmlWriter, dom, true );
+    public static void write(XMLWriter xmlWriter, Xpp3Dom dom) throws IOException {
+        write(xmlWriter, dom, true);
     }
 
     /**
@@ -64,33 +59,25 @@ public static void write( XMLWriter xmlWriter, Xpp3Dom dom ) throws IOException
      * @param escape true/false.
      * @throws IOException if writing fails.
      */
-    public static void write( XMLWriter xmlWriter, Xpp3Dom dom, boolean escape ) throws IOException
-    {
-        xmlWriter.startElement( dom.getName() );
+    public static void write(XMLWriter xmlWriter, Xpp3Dom dom, boolean escape) throws IOException {
+        xmlWriter.startElement(dom.getName());
         String[] attributeNames = dom.getAttributeNames();
-        for ( String attributeName : attributeNames )
-        {
-            xmlWriter.addAttribute( attributeName, dom.getAttribute( attributeName ) );
+        for (String attributeName : attributeNames) {
+            xmlWriter.addAttribute(attributeName, dom.getAttribute(attributeName));
         }
         Xpp3Dom[] children = dom.getChildren();
-        for ( Xpp3Dom aChildren : children )
-        {
-            write( xmlWriter, aChildren, escape );
+        for (Xpp3Dom aChildren : children) {
+            write(xmlWriter, aChildren, escape);
         }
 
         String value = dom.getValue();
-        if ( value != null )
-        {
-            if ( escape )
-            {
-                xmlWriter.writeText( value );
-            }
-            else
-            {
-                xmlWriter.writeMarkup( value );
+        if (value != null) {
+            if (escape) {
+                xmlWriter.writeText(value);
+            } else {
+                xmlWriter.writeMarkup(value);
             }
         }
         xmlWriter.endElement();
     }
-
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java b/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java
index 3858a902..5f495b11 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.xml.pull;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,44 +16,34 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import org.xml.sax.SAXException;
+package org.apache.maven.shared.utils.xml.pull;
 
 import java.io.IOException;
 
-/**
- * 
- */
-public class XmlPullParserException
-    extends RuntimeException
-{
+import org.xml.sax.SAXException;
+
+public class XmlPullParserException extends RuntimeException {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 117075811816936575L;
 
     /**
      * @param e IOException.
      */
-    public XmlPullParserException( IOException e )
-    {
-        super( e );
+    public XmlPullParserException(IOException e) {
+        super(e);
     }
 
     /**
      * @param e The exception.
      */
-    public XmlPullParserException( SAXException e )
-    {
-        super( e );
+    public XmlPullParserException(SAXException e) {
+        super(e);
     }
 
     /**
      * @param message The message.
      */
-    public XmlPullParserException( String message )
-    {
-        super( message );
+    public XmlPullParserException(String message) {
+        super(message);
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/CaseTest.java b/src/test/java/org/apache/maven/shared/utils/CaseTest.java
index 7eae3028..113c441c 100644
--- a/src/test/java/org/apache/maven/shared/utils/CaseTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/CaseTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils;
 
 import java.util.Locale;
 
@@ -32,36 +31,33 @@
  * give intuitive result, or why one should avoid {@link String#toUpperCase()} and {@link String#toLowerCase()}
  * (platform locale dependent, with sometimes unexpected results)
  * but prefer {@link String#equalsIgnoreCase(String)} when possible.
- * 
+ *
  * @author Hervé Boutemy
  * @see Simple Smiles - Xuelei Fan's Blog
  */
-public class CaseTest
-    extends Assert
-{
-    private final static Locale LOCALE_TURKISH = new Locale( "tr" );
+public class CaseTest extends Assert {
+    private static final Locale LOCALE_TURKISH = new Locale("tr");
 
     /** common ASCII 'i' */
-    private final static char DOTTED_i = '\u0069';
+    private static final char DOTTED_i = '\u0069';
 
     /** common ASCII 'I' */
-    private final static char DOTLESS_I = '\u0049';
+    private static final char DOTLESS_I = '\u0049';
 
     /** turkish dotless i = ı */
-    private final static char DOTLESS_i = '\u0131';
+    private static final char DOTLESS_i = '\u0131';
 
     /** turkish dotted I = Ä° */
-    private final static char DOTTED_I = '\u0130';
+    private static final char DOTTED_I = '\u0130';
 
     /** http://en.wikipedia.org/wiki/Dot_(diacritic) */
-    private final static char COMBINING_DOT_ABOVE = '\u0307';
+    private static final char COMBINING_DOT_ABOVE = '\u0307';
 
-    private final static Locale SAVED_DEFAULT_LOCALE = Locale.getDefault();
+    private static final Locale SAVED_DEFAULT_LOCALE = Locale.getDefault();
 
     @AfterClass
-    public static void restoreDefaultLocale()
-    {
-        Locale.setDefault( SAVED_DEFAULT_LOCALE );
+    public static void restoreDefaultLocale() {
+        Locale.setDefault(SAVED_DEFAULT_LOCALE);
     }
 
     /**
@@ -69,42 +65,47 @@ public static void restoreDefaultLocale()
      * @see The infamous Turkish locale bug
      */
     @Test
-    public void testTurkishI()
-    {
+    public void testTurkishI() {
         // check common i and I
-        assertEquals( "common lowercase i should have a dot", 'i', DOTTED_i );
-        assertEquals( "common uppercase I should not have a dot", 'I', DOTLESS_I );
+        assertEquals("common lowercase i should have a dot", 'i', DOTTED_i);
+        assertEquals("common uppercase I should not have a dot", 'I', DOTLESS_I);
 
         final String iIıİ = "iIıİ";
 
         // check source encoding doesn't wreck havoc */
-        assertUnicodeEquals( "misc i directly in (UTF-8) source", iIıİ, "" + DOTTED_i + DOTLESS_I + DOTLESS_i
-            + DOTTED_I );
+        assertUnicodeEquals(
+                "misc i directly in (UTF-8) source", iIıİ, "" + DOTTED_i + DOTLESS_I + DOTLESS_i + DOTTED_I);
 
         // check toUpperCase and toLowerCase difference with turkish and english locales
-        assertUnicodeEquals( "'iIıİ'.toUpperCase('tr')=='İIIİ'", "" + DOTTED_I + DOTLESS_I + DOTLESS_I + DOTTED_I,
-                             iIıİ.toUpperCase( LOCALE_TURKISH ) );
-        assertUnicodeEquals( "'iIıİ'.toLowerCase('tr')=='iııi'", "" + DOTTED_i + DOTLESS_i + DOTLESS_i + DOTTED_i,
-                             iIıİ.toLowerCase( LOCALE_TURKISH ) );
-        assertUnicodeEquals( "'iIıİ'.toUpperCase('en')=='IIIİ'", "" + DOTLESS_I + DOTLESS_I + DOTLESS_I + DOTTED_I,
-                             iIıİ.toUpperCase( Locale.ENGLISH ) );
-        String lower = iIıİ.toLowerCase( Locale.ENGLISH ); // on some platforms, ends with extra COMBINED DOT ABOVE
-        assertUnicodeEquals( "'iIıİ'.toLowerCase('en')=='iiıi'", "" + DOTTED_i + DOTTED_i + DOTLESS_i + DOTTED_i
-            + ( lower.length() > 4 ? COMBINING_DOT_ABOVE : "" ), lower );
+        assertUnicodeEquals(
+                "'iIıİ'.toUpperCase('tr')=='İIIİ'",
+                "" + DOTTED_I + DOTLESS_I + DOTLESS_I + DOTTED_I,
+                iIıİ.toUpperCase(LOCALE_TURKISH));
+        assertUnicodeEquals(
+                "'iIıİ'.toLowerCase('tr')=='iııi'",
+                "" + DOTTED_i + DOTLESS_i + DOTLESS_i + DOTTED_i,
+                iIıİ.toLowerCase(LOCALE_TURKISH));
+        assertUnicodeEquals(
+                "'iIıİ'.toUpperCase('en')=='IIIİ'",
+                "" + DOTLESS_I + DOTLESS_I + DOTLESS_I + DOTTED_I,
+                iIıİ.toUpperCase(Locale.ENGLISH));
+        String lower = iIıİ.toLowerCase(Locale.ENGLISH); // on some platforms, ends with extra COMBINED DOT ABOVE
+        assertUnicodeEquals(
+                "'iIıİ'.toLowerCase('en')=='iiıi'",
+                "" + DOTTED_i + DOTTED_i + DOTLESS_i + DOTTED_i + (lower.length() > 4 ? COMBINING_DOT_ABOVE : ""),
+                lower);
 
         // check equalsIgnoreCase() , which has no locale
-        for ( int i = 0; i < iIıİ.length(); i++ )
-        {
-            char currentI = iIıİ.charAt( i );
-
-            StringBuilder sb = new StringBuilder( iIıİ.length() );
-            for ( int j = 0; j < iIıİ.length(); j++ )
-            {
-                sb.append( currentI );
+        for (int i = 0; i < iIıİ.length(); i++) {
+            char currentI = iIıİ.charAt(i);
+
+            StringBuilder sb = new StringBuilder(iIıİ.length());
+            for (int j = 0; j < iIıİ.length(); j++) {
+                sb.append(currentI);
             }
             String current = sb.toString();
 
-            assertTrue( "'" + current + "'.equalsIgnoreCase('" + iIıİ + "')", current.equalsIgnoreCase( iIıİ ) );
+            assertTrue("'" + current + "'.equalsIgnoreCase('" + iIıİ + "')", current.equalsIgnoreCase(iIıİ));
         }
     }
 
@@ -114,15 +115,13 @@ public void testTurkishI()
      * @param expected
      * @param actual
      */
-    private void assertUnicodeEquals( String message, String expected, String actual )
-    {
-        if ( expected.equals( actual ) )
-        {
+    private void assertUnicodeEquals(String message, String expected, String actual) {
+        if (expected.equals(actual)) {
             return;
         }
 
-        throw new ComparisonFailure( message, StringEscapeUtils.escapeJava( expected ),
-                                     StringEscapeUtils.escapeJava( actual ) );
+        throw new ComparisonFailure(
+                message, StringEscapeUtils.escapeJava(expected), StringEscapeUtils.escapeJava(actual));
     }
 
     /**
@@ -130,43 +129,46 @@ private void assertUnicodeEquals( String message, String expected, String actual
      * exception on these characters.
      */
     @Test
-    public void testAsciiAvailableLocales()
-    {
+    public void testAsciiAvailableLocales() {
         final String lower = "abcdefghijklmnopqrstuvwxyz";
         final String upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
-        for ( Locale locale : Locale.getAvailableLocales() )
-        {
+        for (Locale locale : Locale.getAvailableLocales()) {
             // check that toUpper() == toUpper(default locale) and toLower() = toLower(default locale)
-            Locale.setDefault( locale );
-            assertEquals( lower.toUpperCase(), lower.toUpperCase( locale ) );
-            assertEquals( upper.toLowerCase(), upper.toLowerCase( locale ) );
+            Locale.setDefault(locale);
+            assertEquals(lower.toUpperCase(), lower.toUpperCase(locale));
+            assertEquals(upper.toLowerCase(), upper.toLowerCase(locale));
 
             // check result
             String expectedToUpperCase = upper;
             String expectedToLowerCase = lower;
-            if ( LOCALE_TURKISH.getLanguage().equals( locale.getLanguage() ) ||
-                 new Locale( "az" ).getLanguage().equals( locale.getLanguage() )           )
-            {
-                expectedToUpperCase = upper.replace( DOTLESS_I, DOTTED_I );
-                expectedToLowerCase = lower.replace( DOTTED_i, DOTLESS_i );
+            if (LOCALE_TURKISH.getLanguage().equals(locale.getLanguage())
+                    || new Locale("az").getLanguage().equals(locale.getLanguage())) {
+                expectedToUpperCase = upper.replace(DOTLESS_I, DOTTED_I);
+                expectedToLowerCase = lower.replace(DOTTED_i, DOTLESS_i);
             }
 
-            assertEquals( "'" + lower + "'.toUpperCase('" + locale.toString() + "')", expectedToUpperCase,
-                          lower.toUpperCase( locale ) );
-            assertEquals( "'" + upper + "'.toLowerCase('" + locale.toString() + "')", expectedToLowerCase,
-                          upper.toLowerCase( locale ) );
+            assertEquals(
+                    "'" + lower + "'.toUpperCase('" + locale.toString() + "')",
+                    expectedToUpperCase,
+                    lower.toUpperCase(locale));
+            assertEquals(
+                    "'" + upper + "'.toLowerCase('" + locale.toString() + "')",
+                    expectedToLowerCase,
+                    upper.toLowerCase(locale));
 
             // check that toLowerCase on lower and toUpperCase on upper don't cause harm
-            assertEquals( "'" + lower + "'.toLowerCase('" + locale.toString() + "')", lower, lower.toLowerCase( locale ) );
-            assertEquals( "'" + upper + "'.toUpperCase('" + locale.toString() + "')", upper, upper.toUpperCase( locale ) );
+            assertEquals("'" + lower + "'.toLowerCase('" + locale.toString() + "')", lower, lower.toLowerCase(locale));
+            assertEquals("'" + upper + "'.toUpperCase('" + locale.toString() + "')", upper, upper.toUpperCase(locale));
 
             // check equalsIgnoreCase
-            assertTrue( "'" + upper + "'.equalsIgnoreCase('" + lower + "')", upper.equalsIgnoreCase( lower ) );
-            assertTrue( "'" + upper + "'.equalsIgnoreCase('" + expectedToLowerCase + "')",
-                        upper.equalsIgnoreCase( expectedToLowerCase ) );
-            assertTrue( "'" + expectedToUpperCase + "'.equalsIgnoreCase('" + lower + "')",
-                        expectedToUpperCase.equalsIgnoreCase( lower ) );
+            assertTrue("'" + upper + "'.equalsIgnoreCase('" + lower + "')", upper.equalsIgnoreCase(lower));
+            assertTrue(
+                    "'" + upper + "'.equalsIgnoreCase('" + expectedToLowerCase + "')",
+                    upper.equalsIgnoreCase(expectedToLowerCase));
+            assertTrue(
+                    "'" + expectedToUpperCase + "'.equalsIgnoreCase('" + lower + "')",
+                    expectedToUpperCase.equalsIgnoreCase(lower));
         }
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/OsTest.java b/src/test/java/org/apache/maven/shared/utils/OsTest.java
index 951c9fc2..e5a321a0 100644
--- a/src/test/java/org/apache/maven/shared/utils/OsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/OsTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils;
+
+import java.util.Set;
 
-import org.junit.Test;
-import org.junit.Before;
 import org.junit.After;
 import org.junit.Assert;
-
-import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -34,156 +33,118 @@
  *
  * @author Mark Struberg
  */
-public class OsTest
-{
+public class OsTest {
     private String origOsName;
     private String origOsArch;
     private String origOsVersion;
 
-
     @Before
-    public void setUp()
-    {
-        origOsName = System.getProperty( "os.name" );
-        origOsArch = System.getProperty( "os.arch" );
-        origOsVersion = System.getProperty( "os.version" );
+    public void setUp() {
+        origOsName = System.getProperty("os.name");
+        origOsArch = System.getProperty("os.arch");
+        origOsVersion = System.getProperty("os.version");
 
         // and now set some special settings ;)
-        System.setProperty( "os.name"   , "os/2" );
-        System.setProperty( "os.arch"   , "i386" );
-        System.setProperty( "os.version", "2.1.32" );
+        System.setProperty("os.name", "os/2");
+        System.setProperty("os.arch", "i386");
+        System.setProperty("os.version", "2.1.32");
     }
 
     @After
-    public void tearDown()
-    {
+    public void tearDown() {
         // set the original OS settings again
-        System.setProperty( "os.name"   , origOsName );
-        System.setProperty( "os.arch"   , origOsArch );
-        System.setProperty( "os.version", origOsVersion );
+        System.setProperty("os.name", origOsName);
+        System.setProperty("os.arch", origOsArch);
+        System.setProperty("os.version", origOsVersion);
     }
 
     @Test
-    public void testConstructor()
-    {
-        Os os  = new Os();
+    public void testConstructor() {
+        Os os = new Os();
         os.eval();
 
-        Assert.assertTrue( Os.isName( Os.FAMILY_OS2 ) );
-
-        Assert.assertFalse( Os.isName( Os.FAMILY_DOS ) );
-        Assert.assertFalse( Os.isName( Os.FAMILY_MAC ) );
-        Assert.assertFalse( Os.isName( Os.FAMILY_NETWARE ) );
-        Assert.assertFalse( Os.isName( Os.FAMILY_OPENVMS ) );
-        Assert.assertFalse( Os.isName( Os.FAMILY_OS400 ) );
-        Assert.assertFalse( Os.isName( Os.FAMILY_TANDEM ) );
-        Assert.assertFalse( Os.isName( Os.FAMILY_UNIX ) );
-        Assert.assertFalse( Os.isName( Os.FAMILY_WIN9X ) );
-        Assert.assertFalse( Os.isName( Os.FAMILY_WINDOWS ) );
-        Assert.assertFalse( Os.isName( Os.FAMILY_ZOS ) );
+        Assert.assertTrue(Os.isName(Os.FAMILY_OS2));
+
+        Assert.assertFalse(Os.isName(Os.FAMILY_DOS));
+        Assert.assertFalse(Os.isName(Os.FAMILY_MAC));
+        Assert.assertFalse(Os.isName(Os.FAMILY_NETWARE));
+        Assert.assertFalse(Os.isName(Os.FAMILY_OPENVMS));
+        Assert.assertFalse(Os.isName(Os.FAMILY_OS400));
+        Assert.assertFalse(Os.isName(Os.FAMILY_TANDEM));
+        Assert.assertFalse(Os.isName(Os.FAMILY_UNIX));
+        Assert.assertFalse(Os.isName(Os.FAMILY_WIN9X));
+        Assert.assertFalse(Os.isName(Os.FAMILY_WINDOWS));
+        Assert.assertFalse(Os.isName(Os.FAMILY_ZOS));
     }
 
     @Test
-    public void testFamilyNames()
-    {
-        Assert.assertEquals( Os.FAMILY_DOS, "dos" );
-        Assert.assertEquals( Os.FAMILY_MAC, "mac" );
-        Assert.assertEquals( Os.FAMILY_NETWARE, "netware" );
-        Assert.assertEquals( Os.FAMILY_OPENVMS, "openvms" );
-        Assert.assertEquals( Os.FAMILY_OS2, "os/2" );
-        Assert.assertEquals( Os.FAMILY_OS400, "os/400" );
-        Assert.assertEquals( Os.FAMILY_TANDEM, "tandem" );
-        Assert.assertEquals( Os.FAMILY_UNIX, "unix" );
-        Assert.assertEquals( Os.FAMILY_WIN9X, "win9x" );
-        Assert.assertEquals( Os.FAMILY_WINDOWS, "windows" );
-        Assert.assertEquals( Os.FAMILY_ZOS, "z/os" );
+    public void testFamilyNames() {
+        Assert.assertEquals(Os.FAMILY_DOS, "dos");
+        Assert.assertEquals(Os.FAMILY_MAC, "mac");
+        Assert.assertEquals(Os.FAMILY_NETWARE, "netware");
+        Assert.assertEquals(Os.FAMILY_OPENVMS, "openvms");
+        Assert.assertEquals(Os.FAMILY_OS2, "os/2");
+        Assert.assertEquals(Os.FAMILY_OS400, "os/400");
+        Assert.assertEquals(Os.FAMILY_TANDEM, "tandem");
+        Assert.assertEquals(Os.FAMILY_UNIX, "unix");
+        Assert.assertEquals(Os.FAMILY_WIN9X, "win9x");
+        Assert.assertEquals(Os.FAMILY_WINDOWS, "windows");
+        Assert.assertEquals(Os.FAMILY_ZOS, "z/os");
     }
 
     @Test
-    public void testGetValidFamilies()
-    {
+    public void testGetValidFamilies() {
         Set osFamilies = Os.getValidFamilies();
 
-        Assert.assertTrue( "OsFamilies Set size"
-                  , osFamilies.size() >= 11 );
-        
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_DOS ) );
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_MAC ) );
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_NETWARE ) );
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_OPENVMS ) );
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_OS2 ) );
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_OS400 ) );
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_TANDEM ) );
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_UNIX ) );
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_WIN9X ) );
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_WINDOWS ) );
-        Assert.assertTrue( osFamilies.contains( Os.FAMILY_ZOS ) );
-        
+        Assert.assertTrue("OsFamilies Set size", osFamilies.size() >= 11);
+
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_DOS));
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_MAC));
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_NETWARE));
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_OPENVMS));
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_OS2));
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_OS400));
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_TANDEM));
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_UNIX));
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_WIN9X));
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_WINDOWS));
+        Assert.assertTrue(osFamilies.contains(Os.FAMILY_ZOS));
     }
 
-
     @Test
-    public void testIsArch()
-    {
-        assertThat( "Arch is i386"
-                  , Os.isArch( "i386" )
-                  , is( true ) );
-
-        assertThat( "Os is not Mac"
-                  , Os.isArch( "x86_64" )
-                  , is( false ) );
+    public void testIsArch() {
+        assertThat("Arch is i386", Os.isArch("i386"), is(true));
+
+        assertThat("Os is not Mac", Os.isArch("x86_64"), is(false));
     }
 
     @Test
-    public void testIsFamily()
-    {
-        assertThat( "Family is os/2"
-                  , Os.isFamily( Os.FAMILY_OS2 )
-                  , is( true ) );
-
-        assertThat( "Family is not mac"
-                  , Os.isFamily( Os.FAMILY_MAC )
-                  , is( false ) );
+    public void testIsFamily() {
+        assertThat("Family is os/2", Os.isFamily(Os.FAMILY_OS2), is(true));
+
+        assertThat("Family is not mac", Os.isFamily(Os.FAMILY_MAC), is(false));
     }
 
     @Test
-    public void testIsName()
-    {
-        assertThat( "Name is os/2"
-                  , Os.isName( "os/2" )
-                  , is( true ) );
-
-        assertThat( "Name is not Mac OS X"
-                  , Os.isName( "Mac OS X" )
-                  , is( false ) );
+    public void testIsName() {
+        assertThat("Name is os/2", Os.isName("os/2"), is(true));
+
+        assertThat("Name is not Mac OS X", Os.isName("Mac OS X"), is(false));
     }
 
     @Test
-    public void testIsValidFamily()
-    {
-        assertThat( "os/2 isValidFamily"
-                  , Os.isValidFamily( Os.FAMILY_OS2 )
-                  , is( true ) );
-
-        assertThat( "iPone != isValidFamily"
-                  , Os.isValidFamily( "iPhone" )
-                  , is( false ) );
+    public void testIsValidFamily() {
+        assertThat("os/2 isValidFamily", Os.isValidFamily(Os.FAMILY_OS2), is(true));
+
+        assertThat("iPone != isValidFamily", Os.isValidFamily("iPhone"), is(false));
     }
 
     @Test
-    public void testIsVersion()
-    {
-        assertThat( "isVersion"
-                  , Os.isVersion( "2.1.32" )
-                  , is( true ) );
-
-        assertThat( "isVersion"
-                  , Os.isVersion( "2.1" )
-                  , is( false ) );
+    public void testIsVersion() {
+        assertThat("isVersion", Os.isVersion("2.1.32"), is(true));
 
-        assertThat( "isVersion"
-                  , Os.isVersion( "4.5" )
-                  , is( false ) );
+        assertThat("isVersion", Os.isVersion("2.1"), is(false));
 
+        assertThat("isVersion", Os.isVersion("4.5"), is(false));
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/PathToolTest.java b/src/test/java/org/apache/maven/shared/utils/PathToolTest.java
index f8db74ff..3aa0da39 100644
--- a/src/test/java/org/apache/maven/shared/utils/PathToolTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/PathToolTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils;
+
+import java.io.File;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.Assume;
@@ -25,134 +26,98 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-
-import java.io.File;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 /**
  * Test the {@link PathTool} class.
  *
  * @author Mark Struberg
  */
-public class PathToolTest
-{
+public class PathToolTest {
 
     @Rule
     public TemporaryFolder tempFolder = new TemporaryFolder();
 
     @Test
     // Keep in sync with testGetRelativeFilePath_Windows()
-    public void testGetRelativeFilePath_NonWindows()
-    {
-        Assume.assumeThat( File.separatorChar, is( '/' ) );
+    public void testGetRelativeFilePath_NonWindows() {
+        Assume.assumeThat(File.separatorChar, is('/'));
 
-        assertThat( PathTool.getRelativeFilePath( null, null )
-                  , is( "" ) );
+        assertThat(PathTool.getRelativeFilePath(null, null), is(""));
 
-        assertThat( PathTool.getRelativeFilePath( null, "/usr/local/java/bin" )
-                  , is( "" ) );
+        assertThat(PathTool.getRelativeFilePath(null, "/usr/local/java/bin"), is(""));
 
-        assertThat( PathTool.getRelativeFilePath( "/usr/local", null )
-                  , is( "" ) );
+        assertThat(PathTool.getRelativeFilePath("/usr/local", null), is(""));
 
-        assertThat( PathTool.getRelativeFilePath( "/usr/local", "/usr/local/java/bin" )
-                  , is( "java/bin" ) );
+        assertThat(PathTool.getRelativeFilePath("/usr/local", "/usr/local/java/bin"), is("java/bin"));
 
-        assertThat( PathTool.getRelativeFilePath( "/usr/local", "/usr/local/java/bin/" )
-                  , is( "java/bin/" ) );
+        assertThat(PathTool.getRelativeFilePath("/usr/local", "/usr/local/java/bin/"), is("java/bin/"));
 
-        assertThat( PathTool.getRelativeFilePath( "/usr/local/java/bin", "/usr/local/" )
-                  , is( "../../" ) );
+        assertThat(PathTool.getRelativeFilePath("/usr/local/java/bin", "/usr/local/"), is("../../"));
 
-        assertThat( PathTool.getRelativeFilePath( "/usr/local/", "/usr/local/java/bin/java.sh" )
-                  , is( "java/bin/java.sh" ) );
+        assertThat(PathTool.getRelativeFilePath("/usr/local/", "/usr/local/java/bin/java.sh"), is("java/bin/java.sh"));
 
-        assertThat( PathTool.getRelativeFilePath( "/usr/local/java/bin/java.sh", "/usr/local/" )
-                  , is( "../../../" ) );
+        assertThat(PathTool.getRelativeFilePath("/usr/local/java/bin/java.sh", "/usr/local/"), is("../../../"));
 
-        assertThat( PathTool.getRelativeFilePath( "/usr/local/", "/bin" )
-                  , is( "../../bin" ) );
+        assertThat(PathTool.getRelativeFilePath("/usr/local/", "/bin"), is("../../bin"));
 
-        assertThat( PathTool.getRelativeFilePath( "/bin", "/usr/local/" )
-                  , is( "../usr/local/" ) );
+        assertThat(PathTool.getRelativeFilePath("/bin", "/usr/local/"), is("../usr/local/"));
     }
-    
+
     @Test
     // Keep in sync with testGetRelativeFilePath_NonWindows()
-    public void testGetRelativeFilePath_Windows()
-    {
-        Assume.assumeThat( File.separatorChar, is( '\\' ) );
+    public void testGetRelativeFilePath_Windows() {
+        Assume.assumeThat(File.separatorChar, is('\\'));
 
-        assertThat( PathTool.getRelativeFilePath( null, null )
-                  , is( "" ) );
+        assertThat(PathTool.getRelativeFilePath(null, null), is(""));
 
-        assertThat( PathTool.getRelativeFilePath( null, "c:\\usr\\local\\java\\bin" )
-                  , is( "" ) );
+        assertThat(PathTool.getRelativeFilePath(null, "c:\\usr\\local\\java\\bin"), is(""));
 
-        assertThat( PathTool.getRelativeFilePath( "c:\\usr\\local", null )
-                  , is( "" ) );
+        assertThat(PathTool.getRelativeFilePath("c:\\usr\\local", null), is(""));
 
-        assertThat( PathTool.getRelativeFilePath( "c:\\usr\\local", "c:\\usr\\local\\java\\bin" )
-                  , is( "java\\bin" ) );
+        assertThat(PathTool.getRelativeFilePath("c:\\usr\\local", "c:\\usr\\local\\java\\bin"), is("java\\bin"));
 
-        assertThat( PathTool.getRelativeFilePath( "c:\\usr\\local", "c:\\usr\\local\\java\\bin\\" )
-                  , is( "java\\bin\\" ) );
+        assertThat(PathTool.getRelativeFilePath("c:\\usr\\local", "c:\\usr\\local\\java\\bin\\"), is("java\\bin\\"));
 
-        assertThat( PathTool.getRelativeFilePath( "c:\\usr\\local\\java\\bin", "c:\\usr\\local\\" )
-                  , is( "..\\..\\" ) );
+        assertThat(PathTool.getRelativeFilePath("c:\\usr\\local\\java\\bin", "c:\\usr\\local\\"), is("..\\..\\"));
 
-        assertThat( PathTool.getRelativeFilePath( "c:\\usr\\local\\", "c:\\usr\\local\\java\\bin\\java.sh" )
-                  , is( "java\\bin\\java.sh" ) );
+        assertThat(
+                PathTool.getRelativeFilePath("c:\\usr\\local\\", "c:\\usr\\local\\java\\bin\\java.sh"),
+                is("java\\bin\\java.sh"));
 
-        assertThat( PathTool.getRelativeFilePath( "c:\\usr\\local\\java\\bin\\java.sh", "c:\\usr\\local\\" )
-                  , is( "..\\..\\..\\" ) );
+        assertThat(
+                PathTool.getRelativeFilePath("c:\\usr\\local\\java\\bin\\java.sh", "c:\\usr\\local\\"),
+                is("..\\..\\..\\"));
 
-        assertThat( PathTool.getRelativeFilePath( "c:\\usr\\local\\", "c:\\bin" )
-                  , is( "..\\..\\bin" ) );
+        assertThat(PathTool.getRelativeFilePath("c:\\usr\\local\\", "c:\\bin"), is("..\\..\\bin"));
 
-        assertThat( PathTool.getRelativeFilePath( "c:\\bin", "c:\\usr\\local\\" )
-                  , is( "..\\usr\\local\\" ) );
+        assertThat(PathTool.getRelativeFilePath("c:\\bin", "c:\\usr\\local\\"), is("..\\usr\\local\\"));
     }
 
     @Test
-    public void testGetRelativePath_2parm()
-    {
-        assertThat( PathTool.getRelativePath( null, null )
-                  , is( "" ) );
+    public void testGetRelativePath_2parm() {
+        assertThat(PathTool.getRelativePath(null, null), is(""));
 
-        assertThat( PathTool.getRelativePath( null, "/usr/local/java/bin" )
-                  , is( "" ) );
+        assertThat(PathTool.getRelativePath(null, "/usr/local/java/bin"), is(""));
 
-        assertThat( PathTool.getRelativePath( "/usr/local/", null )
-                  , is( "" ) );
+        assertThat(PathTool.getRelativePath("/usr/local/", null), is(""));
 
-        assertThat( PathTool.getRelativePath( "/usr/local/", "/usr/local/java/bin" )
-                  , is( ".." ) );
+        assertThat(PathTool.getRelativePath("/usr/local/", "/usr/local/java/bin"), is(".."));
 
-        assertThat( PathTool.getRelativePath( "/usr/local/", "/usr/local/java/bin/java.sh" )
-                  , is( "../.." ) );
+        assertThat(PathTool.getRelativePath("/usr/local/", "/usr/local/java/bin/java.sh"), is("../.."));
 
-        assertThat( PathTool.getRelativePath( "/usr/local/java/bin/java.sh", "/usr/local/" )
-                  , is( "" ) );
+        assertThat(PathTool.getRelativePath("/usr/local/java/bin/java.sh", "/usr/local/"), is(""));
     }
 
     @Test
-    public void testUppercaseDrive()
-    {
-        assertThat( PathTool.uppercaseDrive( null )
-                , CoreMatchers.nullValue() );
+    public void testUppercaseDrive() {
+        assertThat(PathTool.uppercaseDrive(null), CoreMatchers.nullValue());
 
-        assertThat( PathTool.uppercaseDrive( "d:" )
-                , is( "D:" ) );
+        assertThat(PathTool.uppercaseDrive("d:"), is("D:"));
 
-        assertThat( PathTool.uppercaseDrive( "D:" )
-                , is( "D:" ) );
+        assertThat(PathTool.uppercaseDrive("D:"), is("D:"));
 
-        assertThat( PathTool.uppercaseDrive( "/notadrive" )
-                , is( "/notadrive" ) );
+        assertThat(PathTool.uppercaseDrive("/notadrive"), is("/notadrive"));
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java
index 0c696415..24940a9f 100644
--- a/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -41,155 +40,122 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-public class PropertyUtilsTest
-{
+public class PropertyUtilsTest {
 
-    @Retention( RetentionPolicy.RUNTIME )
-    @Target( ElementType.METHOD )
-    @interface NeedsTemporaryFolder
-    {
-    }
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    @interface NeedsTemporaryFolder {}
 
     @Rule
     public TemporaryFolder tempFolder = new TemporaryFolder();
 
     @Test
-    @SuppressWarnings( "deprecation" )
+    @SuppressWarnings("deprecation")
     // @ReproducesPlexusBug( "Should return null on error like url and file do" )
-    public void loadNullInputStream()
-        throws Exception
-    {
-        assertThat( PropertyUtils.loadProperties( (InputStream) null ), is( new Properties() ) );
+    public void loadNullInputStream() throws Exception {
+        assertThat(PropertyUtils.loadProperties((InputStream) null), is(new Properties()));
     }
 
     @Test
-    public void loadOptionalNullInputStream()
-        throws Exception
-    {
-        assertThat( PropertyUtils.loadOptionalProperties( (InputStream) null ), is( new Properties() ) );
+    public void loadOptionalNullInputStream() throws Exception {
+        assertThat(PropertyUtils.loadOptionalProperties((InputStream) null), is(new Properties()));
     }
-    
 
     @Test
-    public void loadOptionalProperties_ioException()
-        throws Exception
-    {
-        URL url = new URL( "https://nonesuch12344.foo.bar.com/" );
-        assertThat( PropertyUtils.loadOptionalProperties( url ), is( new Properties() ) );
+    public void loadOptionalProperties_ioException() throws Exception {
+        URL url = new URL("https://nonesuch12344.foo.bar.com/");
+        assertThat(PropertyUtils.loadOptionalProperties(url), is(new Properties()));
     }
 
     @Test
-    @SuppressWarnings( "deprecation" )
-    public void loadNullURL()
-        throws Exception
-    {
-        assertThat( PropertyUtils.loadProperties( (URL) null ), nullValue( Properties.class ) );
+    @SuppressWarnings("deprecation")
+    public void loadNullURL() throws Exception {
+        assertThat(PropertyUtils.loadProperties((URL) null), nullValue(Properties.class));
     }
 
     @Test
-    public void loadOptionalNullURL()
-        throws Exception
-    {
-        assertThat( PropertyUtils.loadOptionalProperties( (URL) null ), is( new Properties() ) );
+    public void loadOptionalNullURL() throws Exception {
+        assertThat(PropertyUtils.loadOptionalProperties((URL) null), is(new Properties()));
     }
 
     @Test
-    @SuppressWarnings( "deprecation" )
-    public void loadNullFile()
-        throws Exception
-    {
-        assertThat( PropertyUtils.loadProperties( (File) null ), nullValue( Properties.class ) );
+    @SuppressWarnings("deprecation")
+    public void loadNullFile() throws Exception {
+        assertThat(PropertyUtils.loadProperties((File) null), nullValue(Properties.class));
     }
 
     @Test
-    public void loadOptionalNullFile()
-        throws Exception
-    {
-        assertThat( PropertyUtils.loadOptionalProperties( (File) null ), is( new Properties() ) );
+    public void loadOptionalNullFile() throws Exception {
+        assertThat(PropertyUtils.loadOptionalProperties((File) null), is(new Properties()));
     }
 
     @Test
-    @SuppressWarnings( "deprecation" )
-    public void loadEmptyInputStream()
-        throws Exception
-    {
-        assertThat( PropertyUtils.loadProperties( new ByteArrayInputStream( new byte[ 0 ] ) ),
-                    is( new Properties() ) );
-
-        assertThat( PropertyUtils.loadOptionalProperties( new ByteArrayInputStream( new byte[ 0 ] ) ),
-                    is( new Properties() ) );
+    @SuppressWarnings("deprecation")
+    public void loadEmptyInputStream() throws Exception {
+        assertThat(PropertyUtils.loadProperties(new ByteArrayInputStream(new byte[0])), is(new Properties()));
 
+        assertThat(PropertyUtils.loadOptionalProperties(new ByteArrayInputStream(new byte[0])), is(new Properties()));
     }
 
     @Test
     @NeedsTemporaryFolder
-    @SuppressWarnings( "deprecation" )
-    public void loadEmptyFile()
-        throws Exception
-    {
-        assertThat( PropertyUtils.loadProperties( tempFolder.newFile( "empty" ) ), is( new Properties() ) );
-        assertThat( PropertyUtils.loadOptionalProperties( tempFolder.newFile( "optional" ) ), is( new Properties() ) );
+    @SuppressWarnings("deprecation")
+    public void loadEmptyFile() throws Exception {
+        assertThat(PropertyUtils.loadProperties(tempFolder.newFile("empty")), is(new Properties()));
+        assertThat(PropertyUtils.loadOptionalProperties(tempFolder.newFile("optional")), is(new Properties()));
     }
 
     @Test
     @NeedsTemporaryFolder
-    @SuppressWarnings( "deprecation" )
-    public void loadEmptyURL()
-        throws Exception
-    {
-        assertThat( PropertyUtils.loadProperties( tempFolder.newFile( "empty" ).toURI().toURL() ),
-                    is( new Properties() ) );
-
-        assertThat( PropertyUtils.loadOptionalProperties( tempFolder.newFile( "optional" ).toURI().toURL() ),
-                    is( new Properties() ) );
-
+    @SuppressWarnings("deprecation")
+    public void loadEmptyURL() throws Exception {
+        assertThat(
+                PropertyUtils.loadProperties(tempFolder.newFile("empty").toURI().toURL()), is(new Properties()));
+
+        assertThat(
+                PropertyUtils.loadOptionalProperties(
+                        tempFolder.newFile("optional").toURI().toURL()),
+                is(new Properties()));
     }
 
     @Test
-    @SuppressWarnings( "deprecation" )
-    public void loadValidInputStream() throws UnsupportedEncodingException
-    {
+    @SuppressWarnings("deprecation")
+    public void loadValidInputStream() throws UnsupportedEncodingException {
         Properties value = new Properties();
-        value.setProperty( "a", "b" );
+        value.setProperty("a", "b");
 
-        assertThat( PropertyUtils.loadProperties( new ByteArrayInputStream( "a=b".getBytes( "ISO-8859-1" ) ) ),
-                    is( value ) );
-
-        assertThat( PropertyUtils.loadOptionalProperties( new ByteArrayInputStream( "a=b".getBytes( "ISO-8859-1" ) ) ),
-                    is( value ) );
+        assertThat(PropertyUtils.loadProperties(new ByteArrayInputStream("a=b".getBytes("ISO-8859-1"))), is(value));
 
+        assertThat(
+                PropertyUtils.loadOptionalProperties(new ByteArrayInputStream("a=b".getBytes("ISO-8859-1"))),
+                is(value));
     }
 
     @Test
     @NeedsTemporaryFolder
-    @SuppressWarnings( "deprecation" )
-    public void loadValidFile() throws IOException
-    {
-        File valid = tempFolder.newFile( "valid" );
+    @SuppressWarnings("deprecation")
+    public void loadValidFile() throws IOException {
+        File valid = tempFolder.newFile("valid");
         Properties value = new Properties();
-        value.setProperty( "a", "b" );
-        try ( OutputStream out = new FileOutputStream( valid ) )
-        {
-            value.store( out, "a test" );
-            assertThat( PropertyUtils.loadProperties( valid ), is( value ) );
-            assertThat( PropertyUtils.loadOptionalProperties( valid ), is( value ) );
+        value.setProperty("a", "b");
+        try (OutputStream out = new FileOutputStream(valid)) {
+            value.store(out, "a test");
+            assertThat(PropertyUtils.loadProperties(valid), is(value));
+            assertThat(PropertyUtils.loadOptionalProperties(valid), is(value));
         }
     }
 
     @Test
     @NeedsTemporaryFolder
-    @SuppressWarnings( "deprecation" )
-    public void loadValidURL() throws IOException
-    {
-        File valid = tempFolder.newFile( "valid" );
+    @SuppressWarnings("deprecation")
+    public void loadValidURL() throws IOException {
+        File valid = tempFolder.newFile("valid");
         Properties value = new Properties();
-        value.setProperty( "a", "b" );
-        try ( OutputStream out = new FileOutputStream( valid ) )
-        {
-          value.store( out, "a test" );
-          assertThat( PropertyUtils.loadProperties( valid.toURI().toURL() ), is( value ) );
-          assertThat( PropertyUtils.loadOptionalProperties( valid.toURI().toURL() ), is( value ) );
+        value.setProperty("a", "b");
+        try (OutputStream out = new FileOutputStream(valid)) {
+            value.store(out, "a test");
+            assertThat(PropertyUtils.loadProperties(valid.toURI().toURL()), is(value));
+            assertThat(PropertyUtils.loadOptionalProperties(valid.toURI().toURL()), is(value));
         }
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
index 505cf508..5ef56f6e 100644
--- a/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,2049 +31,1479 @@
 
 /**
  * Test the {@link StringUtils} class.
- * 
+ *
  * @author Mark Struberg
  */
-public class StringUtilsTest
-{
+public class StringUtilsTest {
 
-    @Test( expected = NullPointerException.class )
-    public void testAbbreviate_NPE()
-    {
-        assertThat( StringUtils.abbreviate( null, 10 )
-                , nullValue() );
+    @Test(expected = NullPointerException.class)
+    public void testAbbreviate_NPE() {
+        assertThat(StringUtils.abbreviate(null, 10), nullValue());
     }
 
-    @Test( expected = IllegalArgumentException.class )
-    public void testAbbreviate_MinLength()
-    {
-        assertThat( StringUtils.abbreviate( "This is a longtext", 3 )
-                  , is( "T" ) );
+    @Test(expected = IllegalArgumentException.class)
+    public void testAbbreviate_MinLength() {
+        assertThat(StringUtils.abbreviate("This is a longtext", 3), is("T"));
     }
 
     @Test
-    public void testAbbreviate()
-    {
-        assertThat( StringUtils.abbreviate( "This is a longtext", 10 )
-                  , is( "This is..." ) );
+    public void testAbbreviate() {
+        assertThat(StringUtils.abbreviate("This is a longtext", 10), is("This is..."));
 
-        assertThat( StringUtils.abbreviate( "This is a longtext", 50 )
-                  , is( "This is a longtext" ) );
+        assertThat(StringUtils.abbreviate("This is a longtext", 50), is("This is a longtext"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testAbbreviate_Offset_NPE()
-    {
-        assertThat( StringUtils.abbreviate( null, 10, 20 )
-                , nullValue() );
+    @Test(expected = NullPointerException.class)
+    public void testAbbreviate_Offset_NPE() {
+        assertThat(StringUtils.abbreviate(null, 10, 20), nullValue());
     }
 
-    @Test( expected = IllegalArgumentException.class )
-    public void testAbbreviate_Offset_MinLength()
-    {
-        assertThat( StringUtils.abbreviate( "This is a longtext", 10, 3 )
-                  , is( "T" ) );
+    @Test(expected = IllegalArgumentException.class)
+    public void testAbbreviate_Offset_MinLength() {
+        assertThat(StringUtils.abbreviate("This is a longtext", 10, 3), is("T"));
     }
 
     @Test
-    public void testAbbreviate_Offset()
-    {
-        assertThat( StringUtils.abbreviate( "This is a longtext", 5, 10 )
-                  , is( "...is a..." ) );
+    public void testAbbreviate_Offset() {
+        assertThat(StringUtils.abbreviate("This is a longtext", 5, 10), is("...is a..."));
 
-        assertThat( StringUtils.abbreviate( "This is a longtext", 10, 20 )
-                  , is( "This is a longtext" ) );
+        assertThat(StringUtils.abbreviate("This is a longtext", 10, 20), is("This is a longtext"));
 
-        assertThat( StringUtils.abbreviate( "This is a longtext", 50, 20 )
-                  , is( "This is a longtext" ) );
+        assertThat(StringUtils.abbreviate("This is a longtext", 50, 20), is("This is a longtext"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testAddAndDeHump_NPE()
-    {
-        StringUtils.addAndDeHump( null );
+    @Test(expected = NullPointerException.class)
+    public void testAddAndDeHump_NPE() {
+        StringUtils.addAndDeHump(null);
     }
 
     @Test
-    public void testAddAndDeHump()
-    {
-        assertThat( StringUtils.addAndDeHump( "lalala" )
-                  , is( "lalala" ) );
-
-        assertThat( StringUtils.addAndDeHump( "LaLaLa" )
-                  , is( "la-la-la" ) );
+    public void testAddAndDeHump() {
+        assertThat(StringUtils.addAndDeHump("lalala"), is("lalala"));
 
-        assertThat( StringUtils.addAndDeHump( "ALLUPPER" )
-                  , is( "a-l-l-u-p-p-e-r" ) );
+        assertThat(StringUtils.addAndDeHump("LaLaLa"), is("la-la-la"));
 
+        assertThat(StringUtils.addAndDeHump("ALLUPPER"), is("a-l-l-u-p-p-e-r"));
     }
 
     @Test
-    public void testCapitalise()
-    {
-        assertThat( StringUtils.capitalise( null )
-                , nullValue() );
+    public void testCapitalise() {
+        assertThat(StringUtils.capitalise(null), nullValue());
 
-        assertThat( StringUtils.capitalise( "startBig" )
-                , is( "StartBig" ) );
+        assertThat(StringUtils.capitalise("startBig"), is("StartBig"));
     }
 
     @Test
-    public void testCapitaliseAllWords()
-    {
-        assertThat( StringUtils.capitaliseAllWords( null )
-                , nullValue() );
+    public void testCapitaliseAllWords() {
+        assertThat(StringUtils.capitaliseAllWords(null), nullValue());
 
-        assertThat( StringUtils.capitaliseAllWords( "start all big" )
-                , is( "Start All Big" ) );
+        assertThat(StringUtils.capitaliseAllWords("start all big"), is("Start All Big"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testCapitalizeFirstLetter_NPE()
-    {
-        assertThat( StringUtils.capitalizeFirstLetter( null )
-                , nullValue() );
+    @Test(expected = NullPointerException.class)
+    public void testCapitalizeFirstLetter_NPE() {
+        assertThat(StringUtils.capitalizeFirstLetter(null), nullValue());
     }
 
     @Test
-    public void testCapitalizeFirstLetter()
-    {
-        assertThat( StringUtils.capitalizeFirstLetter( "Dings" )
-                , is( "Dings" ) );
+    public void testCapitalizeFirstLetter() {
+        assertThat(StringUtils.capitalizeFirstLetter("Dings"), is("Dings"));
 
-        assertThat( StringUtils.capitalizeFirstLetter( "  dings" )
-                , is( "  dings" ) );
+        assertThat(StringUtils.capitalizeFirstLetter("  dings"), is("  dings"));
 
-        assertThat( StringUtils.capitalizeFirstLetter( "start all big" )
-                , is( "Start all big" ) );
+        assertThat(StringUtils.capitalizeFirstLetter("start all big"), is("Start all big"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testCenter_NPE()
-    {
-        StringUtils.center( null, 20 );
+    @Test(expected = NullPointerException.class)
+    public void testCenter_NPE() {
+        StringUtils.center(null, 20);
     }
 
     @Test
-    public void testCenter()
-    {
-        assertThat( StringUtils.center( "centerMe", 20 )
-                , is( "      centerMe      " ) );
+    public void testCenter() {
+        assertThat(StringUtils.center("centerMe", 20), is("      centerMe      "));
 
-        assertThat( StringUtils.center( "centerMe", 4 )
-                , is( "centerMe" ) );
+        assertThat(StringUtils.center("centerMe", 4), is("centerMe"));
 
-        assertThat( StringUtils.center( "        centerMe", 20 )
-                , is( "          centerMe  " ) );
+        assertThat(StringUtils.center("        centerMe", 20), is("          centerMe  "));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testCenter_Delim_NPE()
-    {
-        StringUtils.center( null, 20, "*" );
+    @Test(expected = NullPointerException.class)
+    public void testCenter_Delim_NPE() {
+        StringUtils.center(null, 20, "*");
     }
 
     @Test
-    public void testCenter_Delim()
-    {
-        assertThat( StringUtils.center( "centerMe", 20, "*" )
-                , is( "******centerMe******" ) );
+    public void testCenter_Delim() {
+        assertThat(StringUtils.center("centerMe", 20, "*"), is("******centerMe******"));
 
-        assertThat( StringUtils.center( "centerMe", 4, "*" )
-                , is( "centerMe" ) );
+        assertThat(StringUtils.center("centerMe", 4, "*"), is("centerMe"));
 
-        assertThat( StringUtils.center( "        centerMe", 20, "*" )
-                , is( "**        centerMe**" ) );
+        assertThat(StringUtils.center("        centerMe", 20, "*"), is("**        centerMe**"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testChomp_NPE()
-    {
-        StringUtils.chomp( null );
+    @Test(expected = NullPointerException.class)
+    public void testChomp_NPE() {
+        StringUtils.chomp(null);
     }
 
     @Test
-    public void testChomp()
-    {
-        assertThat( StringUtils.chomp( "dings" )
-                , is( "dings" ) );
+    public void testChomp() {
+        assertThat(StringUtils.chomp("dings"), is("dings"));
 
-        assertThat( StringUtils.chomp( "dings\n" )
-                , is( "dings" ) );
+        assertThat(StringUtils.chomp("dings\n"), is("dings"));
 
-        assertThat( StringUtils.chomp( "dings\nbums" )
-                , is( "dings" ) );
+        assertThat(StringUtils.chomp("dings\nbums"), is("dings"));
 
-        assertThat( StringUtils.chomp( "dings\nbums\ndongs" )
-                , is( "dings\nbums" ) );
+        assertThat(StringUtils.chomp("dings\nbums\ndongs"), is("dings\nbums"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testChomp_Delim_NPE()
-    {
-        StringUtils.chomp( null, "+" );
+    @Test(expected = NullPointerException.class)
+    public void testChomp_Delim_NPE() {
+        StringUtils.chomp(null, "+");
     }
 
     @Test
-    public void testChomp_Delim()
-    {
-        assertThat( StringUtils.chomp( "dings", "+" )
-                , is( "dings" ) );
+    public void testChomp_Delim() {
+        assertThat(StringUtils.chomp("dings", "+"), is("dings"));
 
-        assertThat( StringUtils.chomp( "dings+", "+" )
-                , is( "dings" ) );
+        assertThat(StringUtils.chomp("dings+", "+"), is("dings"));
 
-        assertThat( StringUtils.chomp( "dings+bums", "+" )
-                , is( "dings" ) );
+        assertThat(StringUtils.chomp("dings+bums", "+"), is("dings"));
 
-        assertThat( StringUtils.chomp( "dings+bums+dongs", "+" )
-                , is( "dings+bums" ) );
+        assertThat(StringUtils.chomp("dings+bums+dongs", "+"), is("dings+bums"));
     }
 
-
-    @Test( expected = NullPointerException.class )
-    public void testChompLast_NPE()
-    {
-        StringUtils.chompLast( null );
+    @Test(expected = NullPointerException.class)
+    public void testChompLast_NPE() {
+        StringUtils.chompLast(null);
     }
 
     @Test
-    public void testChompLast()
-    {
-        assertThat( StringUtils.chompLast( "dings" )
-                , is( "dings" ) );
+    public void testChompLast() {
+        assertThat(StringUtils.chompLast("dings"), is("dings"));
 
-        assertThat( StringUtils.chompLast( "\n" )
-                , is( "" ) );
+        assertThat(StringUtils.chompLast("\n"), is(""));
 
-        assertThat( StringUtils.chompLast( "dings\n" )
-                , is( "dings" ) );
+        assertThat(StringUtils.chompLast("dings\n"), is("dings"));
 
-        assertThat( StringUtils.chompLast( "dings\nbums" )
-                , is( "dings\nbums" ) );
+        assertThat(StringUtils.chompLast("dings\nbums"), is("dings\nbums"));
 
-        assertThat( StringUtils.chompLast( "dings\nbums\ndongs\n" )
-                , is( "dings\nbums\ndongs" ) );
+        assertThat(StringUtils.chompLast("dings\nbums\ndongs\n"), is("dings\nbums\ndongs"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testChompLast_Delim_NPE()
-    {
-        StringUtils.chompLast( null, "+" );
+    @Test(expected = NullPointerException.class)
+    public void testChompLast_Delim_NPE() {
+        StringUtils.chompLast(null, "+");
     }
 
     @Test
-    public void testChompLast_Delim()
-    {
-        assertThat( StringUtils.chompLast( "dings", "+" )
-                , is( "dings" ) );
+    public void testChompLast_Delim() {
+        assertThat(StringUtils.chompLast("dings", "+"), is("dings"));
 
-        assertThat( StringUtils.chompLast( "+", "+" )
-                , is( "" ) );
+        assertThat(StringUtils.chompLast("+", "+"), is(""));
 
-        assertThat( StringUtils.chompLast( "dings+", "+" )
-                , is( "dings" ) );
+        assertThat(StringUtils.chompLast("dings+", "+"), is("dings"));
 
-        assertThat( StringUtils.chompLast( "dings+bums", "+" )
-                , is( "dings+bums" ) );
+        assertThat(StringUtils.chompLast("dings+bums", "+"), is("dings+bums"));
 
-        assertThat( StringUtils.chompLast( "dings+bums+dongs+", "+" )
-                , is( "dings+bums+dongs" ) );
+        assertThat(StringUtils.chompLast("dings+bums+dongs+", "+"), is("dings+bums+dongs"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testChop_NPE()
-    {
-        StringUtils.chop( null );
+    @Test(expected = NullPointerException.class)
+    public void testChop_NPE() {
+        StringUtils.chop(null);
     }
 
     @Test
-    public void testChop()
-    {
-        assertThat( StringUtils.chop( "dings" )
-                , is( "ding" ) );
+    public void testChop() {
+        assertThat(StringUtils.chop("dings"), is("ding"));
 
-        assertThat( StringUtils.chop( "x" )
-                , is( "" ) );
+        assertThat(StringUtils.chop("x"), is(""));
 
-        assertThat( StringUtils.chop( "dings\n" )
-                , is( "dings" ) );
+        assertThat(StringUtils.chop("dings\n"), is("dings"));
 
-        assertThat( StringUtils.chop( "dings\r\n" )
-                , is( "dings" ) );
+        assertThat(StringUtils.chop("dings\r\n"), is("dings"));
 
-        assertThat( StringUtils.chop( "dings\n\r" )
-                , is( "dings\n" ) );
+        assertThat(StringUtils.chop("dings\n\r"), is("dings\n"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testChopNewline_NPE()
-    {
-        StringUtils.chopNewline( null );
+    @Test(expected = NullPointerException.class)
+    public void testChopNewline_NPE() {
+        StringUtils.chopNewline(null);
     }
 
     @Test
-    public void testChopNewline()
-    {
-        assertThat( StringUtils.chopNewline( "dings" )
-                , is( "dings" ) );
+    public void testChopNewline() {
+        assertThat(StringUtils.chopNewline("dings"), is("dings"));
 
-        assertThat( StringUtils.chopNewline( "x" )
-                , is( "x" ) );
+        assertThat(StringUtils.chopNewline("x"), is("x"));
 
+        assertThat(StringUtils.chopNewline("dings\n"), is("dings"));
 
-        assertThat( StringUtils.chopNewline( "dings\n" )
-                , is( "dings" ) );
+        assertThat(StringUtils.chopNewline("dings\r\n"), is("dings"));
 
-        assertThat( StringUtils.chopNewline( "dings\r\n" )
-                , is( "dings" ) );
-
-        assertThat( StringUtils.chopNewline( "dings\n\r" )
-                , is( "dings\n\r" ) );
+        assertThat(StringUtils.chopNewline("dings\n\r"), is("dings\n\r"));
     }
 
-
     @Test
-    public void testClean()
-    {
-        assertThat( StringUtils.clean( null )
-                  , is( "" ) );
+    public void testClean() {
+        assertThat(StringUtils.clean(null), is(""));
 
-        assertThat( StringUtils.clean( "   " )
-                  , is( "" ) );
+        assertThat(StringUtils.clean("   "), is(""));
 
-        assertThat( StringUtils.clean( "  c " )
-                  , is( "c" ) );
+        assertThat(StringUtils.clean("  c "), is("c"));
 
-        assertThat( StringUtils.clean( "  dings \n  " )
-                  , is( "dings" ) );
+        assertThat(StringUtils.clean("  dings \n  "), is("dings"));
     }
 
-
-    @Test( expected = NullPointerException.class )
-    public void testConcatenate_NPE()
-    {
-        StringUtils.concatenate( null );
+    @Test(expected = NullPointerException.class)
+    public void testConcatenate_NPE() {
+        StringUtils.concatenate(null);
     }
 
     @Test
-    public void testConcatenate()
-    {
-        assertThat( StringUtils.concatenate( new String[0] )
-                  , is( "" ) );
+    public void testConcatenate() {
+        assertThat(StringUtils.concatenate(new String[0]), is(""));
 
-        assertThat( StringUtils.concatenate( new String[]{ "x" } )
-                  , is( "x" ) );
+        assertThat(StringUtils.concatenate(new String[] {"x"}), is("x"));
 
-        assertThat( StringUtils.concatenate( new String[]{ "x", "y", "z" } )
-                  , is( "xyz" ) );
+        assertThat(StringUtils.concatenate(new String[] {"x", "y", "z"}), is("xyz"));
     }
 
     @Test
-    public void testContains_String()
-    {
-        assertThat( StringUtils.contains( null, null )
-                , is( false ) );
+    public void testContains_String() {
+        assertThat(StringUtils.contains(null, null), is(false));
 
-        assertThat( StringUtils.contains( null, "string" )
-                , is( false ) );
+        assertThat(StringUtils.contains(null, "string"), is(false));
 
-        assertThat( StringUtils.contains( "string", null )
-                , is( false ) );
+        assertThat(StringUtils.contains("string", null), is(false));
 
-        assertThat( StringUtils.contains( "string", "" )
-                , is( true ) );
+        assertThat(StringUtils.contains("string", ""), is(true));
 
-        assertThat( StringUtils.contains( "string", "in" )
-                , is( true ) );
+        assertThat(StringUtils.contains("string", "in"), is(true));
 
-        assertThat( StringUtils.contains( "string", "IN" )
-                , is( false ) );
+        assertThat(StringUtils.contains("string", "IN"), is(false));
     }
 
     @Test
-    public void testContains_Char()
-    {
-        assertThat( StringUtils.contains( null, 'c' )
-                , is( false ) );
+    public void testContains_Char() {
+        assertThat(StringUtils.contains(null, 'c'), is(false));
 
-        assertThat( StringUtils.contains( "string", "c" )
-                , is( false ) );
+        assertThat(StringUtils.contains("string", "c"), is(false));
 
-        assertThat( StringUtils.contains( "string", "" )
-                , is( true ) );
+        assertThat(StringUtils.contains("string", ""), is(true));
 
-        assertThat( StringUtils.contains( "string", "r" )
-                , is( true ) );
-
-        assertThat( StringUtils.contains( "string", "R" )
-                , is( false ) );
+        assertThat(StringUtils.contains("string", "r"), is(true));
 
+        assertThat(StringUtils.contains("string", "R"), is(false));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testCountMatches_NPE()
-    {
-         StringUtils.countMatches( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testCountMatches_NPE() {
+        StringUtils.countMatches(null, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testCountMatches_NPE2()
-    {
-         StringUtils.countMatches( "this is it", null );
+    @Test(expected = NullPointerException.class)
+    public void testCountMatches_NPE2() {
+        StringUtils.countMatches("this is it", null);
     }
 
     @Test
-    public void testCountMatches()
-    {
-        assertThat( StringUtils.countMatches( null, "is" )
-                  , is( 0 ) );
+    public void testCountMatches() {
+        assertThat(StringUtils.countMatches(null, "is"), is(0));
 
-        assertThat( StringUtils.countMatches( "this is it", "is" )
-                  , is( 2 ) );
+        assertThat(StringUtils.countMatches("this is it", "is"), is(2));
 
-        assertThat( StringUtils.countMatches( "this is it", "notincluded" )
-                  , is( 0 ) );
+        assertThat(StringUtils.countMatches("this is it", "notincluded"), is(0));
     }
 
     @Test
-    public void testDefaultString()
-    {
-         assertThat( StringUtils.defaultString( null )
-                   , is( "" ) );
+    public void testDefaultString() {
+        assertThat(StringUtils.defaultString(null), is(""));
 
-        assertThat( StringUtils.defaultString( "dings" )
-                  , is( "dings" ) );
+        assertThat(StringUtils.defaultString("dings"), is("dings"));
     }
 
     @Test
-    public void testDefaultString_defaultValue()
-    {
-         assertThat( StringUtils.defaultString( null, "defaultValue" )
-                   , is( "defaultValue" ) );
+    public void testDefaultString_defaultValue() {
+        assertThat(StringUtils.defaultString(null, "defaultValue"), is("defaultValue"));
 
-        assertThat( StringUtils.defaultString( "dings", "defaultValue" )
-                  , is( "dings" ) );
+        assertThat(StringUtils.defaultString("dings", "defaultValue"), is("dings"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testDeleteWhitespace_NPE()
-    {
-        StringUtils.deleteWhitespace( null );
+    @Test(expected = NullPointerException.class)
+    public void testDeleteWhitespace_NPE() {
+        StringUtils.deleteWhitespace(null);
     }
 
     @Test
-    public void testDeleteWhitespace()
-    {
-        assertThat( StringUtils.deleteWhitespace( " \t  \n" )
-                  , is( "" ) );
+    public void testDeleteWhitespace() {
+        assertThat(StringUtils.deleteWhitespace(" \t  \n"), is(""));
 
-        assertThat( StringUtils.deleteWhitespace( " \t  \b \n" )
-                  , is( "\b" ) );
+        assertThat(StringUtils.deleteWhitespace(" \t  \b \n"), is("\b"));
 
-        assertThat( StringUtils.deleteWhitespace( "dings" )
-                , is( "dings" ) );
+        assertThat(StringUtils.deleteWhitespace("dings"), is("dings"));
 
-        assertThat( StringUtils.deleteWhitespace( "\n  dings \t " )
-                  , is( "dings" ) );
+        assertThat(StringUtils.deleteWhitespace("\n  dings \t "), is("dings"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testDifference_NPE()
-    {
-        StringUtils.difference( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testDifference_NPE() {
+        StringUtils.difference(null, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testDifference_NPE2()
-    {
-        StringUtils.difference( null, "another" );
+    @Test(expected = NullPointerException.class)
+    public void testDifference_NPE2() {
+        StringUtils.difference(null, "another");
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testDifference_NPE3()
-    {
-        StringUtils.difference( "this", null );
+    @Test(expected = NullPointerException.class)
+    public void testDifference_NPE3() {
+        StringUtils.difference("this", null);
     }
 
     @Test
-    public void testDifference()
-    {
-        assertThat( StringUtils.difference( "this", "another" )
-                , is( "another" ) );
+    public void testDifference() {
+        assertThat(StringUtils.difference("this", "another"), is("another"));
 
-        assertThat( StringUtils.difference( "I am human", "I am a robot" )
-                  , is( "a robot" ) );
+        assertThat(StringUtils.difference("I am human", "I am a robot"), is("a robot"));
 
-        assertThat( StringUtils.difference( "I am human", "I AM a robot" )
-                  , is( "AM a robot" ) );
+        assertThat(StringUtils.difference("I am human", "I AM a robot"), is("AM a robot"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testDifferenceAt_NPE()
-    {
-        StringUtils.differenceAt( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testDifferenceAt_NPE() {
+        StringUtils.differenceAt(null, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testDifferenceAt_NPE2()
-    {
-        StringUtils.differenceAt( "test", null );
+    @Test(expected = NullPointerException.class)
+    public void testDifferenceAt_NPE2() {
+        StringUtils.differenceAt("test", null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testDifferenceAt_NPE3()
-    {
-        StringUtils.differenceAt( null, "test" );
+    @Test(expected = NullPointerException.class)
+    public void testDifferenceAt_NPE3() {
+        StringUtils.differenceAt(null, "test");
     }
 
     @Test
-    public void testDifferenceAt()
-    {
-        assertThat( StringUtils.differenceAt( "this", "another" )
-                  , is( 0 ) );
+    public void testDifferenceAt() {
+        assertThat(StringUtils.differenceAt("this", "another"), is(0));
 
-        assertThat( StringUtils.differenceAt( "I am human", "I am a robot" )
-                  , is( 5 ) );
+        assertThat(StringUtils.differenceAt("I am human", "I am a robot"), is(5));
 
-        assertThat( StringUtils.differenceAt( "I am human", "I AM a robot" )
-                , is( 2 ) );
+        assertThat(StringUtils.differenceAt("I am human", "I AM a robot"), is(2));
     }
 
     @Test
-    public void testEndsWithIgnoreCase()
-    {
-        assertThat( StringUtils.endsWithIgnoreCase( null, null )
-                , is( false ) );
+    public void testEndsWithIgnoreCase() {
+        assertThat(StringUtils.endsWithIgnoreCase(null, null), is(false));
 
-        assertThat( StringUtils.endsWithIgnoreCase( null, "string" )
-                , is( false ) );
+        assertThat(StringUtils.endsWithIgnoreCase(null, "string"), is(false));
 
-        assertThat( StringUtils.endsWithIgnoreCase( "string", null )
-                , is( false ) );
+        assertThat(StringUtils.endsWithIgnoreCase("string", null), is(false));
 
-        assertThat( StringUtils.endsWithIgnoreCase( "string", "ing" )
-                , is( true ) );
+        assertThat(StringUtils.endsWithIgnoreCase("string", "ing"), is(true));
 
-        assertThat( StringUtils.endsWithIgnoreCase( "string", "a string" )
-                , is( false ) );
+        assertThat(StringUtils.endsWithIgnoreCase("string", "a string"), is(false));
 
-        assertThat( StringUtils.endsWithIgnoreCase( "string", "str" )
-                , is( false ) );
+        assertThat(StringUtils.endsWithIgnoreCase("string", "str"), is(false));
     }
 
     @Test
-    public void testEquals()
-    {
-        assertThat( StringUtils.equals( null, null )
-                  , is( true ) );
+    public void testEquals() {
+        assertThat(StringUtils.equals(null, null), is(true));
 
-        assertThat( StringUtils.equals( "x", null )
-                  , is( false ) );
+        assertThat(StringUtils.equals("x", null), is(false));
 
-        assertThat( StringUtils.equals( null, "x" )
-                  , is( false ) );
+        assertThat(StringUtils.equals(null, "x"), is(false));
 
-        assertThat( StringUtils.equals( "X", "x" )
-                  , is( false ) );
+        assertThat(StringUtils.equals("X", "x"), is(false));
 
-        assertThat( StringUtils.equals( "dings", "dings" )
-                  , is( true ) );
+        assertThat(StringUtils.equals("dings", "dings"), is(true));
     }
 
     @Test
-    public void testEqualsIgnoreCase()
-    {
-        assertThat( StringUtils.equalsIgnoreCase( null, null )
-                  , is( true ) );
+    public void testEqualsIgnoreCase() {
+        assertThat(StringUtils.equalsIgnoreCase(null, null), is(true));
 
-        assertThat( StringUtils.equalsIgnoreCase( "x", null )
-                  , is( false ) );
+        assertThat(StringUtils.equalsIgnoreCase("x", null), is(false));
 
-        assertThat( StringUtils.equalsIgnoreCase( null, "x" )
-                  , is( false ) );
+        assertThat(StringUtils.equalsIgnoreCase(null, "x"), is(false));
 
-        assertThat( StringUtils.equalsIgnoreCase( "X", "x" )
-                  , is( true ) );
+        assertThat(StringUtils.equalsIgnoreCase("X", "x"), is(true));
 
-        assertThat( StringUtils.equalsIgnoreCase( "dings", "dings" )
-                  , is( true ) );
+        assertThat(StringUtils.equalsIgnoreCase("dings", "dings"), is(true));
 
-        assertThat( StringUtils.equalsIgnoreCase( "dings", "diNGs" )
-                  , is( true ) );
+        assertThat(StringUtils.equalsIgnoreCase("dings", "diNGs"), is(true));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testEscape_NPE()
-    {
-        StringUtils.escape( null );
+    @Test(expected = NullPointerException.class)
+    public void testEscape_NPE() {
+        StringUtils.escape(null);
     }
 
     @Test
-    public void testEscape()
-    {
-        assertThat( StringUtils.escape( "dings" )
-                  , is( "dings" ) );
+    public void testEscape() {
+        assertThat(StringUtils.escape("dings"), is("dings"));
 
-        assertThat( StringUtils.escape( "dings\tbums" )
-                  , is( "dings\\tbums" ) );
+        assertThat(StringUtils.escape("dings\tbums"), is("dings\\tbums"));
 
-        assertThat( StringUtils.escape( "dings\nbums" )
-                  , is( "dings\\nbums" ) );
+        assertThat(StringUtils.escape("dings\nbums"), is("dings\\nbums"));
     }
 
-
     @Test
-    public void testEscape2()
-    {
-        assertThat( StringUtils.escape( null, null, '#' )
-                  , nullValue() );
+    public void testEscape2() {
+        assertThat(StringUtils.escape(null, null, '#'), nullValue());
 
-        assertThat( StringUtils.escape( "dings", new char[]{ '\t', '\b' }, '+' )
-                  , is( "dings" ) );
+        assertThat(StringUtils.escape("dings", new char[] {'\t', '\b'}, '+'), is("dings"));
 
-        assertThat( StringUtils.escape( "dings\tbums", new char[]{ '\t', '\b' }, '+' )
-                  , is( "dings+\tbums" ) );
+        assertThat(StringUtils.escape("dings\tbums", new char[] {'\t', '\b'}, '+'), is("dings+\tbums"));
 
-        assertThat( StringUtils.escape( "dings\nbums", new char[]{ '\t', '\b' }, '+' )
-                  , is( "dings\nbums" ) );
-        assertThat( StringUtils.escape( "dings\bbums", new char[]{ '\t', '\b' }, '+' )
-                  , is( "dings+\bbums" ) );
+        assertThat(StringUtils.escape("dings\nbums", new char[] {'\t', '\b'}, '+'), is("dings\nbums"));
+        assertThat(StringUtils.escape("dings\bbums", new char[] {'\t', '\b'}, '+'), is("dings+\bbums"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testGetChomp_NPE1()
-    {
-        StringUtils.getChomp( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testGetChomp_NPE1() {
+        StringUtils.getChomp(null, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testGetChomp_NPE2()
-    {
-        StringUtils.getChomp( "dings", null );
+    @Test(expected = NullPointerException.class)
+    public void testGetChomp_NPE2() {
+        StringUtils.getChomp("dings", null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testGetChomp_NPE3()
-    {
-        StringUtils.getChomp( null, "dings" );
+    @Test(expected = NullPointerException.class)
+    public void testGetChomp_NPE3() {
+        StringUtils.getChomp(null, "dings");
     }
 
     @Test
-    public void testGetChomp()
-    {
-        assertThat( StringUtils.getChomp( "dings-bums", "-" )
-                  , is( "-bums" ) );
+    public void testGetChomp() {
+        assertThat(StringUtils.getChomp("dings-bums", "-"), is("-bums"));
 
-        assertThat( StringUtils.getChomp( "dings-", "-" )
-                  , is( "-" ) );
+        assertThat(StringUtils.getChomp("dings-", "-"), is("-"));
 
-        assertThat( StringUtils.getChomp( "dingsbums", "-" )
-                , is( "" ) );
+        assertThat(StringUtils.getChomp("dingsbums", "-"), is(""));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testGetNestedString_NPE()
-    {
-        assertThat( StringUtils.getNestedString( "  +dings+ ", null )
-                , nullValue() );
+    @Test(expected = NullPointerException.class)
+    public void testGetNestedString_NPE() {
+        assertThat(StringUtils.getNestedString("  +dings+ ", null), nullValue());
     }
 
     @Test
-    public void testGetNestedString()
-    {
-        assertThat( StringUtils.getNestedString( null, null )
-                  , nullValue() );
+    public void testGetNestedString() {
+        assertThat(StringUtils.getNestedString(null, null), nullValue());
 
-        assertThat( StringUtils.getNestedString( "  +dings+ ", "+" )
-                  , is( "dings" ) );
+        assertThat(StringUtils.getNestedString("  +dings+ ", "+"), is("dings"));
 
-        assertThat( StringUtils.getNestedString( "  +dings+ ", "not" )
-                  , nullValue() );
+        assertThat(StringUtils.getNestedString("  +dings+ ", "not"), nullValue());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testGetNestedString2_NPE1()
-    {
-        assertThat( StringUtils.getNestedString( "  +dings+ ", null, null )
-                  , nullValue() );
+    @Test(expected = NullPointerException.class)
+    public void testGetNestedString2_NPE1() {
+        assertThat(StringUtils.getNestedString("  +dings+ ", null, null), nullValue());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testGetNestedString2_NPE2()
-    {
-        assertThat( StringUtils.getNestedString( "  +dings+ ", null, "neither" )
-                  , nullValue() );
+    @Test(expected = NullPointerException.class)
+    public void testGetNestedString2_NPE2() {
+        assertThat(StringUtils.getNestedString("  +dings+ ", null, "neither"), nullValue());
     }
 
     @Test
-    public void testGetNestedString2()
-    {
-        assertThat( StringUtils.getNestedString( null, null, null )
-                  , nullValue() );
+    public void testGetNestedString2() {
+        assertThat(StringUtils.getNestedString(null, null, null), nullValue());
 
-        assertThat( StringUtils.getNestedString( "  +dings+ ", "not", null )
-                  , nullValue() );
+        assertThat(StringUtils.getNestedString("  +dings+ ", "not", null), nullValue());
 
-        assertThat( StringUtils.getNestedString( "  +dings- ", "+", "-" )
-                  , is( "dings" ) );
+        assertThat(StringUtils.getNestedString("  +dings- ", "+", "-"), is("dings"));
 
-        assertThat( StringUtils.getNestedString( "  +dings+ ", "not", "neither" )
-                  , nullValue() );
+        assertThat(StringUtils.getNestedString("  +dings+ ", "not", "neither"), nullValue());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testGetPrechomp_NPE1()
-    {
-        StringUtils.getPrechomp( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testGetPrechomp_NPE1() {
+        StringUtils.getPrechomp(null, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testGetPrechomp_NPE2()
-    {
-        StringUtils.getPrechomp( null, "bums" );
+    @Test(expected = NullPointerException.class)
+    public void testGetPrechomp_NPE2() {
+        StringUtils.getPrechomp(null, "bums");
     }
 
     @Test
-    public void testGetPrechomp()
-    {
-        assertThat( StringUtils.getPrechomp( "dings bums dongs", "bums" )
-                  , is( "dings bums" ) );
+    public void testGetPrechomp() {
+        assertThat(StringUtils.getPrechomp("dings bums dongs", "bums"), is("dings bums"));
 
-        assertThat( StringUtils.getPrechomp( "dings bums dongs", "non" )
-                , is( "" ) );
+        assertThat(StringUtils.getPrechomp("dings bums dongs", "non"), is(""));
     }
 
     @Test
-    public void testIndexOfAny()
-    {
-        assertThat( StringUtils.indexOfAny( null, null )
-                  , is( -1 ) );
+    public void testIndexOfAny() {
+        assertThat(StringUtils.indexOfAny(null, null), is(-1));
 
-        assertThat( StringUtils.indexOfAny( "dings", null )
-                  , is( -1 ) );
+        assertThat(StringUtils.indexOfAny("dings", null), is(-1));
 
-        assertThat( StringUtils.indexOfAny( null, new String[]{} )
-                  , is( -1 ) );
+        assertThat(StringUtils.indexOfAny(null, new String[] {}), is(-1));
 
-        assertThat( StringUtils.indexOfAny( "dings bums dongs", new String[]{ "knuff", "bums" } )
-                , is( 6 ) );
+        assertThat(StringUtils.indexOfAny("dings bums dongs", new String[] {"knuff", "bums"}), is(6));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testInterpolate_NPE()
-    {
-        StringUtils.interpolate( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testInterpolate_NPE() {
+        StringUtils.interpolate(null, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testInterpolate_NPE2()
-    {
-        StringUtils.interpolate( "This ${text} will get replaced", null );
+    @Test(expected = NullPointerException.class)
+    public void testInterpolate_NPE2() {
+        StringUtils.interpolate("This ${text} will get replaced", null);
     }
 
     @Test
-    public void testInterpolate()
-    {
+    public void testInterpolate() {
         Map variables = new HashMap();
-        assertThat( StringUtils.interpolate( "This ${text} will get replaced", variables )
-                  , is( "This ${text} will get replaced" ) );
+        assertThat(
+                StringUtils.interpolate("This ${text} will get replaced", variables),
+                is("This ${text} will get replaced"));
 
-        variables.put( "text", "with a special content" );
+        variables.put("text", "with a special content");
 
-        assertThat( StringUtils.interpolate( "This ${text} will get replaced", variables )
-                  , is( "This with a special content will get replaced" ) );
+        assertThat(
+                StringUtils.interpolate("This ${text} will get replaced", variables),
+                is("This with a special content will get replaced"));
     }
 
     @Test
-    public void testIsAlpha()
-    {
-        assertThat( StringUtils.isAlpha( null )
-                  , is( false ) );
+    public void testIsAlpha() {
+        assertThat(StringUtils.isAlpha(null), is(false));
 
-        assertThat( StringUtils.isAlpha( "2" )
-                  , is( false ) );
+        assertThat(StringUtils.isAlpha("2"), is(false));
 
-        assertThat( StringUtils.isAlpha( "asvsdfSDF" )
-                  , is( true ) );
+        assertThat(StringUtils.isAlpha("asvsdfSDF"), is(true));
 
-        assertThat( StringUtils.isAlpha( "asvsdfSDF \t " )
-                  , is( false ) );
+        assertThat(StringUtils.isAlpha("asvsdfSDF \t "), is(false));
 
-        assertThat( StringUtils.isAlpha( "435afsafd3!" )
-                  , is( false ) );
+        assertThat(StringUtils.isAlpha("435afsafd3!"), is(false));
     }
 
     @Test
-    public void testIsAlphaSpace()
-    {
-        assertThat( StringUtils.isAlphaSpace( null )
-                  , is( false ) );
+    public void testIsAlphaSpace() {
+        assertThat(StringUtils.isAlphaSpace(null), is(false));
 
-        assertThat( StringUtils.isAlphaSpace( "2" )
-                  , is( false ) );
+        assertThat(StringUtils.isAlphaSpace("2"), is(false));
 
-        assertThat( StringUtils.isAlphaSpace( "asvsdfSDF" )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphaSpace("asvsdfSDF"), is(true));
 
-        assertThat( StringUtils.isAlphaSpace( "asvsdfSDF  " )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphaSpace("asvsdfSDF  "), is(true));
 
-        assertThat( StringUtils.isAlphaSpace( "asvsdfSDF \t " )
-                  , is( false ) );
+        assertThat(StringUtils.isAlphaSpace("asvsdfSDF \t "), is(false));
 
-        assertThat( StringUtils.isAlphaSpace( "435afsafd3!" )
-                  , is( false ) );
+        assertThat(StringUtils.isAlphaSpace("435afsafd3!"), is(false));
     }
 
     @Test
-    public void testIsAlphanumeric()
-    {
-        assertThat( StringUtils.isAlphanumeric( null )
-                  , is( false ) );
+    public void testIsAlphanumeric() {
+        assertThat(StringUtils.isAlphanumeric(null), is(false));
 
-        assertThat( StringUtils.isAlphanumeric( "2" )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphanumeric("2"), is(true));
 
-        assertThat( StringUtils.isAlphanumeric( "asvsdfSDF" )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphanumeric("asvsdfSDF"), is(true));
 
-        assertThat( StringUtils.isAlphanumeric( "asvsdfSDF  " )
-                  , is( false ) );
+        assertThat(StringUtils.isAlphanumeric("asvsdfSDF  "), is(false));
 
-        assertThat( StringUtils.isAlphanumeric( "asvsdfSDF \t " )
-                  , is( false ) );
+        assertThat(StringUtils.isAlphanumeric("asvsdfSDF \t "), is(false));
 
-        assertThat( StringUtils.isAlphanumeric( "435afsafd3!" )
-                  , is( false ) );
+        assertThat(StringUtils.isAlphanumeric("435afsafd3!"), is(false));
 
-        assertThat( StringUtils.isAlphanumeric( "435afsafd3" )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphanumeric("435afsafd3"), is(true));
 
-        assertThat( StringUtils.isAlphanumeric( "435 " )
-                  , is( false ) );
+        assertThat(StringUtils.isAlphanumeric("435 "), is(false));
 
-        assertThat( StringUtils.isAlphanumeric( "435" )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphanumeric("435"), is(true));
     }
 
     @Test
-    public void testIsAlphanumericSpace()
-    {
-        assertThat( StringUtils.isAlphanumericSpace( null )
-                  , is( false ) );
+    public void testIsAlphanumericSpace() {
+        assertThat(StringUtils.isAlphanumericSpace(null), is(false));
 
-        assertThat( StringUtils.isAlphanumericSpace( "2" )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphanumericSpace("2"), is(true));
 
-        assertThat( StringUtils.isAlphanumericSpace( "asvsdfSDF" )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphanumericSpace("asvsdfSDF"), is(true));
 
-        assertThat( StringUtils.isAlphanumericSpace( "asvsdfSDF  " )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphanumericSpace("asvsdfSDF  "), is(true));
 
-        assertThat( StringUtils.isAlphanumericSpace( "asvsdfSDF \t " )
-                  , is( false ) );
+        assertThat(StringUtils.isAlphanumericSpace("asvsdfSDF \t "), is(false));
 
-        assertThat( StringUtils.isAlphanumericSpace( "435afsafd3!" )
-                  , is( false ) );
+        assertThat(StringUtils.isAlphanumericSpace("435afsafd3!"), is(false));
 
-        assertThat( StringUtils.isAlphanumericSpace( "435afsafd3" )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphanumericSpace("435afsafd3"), is(true));
 
-        assertThat( StringUtils.isAlphanumericSpace( "435 " )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphanumericSpace("435 "), is(true));
 
-        assertThat( StringUtils.isAlphanumericSpace( "435" )
-                  , is( true ) );
+        assertThat(StringUtils.isAlphanumericSpace("435"), is(true));
     }
 
     @Test
-    public void testIsBlank()
-    {
-        assertThat( StringUtils.isBlank( null )
-                  , is( true ) );
+    public void testIsBlank() {
+        assertThat(StringUtils.isBlank(null), is(true));
 
-        assertThat( StringUtils.isBlank( "xx" )
-                  , is( false ) );
+        assertThat(StringUtils.isBlank("xx"), is(false));
 
-        assertThat( StringUtils.isBlank( "xx " )
-                  , is( false ) );
+        assertThat(StringUtils.isBlank("xx "), is(false));
 
-        assertThat( StringUtils.isBlank( "  " )
-                  , is( true ) );
+        assertThat(StringUtils.isBlank("  "), is(true));
 
-        assertThat( StringUtils.isBlank( "  \t " )
-                  , is( true ) );
+        assertThat(StringUtils.isBlank("  \t "), is(true));
 
-        assertThat( StringUtils.isBlank( "  \n " )
-                  , is( true ) );
+        assertThat(StringUtils.isBlank("  \n "), is(true));
     }
 
-
     @Test
-    public void testEmpty()
-    {
-        assertThat( StringUtils.isEmpty( null )
-                  , is( true ) );
+    public void testEmpty() {
+        assertThat(StringUtils.isEmpty(null), is(true));
 
-        assertThat( StringUtils.isEmpty( "xx" )
-                  , is( false ) );
+        assertThat(StringUtils.isEmpty("xx"), is(false));
 
-        assertThat( StringUtils.isEmpty( "xx " )
-                  , is( false ) );
+        assertThat(StringUtils.isEmpty("xx "), is(false));
 
-        assertThat( StringUtils.isEmpty( "  " )
-                  , is( true ) );
+        assertThat(StringUtils.isEmpty("  "), is(true));
 
-        assertThat( StringUtils.isEmpty( "  \t " )
-                  , is( true ) );
+        assertThat(StringUtils.isEmpty("  \t "), is(true));
 
-        assertThat( StringUtils.isEmpty( "  \n " )
-                  , is( true ) );
+        assertThat(StringUtils.isEmpty("  \n "), is(true));
     }
 
     @Test
-    public void testNotBlank()
-    {
-        assertThat( StringUtils.isNotBlank( null )
-                  , is( false ) );
+    public void testNotBlank() {
+        assertThat(StringUtils.isNotBlank(null), is(false));
 
-        assertThat( StringUtils.isNotBlank( "xx" )
-                  , is( true ) );
+        assertThat(StringUtils.isNotBlank("xx"), is(true));
 
-        assertThat( StringUtils.isNotBlank( "xx " )
-                  , is( true ) );
+        assertThat(StringUtils.isNotBlank("xx "), is(true));
 
-        assertThat( StringUtils.isNotBlank( "  " )
-                  , is( false ) );
+        assertThat(StringUtils.isNotBlank("  "), is(false));
 
-        assertThat( StringUtils.isNotBlank( "  \t " )
-                  , is( false ) );
+        assertThat(StringUtils.isNotBlank("  \t "), is(false));
 
-        assertThat( StringUtils.isNotBlank( "  \n " )
-                  , is( false ) );
+        assertThat(StringUtils.isNotBlank("  \n "), is(false));
     }
 
     @Test
-    public void testNotEmpty()
-    {
-        assertThat( StringUtils.isNotEmpty( null )
-                  , is( false ) );
+    public void testNotEmpty() {
+        assertThat(StringUtils.isNotEmpty(null), is(false));
 
-        assertThat( StringUtils.isNotEmpty( "xx" )
-                  , is( true ) );
+        assertThat(StringUtils.isNotEmpty("xx"), is(true));
 
-        assertThat( StringUtils.isNotEmpty( "xx " )
-                  , is( true ) );
+        assertThat(StringUtils.isNotEmpty("xx "), is(true));
 
-        assertThat( StringUtils.isNotEmpty( "  " )
-                  , is( true ) );
+        assertThat(StringUtils.isNotEmpty("  "), is(true));
 
-        assertThat( StringUtils.isNotEmpty( "" )
-                  , is( false ) );
+        assertThat(StringUtils.isNotEmpty(""), is(false));
 
-        assertThat( StringUtils.isNotEmpty( "  \t " )
-                  , is( true ) );
+        assertThat(StringUtils.isNotEmpty("  \t "), is(true));
 
-        assertThat( StringUtils.isNotEmpty( "  \n " )
-                  , is( true ) );
+        assertThat(StringUtils.isNotEmpty("  \n "), is(true));
     }
 
     @Test
-    public void testIsNumeric()
-    {
-        assertThat( StringUtils.isNumeric( null )
-                  , is( false ) );
+    public void testIsNumeric() {
+        assertThat(StringUtils.isNumeric(null), is(false));
 
-        assertThat( StringUtils.isNumeric( "2" )
-                  , is( true ) );
+        assertThat(StringUtils.isNumeric("2"), is(true));
 
-        assertThat( StringUtils.isNumeric( "asvsdfSDF" )
-                  , is( false ) );
+        assertThat(StringUtils.isNumeric("asvsdfSDF"), is(false));
 
-        assertThat( StringUtils.isNumeric( "asvsdfSDF  " )
-                  , is( false ) );
+        assertThat(StringUtils.isNumeric("asvsdfSDF  "), is(false));
 
-        assertThat( StringUtils.isNumeric( "asvsdfSDF \t " )
-                  , is( false ) );
+        assertThat(StringUtils.isNumeric("asvsdfSDF \t "), is(false));
 
-        assertThat( StringUtils.isNumeric( "435afsafd3!" )
-                  , is( false ) );
+        assertThat(StringUtils.isNumeric("435afsafd3!"), is(false));
 
-        assertThat( StringUtils.isNumeric( "435afsafd3" )
-                  , is( false ) );
+        assertThat(StringUtils.isNumeric("435afsafd3"), is(false));
 
-        assertThat( StringUtils.isNumeric( "435 " )
-                  , is( false ) );
+        assertThat(StringUtils.isNumeric("435 "), is(false));
 
-        assertThat( StringUtils.isNumeric( "435" )
-                  , is( true ) );
+        assertThat(StringUtils.isNumeric("435"), is(true));
     }
 
     @Test
-    public void testIsWhitespace()
-    {
-        assertThat( StringUtils.isWhitespace( null )
-                  , is( false ) );
+    public void testIsWhitespace() {
+        assertThat(StringUtils.isWhitespace(null), is(false));
 
-        assertThat( StringUtils.isWhitespace( "xx" )
-                  , is( false ) );
+        assertThat(StringUtils.isWhitespace("xx"), is(false));
 
-        assertThat( StringUtils.isWhitespace( "xx " )
-                  , is( false ) );
+        assertThat(StringUtils.isWhitespace("xx "), is(false));
 
-        assertThat( StringUtils.isWhitespace( "  " )
-                  , is( true ) );
+        assertThat(StringUtils.isWhitespace("  "), is(true));
 
-        assertThat( StringUtils.isWhitespace( "" )
-                  , is( true ) );
+        assertThat(StringUtils.isWhitespace(""), is(true));
 
-        assertThat( StringUtils.isWhitespace( "  \t " )
-                  , is( true ) );
+        assertThat(StringUtils.isWhitespace("  \t "), is(true));
 
-        assertThat( StringUtils.isWhitespace( "  \n " )
-                  , is( true ) );
+        assertThat(StringUtils.isWhitespace("  \n "), is(true));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testJoin_Array_NPE()
-    {
-        StringUtils.join( ( Object[] ) null, null );
+    @Test(expected = NullPointerException.class)
+    public void testJoin_Array_NPE() {
+        StringUtils.join((Object[]) null, null);
     }
 
     @Test
-    public void testJoin_Array()
-    {
-        assertThat( StringUtils.join( new Object[0], null )
-                  , is( "" ) );
+    public void testJoin_Array() {
+        assertThat(StringUtils.join(new Object[0], null), is(""));
 
-        assertThat( StringUtils.join( new Object[]{ "a", "b", "c" }, null )
-                  , is( "abc" ) );
+        assertThat(StringUtils.join(new Object[] {"a", "b", "c"}, null), is("abc"));
 
-        assertThat( StringUtils.join( new Object[]{ "a", "b", "c" }, "__" )
-                  , is( "a__b__c" ) );
+        assertThat(StringUtils.join(new Object[] {"a", "b", "c"}, "__"), is("a__b__c"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testJoin_Iterator_NPE()
-    {
-        StringUtils.join( (Iterator) null, null );
+    @Test(expected = NullPointerException.class)
+    public void testJoin_Iterator_NPE() {
+        StringUtils.join((Iterator) null, null);
     }
 
     @Test
-    public void testJoin_Iterator()
-    {
+    public void testJoin_Iterator() {
         ArrayList list = new ArrayList();
 
-        assertThat( StringUtils.join( list.iterator(), null )
-                  , is( "" ) );
+        assertThat(StringUtils.join(list.iterator(), null), is(""));
 
-        list.add( "a" );
-        list.add( "b" );
-        list.add( "c" );
+        list.add("a");
+        list.add("b");
+        list.add("c");
 
-        assertThat( StringUtils.join( list.iterator(), null )
-                  , is( "abc" ) );
+        assertThat(StringUtils.join(list.iterator(), null), is("abc"));
 
-        assertThat( StringUtils.join( list.iterator(), "__" )
-                  , is( "a__b__c" ) );
+        assertThat(StringUtils.join(list.iterator(), "__"), is("a__b__c"));
     }
 
     @Test
-    public void testLastIndexOfAny()
-    {
-        assertThat( StringUtils.lastIndexOfAny( null, null )
-                  , is( -1 ) );
+    public void testLastIndexOfAny() {
+        assertThat(StringUtils.lastIndexOfAny(null, null), is(-1));
 
-        assertThat( StringUtils.lastIndexOfAny( "dings", null )
-                  , is( -1 ) );
+        assertThat(StringUtils.lastIndexOfAny("dings", null), is(-1));
 
-        assertThat( StringUtils.lastIndexOfAny( "dings bums boms", new String[] { "ms", " b" } )
-                  , is( 13 ) );
+        assertThat(StringUtils.lastIndexOfAny("dings bums boms", new String[] {"ms", " b"}), is(13));
 
-        assertThat( StringUtils.lastIndexOfAny( "dings bums boms", new String[] { "nix", "da" } )
-                  , is( -1 ) );
+        assertThat(StringUtils.lastIndexOfAny("dings bums boms", new String[] {"nix", "da"}), is(-1));
     }
 
-    @Test( expected = IllegalArgumentException.class )
-    public void testLeft_IAE()
-    {
-        StringUtils.left( null, -1 );
+    @Test(expected = IllegalArgumentException.class)
+    public void testLeft_IAE() {
+        StringUtils.left(null, -1);
     }
 
     @Test
-    public void testLeft()
-    {
-        assertThat( StringUtils.left( null, 4 )
-                  , nullValue() );
+    public void testLeft() {
+        assertThat(StringUtils.left(null, 4), nullValue());
 
-        assertThat( StringUtils.left( "dingsbums", 4 )
-                  , is( "ding" ) );
+        assertThat(StringUtils.left("dingsbums", 4), is("ding"));
 
-        assertThat( StringUtils.left( "dingsbums", 40 )
-                  , is( "dingsbums" ) );
+        assertThat(StringUtils.left("dingsbums", 40), is("dingsbums"));
 
-        assertThat( StringUtils.left( "dingsbums", 0 )
-                  , is( "" ) );
+        assertThat(StringUtils.left("dingsbums", 0), is(""));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testLeftPad1_NPE()
-    {
-        StringUtils.leftPad( null, 0 );
+    @Test(expected = NullPointerException.class)
+    public void testLeftPad1_NPE() {
+        StringUtils.leftPad(null, 0);
     }
 
     @Test
-    public void testLeftPad1()
-    {
-        assertThat( StringUtils.leftPad( "dings", 0 )
-                  , is( "dings")  );
+    public void testLeftPad1() {
+        assertThat(StringUtils.leftPad("dings", 0), is("dings"));
 
-        assertThat( StringUtils.leftPad( "dings", 2 )
-                  , is( "dings")  );
+        assertThat(StringUtils.leftPad("dings", 2), is("dings"));
 
-        assertThat( StringUtils.leftPad( "dings", 10 )
-                  , is( "     dings")  );
+        assertThat(StringUtils.leftPad("dings", 10), is("     dings"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testLeftPad2_NPE1()
-    {
-        StringUtils.leftPad( null, 0, null );
+    @Test(expected = NullPointerException.class)
+    public void testLeftPad2_NPE1() {
+        StringUtils.leftPad(null, 0, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testLeftPad2_NPE2()
-    {
-        StringUtils.leftPad( "dings", 0, null );
+    @Test(expected = NullPointerException.class)
+    public void testLeftPad2_NPE2() {
+        StringUtils.leftPad("dings", 0, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testLeftPad2_NPE3()
-    {
-        StringUtils.leftPad( null, 0, "*" );
+    @Test(expected = NullPointerException.class)
+    public void testLeftPad2_NPE3() {
+        StringUtils.leftPad(null, 0, "*");
     }
 
     @Test
-    public void testLeftPad2()
-    {
-        assertThat( StringUtils.leftPad( "dings", 0, "*" )
-                  , is( "dings") );
+    public void testLeftPad2() {
+        assertThat(StringUtils.leftPad("dings", 0, "*"), is("dings"));
 
-        assertThat( StringUtils.leftPad( "dings", 2, "*" )
-                  , is( "dings") );
+        assertThat(StringUtils.leftPad("dings", 2, "*"), is("dings"));
 
-        assertThat( StringUtils.leftPad( "dings", 10, "*" )
-                  , is( "*****dings") );
+        assertThat(StringUtils.leftPad("dings", 10, "*"), is("*****dings"));
     }
 
     @Test
-    public void testLowerCase()
-    {
-        assertThat( StringUtils.lowerCase( null )
-                  , nullValue()  );
+    public void testLowerCase() {
+        assertThat(StringUtils.lowerCase(null), nullValue());
 
-        assertThat( StringUtils.lowerCase( "dinGSbuMS" )
-                  , is( "dingsbums" ) );
-
-        assertThat( StringUtils.lowerCase( "" )
-                  , is( "" ) );
+        assertThat(StringUtils.lowerCase("dinGSbuMS"), is("dingsbums"));
 
+        assertThat(StringUtils.lowerCase(""), is(""));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testLowerCaseFirstLetter_NPE()
-    {
-        StringUtils.lowercaseFirstLetter( null );
+    @Test(expected = NullPointerException.class)
+    public void testLowerCaseFirstLetter_NPE() {
+        StringUtils.lowercaseFirstLetter(null);
     }
 
     @Test
-    public void testLowerCaseFirstLetter()
-    {
-        assertThat( StringUtils.lowercaseFirstLetter( "Dings Bums" )
-                  , is( "dings Bums" ) );
+    public void testLowerCaseFirstLetter() {
+        assertThat(StringUtils.lowercaseFirstLetter("Dings Bums"), is("dings Bums"));
     }
 
-    @Test( expected = IllegalArgumentException.class )
-    public void testMid_NegativeLen()
-    {
-        StringUtils.mid( null, 0, -2 );
+    @Test(expected = IllegalArgumentException.class)
+    public void testMid_NegativeLen() {
+        StringUtils.mid(null, 0, -2);
     }
 
-    @Test( expected = IndexOutOfBoundsException.class )
-    public void testMid_WrongPos()
-    {
-        StringUtils.mid( null, -2, 3 );
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void testMid_WrongPos() {
+        StringUtils.mid(null, -2, 3);
     }
 
     @Test
-    public void testMid()
-    {
-        assertThat( StringUtils.mid( null, 0, 0 )
-                  , nullValue() );
+    public void testMid() {
+        assertThat(StringUtils.mid(null, 0, 0), nullValue());
 
-        assertThat( StringUtils.mid( "dings bums", 0, 0 )
-                  , is( "" ) );
+        assertThat(StringUtils.mid("dings bums", 0, 0), is(""));
 
-        assertThat( StringUtils.mid( "dings bums", 3, 4 )
-                  , is( "gs b" ) );
+        assertThat(StringUtils.mid("dings bums", 3, 4), is("gs b"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testOverlayString_NPE1()
-    {
-        StringUtils.overlayString( null, null, 0, 0 );
+    @Test(expected = NullPointerException.class)
+    public void testOverlayString_NPE1() {
+        StringUtils.overlayString(null, null, 0, 0);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testOverlayString_NPE2()
-    {
-        StringUtils.overlayString( "dings", null, 0, 0 );
+    @Test(expected = NullPointerException.class)
+    public void testOverlayString_NPE2() {
+        StringUtils.overlayString("dings", null, 0, 0);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testOverlayString_NPE3()
-    {
-        StringUtils.overlayString( null, "bums", 0, 0 );
+    @Test(expected = NullPointerException.class)
+    public void testOverlayString_NPE3() {
+        StringUtils.overlayString(null, "bums", 0, 0);
     }
 
     @Test
-    public void testOverlayString()
-    {
-        assertThat( StringUtils.overlayString( "dings", "bums", 0, 0 )
-                  , is( "bumsdings" ) );
+    public void testOverlayString() {
+        assertThat(StringUtils.overlayString("dings", "bums", 0, 0), is("bumsdings"));
 
-        assertThat( StringUtils.overlayString( "dings", "bums", 2, 4 )
-                  , is( "dibumss" ) );
+        assertThat(StringUtils.overlayString("dings", "bums", 2, 4), is("dibumss"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testPrechomp_NPE1()
-    {
-        StringUtils.prechomp( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testPrechomp_NPE1() {
+        StringUtils.prechomp(null, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testPrechomp_NPE2()
-    {
-        StringUtils.prechomp( "dings", null );
+    @Test(expected = NullPointerException.class)
+    public void testPrechomp_NPE2() {
+        StringUtils.prechomp("dings", null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testPrechomp_NPE3()
-    {
-        StringUtils.prechomp( null, "bums" );
+    @Test(expected = NullPointerException.class)
+    public void testPrechomp_NPE3() {
+        StringUtils.prechomp(null, "bums");
     }
 
     @Test
-    public void testPrechomp()
-    {
-        assertThat( StringUtils.prechomp( "dings bums", " " )
-                  , is( "bums" ) );
+    public void testPrechomp() {
+        assertThat(StringUtils.prechomp("dings bums", " "), is("bums"));
 
-        assertThat( StringUtils.prechomp( "dings bums", "nix" )
-                  , is( "dings bums" ) );
+        assertThat(StringUtils.prechomp("dings bums", "nix"), is("dings bums"));
     }
 
     @Test
-    public void testQuoteAndEscape1()
-    {
-        assertThat( StringUtils.quoteAndEscape( null, '+' )
-                  , nullValue() );
+    public void testQuoteAndEscape1() {
+        assertThat(StringUtils.quoteAndEscape(null, '+'), nullValue());
 
-        assertThat( StringUtils.quoteAndEscape( "", '+' )
-                  , is( "" ) );
+        assertThat(StringUtils.quoteAndEscape("", '+'), is(""));
 
-        assertThat( StringUtils.quoteAndEscape( "abc", '"' )
-                  , is( "abc" ) );
+        assertThat(StringUtils.quoteAndEscape("abc", '"'), is("abc"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '"' )
-                  , is( "\"a\\\"bc\"" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '"'), is("\"a\\\"bc\""));
 
-        assertThat( StringUtils.quoteAndEscape( "a\'bc", '\'' )
-                  , is( "\'a\\'bc\'" ) );
+        assertThat(StringUtils.quoteAndEscape("a\'bc", '\''), is("\'a\\'bc\'"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '\'' )
-                  , is( "a\"bc" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '\''), is("a\"bc"));
     }
 
     @Test
-    public void testQuoteAndEscape2()
-    {
-        assertThat( StringUtils.quoteAndEscape( null, '+', new char[]{ '"' } )
-                  , nullValue() );
+    public void testQuoteAndEscape2() {
+        assertThat(StringUtils.quoteAndEscape(null, '+', new char[] {'"'}), nullValue());
 
-        assertThat( StringUtils.quoteAndEscape( "", '+', new char[]{ '"' } )
-                  , is( "" ) );
+        assertThat(StringUtils.quoteAndEscape("", '+', new char[] {'"'}), is(""));
 
-        assertThat( StringUtils.quoteAndEscape( "abc", '"', new char[]{ '"' } )
-                  , is( "abc" ) );
+        assertThat(StringUtils.quoteAndEscape("abc", '"', new char[] {'"'}), is("abc"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '"', new char[]{ '"' } )
-                  , is( "\"a\\\"bc\"" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '"', new char[] {'"'}), is("\"a\\\"bc\""));
 
-        assertThat( StringUtils.quoteAndEscape( "a\'bc", '\'', new char[]{ '"' } )
-                  , is( "\'a\\'bc\'" ) );
+        assertThat(StringUtils.quoteAndEscape("a\'bc", '\'', new char[] {'"'}), is("\'a\\'bc\'"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '\'', new char[]{ '\'' } )
-                  , is( "a\"bc" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '\'', new char[] {'\''}), is("a\"bc"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '\'', new char[]{ '\'', '"' } )
-                  , is( "\'a\"bc\'" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '\'', new char[] {'\'', '"'}), is("\'a\"bc\'"));
     }
 
     @Test
-    public void testQuoteAndEscape3()
-    {
-        assertThat( StringUtils.quoteAndEscape( null, '+', new char[]{ '"' }, '\\', false )
-                  , nullValue() );
+    public void testQuoteAndEscape3() {
+        assertThat(StringUtils.quoteAndEscape(null, '+', new char[] {'"'}, '\\', false), nullValue());
 
-        assertThat( StringUtils.quoteAndEscape( "", '+', new char[]{ '"' }, '\\', false )
-                  , is( "" ) );
+        assertThat(StringUtils.quoteAndEscape("", '+', new char[] {'"'}, '\\', false), is(""));
 
-        assertThat( StringUtils.quoteAndEscape( "abc", '"', new char[]{ '"' }, '\\', false )
-                  , is( "abc" ) );
+        assertThat(StringUtils.quoteAndEscape("abc", '"', new char[] {'"'}, '\\', false), is("abc"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '"', new char[]{ '"' }, '\\', false )
-                  , is( "\"a\\\"bc\"" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '"', new char[] {'"'}, '\\', false), is("\"a\\\"bc\""));
 
-        assertThat( StringUtils.quoteAndEscape( "a\'bc", '\'', new char[]{ '"' }, '\\', false )
-                  , is( "a\'bc" ) );
+        assertThat(StringUtils.quoteAndEscape("a\'bc", '\'', new char[] {'"'}, '\\', false), is("a\'bc"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '\'', new char[]{ '\'' }, '\\', false )
-                  , is( "a\"bc" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '\'', new char[] {'\''}, '\\', false), is("a\"bc"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '\'', new char[]{ '\'', '"' }, '\\', false )
-                  , is( "\'a\\\"bc\'" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '\'', new char[] {'\'', '"'}, '\\', false), is("\'a\\\"bc\'"));
 
         // with force flag
-        assertThat( StringUtils.quoteAndEscape( null, '+', new char[]{ '"' }, '\\', true )
-                  , nullValue() );
+        assertThat(StringUtils.quoteAndEscape(null, '+', new char[] {'"'}, '\\', true), nullValue());
 
-        assertThat( StringUtils.quoteAndEscape( "", '+', new char[]{ '"' }, '\\', true )
-                  , is( "++" ) );
+        assertThat(StringUtils.quoteAndEscape("", '+', new char[] {'"'}, '\\', true), is("++"));
 
-        assertThat( StringUtils.quoteAndEscape( "abc", '"', new char[]{ '"' }, '\\', true )
-                  , is( "\"abc\"" ) );
+        assertThat(StringUtils.quoteAndEscape("abc", '"', new char[] {'"'}, '\\', true), is("\"abc\""));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '"', new char[]{ '"' }, '\\', true )
-                  , is( "\"a\\\"bc\"" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '"', new char[] {'"'}, '\\', true), is("\"a\\\"bc\""));
 
-        assertThat( StringUtils.quoteAndEscape( "a\'bc", '\'', new char[]{ '"' }, '\\', true )
-                  , is( "\'a\'bc\'" ) );
+        assertThat(StringUtils.quoteAndEscape("a\'bc", '\'', new char[] {'"'}, '\\', true), is("\'a\'bc\'"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '\'', new char[]{ '\'' }, '\\', true )
-                  , is( "\'a\"bc\'" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '\'', new char[] {'\''}, '\\', true), is("\'a\"bc\'"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '\'', new char[]{ '\'', '"' }, '\\', true )
-                  , is( "\'a\\\"bc\'" ) );
+        assertThat(StringUtils.quoteAndEscape("a\"bc", '\'', new char[] {'\'', '"'}, '\\', true), is("\'a\\\"bc\'"));
     }
 
     @Test
-    public void testQuoteAndEscape4()
-    {
-        assertThat( StringUtils.quoteAndEscape( null, '+', new char[]{ '"' }, new char[]{ '"' }, '\\', false )
-                  , nullValue() );
+    public void testQuoteAndEscape4() {
+        assertThat(StringUtils.quoteAndEscape(null, '+', new char[] {'"'}, new char[] {'"'}, '\\', false), nullValue());
 
-        assertThat( StringUtils.quoteAndEscape( "", '+', new char[]{ '"' },  new char[]{ '"' }, '\\', false )
-                  , is( "" ) );
+        assertThat(StringUtils.quoteAndEscape("", '+', new char[] {'"'}, new char[] {'"'}, '\\', false), is(""));
 
-        assertThat( StringUtils.quoteAndEscape( "abc", '"', new char[]{ '"' }, new char[]{ '"' }, '\\', false )
-                  , is( "abc" ) );
+        assertThat(StringUtils.quoteAndEscape("abc", '"', new char[] {'"'}, new char[] {'"'}, '\\', false), is("abc"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '"', new char[]{ '"' }, new char[]{ '"' }, '\\', false )
-                  , is( "\"a\\\"bc\"" ) );
+        assertThat(
+                StringUtils.quoteAndEscape("a\"bc", '"', new char[] {'"'}, new char[] {'"'}, '\\', false),
+                is("\"a\\\"bc\""));
 
-        assertThat( StringUtils.quoteAndEscape( "a\'bc", '\'', new char[]{ '"' }, new char[]{ '"' }, '\\', false )
-                  , is( "a\'bc" ) );
+        assertThat(
+                StringUtils.quoteAndEscape("a\'bc", '\'', new char[] {'"'}, new char[] {'"'}, '\\', false),
+                is("a\'bc"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '\'', new char[]{ '\'' }, new char[]{ '"' }, '\\', false )
-                  , is( "\'a\"bc\'" ) );
+        assertThat(
+                StringUtils.quoteAndEscape("a\"bc", '\'', new char[] {'\''}, new char[] {'"'}, '\\', false),
+                is("\'a\"bc\'"));
 
-        assertThat( StringUtils.quoteAndEscape( "\'a\"bc\'", '\'', new char[]{ '\'', '"' }, new char[]{ '"' }, '\\', false )
-                  , is( "\'a\"bc\'" ) );
+        assertThat(
+                StringUtils.quoteAndEscape("\'a\"bc\'", '\'', new char[] {'\'', '"'}, new char[] {'"'}, '\\', false),
+                is("\'a\"bc\'"));
 
         // with force flag
-        assertThat( StringUtils.quoteAndEscape( null, '+', new char[]{ '"' }, new char[]{ '"' }, '\\', true )
-                  , nullValue() );
+        assertThat(StringUtils.quoteAndEscape(null, '+', new char[] {'"'}, new char[] {'"'}, '\\', true), nullValue());
 
-        assertThat( StringUtils.quoteAndEscape( "", '+', new char[]{ '"' }, new char[]{ '"' }, '\\', true )
-                  , is( "++" ) );
+        assertThat(StringUtils.quoteAndEscape("", '+', new char[] {'"'}, new char[] {'"'}, '\\', true), is("++"));
 
-        assertThat( StringUtils.quoteAndEscape( "abc", '"', new char[]{ '"' }, new char[]{ '"' }, '\\', true )
-                  , is( "\"abc\"" ) );
+        assertThat(
+                StringUtils.quoteAndEscape("abc", '"', new char[] {'"'}, new char[] {'"'}, '\\', true), is("\"abc\""));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '"', new char[]{ '"' }, new char[]{ '"' }, '\\', true )
-                  , is( "\"a\\\"bc\"" ) );
+        assertThat(
+                StringUtils.quoteAndEscape("a\"bc", '"', new char[] {'"'}, new char[] {'"'}, '\\', true),
+                is("\"a\\\"bc\""));
 
-        assertThat( StringUtils.quoteAndEscape( "a\'bc", '\'', new char[]{ '"' }, new char[]{ '"' }, '\\', true )
-                  , is( "\'a\'bc\'" ) );
+        assertThat(
+                StringUtils.quoteAndEscape("a\'bc", '\'', new char[] {'"'}, new char[] {'"'}, '\\', true),
+                is("\'a\'bc\'"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '\'', new char[]{ '\'' }, new char[]{ '"' }, '\\', true )
-                  , is( "\'a\"bc\'" ) );
+        assertThat(
+                StringUtils.quoteAndEscape("a\"bc", '\'', new char[] {'\''}, new char[] {'"'}, '\\', true),
+                is("\'a\"bc\'"));
 
-        assertThat( StringUtils.quoteAndEscape( "a\"bc", '\'', new char[]{ '\'', '"' }, new char[]{ '"' }, '\\', true )
-                  , is( "\'a\\\"bc\'" ) );
+        assertThat(
+                StringUtils.quoteAndEscape("a\"bc", '\'', new char[] {'\'', '"'}, new char[] {'"'}, '\\', true),
+                is("\'a\\\"bc\'"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testRemoveAndHump_NPE1()
-    {
-        StringUtils.removeAndHump( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testRemoveAndHump_NPE1() {
+        StringUtils.removeAndHump(null, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testRemoveAndHump_NPE2()
-    {
-        StringUtils.removeAndHump( "dings", null );
+    @Test(expected = NullPointerException.class)
+    public void testRemoveAndHump_NPE2() {
+        StringUtils.removeAndHump("dings", null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testRemoveAndHump_NPE3()
-    {
-        StringUtils.removeAndHump( null, "bums" );
+    @Test(expected = NullPointerException.class)
+    public void testRemoveAndHump_NPE3() {
+        StringUtils.removeAndHump(null, "bums");
     }
 
     @Test
-    public void testRemoveAndHump()
-    {
-        assertThat( StringUtils.removeAndHump( "dings", "bums" )
-                  , is( "Ding" ) );
-
-        assertThat( StringUtils.removeAndHump( "this-is-it", "-" )
-                  , is( "ThisIsIt" ) );
+    public void testRemoveAndHump() {
+        assertThat(StringUtils.removeAndHump("dings", "bums"), is("Ding"));
 
-        assertThat( StringUtils.removeAndHump( "THIS-IS-IT", "-" )
-                  , is( "THISISIT" ) );
+        assertThat(StringUtils.removeAndHump("this-is-it", "-"), is("ThisIsIt"));
 
+        assertThat(StringUtils.removeAndHump("THIS-IS-IT", "-"), is("THISISIT"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testRemoveDuplicateWhitespace_NPE()
-    {
-        StringUtils.removeDuplicateWhitespace( null );
+    @Test(expected = NullPointerException.class)
+    public void testRemoveDuplicateWhitespace_NPE() {
+        StringUtils.removeDuplicateWhitespace(null);
     }
 
     @Test
-    public void testRemoveDuplicateWhitespace()
-    {
-        assertThat( StringUtils.removeDuplicateWhitespace( "dings" )
-                  , is( "dings" ) );
-
-        assertThat( StringUtils.removeDuplicateWhitespace( "dings bums" )
-                  , is( "dings bums" ) );
+    public void testRemoveDuplicateWhitespace() {
+        assertThat(StringUtils.removeDuplicateWhitespace("dings"), is("dings"));
 
-        assertThat( StringUtils.removeDuplicateWhitespace( "dings  bums" )
-                  , is( "dings bums" ) );
+        assertThat(StringUtils.removeDuplicateWhitespace("dings bums"), is("dings bums"));
 
-        assertThat( StringUtils.removeDuplicateWhitespace( "dings \t bums" )
-                  , is( "dings bums" ) );
+        assertThat(StringUtils.removeDuplicateWhitespace("dings  bums"), is("dings bums"));
 
+        assertThat(StringUtils.removeDuplicateWhitespace("dings \t bums"), is("dings bums"));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testRepeat_NPE()
-    {
-        StringUtils.repeat( null, 0 );
+    @Test(expected = NullPointerException.class)
+    public void testRepeat_NPE() {
+        StringUtils.repeat(null, 0);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void testRepeat_NegativeAmount()
-    {
-        StringUtils.repeat( "dings", -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void testRepeat_NegativeAmount() {
+        StringUtils.repeat("dings", -1);
     }
 
-
     @Test
-    public void testRepeat()
-    {
-        assertThat( StringUtils.repeat( "dings", 0 )
-                  , is( "" ) );
+    public void testRepeat() {
+        assertThat(StringUtils.repeat("dings", 0), is(""));
 
-        assertThat( StringUtils.repeat( "dings", 1 )
-                  , is( "dings" ) );
+        assertThat(StringUtils.repeat("dings", 1), is("dings"));
 
-        assertThat( StringUtils.repeat( "dings", 3 )
-                  , is( "dingsdingsdings" ) );
+        assertThat(StringUtils.repeat("dings", 3), is("dingsdingsdings"));
     }
 
-
     @Test
-    public void testReplace_char()
-    {
-        assertThat( StringUtils.replace(  null, 'i', 'o' )
-                  , nullValue() );
+    public void testReplace_char() {
+        assertThat(StringUtils.replace(null, 'i', 'o'), nullValue());
 
-        assertThat( StringUtils.replace(  "dings", 'i', 'o' )
-                  , is( "dongs" ) );
+        assertThat(StringUtils.replace("dings", 'i', 'o'), is("dongs"));
 
-        assertThat( StringUtils.replace(  "dingsbims", 'i', 'o' )
-                  , is( "dongsboms" ) );
+        assertThat(StringUtils.replace("dingsbims", 'i', 'o'), is("dongsboms"));
 
-        assertThat( StringUtils.replace(  "dings", 'x', 'o' )
-                  , is( "dings" ) );
+        assertThat(StringUtils.replace("dings", 'x', 'o'), is("dings"));
     }
 
     @Test
-    public void testReplace2_char_max()
-    {
-        assertThat( StringUtils.replace(  null, 'i', 'o', 0 )
-                  , nullValue() );
+    public void testReplace2_char_max() {
+        assertThat(StringUtils.replace(null, 'i', 'o', 0), nullValue());
 
-        assertThat( StringUtils.replace(  "dingsibumsi", 'i', 'o', 3 )
-                  , is( "dongsobumso" ) );
+        assertThat(StringUtils.replace("dingsibumsi", 'i', 'o', 3), is("dongsobumso"));
 
-        assertThat( StringUtils.replace(  "dingsibumsi", 'i', 'o', 2 )
-                  , is( "dongsobumsi" ) );
+        assertThat(StringUtils.replace("dingsibumsi", 'i', 'o', 2), is("dongsobumsi"));
 
-        assertThat( StringUtils.replace(  "dingsibumsi", 'i', 'o', 0 )
-                  , is( "dongsobumso" ) );
+        assertThat(StringUtils.replace("dingsibumsi", 'i', 'o', 0), is("dongsobumso"));
 
-        assertThat( StringUtils.replace(  "dingsibumsi", 'i', 'o', -2 )
-                  , is( "dongsobumso" ) );
+        assertThat(StringUtils.replace("dingsibumsi", 'i', 'o', -2), is("dongsobumso"));
 
-        assertThat( StringUtils.replace(  "dings", 'x', 'o', 2 )
-                  , is( "dings" ) );
+        assertThat(StringUtils.replace("dings", 'x', 'o', 2), is("dings"));
     }
 
     @Test
-    public void testReplace_string()
-    {
-        assertThat( StringUtils.replace(  null, "in", "ox" )
-                  , nullValue() );
+    public void testReplace_string() {
+        assertThat(StringUtils.replace(null, "in", "ox"), nullValue());
 
-        assertThat( StringUtils.replace(  "dings", "in", "ox" )
-                  , is( "doxgs" ) );
+        assertThat(StringUtils.replace("dings", "in", "ox"), is("doxgs"));
 
-        assertThat( StringUtils.replace(  "dingsbins", "in", "ox" )
-                  , is( "doxgsboxs" ) );
+        assertThat(StringUtils.replace("dingsbins", "in", "ox"), is("doxgsboxs"));
 
-        assertThat( StringUtils.replace(  "dings", "nin", "ox" )
-                  , is( "dings" ) );
+        assertThat(StringUtils.replace("dings", "nin", "ox"), is("dings"));
     }
 
-
     @Test
-    public void testReplace2_string_max()
-    {
-        assertThat( StringUtils.replace(  null, "in", "ox", 0 )
-                  , nullValue() );
+    public void testReplace2_string_max() {
+        assertThat(StringUtils.replace(null, "in", "ox", 0), nullValue());
 
-        assertThat( StringUtils.replace(  "dingsibumsi", "si", "xo", 3 )
-                  , is( "dingxobumxo" ) );
+        assertThat(StringUtils.replace("dingsibumsi", "si", "xo", 3), is("dingxobumxo"));
 
-        assertThat( StringUtils.replace(  "dingsibumsi", "si", "xo", 2 )
-                  , is( "dingxobumxo" ) );
+        assertThat(StringUtils.replace("dingsibumsi", "si", "xo", 2), is("dingxobumxo"));
 
-        assertThat( StringUtils.replace(  "dingsibumsi", "si", "xo", 1 )
-                  , is( "dingxobumsi" ) );
+        assertThat(StringUtils.replace("dingsibumsi", "si", "xo", 1), is("dingxobumsi"));
 
-        assertThat( StringUtils.replace(  "dingsibumsi", "si", "xo", 0 )
-                  , is( "dingxobumxo" ) );
+        assertThat(StringUtils.replace("dingsibumsi", "si", "xo", 0), is("dingxobumxo"));
 
-        assertThat( StringUtils.replace(  "dingsibumsi", "si", "xo", -2 )
-                  , is( "dingxobumxo" ) );
+        assertThat(StringUtils.replace("dingsibumsi", "si", "xo", -2), is("dingxobumxo"));
 
-        assertThat( StringUtils.replace(  "dings", "si", "xo", 2 )
-                  , is( "dings" ) );
+        assertThat(StringUtils.replace("dings", "si", "xo", 2), is("dings"));
     }
 
     @Test
-    public void testReplaceOnce_char()
-    {
-        assertThat( StringUtils.replaceOnce(  null, 'i', 'o' )
-                  , nullValue() );
+    public void testReplaceOnce_char() {
+        assertThat(StringUtils.replaceOnce(null, 'i', 'o'), nullValue());
 
-        assertThat( StringUtils.replaceOnce(  "dingsibumsi", 'i', 'o' )
-                  , is( "dongsibumsi" ) );
+        assertThat(StringUtils.replaceOnce("dingsibumsi", 'i', 'o'), is("dongsibumsi"));
 
-        assertThat( StringUtils.replaceOnce(  "dings", 'x', 'o' )
-                  , is( "dings" ) );
+        assertThat(StringUtils.replaceOnce("dings", 'x', 'o'), is("dings"));
     }
 
     @Test
-    public void testReplaceOnce_string()
-    {
-        assertThat( StringUtils.replaceOnce(  null, "in", "ox" )
-                  , nullValue() );
+    public void testReplaceOnce_string() {
+        assertThat(StringUtils.replaceOnce(null, "in", "ox"), nullValue());
 
-        assertThat( StringUtils.replaceOnce(  "dingsibumsi", "si", "xo" )
-                  , is( "dingxobumsi" ) );
+        assertThat(StringUtils.replaceOnce("dingsibumsi", "si", "xo"), is("dingxobumsi"));
 
-        assertThat( StringUtils.replaceOnce(  "dings", "si", "xo" )
-                  , is( "dings" ) );
+        assertThat(StringUtils.replaceOnce("dings", "si", "xo"), is("dings"));
     }
 
-    
     @Test
-    public void testReverse()
-    {
-        assertThat( StringUtils.reverse( null )
-                  , nullValue() );
+    public void testReverse() {
+        assertThat(StringUtils.reverse(null), nullValue());
 
-        assertThat( StringUtils.reverse( "" )
-                  , is( "" ) );
+        assertThat(StringUtils.reverse(""), is(""));
 
-        assertThat( StringUtils.reverse( "dings" )
-                  , is( "sgnid" ) );
+        assertThat(StringUtils.reverse("dings"), is("sgnid"));
 
-        assertThat( StringUtils.reverse( "  dings " )
-                  , is( " sgnid  " ) );
+        assertThat(StringUtils.reverse("  dings "), is(" sgnid  "));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testReverseDelimitedString_NPE1()
-    {
-        StringUtils.reverseDelimitedString( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testReverseDelimitedString_NPE1() {
+        StringUtils.reverseDelimitedString(null, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testReverseDelimitedString_NPE2()
-    {
-        StringUtils.reverseDelimitedString( null, " " );
+    @Test(expected = NullPointerException.class)
+    public void testReverseDelimitedString_NPE2() {
+        StringUtils.reverseDelimitedString(null, " ");
     }
 
     @Test
-    public void testReverseDelimitedString()
-    {
-        assertThat( StringUtils.reverseDelimitedString( "dings", null )
-                  , is( "dings" ) );
+    public void testReverseDelimitedString() {
+        assertThat(StringUtils.reverseDelimitedString("dings", null), is("dings"));
 
-        assertThat( StringUtils.reverseDelimitedString( "", " " )
-                  , is( "" ) );
+        assertThat(StringUtils.reverseDelimitedString("", " "), is(""));
 
-        assertThat( StringUtils.reverseDelimitedString( "dings", " " )
-                  , is( "dings" ) );
+        assertThat(StringUtils.reverseDelimitedString("dings", " "), is("dings"));
 
-        assertThat( StringUtils.reverseDelimitedString( "  dings ", " " )
-                  , is( "dings" ) );
+        assertThat(StringUtils.reverseDelimitedString("  dings ", " "), is("dings"));
 
-        assertThat( StringUtils.reverseDelimitedString( "dings bums", " " )
-                  , is( "bums dings" ) );
+        assertThat(StringUtils.reverseDelimitedString("dings bums", " "), is("bums dings"));
     }
 
-    @Test( expected = IllegalArgumentException.class )
-    public void testRight_IAE1()
-    {
-        StringUtils.right( null, -1 );
+    @Test(expected = IllegalArgumentException.class)
+    public void testRight_IAE1() {
+        StringUtils.right(null, -1);
     }
 
-    @Test( expected = IllegalArgumentException.class )
-    public void testRight_IAE2()
-    {
-        StringUtils.right( "dings", -1 );
+    @Test(expected = IllegalArgumentException.class)
+    public void testRight_IAE2() {
+        StringUtils.right("dings", -1);
     }
 
     @Test
-    public void testRight()
-    {
-        assertThat( StringUtils.right( null, 0 )
-                  , nullValue() );
+    public void testRight() {
+        assertThat(StringUtils.right(null, 0), nullValue());
 
-        assertThat( StringUtils.right( "dings", 0 )
-                  , is( "" ) );
+        assertThat(StringUtils.right("dings", 0), is(""));
 
-        assertThat( StringUtils.right( "dings", 3 )
-                  , is( "ngs" ) );
+        assertThat(StringUtils.right("dings", 3), is("ngs"));
 
-        assertThat( StringUtils.right( "dings ", 3 )
-                  , is( "gs " ) );
+        assertThat(StringUtils.right("dings ", 3), is("gs "));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testRightPad1_NPE()
-    {
-        StringUtils.rightPad( null, 0 );
+    @Test(expected = NullPointerException.class)
+    public void testRightPad1_NPE() {
+        StringUtils.rightPad(null, 0);
     }
 
     @Test
-    public void testRightPad1()
-    {
-        assertThat( StringUtils.rightPad( "dings", 0 )
-                  , is( "dings" ) );
+    public void testRightPad1() {
+        assertThat(StringUtils.rightPad("dings", 0), is("dings"));
 
-        assertThat( StringUtils.rightPad( "dings", 3 )
-                  , is( "dings" ) );
+        assertThat(StringUtils.rightPad("dings", 3), is("dings"));
 
-        assertThat( StringUtils.rightPad( "dings", 10 )
-                  , is( "dings     " ) );
+        assertThat(StringUtils.rightPad("dings", 10), is("dings     "));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testRightPad2_NPE1()
-    {
-        StringUtils.rightPad( null, 0, null );
+    @Test(expected = NullPointerException.class)
+    public void testRightPad2_NPE1() {
+        StringUtils.rightPad(null, 0, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testRightPad2_NPE2()
-    {
-        StringUtils.rightPad( "dings", 0, null );
+    @Test(expected = NullPointerException.class)
+    public void testRightPad2_NPE2() {
+        StringUtils.rightPad("dings", 0, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testRightPad2_NPE23()
-    {
-        StringUtils.rightPad( null, 0, "+" );
+    @Test(expected = NullPointerException.class)
+    public void testRightPad2_NPE23() {
+        StringUtils.rightPad(null, 0, "+");
     }
 
     @Test
-    public void testRightPad2()
-    {
-        assertThat( StringUtils.rightPad( "dings", 0, "+" )
-                  , is( "dings" ) );
+    public void testRightPad2() {
+        assertThat(StringUtils.rightPad("dings", 0, "+"), is("dings"));
 
-        assertThat( StringUtils.rightPad( "dings", 3, "+" )
-                  , is( "dings" ) );
+        assertThat(StringUtils.rightPad("dings", 3, "+"), is("dings"));
 
-        assertThat( StringUtils.rightPad( "dings", 10, "+" )
-                  , is( "dings+++++" ) );
+        assertThat(StringUtils.rightPad("dings", 10, "+"), is("dings+++++"));
     }
 
-
-    @Test( expected = NullPointerException.class )
-    public void testSplit1_NPE()
-    {
-        StringUtils.split( null );
+    @Test(expected = NullPointerException.class)
+    public void testSplit1_NPE() {
+        StringUtils.split(null);
     }
 
     @Test
-    public void testSplit1()
-    {
-        assertThat( StringUtils.split( "dings" )
-                  , is( new String[]{ "dings" } ) );
+    public void testSplit1() {
+        assertThat(StringUtils.split("dings"), is(new String[] {"dings"}));
 
-        assertThat( StringUtils.split( "dings bums" )
-                  , is( new String[]{ "dings", "bums" } ) );
+        assertThat(StringUtils.split("dings bums"), is(new String[] {"dings", "bums"}));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testSplit2_NPE1()
-    {
-        StringUtils.split( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testSplit2_NPE1() {
+        StringUtils.split(null, null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testSplit2_NPE2()
-    {
-        StringUtils.split( null, " " );
+    @Test(expected = NullPointerException.class)
+    public void testSplit2_NPE2() {
+        StringUtils.split(null, " ");
     }
 
     @Test
-    public void testSplit2()
-    {
-        assertThat( StringUtils.split( "dings", null )
-                  , is( new String[]{ "dings" } ) );
+    public void testSplit2() {
+        assertThat(StringUtils.split("dings", null), is(new String[] {"dings"}));
 
-        assertThat( StringUtils.split( "dings bums", null )
-                  , is( new String[]{ "dings", "bums" } ) );
+        assertThat(StringUtils.split("dings bums", null), is(new String[] {"dings", "bums"}));
 
-        assertThat( StringUtils.split( "dings", "+" )
-                  , is( new String[]{ "dings" } ) );
+        assertThat(StringUtils.split("dings", "+"), is(new String[] {"dings"}));
 
-        assertThat( StringUtils.split( "dings+bums", "+" )
-                  , is( new String[]{ "dings", "bums" } ) );
+        assertThat(StringUtils.split("dings+bums", "+"), is(new String[] {"dings", "bums"}));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testSplit3_NPE1()
-    {
-        StringUtils.split( null, null, 1 );
+    @Test(expected = NullPointerException.class)
+    public void testSplit3_NPE1() {
+        StringUtils.split(null, null, 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void testSplit3_NPE2()
-    {
-        StringUtils.split( null, " ", 1 );
+    @Test(expected = NullPointerException.class)
+    public void testSplit3_NPE2() {
+        StringUtils.split(null, " ", 1);
     }
 
     @Test
-    public void testSplit3()
-    {
-        assertThat( StringUtils.split( "dings", null, 3 )
-                  , is( new String[]{ "dings" } ) );
-
-        assertThat( StringUtils.split( "dings bums", null, 3 )
-                  , is( new String[]{ "dings", "bums" } ) );
+    public void testSplit3() {
+        assertThat(StringUtils.split("dings", null, 3), is(new String[] {"dings"}));
 
-        assertThat( StringUtils.split( "dings", "+", 3 )
-                  , is( new String[]{ "dings" } )  );
+        assertThat(StringUtils.split("dings bums", null, 3), is(new String[] {"dings", "bums"}));
 
-        assertThat( StringUtils.split( "dings+bums", "+", 3 )
-                  , is( new String[]{ "dings", "bums" } ) );
+        assertThat(StringUtils.split("dings", "+", 3), is(new String[] {"dings"}));
 
-        assertThat( StringUtils.split( "dings+bums", "+", 1 )
-                  , is( new String[]{ "dings+bums" } )  );
+        assertThat(StringUtils.split("dings+bums", "+", 3), is(new String[] {"dings", "bums"}));
 
-        assertThat( StringUtils.split( "dings+bums", "+", 0 )
-                  , is( new String[]{ "dings", "bums" } ) );
+        assertThat(StringUtils.split("dings+bums", "+", 1), is(new String[] {"dings+bums"}));
 
-        assertThat( StringUtils.split( "dings+bums", "+", -5 )
-                  , is( new String[]{ "dings", "bums" } ) );
+        assertThat(StringUtils.split("dings+bums", "+", 0), is(new String[] {"dings", "bums"}));
 
+        assertThat(StringUtils.split("dings+bums", "+", -5), is(new String[] {"dings", "bums"}));
     }
 
-
     @Test
-    public void testStrip1()
-    {
-        assertThat( StringUtils.strip( null )
-                  , nullValue() );
+    public void testStrip1() {
+        assertThat(StringUtils.strip(null), nullValue());
 
-        assertThat( StringUtils.strip( "dings" )
-                  , is( "dings" ) );
+        assertThat(StringUtils.strip("dings"), is("dings"));
 
-        assertThat( StringUtils.strip( "  dings \t " )
-                  , is( "dings" ) );
+        assertThat(StringUtils.strip("  dings \t "), is("dings"));
     }
 
     @Test
-    public void testStrip2()
-    {
-        assertThat( StringUtils.strip( null, " " )
-                  , nullValue() );
+    public void testStrip2() {
+        assertThat(StringUtils.strip(null, " "), nullValue());
 
-        assertThat( StringUtils.strip( null, null )
-                  , nullValue() );
+        assertThat(StringUtils.strip(null, null), nullValue());
 
-        assertThat( StringUtils.strip( "dings", " " )
-                  , is( "dings" ) );
+        assertThat(StringUtils.strip("dings", " "), is("dings"));
 
-        assertThat( StringUtils.strip( "  dings \t ", " " )
-                  , is( "dings \t" ) );
+        assertThat(StringUtils.strip("  dings \t ", " "), is("dings \t"));
     }
 
     @Test
-    public void testStripAll1()
-    {
-        assertThat( StringUtils.stripAll( null )
-                  , nullValue() );
+    public void testStripAll1() {
+        assertThat(StringUtils.stripAll(null), nullValue());
 
-        assertThat( StringUtils.stripAll( new String[]{} )
-                  , is( new String[]{} ) );
+        assertThat(StringUtils.stripAll(new String[] {}), is(new String[] {}));
 
-        assertThat( StringUtils.stripAll( new String[]{ "dings" } )
-                  , is( new String[]{ "dings" } ) );
+        assertThat(StringUtils.stripAll(new String[] {"dings"}), is(new String[] {"dings"}));
 
-        assertThat( StringUtils.stripAll( new String[]{ " dings ", "  bums \t  " } )
-                  , is( new String[]{ "dings", "bums" } ) );
+        assertThat(StringUtils.stripAll(new String[] {" dings ", "  bums \t  "}), is(new String[] {"dings", "bums"}));
     }
 
     @Test
-    public void testStripAll2()
-    {
-        assertThat( StringUtils.stripAll( null, " " )
-                  , nullValue() );
+    public void testStripAll2() {
+        assertThat(StringUtils.stripAll(null, " "), nullValue());
 
-        assertThat( StringUtils.stripAll( new String[]{}, " " )
-                  , is( new String[]{} ) );
+        assertThat(StringUtils.stripAll(new String[] {}, " "), is(new String[] {}));
 
-        assertThat( StringUtils.stripAll( new String[]{ "dings" }, " " )
-                  , is( new String[]{ "dings" } ) );
+        assertThat(StringUtils.stripAll(new String[] {"dings"}, " "), is(new String[] {"dings"}));
 
-        assertThat( StringUtils.stripAll( new String[]{ " dings ", "  bums \t  " }, " " )
-                  , is( new String[]{ "dings", "bums \t" } ) );
+        assertThat(
+                StringUtils.stripAll(new String[] {" dings ", "  bums \t  "}, " "),
+                is(new String[] {"dings", "bums \t"}));
     }
 
     @Test
-    public void testStripEnd()
-    {
-        assertThat( StringUtils.stripEnd( null, null )
-                  , nullValue() );
+    public void testStripEnd() {
+        assertThat(StringUtils.stripEnd(null, null), nullValue());
 
-        assertThat( StringUtils.stripEnd( "dings", null )
-                  , is( "dings" ) );
+        assertThat(StringUtils.stripEnd("dings", null), is("dings"));
 
-        assertThat( StringUtils.stripEnd( "  dings \t ", null )
-                  , is( "  dings" ) );
+        assertThat(StringUtils.stripEnd("  dings \t ", null), is("  dings"));
 
-        assertThat( StringUtils.stripEnd( null, " " )
-                  , nullValue() );
+        assertThat(StringUtils.stripEnd(null, " "), nullValue());
 
-        assertThat( StringUtils.stripEnd( "dings", " " )
-                  , is( "dings" ) );
+        assertThat(StringUtils.stripEnd("dings", " "), is("dings"));
 
-        assertThat( StringUtils.stripEnd( "  dings \t ", " " )
-                  , is( "  dings \t" ) );
+        assertThat(StringUtils.stripEnd("  dings \t ", " "), is("  dings \t"));
     }
 
     @Test
-    public void testStripStart()
-    {
-        assertThat( StringUtils.stripStart( null, null )
-                  , nullValue() );
+    public void testStripStart() {
+        assertThat(StringUtils.stripStart(null, null), nullValue());
 
-        assertThat( StringUtils.stripStart( "dings", null )
-                  , is( "dings" ) );
+        assertThat(StringUtils.stripStart("dings", null), is("dings"));
 
-        assertThat( StringUtils.stripStart( "  dings \t ", null )
-                  , is( "dings \t " ) );
+        assertThat(StringUtils.stripStart("  dings \t ", null), is("dings \t "));
 
-        assertThat( StringUtils.stripStart( null, " " )
-                  , nullValue() );
+        assertThat(StringUtils.stripStart(null, " "), nullValue());
 
-        assertThat( StringUtils.stripStart( "dings", " " )
-                  , is( "dings" ) );
+        assertThat(StringUtils.stripStart("dings", " "), is("dings"));
 
-        assertThat( StringUtils.stripStart( "  \t dings \t ", " " )
-                  , is( "\t dings \t " ) );
+        assertThat(StringUtils.stripStart("  \t dings \t ", " "), is("\t dings \t "));
     }
 
     @Test
-    public void testSubstring1()
-    {
-        assertThat( StringUtils.substring( null, 0 )
-                  , nullValue() );
-        assertThat( StringUtils.substring( null, -3 )
-                  , nullValue() );
+    public void testSubstring1() {
+        assertThat(StringUtils.substring(null, 0), nullValue());
+        assertThat(StringUtils.substring(null, -3), nullValue());
 
-        assertThat( StringUtils.substring( "dings", 2 )
-                  , is( "ngs" ) );
+        assertThat(StringUtils.substring("dings", 2), is("ngs"));
 
-        assertThat( StringUtils.substring( "dings", -2 )
-                  , is( "gs" ) );
+        assertThat(StringUtils.substring("dings", -2), is("gs"));
 
-        assertThat( StringUtils.substring( "dings", 20 )
-                  , is( "" ) );
+        assertThat(StringUtils.substring("dings", 20), is(""));
     }
 
     @Test
-    public void testSubstring2()
-    {
-        assertThat( StringUtils.substring( null, 0, 2 )
-                  , nullValue() );
+    public void testSubstring2() {
+        assertThat(StringUtils.substring(null, 0, 2), nullValue());
 
-        assertThat( StringUtils.substring( null, -3, 0 )
-                  , nullValue() );
+        assertThat(StringUtils.substring(null, -3, 0), nullValue());
 
-        assertThat( StringUtils.substring( "dings", 2, 4 )
-                  , is( "ng" ) );
+        assertThat(StringUtils.substring("dings", 2, 4), is("ng"));
 
-        assertThat( StringUtils.substring( "dings", -2, 4 )
-                  , is( "g" ) );
+        assertThat(StringUtils.substring("dings", -2, 4), is("g"));
 
-        assertThat( StringUtils.substring( "dings", 20, 23 )
-                  , is( "" ) );
+        assertThat(StringUtils.substring("dings", 20, 23), is(""));
 
-        assertThat( StringUtils.substring( "dings", 4, 2 )
-                  , is( "" ) );
+        assertThat(StringUtils.substring("dings", 4, 2), is(""));
     }
 
     @Test
-    public void testSwapCase()
-    {
-        assertThat( StringUtils.swapCase( null )
-                  , nullValue() );
+    public void testSwapCase() {
+        assertThat(StringUtils.swapCase(null), nullValue());
 
-        assertThat( StringUtils.swapCase( "dings" )
-                  , is( "DINGS" ) );
-
-        assertThat( StringUtils.swapCase( "DinGs" )
-                  , is( "dINgS" ) );
+        assertThat(StringUtils.swapCase("dings"), is("DINGS"));
 
+        assertThat(StringUtils.swapCase("DinGs"), is("dINgS"));
     }
 
     @Test
-    public void testTrim()
-    {
-        assertThat( StringUtils.trim( null )
-                , nullValue() );
+    public void testTrim() {
+        assertThat(StringUtils.trim(null), nullValue());
 
-        assertThat( StringUtils.trim( "   " )
-                  , is( "" ) );
+        assertThat(StringUtils.trim("   "), is(""));
 
-        assertThat( StringUtils.trim( "  c " )
-                  , is( "c" ) );
+        assertThat(StringUtils.trim("  c "), is("c"));
 
-        assertThat( StringUtils.trim( "  dings \n  " )
-                  , is( "dings" ) );
+        assertThat(StringUtils.trim("  dings \n  "), is("dings"));
     }
 
     @Test
-    public void testUncapitalise()
-    {
-        assertThat( StringUtils.uncapitalise( null )
-                , nullValue() );
+    public void testUncapitalise() {
+        assertThat(StringUtils.uncapitalise(null), nullValue());
 
-        assertThat( StringUtils.uncapitalise( "   " )
-                  , is( "   " ) );
+        assertThat(StringUtils.uncapitalise("   "), is("   "));
 
-        assertThat( StringUtils.uncapitalise( "dings" )
-                  , is( "dings" ) );
+        assertThat(StringUtils.uncapitalise("dings"), is("dings"));
 
-        assertThat( StringUtils.uncapitalise( "Dings" )
-                  , is( "dings" ) );
+        assertThat(StringUtils.uncapitalise("Dings"), is("dings"));
 
-        assertThat( StringUtils.uncapitalise( "DINGS" )
-                  , is( "dINGS" ) );
+        assertThat(StringUtils.uncapitalise("DINGS"), is("dINGS"));
     }
 
     @Test
-    public void testUncapitaliseAllWords()
-    {
-        assertThat( StringUtils.uncapitaliseAllWords( null )
-                , nullValue() );
+    public void testUncapitaliseAllWords() {
+        assertThat(StringUtils.uncapitaliseAllWords(null), nullValue());
 
-        assertThat( StringUtils.uncapitaliseAllWords( "   " )
-                  , is( "   " ) );
+        assertThat(StringUtils.uncapitaliseAllWords("   "), is("   "));
 
-        assertThat( StringUtils.uncapitaliseAllWords( "dings bums" )
-                  , is( "dings bums" ) );
+        assertThat(StringUtils.uncapitaliseAllWords("dings bums"), is("dings bums"));
 
-        assertThat( StringUtils.uncapitaliseAllWords( "Dings Bums" )
-                  , is( "dings bums" ) );
+        assertThat(StringUtils.uncapitaliseAllWords("Dings Bums"), is("dings bums"));
 
-        assertThat( StringUtils.uncapitaliseAllWords( "DINGS Bums" )
-                  , is( "dINGS bums" ) );
+        assertThat(StringUtils.uncapitaliseAllWords("DINGS Bums"), is("dINGS bums"));
     }
 
     @Test
-    public void testUnifyLineSeparators1()
-    {
-        String sls = System.getProperty( "line.separator" );
+    public void testUnifyLineSeparators1() {
+        String sls = System.getProperty("line.separator");
 
-        assertThat( StringUtils.unifyLineSeparators( null )
-                , nullValue() );
+        assertThat(StringUtils.unifyLineSeparators(null), nullValue());
 
-        assertThat( StringUtils.unifyLineSeparators( "   " )
-                  , is( "   " ) );
+        assertThat(StringUtils.unifyLineSeparators("   "), is("   "));
 
-        assertThat( StringUtils.unifyLineSeparators( "dings\nbums\r\ndongs" )
-                  , is( "dings" + sls + "bums" + sls + "dongs") );
+        assertThat(StringUtils.unifyLineSeparators("dings\nbums\r\ndongs"), is("dings" + sls + "bums" + sls + "dongs"));
     }
 
     @Test
-    public void testUnifyLineSeparators2()
-    {
-        assertThat( StringUtils.unifyLineSeparators( null, "\n" )
-                , nullValue() );
+    public void testUnifyLineSeparators2() {
+        assertThat(StringUtils.unifyLineSeparators(null, "\n"), nullValue());
 
-        assertThat( StringUtils.unifyLineSeparators( "   ", "\n" )
-                  , is( "   " ) );
+        assertThat(StringUtils.unifyLineSeparators("   ", "\n"), is("   "));
 
-        assertThat( StringUtils.unifyLineSeparators( "   ", null )  // takes the sytem line separator
-                  , is( "   " ) );
+        assertThat(
+                StringUtils.unifyLineSeparators("   ", null) // takes the sytem line separator
+                ,
+                is("   "));
 
-        assertThat( StringUtils.unifyLineSeparators( "dings\nbums\r\ndongs", "\n" )
-                  , is( "dings\nbums\ndongs" ) );
+        assertThat(StringUtils.unifyLineSeparators("dings\nbums\r\ndongs", "\n"), is("dings\nbums\ndongs"));
     }
 
     @Test
-    public void testUppercase()
-    {
-        assertThat( StringUtils.upperCase( null )
-                , nullValue() );
-
-        assertThat( StringUtils.upperCase( "   " )
-                  , is( "   " ) );
+    public void testUppercase() {
+        assertThat(StringUtils.upperCase(null), nullValue());
 
-        assertThat( StringUtils.upperCase( "" )
-                  , is( "" ) );
+        assertThat(StringUtils.upperCase("   "), is("   "));
 
-        assertThat( StringUtils.upperCase( "dings" )
-                  , is( "DINGS" ) );
+        assertThat(StringUtils.upperCase(""), is(""));
 
+        assertThat(StringUtils.upperCase("dings"), is("DINGS"));
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java b/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java
index 2e305382..a61637b4 100644
--- a/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/XmlStreamReaderTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,26 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.SequenceInputStream;
 
-
 import junit.framework.ComparisonFailure;
 import junit.framework.TestCase;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.shared.utils.xml.XmlStreamReader;
 
 /**
- * 
+ *
  * @author Hervé Boutemy
  */
-public class XmlStreamReaderTest
-    extends TestCase
-{
+public class XmlStreamReaderTest extends TestCase {
     /** french */
     private static final String TEXT_LATIN1 = "eacute: \u00E9";
     /** greek */
@@ -48,161 +43,134 @@ public class XmlStreamReaderTest
     private static final String TEXT_EUC_JP = "hiragana A: \u3042";
     /** Unicode: support everything */
     private static final String TEXT_UNICODE =
-        TEXT_LATIN1 + ", " +
-        TEXT_LATIN7 + ", " +
-        TEXT_LATIN15 + ", " +
-        TEXT_EUC_JP;
+            TEXT_LATIN1 + ", " + TEXT_LATIN7 + ", " + TEXT_LATIN15 + ", " + TEXT_EUC_JP;
     /** see http://unicode.org/faq/utf_bom.html#BOM */
-    private static final byte[] BOM_UTF8 = { (byte)0xEF, (byte)0xBB, (byte)0xBF };
-    private static final byte[] BOM_UTF16BE = { (byte)0xFE, (byte)0xFF };
-    private static final byte[] BOM_UTF16LE = { (byte)0xFF, (byte)0xFE };
+    private static final byte[] BOM_UTF8 = {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF};
+
+    private static final byte[] BOM_UTF16BE = {(byte) 0xFE, (byte) 0xFF};
+    private static final byte[] BOM_UTF16LE = {(byte) 0xFF, (byte) 0xFE};
 
-    private static String createXmlContent( String text, String encoding )
-    {
+    private static String createXmlContent(String text, String encoding) {
         String xmlDecl = "";
-        if ( encoding != null )
-        {
+        if (encoding != null) {
             xmlDecl = "";
         }
         return xmlDecl + "\n" + text + "";
     }
 
-    private static void checkXmlContent( String xml, String encoding ) throws IOException
-    {
-        checkXmlContent( xml, encoding, null );
+    private static void checkXmlContent(String xml, String encoding) throws IOException {
+        checkXmlContent(xml, encoding, null);
     }
 
-    private static void checkXmlContent( String xml, String encoding, byte[] bom ) throws IOException
-    {
-        byte[] xmlContent = xml.getBytes( encoding );
-        InputStream in = new ByteArrayInputStream( xmlContent );
-        
-        if ( bom != null )
-        {
-            in = new SequenceInputStream( new ByteArrayInputStream( bom ), in );
+    private static void checkXmlContent(String xml, String encoding, byte[] bom) throws IOException {
+        byte[] xmlContent = xml.getBytes(encoding);
+        InputStream in = new ByteArrayInputStream(xmlContent);
+
+        if (bom != null) {
+            in = new SequenceInputStream(new ByteArrayInputStream(bom), in);
         }
 
-        XmlStreamReader reader = new XmlStreamReader( in );
-        assertEquals( encoding, reader.getEncoding() );
-        String result = IOUtils.toString( reader );
-        assertEquals( xml, result );
+        XmlStreamReader reader = new XmlStreamReader(in);
+        assertEquals(encoding, reader.getEncoding());
+        String result = IOUtils.toString(reader);
+        assertEquals(xml, result);
     }
 
-    private static void checkXmlStreamReader( String text, String encoding, String effectiveEncoding )
-        throws IOException
-    {
-        checkXmlStreamReader( text, encoding, effectiveEncoding, null );
+    private static void checkXmlStreamReader(String text, String encoding, String effectiveEncoding)
+            throws IOException {
+        checkXmlStreamReader(text, encoding, effectiveEncoding, null);
     }
 
-    private static void checkXmlStreamReader( String text, String encoding ) throws IOException
-    {
-        checkXmlStreamReader( text, encoding, encoding, null );
+    private static void checkXmlStreamReader(String text, String encoding) throws IOException {
+        checkXmlStreamReader(text, encoding, encoding, null);
     }
 
-    private static void checkXmlStreamReader( String text, String encoding, byte[] bom ) throws IOException
-    {
-        checkXmlStreamReader( text, encoding, encoding, bom );
+    private static void checkXmlStreamReader(String text, String encoding, byte[] bom) throws IOException {
+        checkXmlStreamReader(text, encoding, encoding, bom);
     }
 
-    private static void checkXmlStreamReader( String text, String encoding, String effectiveEncoding, byte[] bom )
-        throws IOException
-    {
-        String xml = createXmlContent( text, encoding );
-        checkXmlContent( xml, effectiveEncoding, bom );
+    private static void checkXmlStreamReader(String text, String encoding, String effectiveEncoding, byte[] bom)
+            throws IOException {
+        String xml = createXmlContent(text, encoding);
+        checkXmlContent(xml, effectiveEncoding, bom);
     }
 
-    public void testNoXmlHeader() throws IOException
-    {
+    public void testNoXmlHeader() throws IOException {
         String xml = "text with no XML header";
-        checkXmlContent( xml, "UTF-8" );
-        checkXmlContent( xml, "UTF-8", BOM_UTF8 );
+        checkXmlContent(xml, "UTF-8");
+        checkXmlContent(xml, "UTF-8", BOM_UTF8);
     }
 
-    public void testDefaultEncoding() throws IOException
-    {
-        checkXmlStreamReader( TEXT_UNICODE, null, "UTF-8" );
-        checkXmlStreamReader( TEXT_UNICODE, null, "UTF-8", BOM_UTF8 );
+    public void testDefaultEncoding() throws IOException {
+        checkXmlStreamReader(TEXT_UNICODE, null, "UTF-8");
+        checkXmlStreamReader(TEXT_UNICODE, null, "UTF-8", BOM_UTF8);
     }
 
-    public void testUTF8Encoding()  throws IOException
-    {
-        checkXmlStreamReader( TEXT_UNICODE, "UTF-8" );
-        checkXmlStreamReader( TEXT_UNICODE, "UTF-8", BOM_UTF8 );
+    public void testUTF8Encoding() throws IOException {
+        checkXmlStreamReader(TEXT_UNICODE, "UTF-8");
+        checkXmlStreamReader(TEXT_UNICODE, "UTF-8", BOM_UTF8);
     }
 
-    public void testUTF16Encoding() throws IOException
-    {
-        checkXmlStreamReader( TEXT_UNICODE, "UTF-16", "UTF-16BE", null );
-        checkXmlStreamReader( TEXT_UNICODE, "UTF-16", "UTF-16LE", BOM_UTF16LE );
-        checkXmlStreamReader( TEXT_UNICODE, "UTF-16", "UTF-16BE", BOM_UTF16BE );
+    public void testUTF16Encoding() throws IOException {
+        checkXmlStreamReader(TEXT_UNICODE, "UTF-16", "UTF-16BE", null);
+        checkXmlStreamReader(TEXT_UNICODE, "UTF-16", "UTF-16LE", BOM_UTF16LE);
+        checkXmlStreamReader(TEXT_UNICODE, "UTF-16", "UTF-16BE", BOM_UTF16BE);
     }
 
-    public void testUTF16BEEncoding() throws IOException
-    {
-        checkXmlStreamReader( TEXT_UNICODE, "UTF-16BE" );
+    public void testUTF16BEEncoding() throws IOException {
+        checkXmlStreamReader(TEXT_UNICODE, "UTF-16BE");
     }
 
-    public void testUTF16LEEncoding() throws IOException
-    {
-        checkXmlStreamReader( TEXT_UNICODE, "UTF-16LE" );
+    public void testUTF16LEEncoding() throws IOException {
+        checkXmlStreamReader(TEXT_UNICODE, "UTF-16LE");
     }
 
-    public void testLatin1Encoding() throws IOException
-    {
-        checkXmlStreamReader( TEXT_LATIN1, "ISO-8859-1" );
+    public void testLatin1Encoding() throws IOException {
+        checkXmlStreamReader(TEXT_LATIN1, "ISO-8859-1");
     }
 
-    public void testLatin7Encoding() throws IOException
-    {
-        checkXmlStreamReader( TEXT_LATIN7, "ISO-8859-7" );
+    public void testLatin7Encoding() throws IOException {
+        checkXmlStreamReader(TEXT_LATIN7, "ISO-8859-7");
     }
 
-    public void testLatin15Encoding() throws IOException
-    {
-        checkXmlStreamReader( TEXT_LATIN15, "ISO-8859-15" );
+    public void testLatin15Encoding() throws IOException {
+        checkXmlStreamReader(TEXT_LATIN15, "ISO-8859-15");
     }
 
-    public void testEUC_JPEncoding() throws IOException
-    {
-        checkXmlStreamReader( TEXT_EUC_JP, "EUC-JP" );
+    public void testEUC_JPEncoding() throws IOException {
+        checkXmlStreamReader(TEXT_EUC_JP, "EUC-JP");
     }
 
-    public void testEBCDICEncoding() throws IOException
-    {
-        checkXmlStreamReader( "simple text in EBCDIC", "CP1047" );
+    public void testEBCDICEncoding() throws IOException {
+        checkXmlStreamReader("simple text in EBCDIC", "CP1047");
     }
 
-    public void testInappropriateEncoding() throws IOException
-    {
-        try
-        {
-            checkXmlStreamReader( TEXT_UNICODE, "ISO-8859-2" );
-            fail( "Check should have failed, since some characters are not available in the specified encoding" );
-        }
-        catch ( ComparisonFailure cf )
-        {
+    public void testInappropriateEncoding() throws IOException {
+        try {
+            checkXmlStreamReader(TEXT_UNICODE, "ISO-8859-2");
+            fail("Check should have failed, since some characters are not available in the specified encoding");
+        } catch (ComparisonFailure cf) {
             // expected failure, since the encoding does not contain some characters
         }
     }
 
-    public void testEncodingAttribute() throws IOException
-    {
+    public void testEncodingAttribute() throws IOException {
         String xml = "";
-        checkXmlContent( xml, "US-ASCII" );
+        checkXmlContent(xml, "US-ASCII");
 
         xml = "";
-        checkXmlContent( xml, "US-ASCII" );
+        checkXmlContent(xml, "US-ASCII");
 
         xml = "";
-        checkXmlContent( xml, "UTF-8" );
+        checkXmlContent(xml, "UTF-8");
 
         xml = "\n";
-        checkXmlContent( xml, "US-ASCII" );
+        checkXmlContent(xml, "US-ASCII");
 
         xml = "\n";
-        checkXmlContent( xml, "UTF-8" );
+        checkXmlContent(xml, "UTF-8");
 
         xml = "";
-        checkXmlContent( xml, "UTF-8" );
+        checkXmlContent(xml, "UTF-8");
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
index fdc83b0a..7ae03f9d 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.cli;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,14 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItemInArray;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+package org.apache.maven.shared.utils.cli;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -34,50 +25,50 @@
 import java.util.Properties;
 
 import org.apache.maven.shared.utils.Os;
-
 import org.junit.Test;
 
-public class CommandLineUtilsTest
-{
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItemInArray;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class CommandLineUtilsTest {
 
     /**
      * Tests that case-insensitive environment variables are normalized to upper case.
      */
     @Test
-    public void testGetSystemEnvVarsCaseInsensitive()
-    {
-        Properties vars = CommandLineUtils.getSystemEnvVars( false );
-        for ( Object o : vars.keySet() )
-        {
+    public void testGetSystemEnvVarsCaseInsensitive() {
+        Properties vars = CommandLineUtils.getSystemEnvVars(false);
+        for (Object o : vars.keySet()) {
             String variable = (String) o;
-            assertEquals( variable.toUpperCase( Locale.ENGLISH ), variable );
+            assertEquals(variable.toUpperCase(Locale.ENGLISH), variable);
         }
     }
 
     @Test
-    public void testEnsureCaseSensitivity()
-    {
+    public void testEnsureCaseSensitivity() {
         Map data = new HashMap<>();
-        data.put( "abz", "cool" );
-        assertTrue( CommandLineUtils.ensureCaseSensitivity( data, false ).containsKey( "ABZ" ) );
-        assertTrue( CommandLineUtils.ensureCaseSensitivity( data, true ).containsKey( "abz" ) );
+        data.put("abz", "cool");
+        assertTrue(CommandLineUtils.ensureCaseSensitivity(data, false).containsKey("ABZ"));
+        assertTrue(CommandLineUtils.ensureCaseSensitivity(data, true).containsKey("abz"));
     }
 
     /**
      * Tests that environment variables on Windows are normalized to upper case. Does nothing on Unix platforms.
      */
     @Test
-    public void testGetSystemEnvVarsWindows()
-    {
-        if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
-        {
+    public void testGetSystemEnvVarsWindows() {
+        if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
             return;
         }
         Properties vars = CommandLineUtils.getSystemEnvVars();
-        for ( Object o : vars.keySet() )
-        {
+        for (Object o : vars.keySet()) {
             String variable = (String) o;
-            assertEquals( variable.toUpperCase( Locale.ENGLISH ), variable );
+            assertEquals(variable.toUpperCase(Locale.ENGLISH), variable);
         }
     }
 
@@ -85,25 +76,22 @@ public void testGetSystemEnvVarsWindows()
      * Tests the splitting of a command line into distinct arguments.
      */
     @Test
-    public void testTranslateCommandline()
-        throws Exception
-    {
-        assertCmdLineArgs( new String[] {}, null );
-        assertCmdLineArgs( new String[] {}, "" );
+    public void testTranslateCommandline() throws Exception {
+        assertCmdLineArgs(new String[] {}, null);
+        assertCmdLineArgs(new String[] {}, "");
 
-        assertCmdLineArgs( new String[] { "foo", "bar" }, "foo bar" );
-        assertCmdLineArgs( new String[] { "foo", "bar" }, "   foo   bar   " );
+        assertCmdLineArgs(new String[] {"foo", "bar"}, "foo bar");
+        assertCmdLineArgs(new String[] {"foo", "bar"}, "   foo   bar   ");
 
-        assertCmdLineArgs( new String[] { "foo", " double quotes ", "bar" }, "foo \" double quotes \" bar" );
-        assertCmdLineArgs( new String[] { "foo", " single quotes ", "bar" }, "foo ' single quotes ' bar" );
+        assertCmdLineArgs(new String[] {"foo", " double quotes ", "bar"}, "foo \" double quotes \" bar");
+        assertCmdLineArgs(new String[] {"foo", " single quotes ", "bar"}, "foo ' single quotes ' bar");
 
-        assertCmdLineArgs( new String[] { "foo", " \" ", "bar" }, "foo ' \" ' bar" );
-        assertCmdLineArgs( new String[] { "foo", " ' ", "bar" }, "foo \" ' \" bar" );
+        assertCmdLineArgs(new String[] {"foo", " \" ", "bar"}, "foo ' \" ' bar");
+        assertCmdLineArgs(new String[] {"foo", " ' ", "bar"}, "foo \" ' \" bar");
     }
 
     @Test
-    public void givenADoubleQuoteMarkInArgument_whenExecutingCode_thenCommandLineExceptionIsThrown()
-    {
+    public void givenADoubleQuoteMarkInArgument_whenExecutingCode_thenCommandLineExceptionIsThrown() {
         try {
             new Commandline("echo \"let\"s go\"").execute();
         } catch (CommandLineException e) {
@@ -113,7 +101,6 @@ public void givenADoubleQuoteMarkInArgument_whenExecutingCode_thenCommandLineExc
         fail("Exception was not thrown when given invalid (3 unescaped double quote) input");
     }
 
-
     @Test
     public void givenASingleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Returned() throws Exception {
         final Process p = new Commandline("echo \"let's go\"").execute();
@@ -123,47 +110,43 @@ public void givenASingleQuoteMarkInArgument_whenExecutingCode_thenExitCode0Retur
 
     @Test
     public void givenASingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkIsNotEscaped()
-        throws Exception
-    {
+            throws Exception {
         final String command = "echo \"let's go\"";
-        final String[] expected = new String[] { "echo", "let's go" };
-        assertCmdLineArgs( expected, command );
+        final String[] expected = new String[] {"echo", "let's go"};
+        assertCmdLineArgs(expected, command);
     }
 
     @Test
-    public void givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped()
-        throws Exception
-    {
+    public void
+            givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped()
+                    throws Exception {
         final String command = "echo \"let\\\"s go\"";
-        final String[] expected = new String[] { "echo", "let\\\"s go" };
-        assertCmdLineArgs( expected, command );
+        final String[] expected = new String[] {"echo", "let\\\"s go"};
+        assertCmdLineArgs(expected, command);
     }
 
     @Test
-    public void givenAnEscapedSingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped()
-        throws Exception
-    {
+    public void
+            givenAnEscapedSingleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenTheQuotationMarkRemainsEscaped()
+                    throws Exception {
         final String command = "echo \"let\\'s go\"";
-        final String[] expected = new String[] { "echo", "let\\'s go"};
-        assertCmdLineArgs( expected, command );
+        final String[] expected = new String[] {"echo", "let\\'s go"};
+        assertCmdLineArgs(expected, command);
     }
 
     @Test
     public void givenAnEscapedDoubleQuoteMarkInArgument_whenTranslatingToCmdLineArgs_thenNoExceptionIsThrown()
-        throws Exception
-    {
-        Process p = new Commandline( "echo \"let\\\"s go\"" ).execute();
+            throws Exception {
+        Process p = new Commandline("echo \"let\\\"s go\"").execute();
         p.waitFor();
         assertEquals(0, p.exitValue());
     }
 
-    private void assertCmdLineArgs( final String[] expected, final String cmdLine )
-        throws Exception
-    {
-        String[] actual = CommandLineUtils.translateCommandline( cmdLine );
-        assertNotNull( actual );
-        assertEquals( expected.length, actual.length );
-        assertEquals( Arrays.asList( expected ), Arrays.asList( actual ) );
+    private void assertCmdLineArgs(final String[] expected, final String cmdLine) throws Exception {
+        String[] actual = CommandLineUtils.translateCommandline(cmdLine);
+        assertNotNull(actual);
+        assertEquals(expected.length, actual.length);
+        assertEquals(Arrays.asList(expected), Arrays.asList(actual));
     }
 
     @Test
@@ -174,8 +157,8 @@ public void environmentVariableWithNullShouldNotBeSet() {
 
         String[] environmentVariables = commandline.getEnvironmentVariables();
 
-        assertNotNull( environmentVariables );
-        assertThat( environmentVariables, not( hasItemInArray( "TEST_NULL_ENV=null" ) ) );
+        assertNotNull(environmentVariables);
+        assertThat(environmentVariables, not(hasItemInArray("TEST_NULL_ENV=null")));
     }
 
     @Test
@@ -186,19 +169,19 @@ public void environmentVariableFromSystemIsCopiedByDefault() {
         String[] environmentVariables = commandline.getEnvironmentVariables();
 
         assertNotNull(environmentVariables);
-        assertThat(environmentVariables, hasItemInArray( "TEST_SHARED_ENV=TestValue" ) );
+        assertThat(environmentVariables, hasItemInArray("TEST_SHARED_ENV=TestValue"));
     }
 
     @Test
     public void environmentVariableFromSystemIsNotCopiedIfInheritedIsFalse() {
 
         Commandline commandline = new Commandline();
-        commandline.setShellEnvironmentInherited( false );
+        commandline.setShellEnvironmentInherited(false);
 
         String[] environmentVariables = commandline.getEnvironmentVariables();
 
         assertNotNull(environmentVariables);
-        assertEquals(0, environmentVariables.length );
+        assertEquals(0, environmentVariables.length);
     }
 
     @Test
@@ -210,7 +193,6 @@ public void environmentVariableFromSystemIsRemoved() {
         String[] environmentVariables = commandline.getEnvironmentVariables();
 
         assertNotNull(environmentVariables);
-        assertThat(environmentVariables, not ( hasItemInArray( "TEST_SHARED_ENV=TestValue" ) ) );
+        assertThat(environmentVariables, not(hasItemInArray("TEST_SHARED_ENV=TestValue")));
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
index 8032ae2d..c9e9f3c7 100644
--- a/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
@@ -1,7 +1,3 @@
-package org.apache.maven.shared.utils.cli.shell;
-
-import java.util.List;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -11,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -20,178 +16,168 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.cli.shell;
 
-import org.apache.maven.shared.utils.StringUtils;
-import org.apache.maven.shared.utils.cli.Commandline;
+import java.util.List;
 
 import junit.framework.TestCase;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.cli.Commandline;
 
-public class BourneShellTest
-    extends TestCase
-{
+public class BourneShellTest extends TestCase {
 
-    Shell newShell()
-    {
+    Shell newShell() {
         return new BourneShell();
     }
 
-    public void testQuoteWorkingDirectoryAndExecutable()
-    {
+    public void testQuoteWorkingDirectoryAndExecutable() {
         Shell sh = newShell();
 
-        sh.setWorkingDirectory( "/usr/local/bin" );
-        sh.setExecutable( "chmod" );
+        sh.setWorkingDirectory("/usr/local/bin");
+        sh.setExecutable("chmod");
 
-        String executable = StringUtils.join( sh.getShellCommandLine().iterator(), " " );
+        String executable = StringUtils.join(sh.getShellCommandLine().iterator(), " ");
 
-        assertEquals( "/bin/sh -c cd '/usr/local/bin' && 'chmod'", executable );
+        assertEquals("/bin/sh -c cd '/usr/local/bin' && 'chmod'", executable);
     }
 
-    public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes()
-    {
+    public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes() {
         Shell sh = newShell();
 
-        sh.setWorkingDirectory( "/usr/local/'something else'" );
-        sh.setExecutable( "chmod" );
+        sh.setWorkingDirectory("/usr/local/'something else'");
+        sh.setExecutable("chmod");
 
-        String executable = StringUtils.join( sh.getShellCommandLine().iterator(), " " );
+        String executable = StringUtils.join(sh.getShellCommandLine().iterator(), " ");
 
-        assertEquals( "/bin/sh -c cd '/usr/local/'\"'\"'something else'\"'\"'' && 'chmod'", executable );
+        assertEquals("/bin/sh -c cd '/usr/local/'\"'\"'something else'\"'\"'' && 'chmod'", executable);
     }
 
-    public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes_BackslashFileSep()
-    {
+    public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes_BackslashFileSep() {
         Shell sh = newShell();
 
-        sh.setWorkingDirectory( "\\usr\\local\\'something else'" );
-        sh.setExecutable( "chmod" );
+        sh.setWorkingDirectory("\\usr\\local\\'something else'");
+        sh.setExecutable("chmod");
 
-        String executable = StringUtils.join( sh.getShellCommandLine().iterator(), " " );
+        String executable = StringUtils.join(sh.getShellCommandLine().iterator(), " ");
 
-        assertEquals( "/bin/sh -c cd '\\usr\\local\\'\"'\"'something else'\"'\"'' && 'chmod'", executable );
+        assertEquals("/bin/sh -c cd '\\usr\\local\\'\"'\"'something else'\"'\"'' && 'chmod'", executable);
     }
 
-    public void testPreserveSingleQuotesOnArgument()
-    {
+    public void testPreserveSingleQuotesOnArgument() {
         Shell sh = newShell();
 
-        sh.setWorkingDirectory( "/usr/bin" );
-        sh.setExecutable( "chmod" );
+        sh.setWorkingDirectory("/usr/bin");
+        sh.setExecutable("chmod");
 
         List shellCommandLine = sh.getShellCommandLine("\"some arg with spaces\"");
 
-        String cli = StringUtils.join( shellCommandLine.iterator(), " " );
-        assertTrue( cli.endsWith( "'\"some arg with spaces\"'" ) );
+        String cli = StringUtils.join(shellCommandLine.iterator(), " ");
+        assertTrue(cli.endsWith("'\"some arg with spaces\"'"));
     }
 
-    public void testAddSingleQuotesOnArgumentWithSpaces()
-    {
+    public void testAddSingleQuotesOnArgumentWithSpaces() {
         Shell sh = newShell();
 
-        sh.setWorkingDirectory( "/usr/bin" );
-        sh.setExecutable( "chmod" );
+        sh.setWorkingDirectory("/usr/bin");
+        sh.setExecutable("chmod");
 
         List shellCommandLine = sh.getShellCommandLine("some arg with spaces");
 
-        String cli = StringUtils.join( shellCommandLine.iterator(), " " );
-        assertTrue( cli.endsWith("'some arg with spaces'"));
+        String cli = StringUtils.join(shellCommandLine.iterator(), " ");
+        assertTrue(cli.endsWith("'some arg with spaces'"));
     }
 
-    public void testAddArgumentWithSingleQuote()
-    {
+    public void testAddArgumentWithSingleQuote() {
         Shell sh = newShell();
 
-        sh.setWorkingDirectory( "/usr/bin" );
-        sh.setExecutable( "chmod" );
+        sh.setWorkingDirectory("/usr/bin");
+        sh.setExecutable("chmod");
 
         List shellCommandLine = sh.getShellCommandLine("arg'withquote");
 
-        assertEquals("cd '/usr/bin' && 'chmod' 'arg'\"'\"'withquote'", shellCommandLine.get(shellCommandLine.size() - 1));
+        assertEquals(
+                "cd '/usr/bin' && 'chmod' 'arg'\"'\"'withquote'", shellCommandLine.get(shellCommandLine.size() - 1));
     }
 
-    public void testArgumentsWithSemicolon()
-    {
-
+    public void testArgumentsWithSemicolon() {
         Shell sh = newShell();
 
-        sh.setWorkingDirectory( "/usr/bin" );
-        sh.setExecutable( "chmod" );
+        sh.setWorkingDirectory("/usr/bin");
+        sh.setExecutable("chmod");
 
         List shellCommandLine = sh.getShellCommandLine(";some&argwithunix$chars");
 
-        String cli = StringUtils.join( shellCommandLine.iterator(), " " );
-        assertTrue( cli.endsWith( "';some&argwithunix$chars'" ) );
-
-        Commandline commandline = new Commandline( newShell() );
-        commandline.setExecutable( "chmod" );
-        commandline.getShell().setQuotedArgumentsEnabled( true );
-        commandline.createArg().setValue( "--password" );
-        commandline.createArg().setValue( ";password" );
-
-        List lines = commandline.getShell().getShellCommandLine( commandline.getArguments() );
-
-        assertEquals( "/bin/sh", lines.get( 0 ) );
-        assertEquals( "-c", lines.get( 1 ) );
-        assertEquals( "'chmod' '--password' ';password'", lines.get( 2 ) );
-
-        commandline = new Commandline( newShell() );
-        commandline.setExecutable( "chmod" );
-        commandline.getShell().setQuotedArgumentsEnabled( true );
-        commandline.createArg().setValue( "--password" );
-        commandline.createArg().setValue( ";password" );
-        lines = commandline.getShell().getShellCommandLine( commandline.getArguments() );
-
-        assertEquals( "/bin/sh", lines.get( 0) );
-        assertEquals( "-c", lines.get( 1 ) );
-        assertEquals( "'chmod' '--password' ';password'", lines.get( 2 ) );
-
-        commandline = new Commandline( new CmdShell() );
-        commandline.getShell().setQuotedArgumentsEnabled( true );
-        commandline.createArg().setValue( "--password" );
-        commandline.createArg().setValue( ";password" );
-        lines = commandline.getShell().getShellCommandLine( commandline.getArguments() );
-
-        assertEquals( "cmd.exe", lines.get( 0 ) );
-        assertEquals( "/X", lines.get( 1 ) );
-        assertEquals( "/C", lines.get( 2 ) );
-        assertEquals( "\"--password ;password\"", lines.get( 3 ) );
+        String cli = StringUtils.join(shellCommandLine.iterator(), " ");
+        assertTrue(cli.endsWith("';some&argwithunix$chars'"));
+
+        Commandline commandline = new Commandline(newShell());
+        commandline.setExecutable("chmod");
+        commandline.getShell().setQuotedArgumentsEnabled(true);
+        commandline.createArg().setValue("--password");
+        commandline.createArg().setValue(";password");
+
+        List lines = commandline.getShell().getShellCommandLine(commandline.getArguments());
+
+        assertEquals("/bin/sh", lines.get(0));
+        assertEquals("-c", lines.get(1));
+        assertEquals("'chmod' '--password' ';password'", lines.get(2));
+
+        commandline = new Commandline(newShell());
+        commandline.setExecutable("chmod");
+        commandline.getShell().setQuotedArgumentsEnabled(true);
+        commandline.createArg().setValue("--password");
+        commandline.createArg().setValue(";password");
+        lines = commandline.getShell().getShellCommandLine(commandline.getArguments());
+
+        assertEquals("/bin/sh", lines.get(0));
+        assertEquals("-c", lines.get(1));
+        assertEquals("'chmod' '--password' ';password'", lines.get(2));
+
+        commandline = new Commandline(new CmdShell());
+        commandline.getShell().setQuotedArgumentsEnabled(true);
+        commandline.createArg().setValue("--password");
+        commandline.createArg().setValue(";password");
+        lines = commandline.getShell().getShellCommandLine(commandline.getArguments());
+
+        assertEquals("cmd.exe", lines.get(0));
+        assertEquals("/X", lines.get(1));
+        assertEquals("/C", lines.get(2));
+        assertEquals("\"--password ;password\"", lines.get(3));
     }
 
-    public void testBourneShellQuotingCharacters()
-        throws Exception
-    {
+    public void testBourneShellQuotingCharacters() throws Exception {
         // { ' ', '$', ';', '&', '|', '<', '>', '*', '?', '(', ')' };
-        // test with values http://steve-parker.org/sh/bourne.shtml Appendix B - Meta-characters and Reserved Words
-        Commandline commandline = new Commandline( newShell() );
-        commandline.setExecutable( "chmod" );
-        commandline.getShell().setQuotedArgumentsEnabled( true );
-        commandline.createArg().setValue( " " );
-        commandline.createArg().setValue( "|" );
-        commandline.createArg().setValue( "&&" );
-        commandline.createArg().setValue( "||" );
-        commandline.createArg().setValue( ";" );
-        commandline.createArg().setValue( ";;" );
-        commandline.createArg().setValue( "&" );
-        commandline.createArg().setValue( "()" );
-        commandline.createArg().setValue( "<" );
-        commandline.createArg().setValue( "<<" );
-        commandline.createArg().setValue( ">" );
-        commandline.createArg().setValue( ">>" );
-        commandline.createArg().setValue( "*" );
-        commandline.createArg().setValue( "?" );
-        commandline.createArg().setValue( "[" );
-        commandline.createArg().setValue( "]" );
-        commandline.createArg().setValue( "{" );
-        commandline.createArg().setValue( "}" );
-        commandline.createArg().setValue( "`" );
-        commandline.createArg().setValue( "#" );
-
-        List lines = commandline.getShell().getShellCommandLine( commandline.getArguments() );
-
-        assertEquals( "/bin/sh", lines.get( 0 ) );
-        assertEquals( "-c", lines.get( 1 ) );
-        assertEquals( "'chmod' ' ' '|' '&&' '||' ';' ';;' '&' '()' '<' '<<' '>' '>>' '*' '?' '[' ']' '{' '}' '`' '#'",
-                      lines.get( 2 ) );
+        // test with values https://steve-parker.org/sh/bourne.shtml Appendix B - Meta-characters and Reserved Words
+        Commandline commandline = new Commandline(newShell());
+        commandline.setExecutable("chmod");
+        commandline.getShell().setQuotedArgumentsEnabled(true);
+        commandline.createArg().setValue(" ");
+        commandline.createArg().setValue("|");
+        commandline.createArg().setValue("&&");
+        commandline.createArg().setValue("||");
+        commandline.createArg().setValue(";");
+        commandline.createArg().setValue(";;");
+        commandline.createArg().setValue("&");
+        commandline.createArg().setValue("()");
+        commandline.createArg().setValue("<");
+        commandline.createArg().setValue("<<");
+        commandline.createArg().setValue(">");
+        commandline.createArg().setValue(">>");
+        commandline.createArg().setValue("*");
+        commandline.createArg().setValue("?");
+        commandline.createArg().setValue("[");
+        commandline.createArg().setValue("]");
+        commandline.createArg().setValue("{");
+        commandline.createArg().setValue("}");
+        commandline.createArg().setValue("`");
+        commandline.createArg().setValue("#");
+
+        List lines = commandline.getShell().getShellCommandLine(commandline.getArguments());
+
+        assertEquals("/bin/sh", lines.get(0));
+        assertEquals("-c", lines.get(1));
+        assertEquals(
+                "'chmod' ' ' '|' '&&' '||' ';' ';;' '&' '()' '<' '<<' '>' '>>' '*' '?' '[' ']' '{' '}' '`' '#'",
+                lines.get(2));
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestException.java b/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestException.java
index 5ccd2e01..3653d78f 100644
--- a/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestException.java
+++ b/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.exceptionutils;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,39 +16,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.exceptionutils;
 
 /**
  *
  * @author Mark Struberg
  */
-public class TestException
-    extends Exception
-{
+public class TestException extends Exception {
     private Throwable cause;
     private Throwable specialCause;
 
-    public TestException()
-    {
+    public TestException() {
         super();
     }
 
-    public void setSourceException( Throwable cause )
-    {
+    public void setSourceException(Throwable cause) {
         this.cause = cause;
     }
 
-    public Throwable getSourceException()
-    {
+    public Throwable getSourceException() {
         return cause;
     }
 
-    public Throwable getSpecialCause()
-    {
+    public Throwable getSpecialCause() {
         return specialCause;
     }
 
-    public void setSpecialCause( Throwable specialCause )
-    {
+    public void setSpecialCause(Throwable specialCause) {
         this.specialCause = specialCause;
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestExceptionWithDetail.java b/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestExceptionWithDetail.java
index 928b18cb..3322ca0e 100644
--- a/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestExceptionWithDetail.java
+++ b/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestExceptionWithDetail.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.exceptionutils;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,29 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.exceptionutils;
 
 /**
  * This test exception has a 'detail' field.
  *
  * @author Mark Struberg
  */
-public class TestExceptionWithDetail
-    extends Exception
-{
+public class TestExceptionWithDetail extends Exception {
     private Throwable detail;
 
-    public TestExceptionWithDetail()
-    {
+    public TestExceptionWithDetail() {
         super();
     }
 
-    public Throwable getDetail()
-    {
+    public Throwable getDetail() {
         return detail;
     }
 
-    public void setDetail( Throwable detail )
-    {
+    public void setDetail(Throwable detail) {
         this.detail = detail;
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
index 775ddc48..39138299 100644
--- a/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.introspection;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.introspection;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,258 +29,226 @@
  * @author Jason van Zyl
  *
  */
-public class ReflectionValueExtractorTest
-    extends TestCase
-{
+public class ReflectionValueExtractorTest extends TestCase {
     private Project project;
 
-    protected void setUp()
-        throws Exception
-    {
+    protected void setUp() throws Exception {
         super.setUp();
 
         Dependency dependency1 = new Dependency();
-        dependency1.setArtifactId( "dep1" );
+        dependency1.setArtifactId("dep1");
         Dependency dependency2 = new Dependency();
-        dependency2.setArtifactId( "dep2" );
+        dependency2.setArtifactId("dep2");
 
         project = new Project();
-        project.setModelVersion( "4.0.0" );
-        project.setGroupId( "org.apache.maven" );
-        project.setArtifactId( "maven-core" );
-        project.setName( "Maven" );
-        project.setVersion( "2.0-SNAPSHOT" );
-        project.setScm( new Scm() );
-        project.getScm().setConnection( "scm-connection" );
-        project.addDependency( dependency1 );
-        project.addDependency( dependency2 );
-        project.setBuild( new Build() );
+        project.setModelVersion("4.0.0");
+        project.setGroupId("org.apache.maven");
+        project.setArtifactId("maven-core");
+        project.setName("Maven");
+        project.setVersion("2.0-SNAPSHOT");
+        project.setScm(new Scm());
+        project.getScm().setConnection("scm-connection");
+        project.addDependency(dependency1);
+        project.addDependency(dependency2);
+        project.setBuild(new Build());
 
         // Build up an artifactMap
-        project.addArtifact( new Artifact("g0","a0","v0","e0","c0") );
-        project.addArtifact( new Artifact("g1","a1","v1","e1","c1") );
-        project.addArtifact( new Artifact("g2","a2","v2","e2","c2") );
+        project.addArtifact(new Artifact("g0", "a0", "v0", "e0", "c0"));
+        project.addArtifact(new Artifact("g1", "a1", "v1", "e1", "c1"));
+        project.addArtifact(new Artifact("g2", "a2", "v2", "e2", "c2"));
     }
 
-    public void testValueExtraction()
-        throws Exception
-    {
+    public void testValueExtraction() throws Exception {
         // ----------------------------------------------------------------------
         // Top level values
         // ----------------------------------------------------------------------
 
-        assertEquals( "4.0.0", ReflectionValueExtractor.evaluate( "project.modelVersion", project ) );
+        assertEquals("4.0.0", ReflectionValueExtractor.evaluate("project.modelVersion", project));
 
-        assertEquals( "org.apache.maven", ReflectionValueExtractor.evaluate( "project.groupId", project ) );
+        assertEquals("org.apache.maven", ReflectionValueExtractor.evaluate("project.groupId", project));
 
-        assertEquals( "maven-core", ReflectionValueExtractor.evaluate( "project.artifactId", project ) );
+        assertEquals("maven-core", ReflectionValueExtractor.evaluate("project.artifactId", project));
 
-        assertEquals( "Maven", ReflectionValueExtractor.evaluate( "project.name", project ) );
+        assertEquals("Maven", ReflectionValueExtractor.evaluate("project.name", project));
 
-        assertEquals( "2.0-SNAPSHOT", ReflectionValueExtractor.evaluate( "project.version", project ) );
+        assertEquals("2.0-SNAPSHOT", ReflectionValueExtractor.evaluate("project.version", project));
 
         // ----------------------------------------------------------------------
         // SCM
         // ----------------------------------------------------------------------
 
-        assertEquals( "scm-connection", ReflectionValueExtractor.evaluate( "project.scm.connection", project ) );
+        assertEquals("scm-connection", ReflectionValueExtractor.evaluate("project.scm.connection", project));
 
         // ----------------------------------------------------------------------
         // Dependencies
         // ----------------------------------------------------------------------
 
-        List dependencies = (List) ReflectionValueExtractor.evaluate( "project.dependencies", project );
+        List dependencies = (List) ReflectionValueExtractor.evaluate("project.dependencies", project);
 
-        assertNotNull( dependencies );
+        assertNotNull(dependencies);
 
-        assertEquals( 2, dependencies.size() );
+        assertEquals(2, dependencies.size());
 
         // ----------------------------------------------------------------------
         // Dependencies - using index notation
         // ----------------------------------------------------------------------
 
         // List
-        Dependency dependency = (Dependency) ReflectionValueExtractor.evaluate( "project.dependencies[0]", project );
+        Dependency dependency = (Dependency) ReflectionValueExtractor.evaluate("project.dependencies[0]", project);
 
-        assertNotNull( dependency );
+        assertNotNull(dependency);
 
-        assertTrue( "dep1".equals( dependency.getArtifactId() ) );
+        assertTrue("dep1".equals(dependency.getArtifactId()));
 
-        String artifactId = (String) ReflectionValueExtractor.evaluate( "project.dependencies[1].artifactId", project );
+        String artifactId = (String) ReflectionValueExtractor.evaluate("project.dependencies[1].artifactId", project);
 
-        assertTrue( "dep2".equals( artifactId ) );
+        assertTrue("dep2".equals(artifactId));
 
         // Array
 
-        dependency = (Dependency) ReflectionValueExtractor.evaluate( "project.dependenciesAsArray[0]", project );
+        dependency = (Dependency) ReflectionValueExtractor.evaluate("project.dependenciesAsArray[0]", project);
 
-        assertNotNull( dependency );
+        assertNotNull(dependency);
 
-        assertTrue( "dep1".equals( dependency.getArtifactId() ) );
+        assertTrue("dep1".equals(dependency.getArtifactId()));
 
-        artifactId = (String) ReflectionValueExtractor.evaluate( "project.dependenciesAsArray[1].artifactId", project );
+        artifactId = (String) ReflectionValueExtractor.evaluate("project.dependenciesAsArray[1].artifactId", project);
 
-        assertTrue( "dep2".equals( artifactId ) );
+        assertTrue("dep2".equals(artifactId));
 
         // Map
 
-        dependency = (Dependency) ReflectionValueExtractor.evaluate( "project.dependenciesAsMap(dep1)", project );
+        dependency = (Dependency) ReflectionValueExtractor.evaluate("project.dependenciesAsMap(dep1)", project);
 
-        assertNotNull( dependency );
+        assertNotNull(dependency);
 
-        assertTrue( "dep1".equals( dependency.getArtifactId() ) );
+        assertTrue("dep1".equals(dependency.getArtifactId()));
 
-        artifactId = (String) ReflectionValueExtractor.evaluate( "project.dependenciesAsMap(dep2).artifactId", project );
+        artifactId = (String) ReflectionValueExtractor.evaluate("project.dependenciesAsMap(dep2).artifactId", project);
 
-        assertTrue( "dep2".equals( artifactId ) );
+        assertTrue("dep2".equals(artifactId));
 
         // ----------------------------------------------------------------------
         // Build
         // ----------------------------------------------------------------------
 
-        Build build = (Build) ReflectionValueExtractor.evaluate( "project.build", project );
+        Build build = (Build) ReflectionValueExtractor.evaluate("project.build", project);
 
-        assertNotNull( build );
+        assertNotNull(build);
     }
 
-    public void testValueExtractorWithAInvalidExpression()
-        throws Exception
-    {
-        assertNull( ReflectionValueExtractor.evaluate( "project.foo", project ) );
-        assertNull( ReflectionValueExtractor.evaluate( "project.dependencies[10]", project ) );
-        assertNull( ReflectionValueExtractor.evaluate( "project.dependencies[0].foo", project ) );
+    public void testValueExtractorWithAInvalidExpression() throws Exception {
+        assertNull(ReflectionValueExtractor.evaluate("project.foo", project));
+        assertNull(ReflectionValueExtractor.evaluate("project.dependencies[10]", project));
+        assertNull(ReflectionValueExtractor.evaluate("project.dependencies[0].foo", project));
     }
 
-    public void testMappedDottedKey()
-            throws Exception
-    {
+    public void testMappedDottedKey() throws Exception {
         Map map = new HashMap();
-        map.put( "a.b", "a.b-value" );
+        map.put("a.b", "a.b-value");
 
-        assertEquals( "a.b-value", ReflectionValueExtractor.evaluate("h.value(a.b)", new ValueHolder(map)) );
+        assertEquals("a.b-value", ReflectionValueExtractor.evaluate("h.value(a.b)", new ValueHolder(map)));
     }
 
-    public void testIndexedMapped()
-            throws Exception
-    {
+    public void testIndexedMapped() throws Exception {
         Map map = new HashMap();
-        map.put( "a", "a-value" );
+        map.put("a", "a-value");
         List list = new ArrayList();
-        list.add( map );
+        list.add(map);
 
-        assertEquals( "a-value", ReflectionValueExtractor.evaluate("h.value[0](a)", new ValueHolder(list)) );
+        assertEquals("a-value", ReflectionValueExtractor.evaluate("h.value[0](a)", new ValueHolder(list)));
     }
 
-    public void testMappedIndexed()
-            throws Exception
-    {
+    public void testMappedIndexed() throws Exception {
         List list = new ArrayList();
-        list.add( "a-value" );
+        list.add("a-value");
         Map map = new HashMap();
-        map.put( "a", list );
-        assertEquals( "a-value", ReflectionValueExtractor.evaluate("h.value(a)[0]", new ValueHolder(map)) );
+        map.put("a", list);
+        assertEquals("a-value", ReflectionValueExtractor.evaluate("h.value(a)[0]", new ValueHolder(map)));
     }
 
-    public void testMappedMissingDot()
-            throws Exception
-    {
+    public void testMappedMissingDot() throws Exception {
         Map map = new HashMap();
-        map.put( "a", new ValueHolder( "a-value" ) );
-        assertNull( ReflectionValueExtractor.evaluate("h.value(a)value", new ValueHolder(map)) );
+        map.put("a", new ValueHolder("a-value"));
+        assertNull(ReflectionValueExtractor.evaluate("h.value(a)value", new ValueHolder(map)));
     }
 
-    public void testIndexedMissingDot()
-            throws Exception
-    {
+    public void testIndexedMissingDot() throws Exception {
         List list = new ArrayList();
-        list.add( new ValueHolder( "a-value" ) );
-        assertNull( ReflectionValueExtractor.evaluate("h.value[0]value", new ValueHolder(list)) );
+        list.add(new ValueHolder("a-value"));
+        assertNull(ReflectionValueExtractor.evaluate("h.value[0]value", new ValueHolder(list)));
     }
 
-    public void testDotDot()
-            throws Exception
-    {
-        assertNull( ReflectionValueExtractor.evaluate("h..value", new ValueHolder("value")) );
+    public void testDotDot() throws Exception {
+        assertNull(ReflectionValueExtractor.evaluate("h..value", new ValueHolder("value")));
     }
 
-    public void testBadIndexedSyntax()
-            throws Exception
-    {
+    public void testBadIndexedSyntax() throws Exception {
         List list = new ArrayList();
-        list.add( "a-value" );
-        Object value = new ValueHolder( list );
-
-        assertNull( ReflectionValueExtractor.evaluate("h.value[", value) );
-        assertNull( ReflectionValueExtractor.evaluate("h.value[]", value) );
-        assertNull( ReflectionValueExtractor.evaluate("h.value[a]", value) );
-        assertNull( ReflectionValueExtractor.evaluate("h.value[0", value) );
-        assertNull( ReflectionValueExtractor.evaluate("h.value[0)", value) );
-        assertNull( ReflectionValueExtractor.evaluate("h.value[-1]", value) );
+        list.add("a-value");
+        Object value = new ValueHolder(list);
+
+        assertNull(ReflectionValueExtractor.evaluate("h.value[", value));
+        assertNull(ReflectionValueExtractor.evaluate("h.value[]", value));
+        assertNull(ReflectionValueExtractor.evaluate("h.value[a]", value));
+        assertNull(ReflectionValueExtractor.evaluate("h.value[0", value));
+        assertNull(ReflectionValueExtractor.evaluate("h.value[0)", value));
+        assertNull(ReflectionValueExtractor.evaluate("h.value[-1]", value));
     }
 
-    public void testBadMappedSyntax()
-            throws Exception
-    {
+    public void testBadMappedSyntax() throws Exception {
         Map map = new HashMap();
-        map.put( "a", "a-value" );
-        Object value = new ValueHolder( map );
+        map.put("a", "a-value");
+        Object value = new ValueHolder(map);
 
-        assertNull( ReflectionValueExtractor.evaluate("h.value(", value) );
-        assertNull( ReflectionValueExtractor.evaluate("h.value()", value) );
-        assertNull( ReflectionValueExtractor.evaluate("h.value(a", value) );
-        assertNull( ReflectionValueExtractor.evaluate("h.value(a]", value) );
+        assertNull(ReflectionValueExtractor.evaluate("h.value(", value));
+        assertNull(ReflectionValueExtractor.evaluate("h.value()", value));
+        assertNull(ReflectionValueExtractor.evaluate("h.value(a", value));
+        assertNull(ReflectionValueExtractor.evaluate("h.value(a]", value));
     }
 
-    public void testIllegalIndexedType()
-            throws Exception
-    {
-        try
-        {
+    public void testIllegalIndexedType() throws Exception {
+        try {
             ReflectionValueExtractor.evaluate("h.value[1]", new ValueHolder("string"));
-        }
-        catch ( Exception e )
-        {
+        } catch (Exception e) {
             // TODO assert exception message
         }
     }
 
-    public void testIllegalMappedType()
-            throws Exception
-    {
-        try
-        {
+    public void testIllegalMappedType() throws Exception {
+        try {
             ReflectionValueExtractor.evaluate("h.value(key)", new ValueHolder("string"));
-        }
-        catch ( Exception e )
-        {
+        } catch (Exception e) {
             // TODO assert exception message
         }
     }
 
-    public void testTrimRootToken()
-            throws Exception
-    {
-        assertNull( ReflectionValueExtractor.evaluate("project", project, true) );
+    public void testTrimRootToken() throws Exception {
+        assertNull(ReflectionValueExtractor.evaluate("project", project, true));
     }
 
-    public void testArtifactMap()
-            throws Exception
-    {
-        assertEquals( "g0", ((Artifact) ReflectionValueExtractor.evaluate("project.artifactMap(g0:a0:c0)", project)).getGroupId() );
-        assertEquals( "a1", ((Artifact) ReflectionValueExtractor.evaluate("project.artifactMap(g1:a1:c1)", project)).getArtifactId() );
-        assertEquals( "c2", ((Artifact) ReflectionValueExtractor.evaluate("project.artifactMap(g2:a2:c2)", project)).getClassifier() );
+    public void testArtifactMap() throws Exception {
+        assertEquals(
+                "g0",
+                ((Artifact) ReflectionValueExtractor.evaluate("project.artifactMap(g0:a0:c0)", project)).getGroupId());
+        assertEquals(
+                "a1",
+                ((Artifact) ReflectionValueExtractor.evaluate("project.artifactMap(g1:a1:c1)", project))
+                        .getArtifactId());
+        assertEquals(
+                "c2",
+                ((Artifact) ReflectionValueExtractor.evaluate("project.artifactMap(g2:a2:c2)", project))
+                        .getClassifier());
     }
 
-    public static class Artifact
-    {
+    public static class Artifact {
         private String groupId;
         private String artifactId;
         private String version;
         private String extension;
         private String classifier;
 
-        public Artifact( String groupId, String artifactId, String version, String extension, String classifier )
-        {
+        public Artifact(String groupId, String artifactId, String version, String extension, String classifier) {
             this.groupId = groupId;
             this.artifactId = artifactId;
             this.version = version;
@@ -289,50 +256,48 @@ public Artifact( String groupId, String artifactId, String version, String exten
             this.classifier = classifier;
         }
 
-        public String getGroupId()
-        {
+        public String getGroupId() {
             return groupId;
         }
-        public void setGroupId( String groupId )
-        {
+
+        public void setGroupId(String groupId) {
             this.groupId = groupId;
         }
-        public String getArtifactId()
-        {
+
+        public String getArtifactId() {
             return artifactId;
         }
-        public void setArtifactId( String artifactId )
-        {
+
+        public void setArtifactId(String artifactId) {
             this.artifactId = artifactId;
         }
-        public String getVersion()
-        {
+
+        public String getVersion() {
             return version;
         }
-        public void setVersion( String version )
-        {
+
+        public void setVersion(String version) {
             this.version = version;
         }
-        public String getExtension()
-        {
+
+        public String getExtension() {
             return extension;
         }
-        public void setExtension( String extension )
-        {
+
+        public void setExtension(String extension) {
             this.extension = extension;
         }
-        public String getClassifier()
-        {
+
+        public String getClassifier() {
             return classifier;
         }
-        public void setClassifier( String classifier )
-        {
+
+        public void setClassifier(String classifier) {
             this.classifier = classifier;
         }
     }
 
-    public static class Project
-    {
+    public static class Project {
         private String modelVersion;
 
         private String groupId;
@@ -349,187 +314,148 @@ public static class Project
 
         private String version;
 
-        private Map artifactMap = new HashMap();
+        private Map artifactMap = new HashMap();
 
         private String description;
 
-        public void setModelVersion( String modelVersion )
-        {
+        public void setModelVersion(String modelVersion) {
             this.modelVersion = modelVersion;
         }
 
-        public void setGroupId( String groupId )
-        {
+        public void setGroupId(String groupId) {
             this.groupId = groupId;
         }
 
-        public void setScm( Scm scm )
-        {
+        public void setScm(Scm scm) {
             this.scm = scm;
         }
 
-        public void addDependency( Dependency dependency )
-        {
-            this.dependencies.add( dependency );
+        public void addDependency(Dependency dependency) {
+            this.dependencies.add(dependency);
         }
 
-        public void setBuild( Build build )
-        {
+        public void setBuild(Build build) {
             this.build = build;
         }
 
-        public void setArtifactId( String artifactId )
-        {
+        public void setArtifactId(String artifactId) {
             this.artifactId = artifactId;
         }
 
-        public void setName( String name )
-        {
+        public void setName(String name) {
             this.name = name;
         }
 
-        public void setVersion( String version )
-        {
+        public void setVersion(String version) {
             this.version = version;
         }
 
-        public Scm getScm()
-        {
+        public Scm getScm() {
             return scm;
         }
 
-        public String getModelVersion()
-        {
+        public String getModelVersion() {
             return modelVersion;
         }
 
-        public String getGroupId()
-        {
+        public String getGroupId() {
             return groupId;
         }
 
-        public List getDependencies()
-        {
+        public List getDependencies() {
             return dependencies;
         }
 
-        public Build getBuild()
-        {
+        public Build getBuild() {
             return build;
         }
 
-        public String getArtifactId()
-        {
+        public String getArtifactId() {
             return artifactId;
         }
 
-        public String getName()
-        {
+        public String getName() {
             return name;
         }
 
-        public String getVersion()
-        {
+        public String getVersion() {
             return version;
         }
 
-        public Dependency[] getDependenciesAsArray()
-        {
+        public Dependency[] getDependenciesAsArray() {
             List list = getDependencies();
-            return list.toArray( new Dependency[list.size()] );
+            return list.toArray(new Dependency[list.size()]);
         }
 
-        public Map getDependenciesAsMap()
-        {
+        public Map getDependenciesAsMap() {
             Map ret = new HashMap();
-            for ( Object o : getDependencies() )
-            {
+            for (Object o : getDependencies()) {
                 Dependency dep = (Dependency) o;
-                ret.put( dep.getArtifactId(), dep );
+                ret.put(dep.getArtifactId(), dep);
             }
             return ret;
         }
 
-
         // ${project.artifactMap(g:a:v)}
-        public void addArtifact(Artifact a)
-        {
-            artifactMap.put( a.getGroupId() + ":" + a.getArtifactId() + ":" + a.getClassifier(), a );
+        public void addArtifact(Artifact a) {
+            artifactMap.put(a.getGroupId() + ":" + a.getArtifactId() + ":" + a.getClassifier(), a);
         }
 
-        public Map getArtifactMap()
-        {
+        public Map getArtifactMap() {
             return artifactMap;
         }
 
-        public void setDescription( String description )
-        {
+        public void setDescription(String description) {
             this.description = description;
         }
 
-        public String getDescription()
-        {
+        public String getDescription() {
             return description;
         }
     }
 
+    public static class Build {}
 
-    public static class Build
-    {
-
-    }
-
-    public static class Dependency
-    {
+    public static class Dependency {
         private String artifactId;
 
-        public String getArtifactId()
-        {
+        public String getArtifactId() {
             return artifactId;
         }
 
-        public void setArtifactId( String id )
-        {
+        public void setArtifactId(String id) {
             artifactId = id;
         }
     }
 
-    public static class Scm
-    {
+    public static class Scm {
         private String connection;
 
-        public void setConnection( String connection )
-        {
+        public void setConnection(String connection) {
             this.connection = connection;
         }
 
-        public String getConnection()
-        {
+        public String getConnection() {
             return connection;
         }
     }
 
-    public static class ValueHolder
-    {
+    public static class ValueHolder {
         private final Object value;
 
-        public ValueHolder( Object value )
-        {
+        public ValueHolder(Object value) {
             this.value = value;
         }
 
-        public Object getValue()
-        {
+        public Object getValue() {
             return value;
         }
     }
 
-    public void testRootPropertyRegression()
-        throws Exception
-    {
+    public void testRootPropertyRegression() throws Exception {
         Project project = new Project();
-        project.setDescription( "c:\\\\org\\apache\\test" );
-        Object evalued  = ReflectionValueExtractor.evaluate( "description", project );
-        assertNotNull( evalued );
+        project.setDescription("c:\\\\org\\apache\\test");
+        Object evalued = ReflectionValueExtractor.evaluate("description", project);
+        assertNotNull(evalued);
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
index 9dffdad5..272cc65e 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.io;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.io;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import org.apache.maven.shared.utils.Os;
 import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
@@ -28,308 +33,303 @@
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
 
-@SuppressWarnings( "deprecation" )
-public class DirectoryScannerTest
-{
+@SuppressWarnings("deprecation")
+public class DirectoryScannerTest {
     private static final String[] NONE = new String[0];
 
     @Rule
     public TemporaryFolder tempFolder = new TemporaryFolder();
 
-    private void createTestData()
-        throws IOException
-    {
+    private void createTestData() throws IOException {
         File rootDir = tempFolder.getRoot();
-        File folder1 = new File( rootDir, "folder1" );
-        if ( !folder1.mkdirs() )
-        {
+        File folder1 = new File(rootDir, "folder1");
+        if (!folder1.mkdirs()) {
             Assert.fail();
         }
 
-        FileTestHelper.generateTestFile( new File( rootDir, "file1.txt" ), 11 );
-        FileTestHelper.generateTestFile( new File( rootDir, "file2.txt" ), 12 );
-        FileTestHelper.generateTestFile( new File( rootDir, "file3.dat" ), 13 );
+        FileTestHelper.generateTestFile(new File(rootDir, "file1.txt"), 11);
+        FileTestHelper.generateTestFile(new File(rootDir, "file2.txt"), 12);
+        FileTestHelper.generateTestFile(new File(rootDir, "file3.dat"), 13);
 
-        FileTestHelper.generateTestFile( new File( folder1, "file4.txt" ), 14 );
-        FileTestHelper.generateTestFile( new File( folder1, "file5.dat" ), 15 );
+        FileTestHelper.generateTestFile(new File(folder1, "file4.txt"), 14);
+        FileTestHelper.generateTestFile(new File(folder1, "file5.dat"), 15);
 
-        File folder2 = new File( folder1, "ignorefolder" );
-        if ( !folder2.mkdirs() )
-        {
+        File folder2 = new File(folder1, "ignorefolder");
+        if (!folder2.mkdirs()) {
             Assert.fail();
         }
-        FileTestHelper.generateTestFile( new File( folder2, "file7.txt" ), 17 );
+        FileTestHelper.generateTestFile(new File(folder2, "file7.txt"), 17);
     }
 
     @Test
-    public void testSimpleScan()
-        throws Exception
-    {
+    public void testSimpleScan() throws Exception {
         createTestData();
 
-        fitScanTest( true, true, true,
-                /* includes */        null,
-                /* excludes */        null,
+        fitScanTest(
+                true,
+                true,
+                true,
+                /* includes */ null,
+                /* excludes */ null,
                 /* expInclFiles */
-                new String[]{ "file1.txt", "file2.txt", "file3.dat", "folder1/file4.txt", "folder1/file5.dat" },
-                /* expInclDirs */     new String[]{ "", "folder1" },
+                new String[] {"file1.txt", "file2.txt", "file3.dat", "folder1/file4.txt", "folder1/file5.dat"},
+                /* expInclDirs */ new String[] {"", "folder1"},
                 /* expNotInclFiles */ NONE,
                 /* expNotInclDirs  */ NONE,
                 /* expNotExclFiles */ NONE,
-                /* expNotExclDirs  */ NONE );
+                /* expNotExclDirs  */ NONE);
 
         // same without followSymlinks
-        fitScanTest( true, false, true,
-                /* includes */        null,
-                /* excludes */        null,
+        fitScanTest(
+                true,
+                false,
+                true,
+                /* includes */ null,
+                /* excludes */ null,
                 /* expInclFiles */
-                new String[]{ "file1.txt", "file2.txt", "file3.dat", "folder1/file4.txt", "folder1/file5.dat" },
-                /* expInclDirs */     new String[]{ "", "folder1" },
+                new String[] {"file1.txt", "file2.txt", "file3.dat", "folder1/file4.txt", "folder1/file5.dat"},
+                /* expInclDirs */ new String[] {"", "folder1"},
                 /* expNotInclFiles */ NONE,
                 /* expNotInclDirs  */ NONE,
                 /* expNotExclFiles */ NONE,
-                /* expNotExclDirs  */ NONE );
+                /* expNotExclDirs  */ NONE);
     }
 
     @Test
-    public void testSimpleIncludes()
-        throws Exception
-    {
+    public void testSimpleIncludes() throws Exception {
         createTestData();
 
-        fitScanTest( true, true, true,
-                /* includes        */ new String[]{ "**/*.dat", "*.somethingelse" },
+        fitScanTest(
+                true,
+                true,
+                true,
+                /* includes        */ new String[] {"**/*.dat", "*.somethingelse"},
                 /* excludes        */ null,
-                /* expInclFiles    */ new String[]{ "file3.dat", "folder1/file5.dat" },
+                /* expInclFiles    */ new String[] {"file3.dat", "folder1/file5.dat"},
                 /* expInclDirs     */ NONE,
-                /* expNotInclFiles */ new String[]{ "file1.txt", "file2.txt", "folder1/file4.txt" },
-                /* expNotInclDirs  */ new String[]{ "", "folder1" },
+                /* expNotInclFiles */ new String[] {"file1.txt", "file2.txt", "folder1/file4.txt"},
+                /* expNotInclDirs  */ new String[] {"", "folder1"},
                 /* expExclFiles    */ NONE,
-                /* expExclDirs     */ NONE );
+                /* expExclDirs     */ NONE);
 
         // same without followSymlinks
-        fitScanTest( true, false, true,
-                /* includes        */ new String[]{ "**/*.dat", "*.somethingelse" },
+        fitScanTest(
+                true,
+                false,
+                true,
+                /* includes        */ new String[] {"**/*.dat", "*.somethingelse"},
                 /* excludes        */ null,
-                /* expInclFiles    */ new String[]{ "file3.dat", "folder1/file5.dat" },
+                /* expInclFiles    */ new String[] {"file3.dat", "folder1/file5.dat"},
                 /* expInclDirs     */ NONE,
-                /* expNotInclFiles */ new String[]{ "file1.txt", "file2.txt", "folder1/file4.txt" },
-                /* expNotInclDirs  */ new String[]{ "", "folder1" },
+                /* expNotInclFiles */ new String[] {"file1.txt", "file2.txt", "folder1/file4.txt"},
+                /* expNotInclDirs  */ new String[] {"", "folder1"},
                 /* expExclFiles    */ NONE,
-                /* expExclDirs     */ NONE );
+                /* expExclDirs     */ NONE);
     }
 
     @Rule
     public ExpectedException xcludesNPExRule = ExpectedException.none();
 
     @Test
-    public void testIncludesWithNull()
-        throws Exception
-    {
-        testXcludesWithNull( new String[]{ null }, null, "includes" );
+    public void testIncludesWithNull() throws Exception {
+        testXcludesWithNull(new String[] {null}, null, "includes");
     }
 
     @Test
-    public void testExcludesWithNull()
-        throws Exception
-    {
-        testXcludesWithNull( null, new String[]{ null }, "excludes" );
+    public void testExcludesWithNull() throws Exception {
+        testXcludesWithNull(null, new String[] {null}, "excludes");
     }
 
-    private void testXcludesWithNull( String[] includes, String[] excludes, String listName )
-        throws Exception
-    {
+    private void testXcludesWithNull(String[] includes, String[] excludes, String listName) throws Exception {
         createTestData();
-        xcludesNPExRule.expect( NullPointerException.class );
-        xcludesNPExRule.expectMessage( "If a non-null " + listName + " list is given, all elements must be non-null" );
+        xcludesNPExRule.expect(NullPointerException.class);
+        xcludesNPExRule.expectMessage("If a non-null " + listName + " list is given, all elements must be non-null");
 
-        fitScanTest( true, true, true,
+        fitScanTest(
+                true,
+                true,
+                true,
                 /* includes        */ includes,
                 /* excludes        */ excludes,
-                /* expInclFiles    */ new String[]{ "file3.dat", "folder1/file5.dat" },
+                /* expInclFiles    */ new String[] {"file3.dat", "folder1/file5.dat"},
                 /* expInclDirs     */ NONE,
-                /* expNotInclFiles */ new String[]{ "file1.txt", "file2.txt", "folder1/file4.txt" },
-                /* expNotInclDirs  */ new String[]{ "", "folder1" },
+                /* expNotInclFiles */ new String[] {"file1.txt", "file2.txt", "folder1/file4.txt"},
+                /* expNotInclDirs  */ new String[] {"", "folder1"},
                 /* expExclFiles    */ NONE,
-                /* expExclDirs     */ NONE );
+                /* expExclDirs     */ NONE);
     }
 
     @Test
-    public void checkSymlinkBehaviour()
-    {
+    public void checkSymlinkBehaviour() {
         DirectoryScanner ds = new DirectoryScanner();
-        ds.setBasedir( new File( "src/test/resources/symlinks/src" ) );
-        ds.setFollowSymlinks( false );
+        ds.setBasedir(new File("src/test/resources/symlinks/src"));
+        ds.setFollowSymlinks(false);
         ds.scan();
-        
+
         String[] includedDirectories = ds.getIncludedDirectories();
         // FIXME 3 (Windows) and 5 (Linux) are both wrong. The correct answer is 4.
         // This method is broken in different ways on different operating systems.
-        assertTrue( includedDirectories.length == 3 || includedDirectories.length == 5);  
-        
+        assertTrue(includedDirectories.length == 3 || includedDirectories.length == 5);
+
         String[] files = ds.getIncludedFiles();
-        assertAlwaysIncluded( Arrays.asList( files ) );
-        
+        assertAlwaysIncluded(Arrays.asList(files));
+
         // FIXME getIncludedFiles is broken on Windows; correct answer is 9
-        assertTrue("files.length is " + files.length, files.length == 9 || files.length == 11 );
+        assertTrue("files.length is " + files.length, files.length == 9 || files.length == 11);
     }
 
     @Test
-    public void followSymlinksFalse()
-        throws IOException
-    {
-        assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+    public void followSymlinksFalse() throws IOException {
+        assumeFalse(Os.isFamily(Os.FAMILY_WINDOWS));
 
-        File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new File( "target/test/symlinkTestCase" ) );
+        File testDir = SymlinkTestSetup.createStandardSymlinkTestDir(new File("target/test/symlinkTestCase"));
 
         DirectoryScanner ds = new DirectoryScanner();
-        ds.setBasedir( testDir );
-        ds.setFollowSymlinks( false );
+        ds.setBasedir(testDir);
+        ds.setFollowSymlinks(false);
         ds.scan();
-        List included = Arrays.asList( ds.getIncludedFiles() );
-        assertAlwaysIncluded( included );
-        assertEquals( 9, included.size() );
-        List includedDirs = Arrays.asList( ds.getIncludedDirectories() );
-        assertTrue( includedDirs.contains( "" ) );
-        assertTrue( includedDirs.contains( "aRegularDir" ) );
-        assertTrue( includedDirs.contains( "symDir" ) );
-        assertTrue( includedDirs.contains( "symLinkToDirOnTheOutside" ) );
-        assertTrue( includedDirs.contains( "targetDir" ) );
-        assertEquals( 5, includedDirs.size() );
+        List included = Arrays.asList(ds.getIncludedFiles());
+        assertAlwaysIncluded(included);
+        assertEquals(9, included.size());
+        List includedDirs = Arrays.asList(ds.getIncludedDirectories());
+        assertTrue(includedDirs.contains(""));
+        assertTrue(includedDirs.contains("aRegularDir"));
+        assertTrue(includedDirs.contains("symDir"));
+        assertTrue(includedDirs.contains("symLinkToDirOnTheOutside"));
+        assertTrue(includedDirs.contains("targetDir"));
+        assertEquals(5, includedDirs.size());
     }
 
-    private void assertAlwaysIncluded( List included )
-    {
-        assertTrue( included.contains( "aRegularDir" + File.separator + "aRegularFile.txt" ) );
-        assertTrue( included.contains( "targetDir" + File.separator + "targetFile.txt" ) );
-        assertTrue( included.contains( "fileR.txt" ) );
-        assertTrue( included.contains( "fileW.txt" ) );
-        assertTrue( included.contains( "fileX.txt" ) );
-        assertTrue( included.contains( "symR" ) );
-        assertTrue( included.contains( "symW" ) );
-        assertTrue( included.contains( "symX" ) );
-        assertTrue( included.contains( "symLinkToFileOnTheOutside" ) );
+    private void assertAlwaysIncluded(List included) {
+        assertTrue(included.contains("aRegularDir" + File.separator + "aRegularFile.txt"));
+        assertTrue(included.contains("targetDir" + File.separator + "targetFile.txt"));
+        assertTrue(included.contains("fileR.txt"));
+        assertTrue(included.contains("fileW.txt"));
+        assertTrue(included.contains("fileX.txt"));
+        assertTrue(included.contains("symR"));
+        assertTrue(included.contains("symW"));
+        assertTrue(included.contains("symX"));
+        assertTrue(included.contains("symLinkToFileOnTheOutside"));
     }
 
     @Test
-    public void followSymlinks()
-        throws IOException
-    {
-        assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+    public void followSymlinks() throws IOException {
+        assumeFalse(Os.isFamily(Os.FAMILY_WINDOWS));
 
         DirectoryScanner ds = new DirectoryScanner();
-        File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new File( "target/test/symlinkTestCase" ) );
+        File testDir = SymlinkTestSetup.createStandardSymlinkTestDir(new File("target/test/symlinkTestCase"));
 
-        ds.setBasedir( testDir );
-        ds.setFollowSymlinks( true );
+        ds.setBasedir(testDir);
+        ds.setFollowSymlinks(true);
         ds.scan();
-        List included = Arrays.asList( ds.getIncludedFiles() );
-        assertAlwaysIncluded( included );
-        assertTrue( included.contains( "symDir/targetFile.txt" ) );
-        assertTrue( included.contains( "symLinkToDirOnTheOutside/FileInDirOnTheOutside.txt" ) );
-        assertEquals( 11, included.size() );
-
-        List includedDirs = Arrays.asList( ds.getIncludedDirectories() );
-        assertTrue( includedDirs.contains( "" ) ); // w00t !
-        assertTrue( includedDirs.contains( "aRegularDir" ) );
-        assertTrue( includedDirs.contains( "symDir" ) );
-        assertTrue( includedDirs.contains( "symLinkToDirOnTheOutside" ) );
-        assertTrue( includedDirs.contains( "targetDir" ) );
-        assertEquals( 5, includedDirs.size() );
+        List included = Arrays.asList(ds.getIncludedFiles());
+        assertAlwaysIncluded(included);
+        assertTrue(included.contains("symDir/targetFile.txt"));
+        assertTrue(included.contains("symLinkToDirOnTheOutside/FileInDirOnTheOutside.txt"));
+        assertEquals(11, included.size());
+
+        List includedDirs = Arrays.asList(ds.getIncludedDirectories());
+        assertTrue(includedDirs.contains("")); // w00t !
+        assertTrue(includedDirs.contains("aRegularDir"));
+        assertTrue(includedDirs.contains("symDir"));
+        assertTrue(includedDirs.contains("symLinkToDirOnTheOutside"));
+        assertTrue(includedDirs.contains("targetDir"));
+        assertEquals(5, includedDirs.size());
     }
 
     /*
-        Creates a standard directory layout with symlinks and files.
-     */
+       Creates a standard directory layout with symlinks and files.
+    */
     @Test
-    public void testSimpleExcludes()
-        throws Exception
-    {
+    public void testSimpleExcludes() throws Exception {
         createTestData();
 
-        fitScanTest( true, true, true,
+        fitScanTest(
+                true,
+                true,
+                true,
                 /* includes        */ null,
-                /* excludes        */ new String[]{ "**/*.dat", "*.somethingelse" },
-                /* expInclFiles    */ new String[]{ "file1.txt", "file2.txt", "folder1/file4.txt" },
-                /* expInclDirs     */ new String[]{ "", "folder1" },
+                /* excludes        */ new String[] {"**/*.dat", "*.somethingelse"},
+                /* expInclFiles    */ new String[] {"file1.txt", "file2.txt", "folder1/file4.txt"},
+                /* expInclDirs     */ new String[] {"", "folder1"},
                 /* expNotInclFiles */ NONE,
                 /* expNotInclDirs  */ NONE,
-                /* expExclFiles    */ new String[]{ "file3.dat", "folder1/file5.dat" },
-                /* expExclDirs     */ NONE );
+                /* expExclFiles    */ new String[] {"file3.dat", "folder1/file5.dat"},
+                /* expExclDirs     */ NONE);
 
         // same without followSymlinks
-        fitScanTest( true, false, true,
+        fitScanTest(
+                true,
+                false,
+                true,
                 /* includes        */ null,
-                /* excludes        */ new String[]{ "**/*.dat", "*.somethingelse" },
-                /* expInclFiles    */ new String[]{ "file1.txt", "file2.txt", "folder1/file4.txt" },
-                /* expInclDirs     */ new String[]{ "", "folder1" },
+                /* excludes        */ new String[] {"**/*.dat", "*.somethingelse"},
+                /* expInclFiles    */ new String[] {"file1.txt", "file2.txt", "folder1/file4.txt"},
+                /* expInclDirs     */ new String[] {"", "folder1"},
                 /* expNotInclFiles */ NONE,
                 /* expNotInclDirs  */ NONE,
-                /* expExclFiles    */ new String[]{ "file3.dat", "folder1/file5.dat" },
-                /* expExclDirs     */ NONE );
+                /* expExclFiles    */ new String[] {"file3.dat", "folder1/file5.dat"},
+                /* expExclDirs     */ NONE);
     }
 
-    public void testIsSymbolicLink()
-        throws IOException
-    {
-        File file = new File( "." );
+    public void testIsSymbolicLink() throws IOException {
+        File file = new File(".");
         DirectoryScanner ds = new DirectoryScanner();
-        ds.isSymbolicLink( file, "abc" );
+        ds.isSymbolicLink(file, "abc");
     }
 
     /**
      * Performs a scan and test for the given parameters if not null.
      */
-    private void fitScanTest( boolean caseSensitive, boolean followSymLinks, boolean addDefaultExcludes,
-                              String[] includes, String[] excludes, String[] expectedIncludedFiles,
-                              String[] expectedIncludedDirectories, String[] expectedNotIncludedFiles,
-                              String[] expectedNotIncludedDirectories, String[] expectedExcludedFiles,
-                              String[] expectedExcludedDirectories )
-    {
+    private void fitScanTest(
+            boolean caseSensitive,
+            boolean followSymLinks,
+            boolean addDefaultExcludes,
+            String[] includes,
+            String[] excludes,
+            String[] expectedIncludedFiles,
+            String[] expectedIncludedDirectories,
+            String[] expectedNotIncludedFiles,
+            String[] expectedNotIncludedDirectories,
+            String[] expectedExcludedFiles,
+            String[] expectedExcludedDirectories) {
         DirectoryScanner ds = new DirectoryScanner();
-        ds.setBasedir( tempFolder.getRoot() );
+        ds.setBasedir(tempFolder.getRoot());
 
-        ds.setCaseSensitive( caseSensitive );
-        ds.setFollowSymlinks( followSymLinks );
+        ds.setCaseSensitive(caseSensitive);
+        ds.setFollowSymlinks(followSymLinks);
 
-        if ( addDefaultExcludes )
-        {
+        if (addDefaultExcludes) {
             ds.addDefaultExcludes();
         }
-        if ( includes != null )
-        {
-            ds.setIncludes( includes );
+        if (includes != null) {
+            ds.setIncludes(includes);
         }
-        if ( excludes != null )
-        {
-            ds.setExcludes( excludes );
+        if (excludes != null) {
+            ds.setExcludes(excludes);
         }
 
         TestScanConductor scanConductor = new TestScanConductor();
 
-        ds.setScanConductor( scanConductor );
+        ds.setScanConductor(scanConductor);
 
         ds.scan();
 
-        checkFiles( "expectedIncludedFiles", expectedIncludedFiles, ds.getIncludedFiles() );
-        checkFiles( "expectedIncludedDirectories", expectedIncludedDirectories, ds.getIncludedDirectories() );
-        checkFiles( "expectedNotIncludedFiles", expectedNotIncludedFiles, ds.getNotIncludedFiles() );
-        checkFiles( "expectedNotIncludedDirectories", expectedNotIncludedDirectories, ds.getNotIncludedDirectories() );
-        checkFiles( "expectedExcludedFiles", expectedExcludedFiles, ds.getExcludedFiles() );
-        checkFiles( "expectedExcludedDirectories", expectedExcludedDirectories, ds.getExcludedDirectories() );
-
-        checkFiles( "visitedFiles", expectedIncludedFiles,
-                    scanConductor.visitedFiles.toArray( new String[scanConductor.visitedFiles.size()] ) );
+        checkFiles("expectedIncludedFiles", expectedIncludedFiles, ds.getIncludedFiles());
+        checkFiles("expectedIncludedDirectories", expectedIncludedDirectories, ds.getIncludedDirectories());
+        checkFiles("expectedNotIncludedFiles", expectedNotIncludedFiles, ds.getNotIncludedFiles());
+        checkFiles("expectedNotIncludedDirectories", expectedNotIncludedDirectories, ds.getNotIncludedDirectories());
+        checkFiles("expectedExcludedFiles", expectedExcludedFiles, ds.getExcludedFiles());
+        checkFiles("expectedExcludedDirectories", expectedExcludedDirectories, ds.getExcludedDirectories());
+
+        checkFiles(
+                "visitedFiles",
+                expectedIncludedFiles,
+                scanConductor.visitedFiles.toArray(new String[scanConductor.visitedFiles.size()]));
     }
 
     /**
@@ -338,72 +338,60 @@ private void fitScanTest( boolean caseSensitive, boolean followSymLinks, boolean
      * @param expectedFiles
      * @param resolvedFiles
      */
-    private void checkFiles( String category, String[] expectedFiles, String[] resolvedFiles )
-    {
-        if ( expectedFiles != null )
-        {
-            String msg = category + " expected: " + Arrays.toString( expectedFiles ) + " but got: " + Arrays.toString(
-                resolvedFiles );
-            Assert.assertNotNull( msg, resolvedFiles );
-            assertEquals( msg, expectedFiles.length, resolvedFiles.length );
-
-            Arrays.sort( expectedFiles );
-            Arrays.sort( resolvedFiles );
-
-            for ( int i = 0; i < resolvedFiles.length; i++ )
-            {
-                assertEquals( msg, expectedFiles[i], resolvedFiles[i].replace( "\\", "/" ) );
+    private void checkFiles(String category, String[] expectedFiles, String[] resolvedFiles) {
+        if (expectedFiles != null) {
+            String msg = category + " expected: " + Arrays.toString(expectedFiles) + " but got: "
+                    + Arrays.toString(resolvedFiles);
+            Assert.assertNotNull(msg, resolvedFiles);
+            assertEquals(msg, expectedFiles.length, resolvedFiles.length);
+
+            Arrays.sort(expectedFiles);
+            Arrays.sort(resolvedFiles);
+
+            for (int i = 0; i < resolvedFiles.length; i++) {
+                assertEquals(msg, expectedFiles[i], resolvedFiles[i].replace("\\", "/"));
             }
         }
     }
 
-    private static class TestScanConductor
-        implements ScanConductor
-    {
+    private static class TestScanConductor implements ScanConductor {
         final List visitedFiles = new ArrayList();
 
-        public ScanConductor.ScanAction visitDirectory( String name, File directory )
-        {
-            assertTrue( directory.isDirectory() );
+        public ScanConductor.ScanAction visitDirectory(String name, File directory) {
+            assertTrue(directory.isDirectory());
 
-            if ( directory.getName().equals( "ignorefolder" ) )
-            {
+            if (directory.getName().equals("ignorefolder")) {
                 return ScanAction.NO_RECURSE;
             }
 
             return ScanAction.CONTINUE;
         }
 
-        public ScanConductor.ScanAction visitFile( String name, File file )
-        {
-            assertTrue( file.isFile() );
-            visitedFiles.add( name );
+        public ScanConductor.ScanAction visitFile(String name, File file) {
+            assertTrue(file.isFile());
+            visitedFiles.add(name);
             return ScanAction.CONTINUE;
         }
     }
 
-    private void removeAndAddSomeFiles()
-        throws IOException
-    {
+    private void removeAndAddSomeFiles() throws IOException {
         File rootDir = tempFolder.getRoot();
-        File file2 = new File( rootDir, "file2.txt" );
+        File file2 = new File(rootDir, "file2.txt");
         file2.delete();
 
-        FileTestHelper.generateTestFile( new File( rootDir, "folder1/file9.txt" ), 15 );
+        FileTestHelper.generateTestFile(new File(rootDir, "folder1/file9.txt"), 15);
 
-        File folder2 = new File( rootDir, "folder1/ignorefolder" );
-        FileUtils.deleteDirectory( folder2 );
+        File folder2 = new File(rootDir, "folder1/ignorefolder");
+        FileUtils.deleteDirectory(folder2);
     }
 
     @Test
-    public void testScanDiff()
-        throws Exception
-    {
+    public void testScanDiff() throws Exception {
         createTestData();
 
         DirectoryScanner dss = new DirectoryScanner();
-        dss.setBasedir( tempFolder.getRoot() );
-        Assert.assertNotNull( dss );
+        dss.setBasedir(tempFolder.getRoot());
+        Assert.assertNotNull(dss);
 
         // we take the initial snapshot
         dss.scan();
@@ -414,54 +402,49 @@ public void testScanDiff()
 
         dss.scan();
 
-        DirectoryScanResult dsr = dss.diffIncludedFiles( oldFiles );
+        DirectoryScanResult dsr = dss.diffIncludedFiles(oldFiles);
 
         String[] addedFiles = dsr.getFilesAdded();
         String[] removedFiles = dsr.getFilesRemoved();
-        Assert.assertNotNull( addedFiles );
-        Assert.assertNotNull( removedFiles );
-        assertEquals( 1, addedFiles.length );
-        assertEquals( 2, removedFiles.length );
+        Assert.assertNotNull(addedFiles);
+        Assert.assertNotNull(removedFiles);
+        assertEquals(1, addedFiles.length);
+        assertEquals(2, removedFiles.length);
     }
 
-    @Ignore( "Enable this test to run performance checks" )
+    @Ignore("Enable this test to run performance checks")
     @Test
-    public void performanceTest()
-        throws Exception
-    {
+    public void performanceTest() throws Exception {
 
         File rootFolder = tempFolder.getRoot();
 
         // do some warmup
-        for ( int i = 1; i < 200; i++ )
-        {
+        for (int i = 1; i < 200; i++) {
             createTestData();
             removeAndAddSomeFiles();
-            FileUtils.deleteDirectory( rootFolder );
+            FileUtils.deleteDirectory(rootFolder);
         }
 
         int cycles = 2000;
 
         // and now we take the time _without_
         long startTime = System.nanoTime();
-        for ( int i = 1; i < cycles; i++ )
-        {
+        for (int i = 1; i < cycles; i++) {
             createTestData();
             removeAndAddSomeFiles();
-            FileUtils.deleteDirectory( rootFolder );
+            FileUtils.deleteDirectory(rootFolder);
             rootFolder.mkdir();
         }
         long endTime = System.nanoTime();
 
         long durationEmptyRun = endTime - startTime;
-        System.out.println( "durationEmptyRun            [ns]: " + durationEmptyRun );
+        System.out.println("durationEmptyRun            [ns]: " + durationEmptyRun);
 
         startTime = System.nanoTime();
-        for ( int i = 1; i < cycles; i++ )
-        {
+        for (int i = 1; i < cycles; i++) {
             createTestData();
             DirectoryScanner directoryScanner = new DirectoryScanner();
-            directoryScanner.setBasedir( rootFolder );
+            directoryScanner.setBasedir(rootFolder);
             directoryScanner.scan();
             String[] oldFiles = directoryScanner.getIncludedFiles();
 
@@ -469,20 +452,19 @@ public void performanceTest()
 
             directoryScanner.scan();
 
-            DirectoryScanResult directoryScanResult = directoryScanner.diffIncludedFiles( oldFiles );
-            Assert.assertNotNull( directoryScanResult );
+            DirectoryScanResult directoryScanResult = directoryScanner.diffIncludedFiles(oldFiles);
+            Assert.assertNotNull(directoryScanResult);
 
-            FileUtils.deleteDirectory( rootFolder );
+            FileUtils.deleteDirectory(rootFolder);
             rootFolder.mkdir();
         }
         endTime = System.nanoTime();
 
         long durationWithSnapshotScanner = endTime - startTime;
-        System.out.println( "durationWithSnapshotScanner [ns]: " + durationWithSnapshotScanner );
+        System.out.println("durationWithSnapshotScanner [ns]: " + durationWithSnapshotScanner);
 
         long dirScannerOverhead = durationWithSnapshotScanner - durationEmptyRun;
 
-        System.out.println( "Overhead for n cycles [ns]: " + dirScannerOverhead );
+        System.out.println("Overhead for n cycles [ns]: " + dirScannerOverhead);
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index 51cfb177..efd49a92 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -1,30 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.maven.shared.utils.io;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.hasItems;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeThat;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.shared.utils.Os;
-import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
-import org.codehaus.plexus.util.InterpolationFilterReader;
-import org.hamcrest.CoreMatchers;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
-
 import javax.annotation.Nonnull;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -46,24 +41,29 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.shared.utils.Os;
+import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
+import org.codehaus.plexus.util.InterpolationFilterReader;
+import org.hamcrest.CoreMatchers;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestName;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeThat;
 
 /**
  * This is used to test FileUtils for correctness.
@@ -75,9 +75,8 @@
  * @version $Id: FileUtilsTestCase.java 1081025 2011-03-13 00:45:10Z niallp $
  * @see FileUtils
  */
-@SuppressWarnings( "deprecation" )
-public class FileUtilsTest
-{
+@SuppressWarnings("deprecation")
+public class FileUtilsTest {
 
     // Test data
 
@@ -104,266 +103,227 @@ public class FileUtilsTest
      * @see junit.framework.TestCase#setUp()
      */
     @Before
-    public void setUp()
-        throws Exception
-    {
-        testFile1 = tempFolder.newFile( "file1-test.txt" );
-        testFile2 = tempFolder.newFile( "file1a-test.txt" );
+    public void setUp() throws Exception {
+        testFile1 = tempFolder.newFile("file1-test.txt");
+        testFile2 = tempFolder.newFile("file1a-test.txt");
 
         testFile1Size = (int) testFile1.length();
         testFile2Size = (int) testFile2.length();
 
         tempFolder.getRoot().mkdirs();
-        createFile( testFile1, testFile1Size );
-        createFile( testFile2, testFile2Size );
-        FileUtils.deleteDirectory( tempFolder.getRoot() );
+        createFile(testFile1, testFile1Size);
+        createFile(testFile2, testFile2Size);
+        FileUtils.deleteDirectory(tempFolder.getRoot());
         tempFolder.getRoot().mkdirs();
-        createFile( testFile1, testFile1Size );
-        createFile( testFile2, testFile2Size );
+        createFile(testFile1, testFile1Size);
+        createFile(testFile2, testFile2Size);
     }
 
-    private static void createFile( File file, long size )
-        throws IOException
-    {
-        if ( !file.getParentFile().exists() )
-        {
-            throw new IOException( "Cannot create file " + file + " as the parent directory does not exist" );
+    private static void createFile(File file, long size) throws IOException {
+        if (!file.getParentFile().exists()) {
+            throw new IOException("Cannot create file " + file + " as the parent directory does not exist");
         }
-        
-        try (OutputStream out = new BufferedOutputStream( new FileOutputStream( file ) ) )
-        {
-            FileTestHelper.generateTestData( out, size );
+
+        try (OutputStream out = new BufferedOutputStream(new FileOutputStream(file))) {
+            FileTestHelper.generateTestData(out, size);
         }
     }
 
-
     /**
      * Assert that the content of a file is equal to that in a byte[].
      */
-    private void assertEqualContent( byte[] b0, File file )
-        throws IOException
-    {
+    private void assertEqualContent(byte[] b0, File file) throws IOException {
         int count = 0, numRead = 0;
         byte[] b1 = new byte[b0.length];
-        try ( InputStream is = new FileInputStream( file ) )
-        {
-            while ( count < b0.length && numRead >= 0 )
-            {
-                numRead = is.read( b1, count, b0.length );
+        try (InputStream is = new FileInputStream(file)) {
+            while (count < b0.length && numRead >= 0) {
+                numRead = is.read(b1, count, b0.length);
                 count += numRead;
             }
-            assertThat( "Different number of bytes: ", count, is( b0.length ) );
-            for ( int i = 0; i < count; i++ )
-            {
-                assertEquals( "byte " + i + " differs", b1[i], b0[i] );
+            assertThat("Different number of bytes: ", count, is(b0.length));
+            for (int i = 0; i < count; i++) {
+                assertEquals("byte " + i + " differs", b1[i], b0[i]);
             }
         }
     }
 
-    private void deleteFile( File file )
-    {
-        if ( file.exists() )
-        {
-            assertTrue( "Couldn't delete file: " + file, file.delete() );
+    private void deleteFile(File file) {
+        if (file.exists()) {
+            assertTrue("Couldn't delete file: " + file, file.delete());
         }
     }
 
-
-    //-----------------------------------------------------------------------
+    // -----------------------------------------------------------------------
     @Test
-    public void toFile1()
-        throws Exception
-    {
-        URL url = new URL( "file", null, "a/b/c/file.txt" );
-        File file = FileUtils.toFile( url );
-        assertThat( file.toString(), containsString( "file.txt" ) );
+    public void toFile1() throws Exception {
+        URL url = new URL("file", null, "a/b/c/file.txt");
+        File file = FileUtils.toFile(url);
+        assertThat(file.toString(), containsString("file.txt"));
     }
 
     @Test
-    public void toFile2()
-        throws Exception
-    {
-        URL url = new URL( "file", null, "a/b/c/file%20n%61me%2520.tx%74" );
-        File file = FileUtils.toFile( url );
-        assertThat( file.toString(), containsString( "file name%20.txt" ) );
+    public void toFile2() throws Exception {
+        URL url = new URL("file", null, "a/b/c/file%20n%61me%2520.tx%74");
+        File file = FileUtils.toFile(url);
+        assertThat(file.toString(), containsString("file name%20.txt"));
     }
 
     @Test
-    public void toFile3()
-        throws Exception
-    {
-        assertThat( FileUtils.toFile( null ), CoreMatchers.nullValue() );
-        assertThat( FileUtils.toFile( new URL( "http://jakarta.apache.org/" ) ), CoreMatchers.nullValue() );
+    public void toFile3() throws Exception {
+        assertThat(FileUtils.toFile(null), CoreMatchers.nullValue());
+        assertThat(FileUtils.toFile(new URL("http://jakarta.apache.org/")), CoreMatchers.nullValue());
     }
 
-    @Test( expected = NumberFormatException.class )
-    public void toFile4()
-        throws Exception
-    {
-        URL url = new URL( "file", null, "a/b/c/file%%20%me.txt%" );
-        File file = FileUtils.toFile( url );
-        assertThat( file.toString(), containsString( "file% %me.txt%" ) );
+    @Test(expected = NumberFormatException.class)
+    public void toFile4() throws Exception {
+        URL url = new URL("file", null, "a/b/c/file%%20%me.txt%");
+        File file = FileUtils.toFile(url);
+        assertThat(file.toString(), containsString("file% %me.txt%"));
     }
 
     /**
      * IO-252
      */
     @Test
-    public void toFile5()
-        throws Exception
-    {
-        URL url = new URL( "file", null, "both%20are%20100%20%25%20true" );
-        File file = FileUtils.toFile( url );
-        assertThat( file.toString(), is( "both are 100 % true" ) );
+    public void toFile5() throws Exception {
+        URL url = new URL("file", null, "both%20are%20100%20%25%20true");
+        File file = FileUtils.toFile(url);
+        assertThat(file.toString(), is("both are 100 % true"));
     }
 
     @Test
-    public void toFileUtf8()
-        throws Exception
-    {
-        URL url = new URL( "file", null, "/home/%C3%A4%C3%B6%C3%BC%C3%9F" );
-        File file = FileUtils.toFile( url );
-        assertThat( file.toString(), not( containsString( "\u00E4\u00F6\u00FC\u00DF" ) ) );
+    public void toFileUtf8() throws Exception {
+        URL url = new URL("file", null, "/home/%C3%A4%C3%B6%C3%BC%C3%9F");
+        File file = FileUtils.toFile(url);
+        assertThat(file.toString(), not(containsString("\u00E4\u00F6\u00FC\u00DF")));
     }
 
     // toURLs
 
     @Test
-    public void toURLs1()
-        throws Exception
-    {
-        File[] files = new File[]{ new File( tempFolder.getRoot(), "file1.txt" ), new File( tempFolder.getRoot(), "file2.txt" ),
-            new File( tempFolder.getRoot(), "test file.txt" ), };
-        URL[] urls = FileUtils.toURLs( files );
+    public void toURLs1() throws Exception {
+        File[] files = new File[] {
+            new File(tempFolder.getRoot(), "file1.txt"),
+            new File(tempFolder.getRoot(), "file2.txt"),
+            new File(tempFolder.getRoot(), "test file.txt"),
+        };
+        URL[] urls = FileUtils.toURLs(files);
 
-        assertThat( urls.length, is( files.length ) );
-        assertThat( urls[0].toExternalForm().startsWith( "file:" ), is( true ) );
-        assertThat( urls[0].toExternalForm().contains( "file1.txt" ), is( true ) );
-        assertThat( urls[1].toExternalForm().startsWith( "file:" ), is( true ) );
-        assertThat( urls[1].toExternalForm(), containsString( "file2.txt" ) );
+        assertThat(urls.length, is(files.length));
+        assertThat(urls[0].toExternalForm().startsWith("file:"), is(true));
+        assertThat(urls[0].toExternalForm().contains("file1.txt"), is(true));
+        assertThat(urls[1].toExternalForm().startsWith("file:"), is(true));
+        assertThat(urls[1].toExternalForm(), containsString("file2.txt"));
 
         // Test escaped char
-        assertThat( urls[2].toExternalForm().startsWith( "file:" ), is( true ) );
-        assertThat( urls[2].toExternalForm(), containsString( "test%20file.txt" ) );
+        assertThat(urls[2].toExternalForm().startsWith("file:"), is(true));
+        assertThat(urls[2].toExternalForm(), containsString("test%20file.txt"));
     }
 
     // contentEquals
 
     @Test
-    public void contentEquals()
-        throws Exception
-    {
+    public void contentEquals() throws Exception {
         // Non-existent files
-        File file = new File( tempFolder.getRoot(), name.getMethodName() );
-        File file2 = new File( tempFolder.getRoot(), name.getMethodName() + "2" );
+        File file = new File(tempFolder.getRoot(), name.getMethodName());
+        File file2 = new File(tempFolder.getRoot(), name.getMethodName() + "2");
         // both don't  exist
-        assertThat( FileUtils.contentEquals( file, file ), is( true ) );
-        assertThat( FileUtils.contentEquals( file, file2 ), is( true ) );
-        assertThat( FileUtils.contentEquals( file2, file2 ), is( true ) );
-        assertThat( FileUtils.contentEquals( file2, file ), is( true ) );
+        assertThat(FileUtils.contentEquals(file, file), is(true));
+        assertThat(FileUtils.contentEquals(file, file2), is(true));
+        assertThat(FileUtils.contentEquals(file2, file2), is(true));
+        assertThat(FileUtils.contentEquals(file2, file), is(true));
 
         // Directories
-        FileUtils.contentEquals( tempFolder.getRoot(), tempFolder.getRoot() );
+        FileUtils.contentEquals(tempFolder.getRoot(), tempFolder.getRoot());
 
         // Different files
-        File objFile1 = new File( tempFolder.getRoot(), name.getMethodName() + ".object" );
+        File objFile1 = new File(tempFolder.getRoot(), name.getMethodName() + ".object");
         objFile1.deleteOnExit();
-        FileUtils.copyURLToFile( getClass().getResource( "/java/lang/Object.class" ), objFile1 );
+        FileUtils.copyURLToFile(getClass().getResource("/java/lang/Object.class"), objFile1);
 
-        File objFile1b = new File( tempFolder.getRoot(), name.getMethodName() + ".object2" );
+        File objFile1b = new File(tempFolder.getRoot(), name.getMethodName() + ".object2");
         objFile1.deleteOnExit();
-        FileUtils.copyURLToFile( getClass().getResource( "/java/lang/Object.class" ), objFile1b );
+        FileUtils.copyURLToFile(getClass().getResource("/java/lang/Object.class"), objFile1b);
 
-        File objFile2 = new File( tempFolder.getRoot(), name.getMethodName() + ".collection" );
+        File objFile2 = new File(tempFolder.getRoot(), name.getMethodName() + ".collection");
         objFile2.deleteOnExit();
-        FileUtils.copyURLToFile( getClass().getResource( "/java/util/Collection.class" ), objFile2 );
+        FileUtils.copyURLToFile(getClass().getResource("/java/util/Collection.class"), objFile2);
 
-        assertThat( FileUtils.contentEquals( objFile1, objFile2 ), is( false ) );
-        assertThat( FileUtils.contentEquals( objFile1b, objFile2 ), is( false ) );
-        assertThat( FileUtils.contentEquals( objFile1, objFile1b ), is( true ) );
+        assertThat(FileUtils.contentEquals(objFile1, objFile2), is(false));
+        assertThat(FileUtils.contentEquals(objFile1b, objFile2), is(false));
+        assertThat(FileUtils.contentEquals(objFile1, objFile1b), is(true));
 
-        assertThat( FileUtils.contentEquals( objFile1, objFile1 ), is( true ) );
-        assertThat( FileUtils.contentEquals( objFile1b, objFile1b ), is( true ) );
-        assertThat( FileUtils.contentEquals( objFile2, objFile2 ), is( true ) );
+        assertThat(FileUtils.contentEquals(objFile1, objFile1), is(true));
+        assertThat(FileUtils.contentEquals(objFile1b, objFile1b), is(true));
+        assertThat(FileUtils.contentEquals(objFile2, objFile2), is(true));
 
         // Equal files
         file.createNewFile();
         file2.createNewFile();
-        assertThat( FileUtils.contentEquals( file, file ), is( true ) );
-        assertThat( FileUtils.contentEquals( file, file2 ), is( true ) );
+        assertThat(FileUtils.contentEquals(file, file), is(true));
+        assertThat(FileUtils.contentEquals(file, file2), is(true));
     }
 
     // copyURLToFile
 
     @Test
-    public void copyURLToFile()
-        throws Exception
-    {
+    public void copyURLToFile() throws Exception {
         // Creates file
-        File file = new File( tempFolder.getRoot(), name.getMethodName() );
+        File file = new File(tempFolder.getRoot(), name.getMethodName());
         file.deleteOnExit();
 
         // Loads resource
         String resourceName = "/java/lang/Object.class";
-        FileUtils.copyURLToFile( getClass().getResource( resourceName ), file );
+        FileUtils.copyURLToFile(getClass().getResource(resourceName), file);
 
         // Tests that resource was copied correctly
-        try ( FileInputStream fis = new FileInputStream( file ) )
-        {
-            assertThat( "Content is not equal.",
-                        IOUtil.contentEquals( getClass().getResourceAsStream( resourceName ), fis ), is( true ) );
+        try (FileInputStream fis = new FileInputStream(file)) {
+            assertThat(
+                    "Content is not equal.",
+                    IOUtil.contentEquals(getClass().getResourceAsStream(resourceName), fis),
+                    is(true));
         }
-        //TODO Maybe test copy to itself like for copyFile()
+        // TODO Maybe test copy to itself like for copyFile()
     }
 
     // forceMkdir
 
     @Test
-    public void forceMkdir()
-        throws Exception
-    {
+    public void forceMkdir() throws Exception {
         // Tests with existing directory
-        FileUtils.forceMkdir( tempFolder.getRoot() );
+        FileUtils.forceMkdir(tempFolder.getRoot());
 
         // Creates test file
-        File testFile = new File( tempFolder.getRoot(), name.getMethodName() );
+        File testFile = new File(tempFolder.getRoot(), name.getMethodName());
         testFile.deleteOnExit();
         testFile.createNewFile();
-        assertThat( "Test file does not exist.", testFile.exists(), is( true ) );
+        assertThat("Test file does not exist.", testFile.exists(), is(true));
 
         // Tests with existing file
-        try
-        {
-            FileUtils.forceMkdir( testFile );
-            fail( "Exception expected." );
-        }
-        catch ( IOException ex )
-        {
+        try {
+            FileUtils.forceMkdir(testFile);
+            fail("Exception expected.");
+        } catch (IOException ex) {
         }
 
         testFile.delete();
 
         // Tests with non-existent directory
-        FileUtils.forceMkdir( testFile );
-        assertThat( "Directory was not created.", testFile.exists(), is( true ) );
+        FileUtils.forceMkdir(testFile);
+        assertThat("Directory was not created.", testFile.exists(), is(true));
     }
 
     // sizeOfDirectory
 
     @Test
-    public void sizeOfDirectory()
-        throws Exception
-    {
-        File file = new File( tempFolder.getRoot(), name.getMethodName() );
+    public void sizeOfDirectory() throws Exception {
+        File file = new File(tempFolder.getRoot(), name.getMethodName());
 
         // Non-existent file
-        try
-        {
-            FileUtils.sizeOfDirectory( file );
-            fail( "Exception expected." );
-        }
-        catch ( IllegalArgumentException ex )
-        {
+        try {
+            FileUtils.sizeOfDirectory(file);
+            fail("Exception expected.");
+        } catch (IllegalArgumentException ex) {
         }
 
         // Creates file
@@ -371,643 +331,436 @@ public void sizeOfDirectory()
         file.deleteOnExit();
 
         // Existing file
-        try
-        {
-            FileUtils.sizeOfDirectory( file );
-            fail( "Exception expected." );
-        }
-        catch ( IllegalArgumentException ex )
-        {
+        try {
+            FileUtils.sizeOfDirectory(file);
+            fail("Exception expected.");
+        } catch (IllegalArgumentException ex) {
         }
 
         // Existing directory
         file.delete();
         file.mkdir();
 
-        assertThat( "Unexpected directory size", FileUtils.sizeOfDirectory( file ), is( (long) TEST_DIRECTORY_SIZE ) );
+        assertThat("Unexpected directory size", FileUtils.sizeOfDirectory(file), is((long) TEST_DIRECTORY_SIZE));
     }
 
     // copyFile
 
     @Test
-    public void copyFile1()
-        throws Exception
-    {
-        File destination = new File( tempFolder.getRoot(), "copy1.txt" );
+    public void copyFile1() throws Exception {
+        File destination = new File(tempFolder.getRoot(), "copy1.txt");
 
-        //Thread.sleep(LAST_MODIFIED_DELAY);
-        //This is to slow things down so we can catch if
-        //the lastModified date is not ok
+        // Thread.sleep(LAST_MODIFIED_DELAY);
+        // This is to slow things down so we can catch if
+        // the lastModified date is not ok
 
-        FileUtils.copyFile( testFile1, destination );
-        assertThat( "Check Exist", destination.exists(), is( true ) );
-        assertThat( "Check Full copy", destination.length(), is( testFile1Size ) );
+        FileUtils.copyFile(testFile1, destination);
+        assertThat("Check Exist", destination.exists(), is(true));
+        assertThat("Check Full copy", destination.length(), is(testFile1Size));
         /* disabled: Thread.sleep doesn't work reliantly for this case
         assertTrue("Check last modified date preserved",
             testFile1.lastModified() == destination.lastModified());*/
     }
 
     /** A time today, rounded down to the previous minute */
-    private static long MODIFIED_TODAY = (System.currentTimeMillis() / TimeUnit.MINUTES.toMillis( 1 )) * TimeUnit.MINUTES.toMillis( 1 );
+    private static long MODIFIED_TODAY =
+            (System.currentTimeMillis() / TimeUnit.MINUTES.toMillis(1)) * TimeUnit.MINUTES.toMillis(1);
 
     /** A time yesterday, rounded down to the previous minute */
-    private static long MODIFIED_YESTERDAY = MODIFIED_TODAY - TimeUnit.DAYS.toMillis( 1 );
+    private static long MODIFIED_YESTERDAY = MODIFIED_TODAY - TimeUnit.DAYS.toMillis(1);
 
     /** A time last week, rounded down to the previous minute */
-    private static long MODIFIED_LAST_WEEK = MODIFIED_TODAY - TimeUnit.DAYS.toMillis( 7 );
-
-    @Test
-    public void copyFileWithNoFiltersAndNoDestination()
-        throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_YESTERDAY,
-            "Hello World!"
-        );
-        File to = new File(
-            tempFolder.getRoot(),
-            "to.txt"
-        );
-
-        FileUtils.copyFile( from, to, null, (FileUtils.FilterWrapper[]) null );
-
-        assertTrue(
-            "to.txt did not exist so should have been written",
-            to.lastModified() >= MODIFIED_TODAY
-        );
-        assertFileContent( to, "Hello World!" );
-    }
-
-    @Test
-    public void copyFileWithNoFiltersAndLastModifiedDateOfZeroAndNoDestination()
-        throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_YESTERDAY,
-            "Hello World!"
-        );
-        File to = new File(
-            tempFolder.getRoot(),
-            "to.txt"
-        );
-
-        from.setLastModified( 0 );
-        FileUtils.copyFile( from, to, null, (FileUtils.FilterWrapper[]) null );
-
-        assertTrue(
-            "to.txt did not exist so should have been written",
-            to.lastModified() >= MODIFIED_TODAY
-        );
-        assertFileContent( to, "Hello World!" );
-    }
-
-    @Test
-    public void copyFileWithNoFiltersAndOutdatedDestination()
-            throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_YESTERDAY,
-            "Hello World!"
-        );
-        File to = write(
-            "to.txt",
-            MODIFIED_LAST_WEEK,
-            "Older content"
-        );
-
-        FileUtils.copyFile( from, to, null, (FileUtils.FilterWrapper[]) null );
-
-        assertTrue(
-            "to.txt was outdated so should have been overwritten",
-            to.lastModified() >= MODIFIED_TODAY
-        );
-        assertFileContent( to, "Hello World!" );
-    }
-
-    @Test
-    public void copyFileWithNoFiltersAndNewerDestination()
-            throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_LAST_WEEK,
-            "Hello World!"
-        );
-        File to = write(
-            "to.txt",
-            MODIFIED_YESTERDAY,
-            "Older content"
-        );
-
-        FileUtils.copyFile( from, to, null, (FileUtils.FilterWrapper[]) null );
-
-        assertTrue(
-            "to.txt was newer so should have been left alone",
-            to.lastModified() < MODIFIED_TODAY
-        );
-        assertFileContent( to, "Older content" );
-    }
-
-    @Test
-    public void copyFileWithNoFiltersAndNewerDestinationButForcedOverwrite()
-            throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_LAST_WEEK,
-            "Hello World!"
-        );
-        File to = write(
-            "to.txt",
-            MODIFIED_YESTERDAY,
-            "Older content"
-        );
-
-        FileUtils.copyFile( from, to, null, null, true );
-
-        assertTrue(
-            "to.txt was newer but the overwrite should have been forced",
-            to.lastModified() >= MODIFIED_TODAY
-        );
-        assertFileContent( to, "Hello World!" );
-    }
-
-    @Test
-    public void copyFileWithFilteringButNoFilters()
-            throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_YESTERDAY,
-            "Hello ${name}!"
-        );
-        File to = write(
-            "to.txt",
-            MODIFIED_LAST_WEEK,
-            "Older content"
-        );
-
-        FileUtils.copyFile( from, to, null );
-
-        assertTrue(
-            "to.txt was outdated so should have been overwritten",
-            to.lastModified() >= MODIFIED_TODAY
-        );
-        assertFileContent( to, "Hello ${name}!" );
-    }
-
-    @Test
-    public void copyFileWithFilteringAndNoDestination()
-            throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_YESTERDAY,
-            "Hello ${name}!"
-        );
-        File to = new File(
-            tempFolder.getRoot(),
-            "to.txt"
-        );
-
-        FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ) );
-
-        assertTrue(
-            "to.txt did not exist so should have been written",
-            to.lastModified() >= MODIFIED_TODAY
-        );
-        assertFileContent( to, "Hello Bob!" );
-    }
-
-    @Test
-    public void copyFileWithFilteringAndOutdatedDestination()
-            throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_YESTERDAY,
-            "Hello ${name}!"
-        );
-        File to = write(
-            "to.txt",
-            MODIFIED_LAST_WEEK,
-            "Older content"
-        );
-
-        FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ) );
-
-        assertTrue(
-            "to.txt was outdated so should have been overwritten",
-            to.lastModified() >= MODIFIED_TODAY
-        );
-        assertFileContent( to, "Hello Bob!" );
-    }
-
-    @Test
-    public void copyFileWithFilteringAndNewerDestinationButForcedOverwrite()
-            throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_LAST_WEEK,
-            "Hello ${name}!"
-        );
-        File to = write(
-            "to.txt",
-            MODIFIED_YESTERDAY,
-            "Older content"
-        );
-
-        FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ), true );
-
-        assertTrue(
-            "to.txt was newer but the overwrite should have been forced",
-            to.lastModified() >= MODIFIED_TODAY
-        );
-        assertFileContent( to, "Hello Bob!" );
-    }
-
-    @Test
-    public void copyFileWithFilteringAndNewerDestinationButModifiedContent()
-            throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_LAST_WEEK,
-            "Hello ${name}!"
-        );
-        File to = write(
-            "to.txt",
-            MODIFIED_YESTERDAY,
-            "Hello Charlie!"
-        );
-
-        FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ) );
-
-        assertTrue(
-            "to.txt was outdated so should have been overwritten",
-            to.lastModified() >= MODIFIED_TODAY
-        );
-        assertFileContent( to, "Hello Bob!" );
-    }
-
-    @Test
-    public void copyFileWithFilteringAndNewerDestinationAndMatchingContent()
-            throws Exception
-    {
-        File from = write(
-            "from.txt",
-            MODIFIED_LAST_WEEK,
-            "Hello ${name}!"
-        );
-        File to = write(
-            "to.txt",
-            MODIFIED_YESTERDAY,
-            "Hello Bob!"
-        );
-
-        FileUtils.copyFile( from, to, null, wrappers( "name", "Bob" ) );
-
-        assertFileContent( to, "Hello Bob!" );
-        assertTrue(
-            "to.txt content should be unchanged and have been left alone",
-            to.lastModified() < MODIFIED_TODAY
-        );
-    }
-
-    private static FileUtils.FilterWrapper[] wrappers( String key, String value )
-    {
+    private static long MODIFIED_LAST_WEEK = MODIFIED_TODAY - TimeUnit.DAYS.toMillis(7);
+
+    @Test
+    public void copyFileWithNoFiltersAndNoDestination() throws Exception {
+        File from = write("from.txt", MODIFIED_YESTERDAY, "Hello World!");
+        File to = new File(tempFolder.getRoot(), "to.txt");
+
+        FileUtils.copyFile(from, to, null, (FileUtils.FilterWrapper[]) null);
+
+        assertTrue("to.txt did not exist so should have been written", to.lastModified() >= MODIFIED_TODAY);
+        assertFileContent(to, "Hello World!");
+    }
+
+    @Test
+    public void copyFileWithNoFiltersAndLastModifiedDateOfZeroAndNoDestination() throws Exception {
+        File from = write("from.txt", MODIFIED_YESTERDAY, "Hello World!");
+        File to = new File(tempFolder.getRoot(), "to.txt");
+
+        from.setLastModified(0);
+        FileUtils.copyFile(from, to, null, (FileUtils.FilterWrapper[]) null);
+
+        assertTrue("to.txt did not exist so should have been written", to.lastModified() >= MODIFIED_TODAY);
+        assertFileContent(to, "Hello World!");
+    }
+
+    @Test
+    public void copyFileWithNoFiltersAndOutdatedDestination() throws Exception {
+        File from = write("from.txt", MODIFIED_YESTERDAY, "Hello World!");
+        File to = write("to.txt", MODIFIED_LAST_WEEK, "Older content");
+
+        FileUtils.copyFile(from, to, null, (FileUtils.FilterWrapper[]) null);
+
+        assertTrue("to.txt was outdated so should have been overwritten", to.lastModified() >= MODIFIED_TODAY);
+        assertFileContent(to, "Hello World!");
+    }
+
+    @Test
+    public void copyFileWithNoFiltersAndNewerDestination() throws Exception {
+        File from = write("from.txt", MODIFIED_LAST_WEEK, "Hello World!");
+        File to = write("to.txt", MODIFIED_YESTERDAY, "Older content");
+
+        FileUtils.copyFile(from, to, null, (FileUtils.FilterWrapper[]) null);
+
+        assertTrue("to.txt was newer so should have been left alone", to.lastModified() < MODIFIED_TODAY);
+        assertFileContent(to, "Older content");
+    }
+
+    @Test
+    public void copyFileWithNoFiltersAndNewerDestinationButForcedOverwrite() throws Exception {
+        File from = write("from.txt", MODIFIED_LAST_WEEK, "Hello World!");
+        File to = write("to.txt", MODIFIED_YESTERDAY, "Older content");
+
+        FileUtils.copyFile(from, to, null, null, true);
+
+        assertTrue("to.txt was newer but the overwrite should have been forced", to.lastModified() >= MODIFIED_TODAY);
+        assertFileContent(to, "Hello World!");
+    }
+
+    @Test
+    public void copyFileWithFilteringButNoFilters() throws Exception {
+        File from = write("from.txt", MODIFIED_YESTERDAY, "Hello ${name}!");
+        File to = write("to.txt", MODIFIED_LAST_WEEK, "Older content");
+
+        FileUtils.copyFile(from, to, null);
+
+        assertTrue("to.txt was outdated so should have been overwritten", to.lastModified() >= MODIFIED_TODAY);
+        assertFileContent(to, "Hello ${name}!");
+    }
+
+    @Test
+    public void copyFileWithFilteringAndNoDestination() throws Exception {
+        File from = write("from.txt", MODIFIED_YESTERDAY, "Hello ${name}!");
+        File to = new File(tempFolder.getRoot(), "to.txt");
+
+        FileUtils.copyFile(from, to, null, wrappers("name", "Bob"));
+
+        assertTrue("to.txt did not exist so should have been written", to.lastModified() >= MODIFIED_TODAY);
+        assertFileContent(to, "Hello Bob!");
+    }
+
+    @Test
+    public void copyFileWithFilteringAndOutdatedDestination() throws Exception {
+        File from = write("from.txt", MODIFIED_YESTERDAY, "Hello ${name}!");
+        File to = write("to.txt", MODIFIED_LAST_WEEK, "Older content");
+
+        FileUtils.copyFile(from, to, null, wrappers("name", "Bob"));
+
+        assertTrue("to.txt was outdated so should have been overwritten", to.lastModified() >= MODIFIED_TODAY);
+        assertFileContent(to, "Hello Bob!");
+    }
+
+    @Test
+    public void copyFileWithFilteringAndNewerDestinationButForcedOverwrite() throws Exception {
+        File from = write("from.txt", MODIFIED_LAST_WEEK, "Hello ${name}!");
+        File to = write("to.txt", MODIFIED_YESTERDAY, "Older content");
+
+        FileUtils.copyFile(from, to, null, wrappers("name", "Bob"), true);
+
+        assertTrue("to.txt was newer but the overwrite should have been forced", to.lastModified() >= MODIFIED_TODAY);
+        assertFileContent(to, "Hello Bob!");
+    }
+
+    @Test
+    public void copyFileWithFilteringAndNewerDestinationButModifiedContent() throws Exception {
+        File from = write("from.txt", MODIFIED_LAST_WEEK, "Hello ${name}!");
+        File to = write("to.txt", MODIFIED_YESTERDAY, "Hello Charlie!");
+
+        FileUtils.copyFile(from, to, null, wrappers("name", "Bob"));
+
+        assertTrue("to.txt was outdated so should have been overwritten", to.lastModified() >= MODIFIED_TODAY);
+        assertFileContent(to, "Hello Bob!");
+    }
+
+    @Test
+    public void copyFileWithFilteringAndNewerDestinationAndMatchingContent() throws Exception {
+        File from = write("from.txt", MODIFIED_LAST_WEEK, "Hello ${name}!");
+        File to = write("to.txt", MODIFIED_YESTERDAY, "Hello Bob!");
+
+        FileUtils.copyFile(from, to, null, wrappers("name", "Bob"));
+
+        assertFileContent(to, "Hello Bob!");
+        assertTrue("to.txt content should be unchanged and have been left alone", to.lastModified() < MODIFIED_TODAY);
+    }
+
+    private static FileUtils.FilterWrapper[] wrappers(String key, String value) {
         final Map map = new HashMap<>();
-        map.put( key, value );
-        return new FileUtils.FilterWrapper[]
-            {
-                new FileUtils.FilterWrapper()
-                {
-                    @Override
-                    public Reader getReader( Reader reader )
-                    {
-                        return new InterpolationFilterReader( reader, map );
-                    }
+        map.put(key, value);
+        return new FileUtils.FilterWrapper[] {
+            new FileUtils.FilterWrapper() {
+                @Override
+                public Reader getReader(Reader reader) {
+                    return new InterpolationFilterReader(reader, map);
                 }
-            };
+            }
+        };
     }
 
-    private File write( @Nonnull String name, long lastModified, @Nonnull String text ) throws IOException
-    {
-        final File file = new File( tempFolder.getRoot(), name );
-        try ( final Writer writer = new FileWriter( file ) ) {
+    private File write(@Nonnull String name, long lastModified, @Nonnull String text) throws IOException {
+        final File file = new File(tempFolder.getRoot(), name);
+        try (final Writer writer = new FileWriter(file)) {
             writer.write(text);
         }
-        assertTrue( file.setLastModified( lastModified ) );
-        assertEquals( "Failed to set lastModified date on " + file.getPath(), lastModified, file.lastModified() );
+        assertTrue(file.setLastModified(lastModified));
+        assertEquals("Failed to set lastModified date on " + file.getPath(), lastModified, file.lastModified());
         return file;
     }
 
-    private static void assertFileContent( @Nonnull File file, @Nonnull String expected ) throws IOException
-    {
-        try ( Reader in = new FileReader( file ))
-        {
-            assertEquals(
-                "Expected " + file.getPath() + " to contain: " + expected,
-                expected,
-                IOUtils.toString( in )
-            );
+    private static void assertFileContent(@Nonnull File file, @Nonnull String expected) throws IOException {
+        try (Reader in = new FileReader(file)) {
+            assertEquals("Expected " + file.getPath() + " to contain: " + expected, expected, IOUtils.toString(in));
         }
     }
 
     @Test
-    public void copyFileThatIsSymlink()
-            throws Exception
-    {
-        assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+    public void copyFileThatIsSymlink() throws Exception {
+        assumeFalse(Os.isFamily(Os.FAMILY_WINDOWS));
 
-        File destination = new File( tempFolder.getRoot(), "symCopy.txt" );
+        File destination = new File(tempFolder.getRoot(), "symCopy.txt");
 
-        File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new File( "target/test/symlinkCopy" ) );
+        File testDir = SymlinkTestSetup.createStandardSymlinkTestDir(new File("target/test/symlinkCopy"));
 
-        FileUtils.copyFile( new File( testDir, "symR" ), destination );
+        FileUtils.copyFile(new File(testDir, "symR"), destination);
 
-        assertTrue( Files.isSymbolicLink( destination.toPath() ) );
+        assertTrue(Files.isSymbolicLink(destination.toPath()));
     }
 
-
     @Test
-    public void deleteFile()
-        throws Exception
-    {
-        File destination = new File( tempFolder.getRoot(), "copy1.txt" );
-        FileUtils.copyFile( testFile1, destination );
-        FileUtils.delete( destination );
-        assertThat( "Check Exist", destination.exists(), is( false ) );
+    public void deleteFile() throws Exception {
+        File destination = new File(tempFolder.getRoot(), "copy1.txt");
+        FileUtils.copyFile(testFile1, destination);
+        FileUtils.delete(destination);
+        assertThat("Check Exist", destination.exists(), is(false));
     }
 
-    @Test( expected = IOException.class )
-    public void deleteFileNofile()
-        throws Exception
-    {
-        File destination = new File( "abc/cde" );
-        FileUtils.delete( destination );
+    @Test(expected = IOException.class)
+    public void deleteFileNofile() throws Exception {
+        File destination = new File("abc/cde");
+        FileUtils.delete(destination);
     }
 
     @Test
-    public void deleteFileLegacy()
-        throws Exception
-    {
-        File destination = new File( tempFolder.getRoot(), "copy1.txt" );
-        FileUtils.copyFile( testFile1, destination );
-        assertTrue( FileUtils.deleteLegacyStyle( destination ) );
+    public void deleteFileLegacy() throws Exception {
+        File destination = new File(tempFolder.getRoot(), "copy1.txt");
+        FileUtils.copyFile(testFile1, destination);
+        assertTrue(FileUtils.deleteLegacyStyle(destination));
     }
 
     @Test
-    public void deleteFileLegacyNofile()
-        throws Exception
-    {
-        File destination = new File( "abc/cde" );
-        assertFalse( FileUtils.deleteLegacyStyle( destination ) );
+    public void deleteFileLegacyNofile() throws Exception {
+        File destination = new File("abc/cde");
+        assertFalse(FileUtils.deleteLegacyStyle(destination));
     }
 
     @Test
-    public void copyFileWithPermissions()
-        throws Exception
-    {
-        File source = new File( "src/test/resources/executable" );
-        source.setExecutable( true );
-        assumeThat( "Need an existing file to copy", source.exists(), is( true ) );
-        assumeThat( "Need an executable file to copy", source.canExecute(), is( true ) );
+    public void copyFileWithPermissions() throws Exception {
+        File source = new File("src/test/resources/executable");
+        source.setExecutable(true);
+        assumeThat("Need an existing file to copy", source.exists(), is(true));
+        assumeThat("Need an executable file to copy", source.canExecute(), is(true));
 
-        File destination = new File( tempFolder.getRoot(), "executable-copy" );
+        File destination = new File(tempFolder.getRoot(), "executable-copy");
 
-        FileUtils.copyFile( source, destination );
+        FileUtils.copyFile(source, destination);
 
-        assertThat( "destination not exists: " + destination.getAbsolutePath()
-                        + ", directory content: " + Arrays.asList( destination.getParentFile().list() ),
-                    Files.exists( destination.toPath() ), is( true ) );
+        assertThat(
+                "destination not exists: " + destination.getAbsolutePath() + ", directory content: "
+                        + Arrays.asList(destination.getParentFile().list()),
+                Files.exists(destination.toPath()),
+                is(true));
 
-        assertThat( "Check copy executable", destination.canExecute(), is( true ) );
+        assertThat("Check copy executable", destination.canExecute(), is(true));
     }
 
     @Test
-    public void copyFile2()
-        throws Exception
-    {
-        File destination = new File( tempFolder.getRoot(), "copy2.txt" );
+    public void copyFile2() throws Exception {
+        File destination = new File(tempFolder.getRoot(), "copy2.txt");
 
-        //Thread.sleep(LAST_MODIFIED_DELAY);
-        //This is to slow things down so we can catch if
-        //the lastModified date is not ok
+        // Thread.sleep(LAST_MODIFIED_DELAY);
+        // This is to slow things down so we can catch if
+        // the lastModified date is not ok
 
-        FileUtils.copyFile( testFile1, destination );
-        assertThat( "Check Exist", destination.exists(), is( true ) );
-        assertThat( "Check Full copy", destination.length(), is( testFile2Size ) );
+        FileUtils.copyFile(testFile1, destination);
+        assertThat("Check Exist", destination.exists(), is(true));
+        assertThat("Check Full copy", destination.length(), is(testFile2Size));
         /* disabled: Thread.sleep doesn't work reliably for this case
         assertTrue("Check last modified date preserved",
             testFile1.lastModified() == destination.lastModified());*/
     }
 
     @Test
-    public void copyToSelf() throws IOException
-    {
-        File destination = new File( tempFolder.getRoot(), "copy3.txt" );
-        //Prepare a test file
-        FileUtils.copyFile( testFile1, destination );
+    public void copyToSelf() throws IOException {
+        File destination = new File(tempFolder.getRoot(), "copy3.txt");
+        // Prepare a test file
+        FileUtils.copyFile(testFile1, destination);
 
-        FileUtils.copyFile( destination, destination );
+        FileUtils.copyFile(destination, destination);
     }
 
     @Test
-    public void copyDirectoryToNonExistingDest()
-        throws Exception
-    {
-        createFile( testFile1, 1234 );
-        createFile( testFile2, 4321 );
+    public void copyDirectoryToNonExistingDest() throws Exception {
+        createFile(testFile1, 1234);
+        createFile(testFile2, 4321);
         File srcDir = tempFolder.getRoot();
-        File subDir = new File( srcDir, "sub" );
+        File subDir = new File(srcDir, "sub");
         subDir.mkdir();
-        File subFile = new File( subDir, "A.txt" );
-        FileUtils.fileWrite( subFile, "UTF8", "HELLO WORLD" );
-        File destDir = new File( System.getProperty( "java.io.tmpdir" ), "tmp-FileUtilsTestCase" );
-        FileUtils.deleteDirectory( destDir );
+        File subFile = new File(subDir, "A.txt");
+        FileUtils.fileWrite(subFile, "UTF8", "HELLO WORLD");
+        File destDir = new File(System.getProperty("java.io.tmpdir"), "tmp-FileUtilsTestCase");
+        FileUtils.deleteDirectory(destDir);
 
-        FileUtils.copyDirectory( srcDir, destDir );
+        FileUtils.copyDirectory(srcDir, destDir);
 
-        assertTrue( destDir.exists() );
-        assertEquals( FileUtils.sizeOfDirectory( destDir ), FileUtils.sizeOfDirectory( srcDir ) );
-        assertTrue( new File( destDir, "sub/A.txt" ).exists() );
-        FileUtils.deleteDirectory( destDir );
+        assertTrue(destDir.exists());
+        assertEquals(FileUtils.sizeOfDirectory(destDir), FileUtils.sizeOfDirectory(srcDir));
+        assertTrue(new File(destDir, "sub/A.txt").exists());
+        FileUtils.deleteDirectory(destDir);
     }
 
     @Test
-    public void copyDirectoryToExistingDest() throws IOException
-    {
-        createFile( testFile1, 1234 );
-        createFile( testFile2, 4321 );
+    public void copyDirectoryToExistingDest() throws IOException {
+        createFile(testFile1, 1234);
+        createFile(testFile2, 4321);
         File srcDir = tempFolder.getRoot();
-        File subDir = new File( srcDir, "sub" );
-        assertTrue( subDir.mkdir() );
-        File subFile = new File( subDir, "A.txt" );
-        FileUtils.fileWrite( subFile, "UTF8", "HELLO WORLD" );
-        File destDir = new File( System.getProperty( "java.io.tmpdir" ), "tmp-FileUtilsTestCase" );
-        FileUtils.deleteDirectory( destDir );
-        assertTrue ( destDir.mkdirs() );
+        File subDir = new File(srcDir, "sub");
+        assertTrue(subDir.mkdir());
+        File subFile = new File(subDir, "A.txt");
+        FileUtils.fileWrite(subFile, "UTF8", "HELLO WORLD");
+        File destDir = new File(System.getProperty("java.io.tmpdir"), "tmp-FileUtilsTestCase");
+        FileUtils.deleteDirectory(destDir);
+        assertTrue(destDir.mkdirs());
 
-        FileUtils.copyDirectory( srcDir, destDir );
+        FileUtils.copyDirectory(srcDir, destDir);
 
-        assertEquals( FileUtils.sizeOfDirectory( destDir ), FileUtils.sizeOfDirectory( srcDir ) );
-        assertTrue( new File( destDir, "sub/A.txt" ).exists() );
+        assertEquals(FileUtils.sizeOfDirectory(destDir), FileUtils.sizeOfDirectory(srcDir));
+        assertTrue(new File(destDir, "sub/A.txt").exists());
     }
 
     @Test
     public void copyDirectoryErrors_nullDestination() throws IOException {
-        try
-        {
-            FileUtils.copyDirectory( new File( "a" ), null );
+        try {
+            FileUtils.copyDirectory(new File("a"), null);
             fail();
-        }
-        catch ( NullPointerException ex )
-        {
+        } catch (NullPointerException ex) {
         }
     }
 
     @Test
     public void copyDirectoryErrors_copyToSelf() {
-        try
-        {
-            FileUtils.copyDirectory( tempFolder.getRoot(), tempFolder.getRoot() );
+        try {
+            FileUtils.copyDirectory(tempFolder.getRoot(), tempFolder.getRoot());
             fail();
-        }
-        catch ( IOException ex )
-        {
+        } catch (IOException ex) {
         }
     }
 
     @Test
-    public void copyDirectoryErrors()
-        throws IOException
-    {
-        try
-        {
-            FileUtils.copyDirectory( null, null );
+    public void copyDirectoryErrors() throws IOException {
+        try {
+            FileUtils.copyDirectory(null, null);
             fail();
+        } catch (NullPointerException ex) {
         }
-        catch ( NullPointerException ex )
-        {
-        }
-        try
-        {
-            FileUtils.copyDirectory( null, new File( "a" ) );
+        try {
+            FileUtils.copyDirectory(null, new File("a"));
             fail();
+        } catch (NullPointerException ex) {
         }
-        catch ( NullPointerException ex )
-        {
-        }
-        try
-        {
-            FileUtils.copyDirectory( tempFolder.getRoot(), testFile1 );
+        try {
+            FileUtils.copyDirectory(tempFolder.getRoot(), testFile1);
             fail();
-        }
-        catch ( IOException ex )
-        {
+        } catch (IOException ex) {
         }
     }
 
     // forceDelete
 
     @Test
-    public void forceDeleteAFile1()
-        throws Exception
-    {
-        File destination = new File( tempFolder.getRoot(), "copy1.txt" );
+    public void forceDeleteAFile1() throws Exception {
+        File destination = new File(tempFolder.getRoot(), "copy1.txt");
         destination.createNewFile();
-        assertTrue( "Copy1.txt doesn't exist to delete", destination.exists() );
-        FileUtils.forceDelete( destination );
-        assertFalse( destination.exists() );
+        assertTrue("Copy1.txt doesn't exist to delete", destination.exists());
+        FileUtils.forceDelete(destination);
+        assertFalse(destination.exists());
     }
 
     @Test
-    public void forceDeleteAFile2()
-        throws Exception
-    {
-        File destination = new File( tempFolder.getRoot(), "copy2.txt" );
+    public void forceDeleteAFile2() throws Exception {
+        File destination = new File(tempFolder.getRoot(), "copy2.txt");
         destination.createNewFile();
-        assertThat( "Copy2.txt doesn't exist to delete", destination.exists(), is( true ) );
-        FileUtils.forceDelete( destination );
-        assertThat( "Check No Exist", !destination.exists(), is( true ) );
-    }
-
-    @Test
-    @Ignore( "Commons test case that is failing for plexus" )
-    public void forceDeleteAFile3()
-        throws Exception
-    {
-        File destination = new File( tempFolder.getRoot(), "no_such_file" );
-        assertThat( "Check No Exist", !destination.exists(), is( true ) );
-        try
-        {
-            FileUtils.forceDelete( destination );
-            fail( "Should generate FileNotFoundException" );
-        }
-        catch ( FileNotFoundException ignored )
-        {
+        assertThat("Copy2.txt doesn't exist to delete", destination.exists(), is(true));
+        FileUtils.forceDelete(destination);
+        assertThat("Check No Exist", !destination.exists(), is(true));
+    }
+
+    @Test
+    @Ignore("Commons test case that is failing for plexus")
+    public void forceDeleteAFile3() throws Exception {
+        File destination = new File(tempFolder.getRoot(), "no_such_file");
+        assertThat("Check No Exist", !destination.exists(), is(true));
+        try {
+            FileUtils.forceDelete(destination);
+            fail("Should generate FileNotFoundException");
+        } catch (FileNotFoundException ignored) {
         }
     }
 
     // copyFileToDirectory
 
     @Test
-    @Ignore( "Commons test case that is failing for plexus" )
-    public void copyFile1ToDir()
-        throws Exception
-    {
-        File directory = new File( tempFolder.getRoot(), "subdir" );
-        if ( !directory.exists() )
-        {
+    @Ignore("Commons test case that is failing for plexus")
+    public void copyFile1ToDir() throws Exception {
+        File directory = new File(tempFolder.getRoot(), "subdir");
+        if (!directory.exists()) {
             directory.mkdirs();
         }
-        File destination = new File( directory, testFile1.getName() );
+        File destination = new File(directory, testFile1.getName());
 
-        //Thread.sleep(LAST_MODIFIED_DELAY);
-        //This is to slow things down so we can catch if
-        //the lastModified date is not ok
+        // Thread.sleep(LAST_MODIFIED_DELAY);
+        // This is to slow things down so we can catch if
+        // the lastModified date is not ok
 
-        FileUtils.copyFileToDirectory( testFile1, directory );
-        assertThat( "Check Exist", destination.exists(), is( true ) );
-        assertThat( "Check Full copy", destination.length(), is( testFile1Size ) );
+        FileUtils.copyFileToDirectory(testFile1, directory);
+        assertThat("Check Exist", destination.exists(), is(true));
+        assertThat("Check Full copy", destination.length(), is(testFile1Size));
         /* disabled: Thread.sleep doesn't work reliantly for this case
         assertTrue("Check last modified date preserved",
             testFile1.lastModified() == destination.lastModified());*/
 
-        try
-        {
-            FileUtils.copyFileToDirectory( destination, directory );
-            fail( "Should not be able to copy a file into the same directory as itself" );
-        }
-        catch ( IOException ioe )
-        {
-            //we want that, cannot copy to the same directory as the original file
+        try {
+            FileUtils.copyFileToDirectory(destination, directory);
+            fail("Should not be able to copy a file into the same directory as itself");
+        } catch (IOException ioe) {
+            // we want that, cannot copy to the same directory as the original file
         }
     }
 
     @Test
-    public void copyFile2ToDir()
-        throws Exception
-    {
-        File directory = new File( tempFolder.getRoot(), "subdir" );
-        if ( !directory.exists() )
-        {
+    public void copyFile2ToDir() throws Exception {
+        File directory = new File(tempFolder.getRoot(), "subdir");
+        if (!directory.exists()) {
             directory.mkdirs();
         }
-        File destination = new File( directory, testFile1.getName() );
+        File destination = new File(directory, testFile1.getName());
 
-        //Thread.sleep(LAST_MODIFIED_DELAY);
-        //This is to slow things down so we can catch if
-        //the lastModified date is not ok
+        // Thread.sleep(LAST_MODIFIED_DELAY);
+        // This is to slow things down so we can catch if
+        // the lastModified date is not ok
 
-        FileUtils.copyFileToDirectory( testFile1, directory );
-        assertThat( "Check Exist", destination.exists(), is( true ) );
-        assertThat( "Check Full copy", destination.length(), is( testFile2Size ) );
+        FileUtils.copyFileToDirectory(testFile1, directory);
+        assertThat("Check Exist", destination.exists(), is(true));
+        assertThat("Check Full copy", destination.length(), is(testFile2Size));
         /* disabled: Thread.sleep doesn't work reliantly for this case
         assertTrue("Check last modified date preserved",
             testFile1.lastModified() == destination.lastModified());*/
@@ -1016,672 +769,559 @@ public void copyFile2ToDir()
     // forceDelete
 
     @Test
-    public void forceDeleteDir()
-        throws Exception
-    {
-        File testDirectory = tempFolder.newFolder( name.getMethodName() );
-        FileUtils.forceDelete( testDirectory.getParentFile() );
-        assertThat( "Check No Exist", !testDirectory.getParentFile().exists(), is( true ) );
+    public void forceDeleteDir() throws Exception {
+        File testDirectory = tempFolder.newFolder(name.getMethodName());
+        FileUtils.forceDelete(testDirectory.getParentFile());
+        assertThat("Check No Exist", !testDirectory.getParentFile().exists(), is(true));
     }
 
     /**
      * Test the FileUtils implementation.
      */
     @Test
-    public void fileUtils()
-        throws Exception
-    {
+    public void fileUtils() throws Exception {
         // Loads file from classpath
-        File file1 = new File( tempFolder.getRoot(), "test.txt" );
+        File file1 = new File(tempFolder.getRoot(), "test.txt");
         String filename = file1.getAbsolutePath();
 
-        //Create test file on-the-fly
-        try ( OutputStream out = new java.io.FileOutputStream( file1 ) )
-        {
-            out.write( "This is a test".getBytes( "UTF-8" ) );
+        // Create test file on-the-fly
+        try (OutputStream out = new java.io.FileOutputStream(file1)) {
+            out.write("This is a test".getBytes("UTF-8"));
         }
 
-        File file2 = new File( tempFolder.getRoot(), "test2.txt" );
+        File file2 = new File(tempFolder.getRoot(), "test2.txt");
 
-        FileUtils.fileWrite( file2, "UTF-8", filename );
-        assertThat( file2.exists(), is( true ) );
-        assertThat( file2.length() > 0, is( true ) );
+        FileUtils.fileWrite(file2, "UTF-8", filename);
+        assertThat(file2.exists(), is(true));
+        assertThat(file2.length() > 0, is(true));
 
-        String file2contents = FileUtils.fileRead( file2, "UTF-8" );
-        assertThat( "Second file's contents correct", filename.equals( file2contents ), is( true ) );
+        String file2contents = FileUtils.fileRead(file2, "UTF-8");
+        assertThat("Second file's contents correct", filename.equals(file2contents), is(true));
 
-        assertThat( file2.delete(), is( true ) );
-
-        String contents = FileUtils.fileRead( new File( filename ), "UTF-8" );
-        assertThat( "FileUtils.fileRead()", contents.equals( "This is a test" ), is( true ) );
+        assertThat(file2.delete(), is(true));
 
+        String contents = FileUtils.fileRead(new File(filename), "UTF-8");
+        assertThat("FileUtils.fileRead()", contents.equals("This is a test"), is(true));
     }
 
     @Test
-    public void fileReadWithDefaultEncoding()
-        throws Exception
-    {
-        File file = new File( tempFolder.getRoot(), "read.obj" );
-        FileOutputStream out = new FileOutputStream( file );
+    public void fileReadWithDefaultEncoding() throws Exception {
+        File file = new File(tempFolder.getRoot(), "read.obj");
+        FileOutputStream out = new FileOutputStream(file);
         byte[] text = "Hello /u1234".getBytes();
-        out.write( text );
+        out.write(text);
         out.close();
 
-        String data = FileUtils.fileRead( file );
-        assertThat( data, is( "Hello /u1234" ) );
+        String data = FileUtils.fileRead(file);
+        assertThat(data, is("Hello /u1234"));
     }
 
     @Test
-    public void fileReadWithEncoding()
-        throws Exception
-    {
-        File file = new File( tempFolder.getRoot(), "read.obj" );
-        FileOutputStream out = new FileOutputStream( file );
-        byte[] text = "Hello /u1234".getBytes( "UTF8" );
-        out.write( text );
+    public void fileReadWithEncoding() throws Exception {
+        File file = new File(tempFolder.getRoot(), "read.obj");
+        FileOutputStream out = new FileOutputStream(file);
+        byte[] text = "Hello /u1234".getBytes("UTF8");
+        out.write(text);
         out.close();
 
-        String data = FileUtils.fileRead( file, "UTF8" );
-        assertThat( data, is( "Hello /u1234" ) );
+        String data = FileUtils.fileRead(file, "UTF8");
+        assertThat(data, is("Hello /u1234"));
     }
 
     @Test
-    @Ignore( "Commons test case that is failing for plexus" )
-    public void readLines()
-        throws Exception
-    {
-        File file = FileTestHelper.newFile( tempFolder, "lines.txt" );
-        try
-        {
-            String[] data = new String[]{ "hello", "/u1234", "", "this is", "some text" };
-            FileTestHelper.createLineBasedFile( file, data );
+    @Ignore("Commons test case that is failing for plexus")
+    public void readLines() throws Exception {
+        File file = FileTestHelper.newFile(tempFolder, "lines.txt");
+        try {
+            String[] data = new String[] {"hello", "/u1234", "", "this is", "some text"};
+            FileTestHelper.createLineBasedFile(file, data);
 
-            List lines = FileUtils.loadFile( file );
-            assertThat( lines, is( Arrays.asList( data ) ) );
-        }
-        finally
-        {
-            deleteFile( file );
+            List lines = FileUtils.loadFile(file);
+            assertThat(lines, is(Arrays.asList(data)));
+        } finally {
+            deleteFile(file);
         }
     }
 
     @Test
-    public void writeStringToFile1()
-        throws Exception
-    {
-        File file = new File( tempFolder.getRoot(), "write.txt" );
-        FileUtils.fileWrite( file, "UTF8", "Hello /u1234" );
-        byte[] text = "Hello /u1234".getBytes( "UTF8" );
-        assertEqualContent( text, file );
+    public void writeStringToFile1() throws Exception {
+        File file = new File(tempFolder.getRoot(), "write.txt");
+        FileUtils.fileWrite(file, "UTF8", "Hello /u1234");
+        byte[] text = "Hello /u1234".getBytes("UTF8");
+        assertEqualContent(text, file);
     }
 
     @Test
-    public void writeStringToFile2()
-        throws Exception
-    {
-        File file = new File( tempFolder.getRoot(), "write.txt" );
-        FileUtils.fileWrite( file, null, "Hello /u1234" );
+    public void writeStringToFile2() throws Exception {
+        File file = new File(tempFolder.getRoot(), "write.txt");
+        FileUtils.fileWrite(file, null, "Hello /u1234");
         byte[] text = "Hello /u1234".getBytes();
-        assertEqualContent( text, file );
+        assertEqualContent(text, file);
     }
 
     @Test
-    public void writeCharSequence1()
-        throws Exception
-    {
-        File file = new File( tempFolder.getRoot(), "write.txt" );
-        FileUtils.fileWrite( file, "UTF8", "Hello /u1234" );
-        byte[] text = "Hello /u1234".getBytes( "UTF8" );
-        assertEqualContent( text, file );
+    public void writeCharSequence1() throws Exception {
+        File file = new File(tempFolder.getRoot(), "write.txt");
+        FileUtils.fileWrite(file, "UTF8", "Hello /u1234");
+        byte[] text = "Hello /u1234".getBytes("UTF8");
+        assertEqualContent(text, file);
     }
 
     @Test
-    public void writeCharSequence2()
-        throws Exception
-    {
-        File file = new File( tempFolder.getRoot(), "write.txt" );
-        FileUtils.fileWrite( file, null, "Hello /u1234" );
+    public void writeCharSequence2() throws Exception {
+        File file = new File(tempFolder.getRoot(), "write.txt");
+        FileUtils.fileWrite(file, null, "Hello /u1234");
         byte[] text = "Hello /u1234".getBytes();
-        assertEqualContent( text, file );
+        assertEqualContent(text, file);
     }
 
-
     @Test
-    public void writeStringToFileWithEncoding_WithAppendOptionTrue_ShouldNotDeletePreviousFileLines()
-        throws Exception
-    {
-        File file = FileTestHelper.newFile( tempFolder, "lines.txt" );
-        FileUtils.fileWrite( file, null, "This line was there before you..." );
+    public void writeStringToFileWithEncoding_WithAppendOptionTrue_ShouldNotDeletePreviousFileLines() throws Exception {
+        File file = FileTestHelper.newFile(tempFolder, "lines.txt");
+        FileUtils.fileWrite(file, null, "This line was there before you...");
 
-        FileUtils.fileAppend( file.getAbsolutePath(), "this is brand new data" );
+        FileUtils.fileAppend(file.getAbsolutePath(), "this is brand new data");
 
         String expected = "This line was there before you..." + "this is brand new data";
-        String actual = FileUtils.fileRead( file );
-        assertThat( actual, is( expected ) );
+        String actual = FileUtils.fileRead(file);
+        assertThat(actual, is(expected));
     }
 
     @Test
-    public void writeStringToFile_WithAppendOptionTrue_ShouldNotDeletePreviousFileLines()
-        throws Exception
-    {
-        File file = FileTestHelper.newFile( tempFolder, "lines.txt" );
-        FileUtils.fileWrite( file, null, "This line was there before you..." );
+    public void writeStringToFile_WithAppendOptionTrue_ShouldNotDeletePreviousFileLines() throws Exception {
+        File file = FileTestHelper.newFile(tempFolder, "lines.txt");
+        FileUtils.fileWrite(file, null, "This line was there before you...");
 
-        FileUtils.fileAppend( file.getAbsolutePath(), "this is brand new data" );
+        FileUtils.fileAppend(file.getAbsolutePath(), "this is brand new data");
 
         String expected = "This line was there before you..." + "this is brand new data";
-        String actual = FileUtils.fileRead( file );
-        assertThat( actual, is( expected ) );
+        String actual = FileUtils.fileRead(file);
+        assertThat(actual, is(expected));
     }
 
     @Test
-    public void writeStringArrayToFile()
-            throws Exception
-    {
-        File file = new File( tempFolder.getRoot(), "writeArray.txt" );
-        FileUtils.fileWriteArray( file, new String[]{"line1", "line2", "line3"} );
+    public void writeStringArrayToFile() throws Exception {
+        File file = new File(tempFolder.getRoot(), "writeArray.txt");
+        FileUtils.fileWriteArray(file, new String[] {"line1", "line2", "line3"});
 
-        byte[] text = "line1\nline2\nline3".getBytes( "UTF8" );
-        assertEqualContent( text, file );
+        byte[] text = "line1\nline2\nline3".getBytes("UTF8");
+        assertEqualContent(text, file);
     }
 
     @Test
-    public void writeStringArrayToFileWithEncoding()
-            throws Exception
-    {
-        File file = new File( tempFolder.getRoot(), "writeArray.txt" );
-        FileUtils.fileWriteArray( file, "UTF8", new String[]{"line1", "line2", "line3"} );
+    public void writeStringArrayToFileWithEncoding() throws Exception {
+        File file = new File(tempFolder.getRoot(), "writeArray.txt");
+        FileUtils.fileWriteArray(file, "UTF8", new String[] {"line1", "line2", "line3"});
 
-        byte[] text = "line1\nline2\nline3".getBytes( "UTF8" );
-        assertEqualContent( text, file );
+        byte[] text = "line1\nline2\nline3".getBytes("UTF8");
+        assertEqualContent(text, file);
     }
 
-
     @Test
-    public void writeWithEncoding_WithAppendOptionTrue_ShouldNotDeletePreviousFileLines()
-        throws Exception
-    {
-        File file = FileTestHelper.newFile( tempFolder, "lines.txt" );
-        FileUtils.fileWrite( file, "UTF-8", "This line was there before you..." );
+    public void writeWithEncoding_WithAppendOptionTrue_ShouldNotDeletePreviousFileLines() throws Exception {
+        File file = FileTestHelper.newFile(tempFolder, "lines.txt");
+        FileUtils.fileWrite(file, "UTF-8", "This line was there before you...");
 
-        FileUtils.fileAppend( file.getAbsolutePath(), "UTF-8", "this is brand new data" );
+        FileUtils.fileAppend(file.getAbsolutePath(), "UTF-8", "this is brand new data");
 
         String expected = "This line was there before you..." + "this is brand new data";
-        String actual = FileUtils.fileRead( file );
-        assertThat( actual, is( expected ) );
+        String actual = FileUtils.fileRead(file);
+        assertThat(actual, is(expected));
     }
 
     @Test
-    public void write_WithAppendOptionTrue_ShouldNotDeletePreviousFileLines()
-        throws Exception
-    {
-        File file = FileTestHelper.newFile( tempFolder, "lines.txt" );
-        FileUtils.fileWrite( file, null, "This line was there before you..." );
+    public void write_WithAppendOptionTrue_ShouldNotDeletePreviousFileLines() throws Exception {
+        File file = FileTestHelper.newFile(tempFolder, "lines.txt");
+        FileUtils.fileWrite(file, null, "This line was there before you...");
 
-        FileUtils.fileAppend( file.getAbsolutePath(), "this is brand new data" );
+        FileUtils.fileAppend(file.getAbsolutePath(), "this is brand new data");
 
         String expected = "This line was there before you..." + "this is brand new data";
-        String actual = FileUtils.fileRead( file );
-        assertThat( actual, is( expected ) );
+        String actual = FileUtils.fileRead(file);
+        assertThat(actual, is(expected));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void blowUpOnNull()
-        throws IOException
-    {
-        FileUtils.deleteDirectory( (File) null );
+    @Test(expected = NullPointerException.class)
+    public void blowUpOnNull() throws IOException {
+        FileUtils.deleteDirectory((File) null);
     }
 
     @Test
-    public void deleteQuietlyDir()
-        throws IOException
-    {
-        File testDirectory = new File( tempFolder.getRoot(), "testDeleteQuietlyDir" );
-        File testFile = new File( testDirectory, "testDeleteQuietlyFile" );
+    public void deleteQuietlyDir() throws IOException {
+        File testDirectory = new File(tempFolder.getRoot(), "testDeleteQuietlyDir");
+        File testFile = new File(testDirectory, "testDeleteQuietlyFile");
         testDirectory.mkdirs();
-        createFile( testFile, 0 );
+        createFile(testFile, 0);
 
-        assertThat( testDirectory.exists(), is( true ) );
-        assertThat( testFile.exists(), is( true ) );
-        FileUtils.deleteDirectory( testDirectory );
-        assertThat( "Check No Exist", testDirectory.exists(), is( false ) );
-        assertThat( "Check No Exist", testFile.exists(), is( false ) );
+        assertThat(testDirectory.exists(), is(true));
+        assertThat(testFile.exists(), is(true));
+        FileUtils.deleteDirectory(testDirectory);
+        assertThat("Check No Exist", testDirectory.exists(), is(false));
+        assertThat("Check No Exist", testFile.exists(), is(false));
     }
 
     @Test
-    public void deleteQuietlyFile()
-        throws IOException
-    {
-        File testFile = new File( tempFolder.getRoot(), "testDeleteQuietlyFile" );
-        createFile( testFile, 0 );
+    public void deleteQuietlyFile() throws IOException {
+        File testFile = new File(tempFolder.getRoot(), "testDeleteQuietlyFile");
+        createFile(testFile, 0);
 
-        assertThat( testFile.exists(), is( true ) );
-        FileUtils.deleteDirectory( testFile );
-        assertThat( "Check No Exist", testFile.exists(), is( false ) );
+        assertThat(testFile.exists(), is(true));
+        FileUtils.deleteDirectory(testFile);
+        assertThat("Check No Exist", testFile.exists(), is(false));
     }
 
     @Test
-    public void deleteQuietlyNonExistent()
-        throws IOException
-    {
-        File testFile = new File( tempFolder.getRoot(), "testDeleteQuietlyNonExistent" );
-        assertThat( testFile.exists(), is( false ) );
+    public void deleteQuietlyNonExistent() throws IOException {
+        File testFile = new File(tempFolder.getRoot(), "testDeleteQuietlyNonExistent");
+        assertThat(testFile.exists(), is(false));
 
-        FileUtils.deleteDirectory( testFile );
+        FileUtils.deleteDirectory(testFile);
     }
 
-
     ////  getDefaultExcludes
 
     @Test
-    public void getDefaultExcludes()
-        throws Exception
-    {
-        assertThat( Arrays.asList( FileUtils.getDefaultExcludes() ), hasItems( MINIMUM_DEFAULT_EXCLUDES ) );
+    public void getDefaultExcludes() throws Exception {
+        assertThat(Arrays.asList(FileUtils.getDefaultExcludes()), hasItems(MINIMUM_DEFAULT_EXCLUDES));
     }
 
-
     //// getDefaultExcludesAsList
 
     @Test
-    public void getDefaultExcludesAsList()
-        throws Exception
-    {
-        assertThat( FileUtils.getDefaultExcludesAsList(), hasItems( MINIMUM_DEFAULT_EXCLUDES ) );
+    public void getDefaultExcludesAsList() throws Exception {
+        assertThat(FileUtils.getDefaultExcludesAsList(), hasItems(MINIMUM_DEFAULT_EXCLUDES));
     }
 
-
     //// getDefaultExcludesAsString
 
     @Test
-    public void getDefaultExcludesAsString()
-        throws Exception
-    {
-        assertThat( new HashSet( Arrays.asList( FileUtils.getDefaultExcludesAsString().split( "," ) ) ),
-                    hasItems( MINIMUM_DEFAULT_EXCLUDES ) );
+    public void getDefaultExcludesAsString() throws Exception {
+        assertThat(
+                new HashSet(
+                        Arrays.asList(FileUtils.getDefaultExcludesAsString().split(","))),
+                hasItems(MINIMUM_DEFAULT_EXCLUDES));
     }
 
-
-
     //// dirname(String)
 
     @SuppressWarnings("ConstantConditions")
-    @Test( expected = NullPointerException.class )
-    public void nlowUpOnDirnameNull()
-        throws Exception
-    {
-        FileUtils.dirname( null );
+    @Test(expected = NullPointerException.class)
+    public void nlowUpOnDirnameNull() throws Exception {
+        FileUtils.dirname(null);
     }
 
     @Test
-    public void dirnameEmpty()
-        throws Exception
-    {
-        assertThat( FileUtils.dirname( "" ), is( "" ) );
+    public void dirnameEmpty() throws Exception {
+        assertThat(FileUtils.dirname(""), is(""));
     }
 
     @Test
-    public void dirnameFilename()
-        throws Exception
-    {
-        assertThat( FileUtils.dirname( "foo.bar.txt" ), is( "" ) );
+    public void dirnameFilename() throws Exception {
+        assertThat(FileUtils.dirname("foo.bar.txt"), is(""));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void dirnameWindowsRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.dirname( "C:\\foo.bar.txt" ), is( "" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void dirnameWindowsRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.dirname("C:\\foo.bar.txt"), is(""));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void dirnameWindowsNonRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.dirname( "C:\\test\\foo.bar.txt" ), is( "" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void dirnameWindowsNonRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.dirname("C:\\test\\foo.bar.txt"), is(""));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void dirnameUnixRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.dirname( "/foo.bar.txt" ), is( "" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void dirnameUnixRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.dirname("/foo.bar.txt"), is(""));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void dirnameUnixNonRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.dirname( "/test/foo.bar.txt" ), is( "" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void dirnameUnixNonRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.dirname("/test/foo.bar.txt"), is(""));
     }
 
     @Test
-    public void dirnameWindowsRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.dirname( "C:\\foo.bar.txt" ), is( "C:" ) );
+    public void dirnameWindowsRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.dirname("C:\\foo.bar.txt"), is("C:"));
     }
 
     @Test
-    public void dirnameWindowsNonRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.dirname( "C:\\test\\foo.bar.txt" ), is( "C:\\test" ) );
+    public void dirnameWindowsNonRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.dirname("C:\\test\\foo.bar.txt"), is("C:\\test"));
     }
 
     @Test
-    public void dirnameUnixRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.dirname( "/foo.bar.txt" ), is( "" ) );
+    public void dirnameUnixRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.dirname("/foo.bar.txt"), is(""));
     }
 
     @Test
-    public void dirnameUnixNonRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.dirname( "/test/foo.bar.txt" ), is( "/test" ) );
+    public void dirnameUnixNonRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.dirname("/test/foo.bar.txt"), is("/test"));
     }
 
     //// filename(String)
 
     @SuppressWarnings("ConstantConditions")
-    @Test( expected = NullPointerException.class )
-    public void blowUpOnFilenameNull()
-        throws Exception
-    {
-        FileUtils.filename( null );
+    @Test(expected = NullPointerException.class)
+    public void blowUpOnFilenameNull() throws Exception {
+        FileUtils.filename(null);
     }
 
     @Test
-    public void filenameEmpty()
-        throws Exception
-    {
-        assertThat( FileUtils.filename( "" ), is( "" ) );
+    public void filenameEmpty() throws Exception {
+        assertThat(FileUtils.filename(""), is(""));
     }
 
     @Test
-    public void filenameFilename()
-        throws Exception
-    {
-        assertThat( FileUtils.filename( "foo.bar.txt" ), is( "foo.bar.txt" ) );
+    public void filenameFilename() throws Exception {
+        assertThat(FileUtils.filename("foo.bar.txt"), is("foo.bar.txt"));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void filenameWindowsRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.filename( "C:\\foo.bar.txt" ), is( "C:\\foo.bar.txt" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void filenameWindowsRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.filename("C:\\foo.bar.txt"), is("C:\\foo.bar.txt"));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void filenameWindowsNonRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.filename( "C:\\test\\foo.bar.txt" ), is( "C:\\test\\foo.bar.txt" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void filenameWindowsNonRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.filename("C:\\test\\foo.bar.txt"), is("C:\\test\\foo.bar.txt"));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void filenameUnixRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.filename( "/foo.bar.txt" ), is( "/foo.bar.txt" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void filenameUnixRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.filename("/foo.bar.txt"), is("/foo.bar.txt"));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void filenameUnixNonRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.filename( "/test/foo.bar.txt" ), is( "/test/foo.bar.txt" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void filenameUnixNonRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.filename("/test/foo.bar.txt"), is("/test/foo.bar.txt"));
     }
 
     @Test
-    public void filenameWindowsRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.filename( "C:\\foo.bar.txt" ), is( "foo.bar.txt" ) );
+    public void filenameWindowsRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.filename("C:\\foo.bar.txt"), is("foo.bar.txt"));
     }
 
     @Test
-    public void filenameWindowsNonRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.filename( "C:\\test\\foo.bar.txt" ), is( "foo.bar.txt" ) );
+    public void filenameWindowsNonRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.filename("C:\\test\\foo.bar.txt"), is("foo.bar.txt"));
     }
 
     @Test
-    public void filenameUnixRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.filename( "/foo.bar.txt" ), is( "foo.bar.txt" ) );
+    public void filenameUnixRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.filename("/foo.bar.txt"), is("foo.bar.txt"));
     }
 
     @Test
-    public void filenameUnixNonRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.filename( "/test/foo.bar.txt" ), is( "foo.bar.txt" ) );
+    public void filenameUnixNonRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.filename("/test/foo.bar.txt"), is("foo.bar.txt"));
     }
 
     //// extension(String)
 
     @SuppressWarnings("ConstantConditions")
-    @Test( expected = NullPointerException.class )
-    public void blowUpOnNullExtension()
-        throws Exception
-    {
-        FileUtils.extension( null );
+    @Test(expected = NullPointerException.class)
+    public void blowUpOnNullExtension() throws Exception {
+        FileUtils.extension(null);
     }
 
     @Test
-    public void extensionEmpty()
-        throws Exception
-    {
-        assertThat( FileUtils.extension( "" ), is( "" ) );
+    public void extensionEmpty() throws Exception {
+        assertThat(FileUtils.extension(""), is(""));
     }
 
     @Test
-    public void extensionFileName()
-        throws Exception
-    {
-        assertThat( FileUtils.extension( "foo.bar.txt" ), is( "txt" ) );
+    public void extensionFileName() throws Exception {
+        assertThat(FileUtils.extension("foo.bar.txt"), is("txt"));
     }
 
     @Test
-    public void extensionFileNameNoExtension()
-        throws Exception
-    {
-        assertThat( FileUtils.extension( "foo_bar_txt" ), is( "" ) );
+    public void extensionFileNameNoExtension() throws Exception {
+        assertThat(FileUtils.extension("foo_bar_txt"), is(""));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void extensionWindowsRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.extension( "C:\\foo.bar.txt" ), is( "txt" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void extensionWindowsRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.extension("C:\\foo.bar.txt"), is("txt"));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void extensionWindowsNonRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.extension( "C:\\test\\foo.bar.txt" ), is( "txt" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void extensionWindowsNonRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.extension("C:\\test\\foo.bar.txt"), is("txt"));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void extensionUnixRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.extension( "/foo.bar.txt" ), is( "txt" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void extensionUnixRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.extension("/foo.bar.txt"), is("txt"));
     }
 
     @Test
-    //X @ReproducesPlexusBug( "assumes that the path is a local path" )
-    public void extensionUnixNonRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.extension( "/test/foo.bar.txt" ), is( "txt" ) );
+    // X @ReproducesPlexusBug( "assumes that the path is a local path" )
+    public void extensionUnixNonRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.extension("/test/foo.bar.txt"), is("txt"));
     }
 
     @Test
-    public void extensionWindowsRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.extension( "C:\\foo.bar.txt" ), is( "txt" ) );
+    public void extensionWindowsRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.extension("C:\\foo.bar.txt"), is("txt"));
     }
 
     @Test
-    public void extensionWindowsNonRootPathOnWindows()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '\\' ) );
-        assertThat( FileUtils.extension( "C:\\test\\foo.bar.txt" ), is( "txt" ) );
+    public void extensionWindowsNonRootPathOnWindows() throws Exception {
+        assumeThat(File.separatorChar, is('\\'));
+        assertThat(FileUtils.extension("C:\\test\\foo.bar.txt"), is("txt"));
     }
 
     @Test
-    @Ignore( "Wait until we can run with assembly 2.5 which will support symlinks properly" )
-    public void isASymbolicLink()
-        throws IOException
-    {
+    @Ignore("Wait until we can run with assembly 2.5 which will support symlinks properly")
+    public void isASymbolicLink() throws IOException {
         // This testcase will pass when running under java7 or higher
-        assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+        assumeFalse(Os.isFamily(Os.FAMILY_WINDOWS));
 
-        File file = new File( "src/test/resources/symlinks/src/symDir" );
-        assertTrue( FileUtils.isSymbolicLink( file ) );
+        File file = new File("src/test/resources/symlinks/src/symDir");
+        assertTrue(FileUtils.isSymbolicLink(file));
     }
 
     @Test
-    @Ignore( "Wait until we can run with assembly 2.5 which will support symlinks properly" )
-    public void notASymbolicLink()
-        throws IOException
-    {
-        File file = new File( "src/test/resources/symlinks/src/" );
-        assertFalse( FileUtils.isSymbolicLink( file ) );
+    @Ignore("Wait until we can run with assembly 2.5 which will support symlinks properly")
+    public void notASymbolicLink() throws IOException {
+        File file = new File("src/test/resources/symlinks/src/");
+        assertFalse(FileUtils.isSymbolicLink(file));
     }
 
     @Test
-    public void extensionUnixRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.extension( "/foo.bar.txt" ), is( "txt" ) );
+    public void extensionUnixRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.extension("/foo.bar.txt"), is("txt"));
     }
 
     @Test
-    public void extensionUnixNonRootPathOnUnix()
-        throws Exception
-    {
-        assumeThat( File.separatorChar, is( '/' ) );
-        assertThat( FileUtils.extension( "/test/foo.bar.txt" ), is( "txt" ) );
+    public void extensionUnixNonRootPathOnUnix() throws Exception {
+        assumeThat(File.separatorChar, is('/'));
+        assertThat(FileUtils.extension("/test/foo.bar.txt"), is("txt"));
     }
 
     @Test
-    public void createAndReadSymlink()
-        throws Exception
-    {
-        assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+    public void createAndReadSymlink() throws Exception {
+        assumeFalse(Os.isFamily(Os.FAMILY_WINDOWS));
 
-        File file = new File( "target/fzz" );
-        FileUtils.createSymbolicLink(  file, new File("../target") );
+        File file = new File("target/fzz");
+        FileUtils.createSymbolicLink(file, new File("../target"));
 
-        final File file1 = Files.readSymbolicLink( file.toPath() ).toFile();
-        assertEquals( "target", file1.getName() );
-        Files.delete( file.toPath() );
+        final File file1 = Files.readSymbolicLink(file.toPath()).toFile();
+        assertEquals("target", file1.getName());
+        Files.delete(file.toPath());
     }
 
     @Test
-    public void createSymbolicLinkWithDifferentTargetOverwritesSymlink()
-            throws Exception
-    {
-        assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+    public void createSymbolicLinkWithDifferentTargetOverwritesSymlink() throws Exception {
+        assumeFalse(Os.isFamily(Os.FAMILY_WINDOWS));
 
         // Arrange
 
-        final File symlink1 = new File( tempFolder.getRoot(), "symlink" );
+        final File symlink1 = new File(tempFolder.getRoot(), "symlink");
 
-        FileUtils.createSymbolicLink( symlink1, testFile1 );
+        FileUtils.createSymbolicLink(symlink1, testFile1);
 
         // Act
 
-        final File symlink2 = FileUtils.createSymbolicLink( symlink1, testFile2 );
+        final File symlink2 = FileUtils.createSymbolicLink(symlink1, testFile2);
 
         // Assert
 
-        assertThat(
-            Files.readSymbolicLink( symlink2.toPath() ).toFile(),
-            CoreMatchers.equalTo( testFile2 )
-        );
+        assertThat(Files.readSymbolicLink(symlink2.toPath()).toFile(), CoreMatchers.equalTo(testFile2));
     }
 
     //// constants for testing
 
     private static final String[] MINIMUM_DEFAULT_EXCLUDES = {
         // Miscellaneous typical temporary files
-        "**/*~", "**/#*#", "**/.#*", "**/%*%", "**/._*",
+        "**/*~",
+        "**/#*#",
+        "**/.#*",
+        "**/%*%",
+        "**/._*",
 
         // CVS
-        "**/CVS", "**/CVS/**", "**/.cvsignore",
+        "**/CVS",
+        "**/CVS/**",
+        "**/.cvsignore",
 
         // Subversion
-        "**/.svn", "**/.svn/**",
+        "**/.svn",
+        "**/.svn/**",
 
         // Arch
-        "**/.arch-ids", "**/.arch-ids/**",
+        "**/.arch-ids",
+        "**/.arch-ids/**",
 
-        //Bazaar
-        "**/.bzr", "**/.bzr/**",
+        // Bazaar
+        "**/.bzr",
+        "**/.bzr/**",
 
-        //SurroundSCM
+        // SurroundSCM
         "**/.MySCMServerInfo",
 
         // Mac
         "**/.DS_Store",
 
         // Serena Dimensions Version 10
-        "**/.metadata", "**/.metadata/**",
+        "**/.metadata",
+        "**/.metadata/**",
 
         // Mercurial
-        "**/.hg", "**/.hg/**",
+        "**/.hg",
+        "**/.hg/**",
 
         // git
-        "**/.git", "**/.git/**",
+        "**/.git",
+        "**/.git/**",
 
         // BitKeeper
-        "**/BitKeeper", "**/BitKeeper/**", "**/ChangeSet", "**/ChangeSet/**",
+        "**/BitKeeper",
+        "**/BitKeeper/**",
+        "**/ChangeSet",
+        "**/ChangeSet/**",
 
         // darcs
-        "**/_darcs", "**/_darcs/**", "**/.darcsrepo", "**/.darcsrepo/**", "**/-darcs-backup*", "**/.darcs-temp-mail" };
-
+        "**/_darcs",
+        "**/_darcs/**",
+        "**/.darcsrepo",
+        "**/.darcsrepo/**",
+        "**/-darcs-backup*",
+        "**/.darcs-temp-mail"
+    };
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java b/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java
index a8b6b31a..06d04d9e 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.io;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,8 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import org.junit.Test;
+package org.apache.maven.shared.utils.io;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -37,2343 +34,1778 @@
 import java.io.Writer;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.junit.Test;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-@SuppressWarnings( "deprecation" )
-public class IOUtilTest
-{
+@SuppressWarnings("deprecation")
+public class IOUtilTest {
 
     private static final long INFINITE_LOOP_TIMEOUT = 500;
 
     @Test
-    public void closeReaderWithNull()
-        throws Exception
-    {
-        IOUtil.close( (Reader) null );
+    public void closeReaderWithNull() throws Exception {
+        IOUtil.close((Reader) null);
     }
 
     @Test
-    public void closeWriterWithNull()
-        throws Exception
-    {
-        IOUtil.close( (Writer) null );
+    public void closeWriterWithNull() throws Exception {
+        IOUtil.close((Writer) null);
     }
 
     @Test
-    public void closeInputStreamWithNull()
-        throws Exception
-    {
-        IOUtil.close( nullInputStream() );
+    public void closeInputStreamWithNull() throws Exception {
+        IOUtil.close(nullInputStream());
     }
 
     @Test
-    public void closeOutputStreamWithNull()
-        throws Exception
-    {
-        IOUtil.close( nullOutputStream() );
+    public void closeOutputStreamWithNull() throws Exception {
+        IOUtil.close(nullOutputStream());
     }
 
     @Test
-    public void closeReaderWithIOE()
-        throws Exception
-    {
-        IOUtil.close( new BufferedReader( new StringReader( emptyString() ) )
-        {
+    public void closeReaderWithIOE() throws Exception {
+        IOUtil.close(new BufferedReader(new StringReader(emptyString())) {
             @Override
-            public void close()
-                throws IOException
-            {
+            public void close() throws IOException {
                 super.close();
-                throw new IOException( "don't bomb out" );
+                throw new IOException("don't bomb out");
             }
-        } );
+        });
     }
 
     @Test
-    public void closeWriterWithIOE()
-        throws Exception
-    {
-        IOUtil.close( new BufferedWriter( new StringWriter() )
-        {
+    public void closeWriterWithIOE() throws Exception {
+        IOUtil.close(new BufferedWriter(new StringWriter()) {
             @Override
-            public void close()
-                throws IOException
-            {
+            public void close() throws IOException {
                 super.close();
-                throw new IOException( "don't bomb out" );
+                throw new IOException("don't bomb out");
             }
-        } );
+        });
     }
 
     @Test
-    public void closeInputStreamWithIOE()
-        throws Exception
-    {
-        IOUtil.close( new BufferedInputStream( emptyInputStream() )
-        {
+    public void closeInputStreamWithIOE() throws Exception {
+        IOUtil.close(new BufferedInputStream(emptyInputStream()) {
             @Override
-            public void close()
-                throws IOException
-            {
+            public void close() throws IOException {
                 super.close();
-                throw new IOException( "don't bomb out" );
+                throw new IOException("don't bomb out");
             }
-        } );
+        });
     }
 
     @Test
-    public void closeOutputStreamWithIOE()
-        throws Exception
-    {
-        IOUtil.close( new BufferedOutputStream( new ByteArrayOutputStream() )
-        {
+    public void closeOutputStreamWithIOE() throws Exception {
+        IOUtil.close(new BufferedOutputStream(new ByteArrayOutputStream()) {
             @Override
-            public void close()
-                throws IOException
-            {
+            public void close() throws IOException {
                 super.close();
-                throw new IOException( "don't bomb out" );
+                throw new IOException("don't bomb out");
             }
-        } );
+        });
     }
 
     @Test
-    public void closeReaderCloses()
-        throws Exception
-    {
-        final AtomicBoolean closed = new AtomicBoolean( false );
-        IOUtil.close( new BufferedReader( new StringReader( emptyString() ) )
-        {
+    public void closeReaderCloses() throws Exception {
+        final AtomicBoolean closed = new AtomicBoolean(false);
+        IOUtil.close(new BufferedReader(new StringReader(emptyString())) {
             @Override
-            public void close()
-                throws IOException
-            {
-                closed.set( true );
+            public void close() throws IOException {
+                closed.set(true);
                 super.close();
             }
-        } );
-        assertThat( closed.get(), is( true ) );
+        });
+        assertThat(closed.get(), is(true));
     }
 
     @Test
-    public void closeWriterCloses()
-        throws Exception
-    {
-        final AtomicBoolean closed = new AtomicBoolean( false );
-        IOUtil.close( new BufferedWriter( new StringWriter() )
-        {
+    public void closeWriterCloses() throws Exception {
+        final AtomicBoolean closed = new AtomicBoolean(false);
+        IOUtil.close(new BufferedWriter(new StringWriter()) {
             @Override
-            public void close()
-                throws IOException
-            {
-                closed.set( true );
+            public void close() throws IOException {
+                closed.set(true);
                 super.close();
             }
-        } );
-        assertThat( closed.get(), is( true ) );
+        });
+        assertThat(closed.get(), is(true));
     }
 
     @Test
-    public void closeInputStreamCloses()
-        throws Exception
-    {
-        final AtomicBoolean closed = new AtomicBoolean( false );
-        IOUtil.close( new BufferedInputStream( emptyInputStream() )
-        {
+    public void closeInputStreamCloses() throws Exception {
+        final AtomicBoolean closed = new AtomicBoolean(false);
+        IOUtil.close(new BufferedInputStream(emptyInputStream()) {
             @Override
-            public void close()
-                throws IOException
-            {
-                closed.set( true );
+            public void close() throws IOException {
+                closed.set(true);
                 super.close();
             }
-        } );
-        assertThat( closed.get(), is( true ) );
+        });
+        assertThat(closed.get(), is(true));
     }
 
     @Test
-    public void closeOutputStreamCloses()
-        throws Exception
-    {
-        final AtomicBoolean closed = new AtomicBoolean( false );
-        IOUtil.close( new BufferedOutputStream( new ByteArrayOutputStream() )
-        {
+    public void closeOutputStreamCloses() throws Exception {
+        final AtomicBoolean closed = new AtomicBoolean(false);
+        IOUtil.close(new BufferedOutputStream(new ByteArrayOutputStream()) {
             @Override
-            public void close()
-                throws IOException
-            {
-                closed.set( true );
+            public void close() throws IOException {
+                closed.set(true);
                 super.close();
             }
-        } );
-        assertThat( closed.get(), is( true ) );
+        });
+        assertThat(closed.get(), is(true));
     }
 
     @Test
-    public void toByteArrayFromString()
-        throws Exception
-    {
+    public void toByteArrayFromString() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toByteArray( probe ), is( probe.getBytes() ) );
+        assertThat(IOUtil.toByteArray(probe), is(probe.getBytes()));
     }
 
     @Test
-    public void toByteArrayFromReader()
-        throws Exception
-    {
+    public void toByteArrayFromReader() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toByteArray( new StringReader( probe ) ), is( probe.getBytes() ) );
+        assertThat(IOUtil.toByteArray(new StringReader(probe)), is(probe.getBytes()));
     }
 
     @Test
-    public void toByteArrayFromInputStream()
-        throws Exception
-    {
+    public void toByteArrayFromInputStream() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toByteArray( new DontCloseByteArrayInputStream( IOUtil.toByteArray( probe ) ) ),
-                    is( probe.getBytes() ) );
+        assertThat(
+                IOUtil.toByteArray(new DontCloseByteArrayInputStream(IOUtil.toByteArray(probe))), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toByteArrayNullString()
-        throws Exception
-    {
-        IOUtil.toByteArray( (String) null );
+    @Test(expected = NullPointerException.class)
+    public void toByteArrayNullString() throws Exception {
+        IOUtil.toByteArray((String) null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toByteArrayNullReader()
-        throws Exception
-    {
-        IOUtil.toByteArray( (Reader) null );
+    @Test(expected = NullPointerException.class)
+    public void toByteArrayNullReader() throws Exception {
+        IOUtil.toByteArray((Reader) null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toByteArrayNullInputStream()
-        throws Exception
-    {
-        IOUtil.toByteArray( nullInputStream() );
+    @Test(expected = NullPointerException.class)
+    public void toByteArrayNullInputStream() throws Exception {
+        IOUtil.toByteArray(nullInputStream());
     }
 
-    @Test( expected = IOException.class )
-    public void contentEqualNullNull()
-        throws Exception
-    {
-        IOUtil.contentEquals( null, null );
+    @Test(expected = IOException.class)
+    public void contentEqualNullNull() throws Exception {
+        IOUtil.contentEquals(null, null);
     }
 
-    @Test( expected = IOException.class )
-    public void contentEqualNonNullNull()
-        throws Exception
-    {
-        IOUtil.contentEquals( new DontCloseByteArrayInputStream( emptyByteArray() ), null );
+    @Test(expected = IOException.class)
+    public void contentEqualNonNullNull() throws Exception {
+        IOUtil.contentEquals(new DontCloseByteArrayInputStream(emptyByteArray()), null);
     }
 
-    @Test( expected = IOException.class )
-    public void contentEqualNullNonNull()
-        throws Exception
-    {
-        IOUtil.contentEquals( new DontCloseByteArrayInputStream( emptyByteArray() ), null );
+    @Test(expected = IOException.class)
+    public void contentEqualNullNonNull() throws Exception {
+        IOUtil.contentEquals(new DontCloseByteArrayInputStream(emptyByteArray()), null);
     }
 
     @Test
-    public void contentEqualEmptyEmpty()
-        throws Exception
-    {
-        assertThat( IOUtil.contentEquals( new DontCloseByteArrayInputStream( emptyByteArray() ),
-                                          new DontCloseByteArrayInputStream( emptyByteArray() ) ), is( true ) );
+    public void contentEqualEmptyEmpty() throws Exception {
+        assertThat(
+                IOUtil.contentEquals(
+                        new DontCloseByteArrayInputStream(emptyByteArray()),
+                        new DontCloseByteArrayInputStream(emptyByteArray())),
+                is(true));
     }
 
     @Test
-    public void contentEqualNonEmptyEmpty()
-        throws Exception
-    {
-        assertThat( IOUtil.contentEquals( new DontCloseByteArrayInputStream( new byte[1] ),
-                                          new DontCloseByteArrayInputStream( emptyByteArray() ) ), is( false ) );
+    public void contentEqualNonEmptyEmpty() throws Exception {
+        assertThat(
+                IOUtil.contentEquals(
+                        new DontCloseByteArrayInputStream(new byte[1]),
+                        new DontCloseByteArrayInputStream(emptyByteArray())),
+                is(false));
     }
 
     @Test
-    public void contentEqualEmptyNonEmpty()
-        throws Exception
-    {
-        assertThat( IOUtil.contentEquals( new DontCloseByteArrayInputStream( emptyByteArray() ),
-                                          new DontCloseByteArrayInputStream( new byte[1] ) ), is( false ) );
+    public void contentEqualEmptyNonEmpty() throws Exception {
+        assertThat(
+                IOUtil.contentEquals(
+                        new DontCloseByteArrayInputStream(emptyByteArray()),
+                        new DontCloseByteArrayInputStream(new byte[1])),
+                is(false));
     }
 
     @Test
-    public void contentEqualNonEmptyNonEmpty()
-        throws Exception
-    {
-        assertThat( IOUtil.contentEquals( new DontCloseByteArrayInputStream( new byte[1] ),
-                                          new DontCloseByteArrayInputStream( new byte[1] ) ), is( true ) );
+    public void contentEqualNonEmptyNonEmpty() throws Exception {
+        assertThat(
+                IOUtil.contentEquals(
+                        new DontCloseByteArrayInputStream(new byte[1]), new DontCloseByteArrayInputStream(new byte[1])),
+                is(true));
     }
 
     @Test
-    public void contentEqualMostlySame()
-        throws Exception
-    {
-        assertThat( IOUtil.contentEquals( new DontCloseByteArrayInputStream( new byte[]{ 1, 2, 3, 4, 5, 6 } ),
-                                          new DontCloseByteArrayInputStream( new byte[]{ 1, 2, 3, 4, 5, 7 } ) ),
-                    is( false ) );
+    public void contentEqualMostlySame() throws Exception {
+        assertThat(
+                IOUtil.contentEquals(
+                        new DontCloseByteArrayInputStream(new byte[] {1, 2, 3, 4, 5, 6}),
+                        new DontCloseByteArrayInputStream(new byte[] {1, 2, 3, 4, 5, 7})),
+                is(false));
     }
 
     @Test
-    public void contentEqualLargeSame()
-        throws Exception
-    {
-        assertThat( IOUtil.contentEquals( new DontCloseByteArrayInputStream( new byte[8192] ),
-                                          new DontCloseByteArrayInputStream( new byte[8192] ) ), is( true ) );
+    public void contentEqualLargeSame() throws Exception {
+        assertThat(
+                IOUtil.contentEquals(
+                        new DontCloseByteArrayInputStream(new byte[8192]),
+                        new DontCloseByteArrayInputStream(new byte[8192])),
+                is(true));
     }
 
     @Test
-    public void contentEqualLargeDifferent()
-        throws Exception
-    {
+    public void contentEqualLargeDifferent() throws Exception {
         byte[] buf = new byte[8192];
         buf[8191] = 1;
-        assertThat( IOUtil.contentEquals( new DontCloseByteArrayInputStream( new byte[8192] ),
-                                          new DontCloseByteArrayInputStream( buf ) ), is( false ) );
+        assertThat(
+                IOUtil.contentEquals(
+                        new DontCloseByteArrayInputStream(new byte[8192]), new DontCloseByteArrayInputStream(buf)),
+                is(false));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullByteArray()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray() );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullByteArray() throws Exception {
+        IOUtil.toString(nullByteArray());
     }
 
     @Test
-    public void toStringEmptyByteArray()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray() ), is( emptyString() ) );
+    public void toStringEmptyByteArray() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray()), is(emptyString()));
     }
 
     @Test
-    public void toStringByteArray()
-        throws Exception
-    {
+    public void toStringByteArray() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes() ).getBytes(), is( probe.getBytes() ) );
+        assertThat(IOUtil.toString(probe.getBytes()).getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullByteArrayNegBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), -1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullByteArrayNegBufSz() throws Exception {
+        IOUtil.toString(nullByteArray(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toStringEmptyByteArrayNegBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray(), -1 ), is( emptyString() ) );
+    @Test(expected = NegativeArraySizeException.class)
+    public void toStringEmptyByteArrayNegBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray(), -1), is(emptyString()));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toStringByteArrayNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void toStringByteArrayNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes(), -1 ), is( probe ) );
+        assertThat(IOUtil.toString(probe.getBytes(), -1), is(probe));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringNullByteArrayZeroBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringNullByteArrayZeroBufSz() throws Exception {
+        IOUtil.toString(nullByteArray(), 0);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullByteArrayPosBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullByteArrayPosBufSz() throws Exception {
+        IOUtil.toString(nullByteArray(), 1);
     }
 
     @Test
-    public void toStringEmptyByteArrayPosBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray(), 1 ), is( emptyString() ) );
+    public void toStringEmptyByteArrayPosBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray(), 1), is(emptyString()));
     }
 
     @Test
-    public void toStringByteArrayPosBufSz()
-        throws Exception
-    {
+    public void toStringByteArrayPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes(), 1 ).getBytes(), is( probe.getBytes() ) );
+        assertThat(IOUtil.toString(probe.getBytes(), 1).getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullByteArrayNullEncoding()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), null );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullByteArrayNullEncoding() throws Exception {
+        IOUtil.toString(nullByteArray(), null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringEmptyByteArrayNullEncoding()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray(), null ), is( emptyString() ) );
+    @Test(expected = NullPointerException.class)
+    public void toStringEmptyByteArrayNullEncoding() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray(), null), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringByteArrayNullEncoding()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void toStringByteArrayNullEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes(), null ).getBytes(), is( probe.getBytes() ) );
+        assertThat(IOUtil.toString(probe.getBytes(), null).getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullByteArrayJunkEncoding()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), "junk" );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullByteArrayJunkEncoding() throws Exception {
+        IOUtil.toString(nullByteArray(), "junk");
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void toStringEmptyByteArrayJunkEncoding()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray(), "junk" ), is( emptyString() ) );
+    @Test(expected = UnsupportedEncodingException.class)
+    public void toStringEmptyByteArrayJunkEncoding() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray(), "junk"), is(emptyString()));
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void toStringByteArrayJunkEncoding()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void toStringByteArrayJunkEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes(), "junk" ).getBytes(), is( probe.getBytes() ) );
+        assertThat(IOUtil.toString(probe.getBytes(), "junk").getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullByteArrayValidEncoding()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), "utf-16" );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullByteArrayValidEncoding() throws Exception {
+        IOUtil.toString(nullByteArray(), "utf-16");
     }
 
     @Test
-    public void toStringEmptyByteArrayValidEncoding()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray(), "utf-16" ), is( emptyString() ) );
+    public void toStringEmptyByteArrayValidEncoding() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray(), "utf-16"), is(emptyString()));
     }
 
     @Test
-    public void toStringByteArrayValidEncoding()
-        throws Exception
-    {
+    public void toStringByteArrayValidEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes( "utf-16" ), "utf-16" ).getBytes( "utf-8" ),
-                    is( probe.getBytes( "utf-8" ) ) );
+        assertThat(IOUtil.toString(probe.getBytes("utf-16"), "utf-16").getBytes("utf-8"), is(probe.getBytes("utf-8")));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullByteArrayNullEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), null, -1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullByteArrayNullEncodingNegBufSz() throws Exception {
+        IOUtil.toString(nullByteArray(), null, -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringEmptyByteArrayNullEncodingNegBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray(), null, -1 ), is( emptyString() ) );
+    @Test(expected = NullPointerException.class)
+    public void toStringEmptyByteArrayNullEncodingNegBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray(), null, -1), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringByteArrayNullEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void toStringByteArrayNullEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes(), null, -1 ).getBytes(), is( probe.getBytes() ) );
+        assertThat(IOUtil.toString(probe.getBytes(), null, -1).getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullByteArrayJunkEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), "junk", -1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullByteArrayJunkEncodingNegBufSz() throws Exception {
+        IOUtil.toString(nullByteArray(), "junk", -1);
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void toStringEmptyByteArrayJunkEncodingNegBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray(), "junk", -1 ), is( emptyString() ) );
+    @Test(expected = UnsupportedEncodingException.class)
+    public void toStringEmptyByteArrayJunkEncodingNegBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray(), "junk", -1), is(emptyString()));
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void toStringByteArrayJunkEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void toStringByteArrayJunkEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes(), "junk", -1 ).getBytes(), is( probe.getBytes() ) );
+        assertThat(IOUtil.toString(probe.getBytes(), "junk", -1).getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullByteArrayValidEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), "utf-16", -1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullByteArrayValidEncodingNegBufSz() throws Exception {
+        IOUtil.toString(nullByteArray(), "utf-16", -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toStringEmptyByteArrayValidEncodingNegBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray(), "utf-16", -1 ), is( emptyString() ) );
+    @Test(expected = NegativeArraySizeException.class)
+    public void toStringEmptyByteArrayValidEncodingNegBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray(), "utf-16", -1), is(emptyString()));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toStringByteArrayValidEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void toStringByteArrayValidEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes( "utf-16" ), "utf-16", -1 ).getBytes( "utf-8" ),
-                    is( probe.getBytes( "utf-8" ) ) );
+        assertThat(
+                IOUtil.toString(probe.getBytes("utf-16"), "utf-16", -1).getBytes("utf-8"), is(probe.getBytes("utf-8")));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringNullByteArrayNullEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), null, 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringNullByteArrayNullEncodingZeroBufSz() throws Exception {
+        IOUtil.toString(nullByteArray(), null, 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringEmptyByteArrayNullEncodingZeroBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray(), null, 0 ), is( emptyString() ) );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringEmptyByteArrayNullEncodingZeroBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray(), null, 0), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringByteArrayNullEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringByteArrayNullEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes(), null, 0 ).getBytes(), is( probe.getBytes() ) );
+        assertThat(IOUtil.toString(probe.getBytes(), null, 0).getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringNullByteArrayJunkEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), "junk", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringNullByteArrayJunkEncodingZeroBufSz() throws Exception {
+        IOUtil.toString(nullByteArray(), "junk", 0);
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringEmptyByteArrayJunkEncodingZeroBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyByteArray(), "junk", 0 ), is( emptyString() ) );
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringEmptyByteArrayJunkEncodingZeroBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyByteArray(), "junk", 0), is(emptyString()));
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringByteArrayJunkEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringByteArrayJunkEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( probe.getBytes(), "junk", 0 ).getBytes(), is( probe.getBytes() ) );
+        assertThat(IOUtil.toString(probe.getBytes(), "junk", 0).getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringNullByteArrayValidEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullByteArray(), "utf-16", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringNullByteArrayValidEncodingZeroBufSz() throws Exception {
+        IOUtil.toString(nullByteArray(), "utf-16", 0);
     }
 
     /*
      * copy(byte[],OutputStream)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullOutputStream() throws Exception {
+        IOUtil.copy(nullByteArray(), nullOutputStream());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayValidOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseByteArrayOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayValidOutputStream() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseByteArrayOutputStream());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyByteArrayNullOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyByteArrayNullOutputStream() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullOutputStream());
     }
 
     @Test
-    public void copyEmptyByteArrayValidOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), new DontCloseByteArrayOutputStream() );
+    public void copyEmptyByteArrayValidOutputStream() throws Exception {
+        IOUtil.copy(emptyByteArray(), new DontCloseByteArrayOutputStream());
     }
 
     @Test
-    public void copyByteArrayValidOutputStream()
-        throws Exception
-    {
+    public void copyByteArrayValidOutputStream() throws Exception {
         ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
-        byte[] input = { 1, 2, 3, 4, 5, 6 };
-        IOUtil.copy( input, outputStream );
-        assertThat( outputStream.toByteArray(), is( input ) );
+        byte[] input = {1, 2, 3, 4, 5, 6};
+        IOUtil.copy(input, outputStream);
+        assertThat(outputStream.toByteArray(), is(input));
     }
 
     /*
      * copy(byte[],OutputStream,int)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullOutputStream());
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullOutputStream());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayValidOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseByteArrayOutputStream());
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayValidOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseByteArrayOutputStream());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyByteArrayNullOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullOutputStream());
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyByteArrayNullOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullOutputStream());
     }
 
     @Test
-    public void copyEmptyByteArrayValidOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), new DontCloseByteArrayOutputStream());
+    public void copyEmptyByteArrayValidOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), new DontCloseByteArrayOutputStream());
     }
 
     @Test
-    public void copyByteArrayValidOutputStreamNegBufSz()
-        throws Exception
-    {
+    public void copyByteArrayValidOutputStreamNegBufSz() throws Exception {
         ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
-        byte[] input = { 1, 2, 3, 4, 5, 6 };
-        IOUtil.copy( input, outputStream);
-        assertThat( outputStream.toByteArray(), is( input ) );
+        byte[] input = {1, 2, 3, 4, 5, 6};
+        IOUtil.copy(input, outputStream);
+        assertThat(outputStream.toByteArray(), is(input));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayNullOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullOutputStream());
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayNullOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullOutputStream());
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayValidOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseByteArrayOutputStream());
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayValidOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseByteArrayOutputStream());
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyByteArrayNullOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullOutputStream());
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyByteArrayNullOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullOutputStream());
     }
 
-    @Test( timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyByteArrayValidOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), new DontCloseByteArrayOutputStream());
+    @Test(timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyByteArrayValidOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), new DontCloseByteArrayOutputStream());
     }
 
-    @Test( timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyByteArrayValidOutputStreamZeroBufSz()
-        throws Exception
-    {
+    @Test(timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyByteArrayValidOutputStreamZeroBufSz() throws Exception {
         ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
-        byte[] input = { 1, 2, 3, 4, 5, 6 };
-        IOUtil.copy( input, outputStream);
-        assertThat( outputStream.toByteArray(), is( input ) );
+        byte[] input = {1, 2, 3, 4, 5, 6};
+        IOUtil.copy(input, outputStream);
+        assertThat(outputStream.toByteArray(), is(input));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayNullOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullOutputStream());
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayNullOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullOutputStream());
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayValidOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseByteArrayOutputStream());
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayValidOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseByteArrayOutputStream());
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyByteArrayNullOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullOutputStream());
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyByteArrayNullOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullOutputStream());
     }
 
-    @Test( timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyByteArrayValidOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), new DontCloseByteArrayOutputStream());
+    @Test(timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyByteArrayValidOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), new DontCloseByteArrayOutputStream());
     }
 
-    @Test( timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyByteArrayValidOutputStreamPosBufSz()
-        throws Exception
-    {
+    @Test(timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyByteArrayValidOutputStreamPosBufSz() throws Exception {
         ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
-        byte[] input = { 1, 2, 3, 4, 5, 6 };
-        IOUtil.copy( input, outputStream);
-        assertThat( outputStream.toByteArray(), is( input ) );
+        byte[] input = {1, 2, 3, 4, 5, 6};
+        IOUtil.copy(input, outputStream);
+        assertThat(outputStream.toByteArray(), is(input));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamNullOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamNullOutputStream() throws Exception {
+        IOUtil.copy(nullInputStream(), nullOutputStream());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamValidOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseByteArrayOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamValidOutputStream() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseByteArrayOutputStream());
     }
 
     @Test
-    public void copyEmptyInputStreamNullOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( new DontCloseByteArrayInputStream( emptyByteArray() ), nullOutputStream() );
+    public void copyEmptyInputStreamNullOutputStream() throws Exception {
+        IOUtil.copy(new DontCloseByteArrayInputStream(emptyByteArray()), nullOutputStream());
     }
 
     @Test
-    public void copyEmptyInputStreamValidOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( new DontCloseByteArrayInputStream( emptyByteArray() ), new DontCloseByteArrayOutputStream() );
+    public void copyEmptyInputStreamValidOutputStream() throws Exception {
+        IOUtil.copy(new DontCloseByteArrayInputStream(emptyByteArray()), new DontCloseByteArrayOutputStream());
     }
 
     @Test
-    public void copyInputStreamValidOutputStream()
-        throws Exception
-    {
+    public void copyInputStreamValidOutputStream() throws Exception {
         ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
-        byte[] input = { 1, 2, 3, 4, 5, 6 };
-        IOUtil.copy( new DontCloseByteArrayInputStream( input ), outputStream );
-        assertThat( outputStream.toByteArray(), is( input ) );
+        byte[] input = {1, 2, 3, 4, 5, 6};
+        IOUtil.copy(new DontCloseByteArrayInputStream(input), outputStream);
+        assertThat(outputStream.toByteArray(), is(input));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyNullInputStreamNullOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullOutputStream(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyNullInputStreamNullOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullOutputStream(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyNullInputStreamValidOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseByteArrayOutputStream(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyNullInputStreamValidOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseByteArrayOutputStream(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyInputStreamNullOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( new DontCloseByteArrayInputStream( emptyByteArray() ), nullOutputStream(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyInputStreamNullOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(new DontCloseByteArrayInputStream(emptyByteArray()), nullOutputStream(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyInputStreamValidOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( new DontCloseByteArrayInputStream( emptyByteArray() ), new DontCloseByteArrayOutputStream(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyInputStreamValidOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(new DontCloseByteArrayInputStream(emptyByteArray()), new DontCloseByteArrayOutputStream(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyInputStreamValidOutputStreamNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyInputStreamValidOutputStreamNegBufSz() throws Exception {
         ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
-        byte[] input = { 1, 2, 3, 4, 5, 6 };
-        IOUtil.copy( new DontCloseByteArrayInputStream( input ), outputStream, -1 );
-        assertThat( outputStream.toByteArray(), is( input ) );
+        byte[] input = {1, 2, 3, 4, 5, 6};
+        IOUtil.copy(new DontCloseByteArrayInputStream(input), outputStream, -1);
+        assertThat(outputStream.toByteArray(), is(input));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamNullOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullOutputStream(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamNullOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullOutputStream(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamValidOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new ByteArrayOutputStream(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamValidOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new ByteArrayOutputStream(), 0);
     }
 
-    @Test( timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyInputStreamNullOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( new DontCloseByteArrayInputStream( emptyByteArray() ), nullOutputStream(), 0 );
+    @Test(timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyInputStreamNullOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(new DontCloseByteArrayInputStream(emptyByteArray()), nullOutputStream(), 0);
     }
 
-    @Test( timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyInputStreamValidOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( new DontCloseByteArrayInputStream( emptyByteArray() ), new DontCloseByteArrayOutputStream(), 0 );
+    @Test(timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyInputStreamValidOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(new DontCloseByteArrayInputStream(emptyByteArray()), new DontCloseByteArrayOutputStream(), 0);
     }
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamNullOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullOutputStream(), 1 );
+
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamNullOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullOutputStream(), 1);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamValidOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new ByteArrayOutputStream(), 1 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamValidOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new ByteArrayOutputStream(), 1);
     }
 
-    @Test( timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyInputStreamNullOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( new DontCloseByteArrayInputStream( emptyByteArray() ), nullOutputStream(), 1 );
+    @Test(timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyInputStreamNullOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(new DontCloseByteArrayInputStream(emptyByteArray()), nullOutputStream(), 1);
     }
 
-    @Test( timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyInputStreamValidOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( new DontCloseByteArrayInputStream( emptyByteArray() ), new DontCloseByteArrayOutputStream(), 1 );
+    @Test(timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyInputStreamValidOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(new DontCloseByteArrayInputStream(emptyByteArray()), new DontCloseByteArrayOutputStream(), 1);
     }
 
-    @Test( timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyInputStreamValidOutputStreamPosBufSz()
-        throws Exception
-    {
+    @Test(timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyInputStreamValidOutputStreamPosBufSz() throws Exception {
         ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
-        byte[] input = { 1, 2, 3, 4, 5, 6 };
-        IOUtil.copy( new DontCloseByteArrayInputStream( input ), outputStream, 1 );
-        assertThat( outputStream.toByteArray(), is( input ) );
+        byte[] input = {1, 2, 3, 4, 5, 6};
+        IOUtil.copy(new DontCloseByteArrayInputStream(input), outputStream, 1);
+        assertThat(outputStream.toByteArray(), is(input));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullInputStream()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream() );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullInputStream() throws Exception {
+        IOUtil.toString(nullInputStream());
     }
 
     @Test
-    public void toStringEmptyInputStream()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream() ), is( emptyString() ) );
+    public void toStringEmptyInputStream() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream()), is(emptyString()));
     }
 
     @Test
-    public void toStringInputStream()
-        throws Exception
-    {
+    public void toStringInputStream() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new ByteArrayInputStream( probe.getBytes() ) ).getBytes(),
-                    is( probe.getBytes() ) );
+        assertThat(IOUtil.toString(new ByteArrayInputStream(probe.getBytes())).getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullInputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), -1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullInputStreamNegBufSz() throws Exception {
+        IOUtil.toString(nullInputStream(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toStringEmptyInputStreamNegBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream(), -1 ), is( emptyString() ) );
+    @Test(expected = NegativeArraySizeException.class)
+    public void toStringEmptyInputStreamNegBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream(), -1), is(emptyString()));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toStringInputStreamNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void toStringInputStreamNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new ByteArrayInputStream( probe.getBytes() ), -1 ), is( probe ) );
+        assertThat(IOUtil.toString(new ByteArrayInputStream(probe.getBytes()), -1), is(probe));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringNullInputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringNullInputStreamZeroBufSz() throws Exception {
+        IOUtil.toString(nullInputStream(), 0);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullInputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullInputStreamPosBufSz() throws Exception {
+        IOUtil.toString(nullInputStream(), 1);
     }
 
     @Test
-    public void toStringEmptyInputStreamPosBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream(), 1 ), is( emptyString() ) );
+    public void toStringEmptyInputStreamPosBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream(), 1), is(emptyString()));
     }
 
     @Test
-    public void toStringInputStreamPosBufSz()
-        throws Exception
-    {
+    public void toStringInputStreamPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new ByteArrayInputStream( probe.getBytes() ), 1 ).getBytes(),
-                    is( probe.getBytes() ) );
+        assertThat(
+                IOUtil.toString(new ByteArrayInputStream(probe.getBytes()), 1).getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullInputStreamNullEncoding()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), null );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullInputStreamNullEncoding() throws Exception {
+        IOUtil.toString(nullInputStream(), null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringEmptyInputStreamNullEncoding()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream(), null ), is( emptyString() ) );
+    @Test(expected = NullPointerException.class)
+    public void toStringEmptyInputStreamNullEncoding() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream(), null), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringInputStreamNullEncoding()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void toStringInputStreamNullEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new ByteArrayInputStream( probe.getBytes() ), null ).getBytes(),
-                    is( probe.getBytes() ) );
+        assertThat(
+                IOUtil.toString(new ByteArrayInputStream(probe.getBytes()), null)
+                        .getBytes(),
+                is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullInputStreamJunkEncoding()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), "junk" );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullInputStreamJunkEncoding() throws Exception {
+        IOUtil.toString(nullInputStream(), "junk");
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void toStringEmptyInputStreamJunkEncoding()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream(), "junk" ), is( emptyString() ) );
+    @Test(expected = UnsupportedEncodingException.class)
+    public void toStringEmptyInputStreamJunkEncoding() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream(), "junk"), is(emptyString()));
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void toStringInputStreamJunkEncoding()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void toStringInputStreamJunkEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new ByteArrayInputStream( probe.getBytes() ), "junk" ).getBytes(),
-                    is( probe.getBytes() ) );
+        assertThat(
+                IOUtil.toString(new ByteArrayInputStream(probe.getBytes()), "junk")
+                        .getBytes(),
+                is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullInputStreamValidEncoding()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), "utf-16" );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullInputStreamValidEncoding() throws Exception {
+        IOUtil.toString(nullInputStream(), "utf-16");
     }
 
     @Test
-    public void toStringEmptyInputStreamValidEncoding()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream(), "utf-16" ), is( emptyString() ) );
+    public void toStringEmptyInputStreamValidEncoding() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream(), "utf-16"), is(emptyString()));
     }
 
     @Test
-    public void toStringInputStreamValidEncoding()
-        throws Exception
-    {
+    public void toStringInputStreamValidEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
         assertThat(
-            IOUtil.toString( new ByteArrayInputStream( probe.getBytes( "utf-16" ) ), "utf-16" ).getBytes( "utf-8" ),
-            is( probe.getBytes( "utf-8" ) ) );
+                IOUtil.toString(new ByteArrayInputStream(probe.getBytes("utf-16")), "utf-16")
+                        .getBytes("utf-8"),
+                is(probe.getBytes("utf-8")));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullInputStreamNullEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), null, -1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullInputStreamNullEncodingNegBufSz() throws Exception {
+        IOUtil.toString(nullInputStream(), null, -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringEmptyInputStreamNullEncodingNegBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream(), null, -1 ), is( emptyString() ) );
+    @Test(expected = NullPointerException.class)
+    public void toStringEmptyInputStreamNullEncodingNegBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream(), null, -1), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringInputStreamNullEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void toStringInputStreamNullEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new ByteArrayInputStream( probe.getBytes() ), null, -1 ).getBytes(),
-                    is( probe.getBytes() ) );
+        assertThat(
+                IOUtil.toString(new ByteArrayInputStream(probe.getBytes()), null, -1)
+                        .getBytes(),
+                is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullInputStreamJunkEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), "junk", -1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullInputStreamJunkEncodingNegBufSz() throws Exception {
+        IOUtil.toString(nullInputStream(), "junk", -1);
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void toStringEmptyInputStreamJunkEncodingNegBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream(), "junk", -1 ), is( emptyString() ) );
+    @Test(expected = UnsupportedEncodingException.class)
+    public void toStringEmptyInputStreamJunkEncodingNegBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream(), "junk", -1), is(emptyString()));
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void toStringInputStreamJunkEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void toStringInputStreamJunkEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new ByteArrayInputStream( probe.getBytes() ), "junk", -1 ).getBytes(),
-                    is( probe.getBytes() ) );
+        assertThat(
+                IOUtil.toString(new ByteArrayInputStream(probe.getBytes()), "junk", -1)
+                        .getBytes(),
+                is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullInputStreamValidEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), "utf-16", -1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullInputStreamValidEncodingNegBufSz() throws Exception {
+        IOUtil.toString(nullInputStream(), "utf-16", -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toStringEmptyInputStreamValidEncodingNegBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream(), "utf-16", -1 ), is( emptyString() ) );
+    @Test(expected = NegativeArraySizeException.class)
+    public void toStringEmptyInputStreamValidEncodingNegBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream(), "utf-16", -1), is(emptyString()));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toStringInputStreamValidEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void toStringInputStreamValidEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         assertThat(
-            IOUtil.toString( new ByteArrayInputStream( probe.getBytes( "utf-16" ) ), "utf-16", -1 ).getBytes( "utf-8" ),
-            is( probe.getBytes( "utf-8" ) ) );
+                IOUtil.toString(new ByteArrayInputStream(probe.getBytes("utf-16")), "utf-16", -1)
+                        .getBytes("utf-8"),
+                is(probe.getBytes("utf-8")));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringNullInputStreamNullEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), null, 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringNullInputStreamNullEncodingZeroBufSz() throws Exception {
+        IOUtil.toString(nullInputStream(), null, 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringEmptyInputStreamNullEncodingZeroBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream(), null, 0 ), is( emptyString() ) );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringEmptyInputStreamNullEncodingZeroBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream(), null, 0), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringInputStreamNullEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringInputStreamNullEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new ByteArrayInputStream( probe.getBytes() ), null, 0 ).getBytes(),
-                    is( probe.getBytes() ) );
+        assertThat(
+                IOUtil.toString(new ByteArrayInputStream(probe.getBytes()), null, 0)
+                        .getBytes(),
+                is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringNullInputStreamJunkEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), "junk", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringNullInputStreamJunkEncodingZeroBufSz() throws Exception {
+        IOUtil.toString(nullInputStream(), "junk", 0);
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringEmptyInputStreamJunkEncodingZeroBufSz()
-        throws Exception
-    {
-        assertThat( IOUtil.toString( emptyInputStream(), "junk", 0 ), is( emptyString() ) );
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringEmptyInputStreamJunkEncodingZeroBufSz() throws Exception {
+        assertThat(IOUtil.toString(emptyInputStream(), "junk", 0), is(emptyString()));
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringInputStreamJunkEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringInputStreamJunkEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new ByteArrayInputStream( probe.getBytes() ), "junk", 0 ).getBytes(),
-                    is( probe.getBytes() ) );
+        assertThat(
+                IOUtil.toString(new ByteArrayInputStream(probe.getBytes()), "junk", 0)
+                        .getBytes(),
+                is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void toStringNullInputStreamValidEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullInputStream(), "utf-16", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void toStringNullInputStreamValidEncodingZeroBufSz() throws Exception {
+        IOUtil.toString(nullInputStream(), "utf-16", 0);
     }
 
     /*
      * copy(InputStream,Writer)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamNullWriter()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamNullWriter() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyInputStreamNullWriter()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter() );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyInputStreamNullWriter() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter());
     }
 
     @Test
-    public void copyEmptyInputStreamValidWriter()
-        throws Exception
-    {
+    public void copyEmptyInputStreamValidWriter() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyInputStream(), writer );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyInputStream(), writer);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyInputStreamNullWriter()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyInputStreamNullWriter() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), nullWriter() );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), nullWriter());
     }
 
     @Test
-    public void copyInputStreamValidWriter()
-        throws Exception
-    {
+    public void copyInputStreamValidWriter() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), writer );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), writer);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
     /*
      * copy(InputStream,Writer,int)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamNullWriterNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamNullWriterNegBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyInputStreamNullWriterNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyInputStreamNullWriterNegBufSz() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyInputStreamValidWriterNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), new DontCloseStringWriter(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyInputStreamValidWriterNegBufSz() throws Exception {
+        IOUtil.copy(emptyInputStream(), new DontCloseStringWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyInputStreamNullWriterNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyInputStreamNullWriterNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), nullWriter(), -1 );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyInputStreamValidWriterNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyInputStreamValidWriterNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), writer, -1 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), writer, -1);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamNullWriterZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamNullWriterZeroBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamValidWriterZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamValidWriterZeroBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyInputStreamNullWriterZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyInputStreamNullWriterZeroBufSz() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), 0);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamNullWriterPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamNullWriterPosBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamValidWriterPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamValidWriterPosBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyInputStreamNullWriterPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyInputStreamNullWriterPosBufSz() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), 1);
     }
 
     @Test
-    public void copyEmptyInputStreamValidWriterPosBufSz()
-        throws Exception
-    {
+    public void copyEmptyInputStreamValidWriterPosBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyInputStream(), writer, 1 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyInputStream(), writer, 1);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
     @Test
-    public void copyInputStreamValidWriterPosBufSz()
-        throws Exception
-    {
+    public void copyInputStreamValidWriterPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), writer, 1 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), writer, 1);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
     /*
      * copy(InputStream,Writer,String)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamNullWriterNullEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), null );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamNullWriterNullEncoding() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamValidWriterNullEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), null );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamValidWriterNullEncoding() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyInputStreamNullWriterNullEncoding()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), null );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyInputStreamNullWriterNullEncoding() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyInputStreamValidWriterNullEncoding()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), new DontCloseStringWriter(), null );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyInputStreamValidWriterNullEncoding() throws Exception {
+        IOUtil.copy(emptyInputStream(), new DontCloseStringWriter(), null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyInputStreamNullEncoding()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyInputStreamNullEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), writer, null );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), writer, null);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamNullWriterJunkEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), "junk" );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamNullWriterJunkEncoding() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), "junk");
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamValidWriterJunkEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), "junk" );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamValidWriterJunkEncoding() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), "junk");
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyEmptyInputStreamNullWriterJunkEncoding()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), "junk" );
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyEmptyInputStreamNullWriterJunkEncoding() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), "junk");
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyEmptyInputStreamValidWriterJunkEncoding()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), new DontCloseStringWriter(), "junk" );
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyEmptyInputStreamValidWriterJunkEncoding() throws Exception {
+        IOUtil.copy(emptyInputStream(), new DontCloseStringWriter(), "junk");
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyInputStreamNullWriterJunkEncoding()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyInputStreamNullWriterJunkEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), nullWriter(), "junk" );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), nullWriter(), "junk");
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyInputStreamValidWriterJunkEncoding()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyInputStreamValidWriterJunkEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), writer, "junk" );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), writer, "junk");
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamNullWriterValidEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), "utf-16" );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamNullWriterValidEncoding() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), "utf-16");
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyInputStreamNullWriterValidEncoding()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), "utf-16" );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyInputStreamNullWriterValidEncoding() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), "utf-16");
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamValidWriterValidEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), "utf-16" );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamValidWriterValidEncoding() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), "utf-16");
     }
 
     @Test
-    public void copyEmptyInputStreamValidWriterValidEncoding()
-        throws Exception
-    {
+    public void copyEmptyInputStreamValidWriterValidEncoding() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyInputStream(), writer, "utf-16" );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyInputStream(), writer, "utf-16");
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyInputStreamNullWriterValidEncoding()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyInputStreamNullWriterValidEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes( "utf-16" ) ), nullWriter(), "utf-16" );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes("utf-16")), nullWriter(), "utf-16");
     }
 
     @Test
-    public void copyInputStreamValidWriterValidEncoding()
-        throws Exception
-    {
+    public void copyInputStreamValidWriterValidEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes( "utf-16" ) ), writer, "utf-16" );
-        assertThat( writer.toString().getBytes( "utf-8" ), is( probe.getBytes( "utf-8" ) ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes("utf-16")), writer, "utf-16");
+        assertThat(writer.toString().getBytes("utf-8"), is(probe.getBytes("utf-8")));
     }
 
     /*
      * copy(InputStream,Writer,String,int)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamNullWriterNullEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), null, -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamNullWriterNullEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), null, -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamValidWriterNullEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), null, -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamValidWriterNullEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), null, -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyInputStreamNullWriterNullEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), null, -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyInputStreamNullWriterNullEncodingNegBufSz() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), null, -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyInputStreamValidWriterNullEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyInputStreamValidWriterNullEncodingNegBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyInputStream(), writer, null, -1 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyInputStream(), writer, null, -1);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyInputStreamNullWriterNullEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyInputStreamNullWriterNullEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), nullWriter(), null, -1 );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), nullWriter(), null, -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyInputStreamValidWriterNullEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyInputStreamValidWriterNullEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), writer, null, -1 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), writer, null, -1);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamNullWriterJunkEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), "junk", -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamNullWriterJunkEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), "junk", -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamValidWriterJunkEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), "junk", -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamValidWriterJunkEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), "junk", -1);
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyEmptyInputStreamNullWriterJunkEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), "junk", -1 );
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyEmptyInputStreamNullWriterJunkEncodingNegBufSz() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), "junk", -1);
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyEmptyInputStreamJunkEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyEmptyInputStreamJunkEncodingNegBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyInputStream(), writer, "junk", -1 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyInputStream(), writer, "junk", -1);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyInputStreamNullWriterJunkEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyInputStreamNullWriterJunkEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), nullWriter(), "junk", -1 );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), nullWriter(), "junk", -1);
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyInputStreamValidWriterJunkEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyInputStreamValidWriterJunkEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), writer, "junk", -1 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), writer, "junk", -1);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamNullWriterValidEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), "utf-16", -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamNullWriterValidEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), "utf-16", -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullInputStreamValidWriterValidEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), "utf-16", -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullInputStreamValidWriterValidEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), "utf-16", -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyInputStreamNullWriterValidEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), "utf-16", -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyInputStreamNullWriterValidEncodingNegBufSz() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), "utf-16", -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyInputStreamValidWriterValidEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyInputStreamValidWriterValidEncodingNegBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyInputStream(), writer, "utf-16", -1 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyInputStream(), writer, "utf-16", -1);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyInputStreamNullWriterValidEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyInputStreamNullWriterValidEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes( "utf-16" ) ), nullWriter(), -1 );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes("utf-16")), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyInputStreamValidEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyInputStreamValidEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes( "utf-16" ) ), writer, "utf-16", -1 );
-        assertThat( writer.toString().getBytes( "utf-8" ), is( probe.getBytes( "utf-8" ) ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes("utf-16")), writer, "utf-16", -1);
+        assertThat(writer.toString().getBytes("utf-8"), is(probe.getBytes("utf-8")));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamNullWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), null, 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamNullWriterNullEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), null, 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamValidWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), null, 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamValidWriterNullEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), null, 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyInputStreamNullWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), null, 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyInputStreamNullWriterNullEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), null, 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyInputStreamValidWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyInputStreamValidWriterNullEncodingZeroBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyInputStream(), writer, null, 0 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyInputStream(), writer, null, 0);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyInputStreamNullWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyInputStreamNullWriterNullEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), nullWriter(), null, 0 );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), nullWriter(), null, 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyInputStreamValidWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyInputStreamValidWriterNullEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), writer, null, 0 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), writer, null, 0);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamNullWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), "junk", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamNullWriterJunkEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), "junk", 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamValidWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), "junk", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamValidWriterJunkEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), "junk", 0);
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyInputStreamNullWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyInputStream(), nullWriter(), "junk", 0 );
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyInputStreamNullWriterJunkEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(emptyInputStream(), nullWriter(), "junk", 0);
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyInputStreamValidWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyInputStreamValidWriterJunkEncodingZeroBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyInputStream(), writer, "junk", 0 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyInputStream(), writer, "junk", 0);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyInputStreamNullWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyInputStreamNullWriterJunkEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), nullWriter(), "junk", 0 );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), nullWriter(), "junk", 0);
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyInputStreamValidWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyInputStreamValidWriterJunkEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new ByteArrayInputStream( probe.getBytes() ), writer, "junk", 0 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(new ByteArrayInputStream(probe.getBytes()), writer, "junk", 0);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamNullWriterValidEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), nullWriter(), "utf-16", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamNullWriterValidEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), nullWriter(), "utf-16", 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullInputStreamValidWriterValidEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullInputStream(), new DontCloseStringWriter(), "utf-16", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullInputStreamValidWriterValidEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullInputStream(), new DontCloseStringWriter(), "utf-16", 0);
     }
 
     /*
      * copy(String,Writer)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullStringNullWriter()
-        throws Exception
-    {
-        IOUtil.copy( nullString(), nullWriter() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullStringNullWriter() throws Exception {
+        IOUtil.copy(nullString(), nullWriter());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyStringNullWriter()
-        throws Exception
-    {
-        IOUtil.copy( emptyString(), nullWriter() );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyStringNullWriter() throws Exception {
+        IOUtil.copy(emptyString(), nullWriter());
     }
 
     @Test
-    public void copyNullStringValidWriter()
-        throws Exception
-    {
-        IOUtil.copy( nullString(), new DontCloseStringWriter() );
+    public void copyNullStringValidWriter() throws Exception {
+        IOUtil.copy(nullString(), new DontCloseStringWriter());
     }
 
     @Test
-    public void copyEmptyStringValidWriter()
-        throws Exception
-    {
+    public void copyEmptyStringValidWriter() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyString(), writer );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyString(), writer);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyStringNullWriter()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyStringNullWriter() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe, nullWriter() );
+        IOUtil.copy(probe, nullWriter());
     }
 
     @Test
-    public void copyStringValidWriter()
-        throws Exception
-    {
+    public void copyStringValidWriter() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe, writer );
-        assertThat( writer.toString(), is( probe ) );
+        IOUtil.copy(probe, writer);
+        assertThat(writer.toString(), is(probe));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullStringNullOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( nullString(), nullOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullStringNullOutputStream() throws Exception {
+        IOUtil.copy(nullString(), nullOutputStream());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyStringNullOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( emptyString(), nullOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyStringNullOutputStream() throws Exception {
+        IOUtil.copy(emptyString(), nullOutputStream());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullStringValidOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( nullString(), new DontCloseByteArrayOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullStringValidOutputStream() throws Exception {
+        IOUtil.copy(nullString(), new DontCloseByteArrayOutputStream());
     }
 
     @Test
-    public void copyEmptyStringValidOutputStream()
-        throws Exception
-    {
+    public void copyEmptyStringValidOutputStream() throws Exception {
         ByteArrayOutputStream OutputStream = new DontCloseByteArrayOutputStream();
-        IOUtil.copy( emptyString(), OutputStream );
-        assertThat( OutputStream.toByteArray(), is( emptyString().getBytes() ) );
+        IOUtil.copy(emptyString(), OutputStream);
+        assertThat(OutputStream.toByteArray(), is(emptyString().getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyStringNullOutputStream()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyStringNullOutputStream() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe, nullOutputStream() );
+        IOUtil.copy(probe, nullOutputStream());
     }
 
     @Test
-    public void copyStringValidOutputStream()
-        throws Exception
-    {
+    public void copyStringValidOutputStream() throws Exception {
         String probe = "A string \u2345\u00ef";
         ByteArrayOutputStream OutputStream = new DontCloseByteArrayOutputStream();
-        IOUtil.copy( probe, OutputStream );
-        assertThat( OutputStream.toByteArray(), is( probe.getBytes() ) );
+        IOUtil.copy(probe, OutputStream);
+        assertThat(OutputStream.toByteArray(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullStringNullOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullString(), nullOutputStream(), -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullStringNullOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(nullString(), nullOutputStream(), -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyStringNullOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyString(), nullOutputStream(), -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyStringNullOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(emptyString(), nullOutputStream(), -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullStringValidOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullString(), new DontCloseByteArrayOutputStream(), -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullStringValidOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(nullString(), new DontCloseByteArrayOutputStream(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyStringValidOutputStreamNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyStringValidOutputStreamNegBufSz() throws Exception {
         ByteArrayOutputStream OutputStream = new DontCloseByteArrayOutputStream();
-        IOUtil.copy( emptyString(), OutputStream, -1 );
-        assertThat( OutputStream.toByteArray(), is( emptyString().getBytes() ) );
+        IOUtil.copy(emptyString(), OutputStream, -1);
+        assertThat(OutputStream.toByteArray(), is(emptyString().getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyStringNullOutputStreamNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyStringNullOutputStreamNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe, nullOutputStream(), -1 );
+        IOUtil.copy(probe, nullOutputStream(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyStringValidOutputStreamNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyStringValidOutputStreamNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         ByteArrayOutputStream OutputStream = new DontCloseByteArrayOutputStream();
-        IOUtil.copy( probe, OutputStream, -1 );
-        assertThat( OutputStream.toByteArray(), is( probe.getBytes() ) );
+        IOUtil.copy(probe, OutputStream, -1);
+        assertThat(OutputStream.toByteArray(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullStringNullOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullString(), nullOutputStream(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullStringNullOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(nullString(), nullOutputStream(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyStringNullOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyString(), nullOutputStream(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyStringNullOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(emptyString(), nullOutputStream(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullStringValidOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullString(), new DontCloseByteArrayOutputStream(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullStringValidOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(nullString(), new DontCloseByteArrayOutputStream(), 0);
     }
-    @Test( expected = NullPointerException.class )
-    public void copyNullStringNullOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullString(), nullOutputStream(), 1 );
+
+    @Test(expected = NullPointerException.class)
+    public void copyNullStringNullOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(nullString(), nullOutputStream(), 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyStringNullOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyString(), nullOutputStream(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyStringNullOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(emptyString(), nullOutputStream(), 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullStringValidOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullString(), new DontCloseByteArrayOutputStream(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullStringValidOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(nullString(), new DontCloseByteArrayOutputStream(), 1);
     }
 
     @Test
-    public void copyEmptyStringValidOutputStreamPosBufSz()
-        throws Exception
-    {
+    public void copyEmptyStringValidOutputStreamPosBufSz() throws Exception {
         ByteArrayOutputStream OutputStream = new DontCloseByteArrayOutputStream();
-        IOUtil.copy( emptyString(), OutputStream, 1 );
-        assertThat( OutputStream.toByteArray(), is( emptyString().getBytes() ) );
+        IOUtil.copy(emptyString(), OutputStream, 1);
+        assertThat(OutputStream.toByteArray(), is(emptyString().getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyStringNullOutputStreamPosBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyStringNullOutputStreamPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe, nullOutputStream(), 1 );
+        IOUtil.copy(probe, nullOutputStream(), 1);
     }
 
     @Test
-    public void copyStringValidOutputStreamPosBufSz()
-        throws Exception
-    {
+    public void copyStringValidOutputStreamPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         ByteArrayOutputStream OutputStream = new DontCloseByteArrayOutputStream();
-        IOUtil.copy( probe, OutputStream, 1 );
-        assertThat( OutputStream.toByteArray(), is( probe.getBytes() ) );
+        IOUtil.copy(probe, OutputStream, 1);
+        assertThat(OutputStream.toByteArray(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullReaderNullWriter()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), nullWriter() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullReaderNullWriter() throws Exception {
+        IOUtil.copy(nullReader(), nullWriter());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyReaderNullWriter()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), nullWriter() );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyReaderNullWriter() throws Exception {
+        IOUtil.copy(emptyReader(), nullWriter());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullReaderValidWriter()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), new DontCloseStringWriter() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullReaderValidWriter() throws Exception {
+        IOUtil.copy(nullReader(), new DontCloseStringWriter());
     }
 
     @Test
-    public void copyEmptyReaderValidWriter()
-        throws Exception
-    {
+    public void copyEmptyReaderValidWriter() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyReader(), writer );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyReader(), writer);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyReaderNullWriter()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyReaderNullWriter() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new StringReader( probe ), nullWriter() );
+        IOUtil.copy(new StringReader(probe), nullWriter());
     }
 
     @Test
-    public void copyReaderValidWriter()
-        throws Exception
-    {
+    public void copyReaderValidWriter() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new StringReader( probe ), writer );
-        assertThat( writer.toString(), is( probe ) );
+        IOUtil.copy(new StringReader(probe), writer);
+        assertThat(writer.toString(), is(probe));
     }
 
     /*
      * copy(Reader,Writer,int)
      */
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyNullReaderNullWriterNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), nullWriter(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyNullReaderNullWriterNegBufSz() throws Exception {
+        IOUtil.copy(nullReader(), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyReaderNullWriterNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), nullWriter(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyReaderNullWriterNegBufSz() throws Exception {
+        IOUtil.copy(emptyReader(), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyNullReaderValidWriterNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), new DontCloseStringWriter(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyNullReaderValidWriterNegBufSz() throws Exception {
+        IOUtil.copy(nullReader(), new DontCloseStringWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyReaderValidWriterNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyReaderValidWriterNegBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyReader(), writer, -1 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyReader(), writer, -1);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyReaderNullWriterNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyReaderNullWriterNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new StringReader( probe ), nullWriter(), -1 );
+        IOUtil.copy(new StringReader(probe), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyReaderValidWriterNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyReaderValidWriterNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new StringReader( probe ), writer, -1 );
-        assertThat( writer.toString(), is( probe ) );
+        IOUtil.copy(new StringReader(probe), writer, -1);
+        assertThat(writer.toString(), is(probe));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullReaderNullWriterZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), nullWriter(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullReaderNullWriterZeroBufSz() throws Exception {
+        IOUtil.copy(nullReader(), nullWriter(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyReaderNullWriterZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), nullWriter(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyReaderNullWriterZeroBufSz() throws Exception {
+        IOUtil.copy(emptyReader(), nullWriter(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullReaderValidWriterZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), new DontCloseStringWriter(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullReaderValidWriterZeroBufSz() throws Exception {
+        IOUtil.copy(nullReader(), new DontCloseStringWriter(), 0);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullReaderNullWriterPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), nullWriter(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullReaderNullWriterPosBufSz() throws Exception {
+        IOUtil.copy(nullReader(), nullWriter(), 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyReaderNullWriterPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), nullWriter(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyReaderNullWriterPosBufSz() throws Exception {
+        IOUtil.copy(emptyReader(), nullWriter(), 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullReaderValidWriterPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), new DontCloseStringWriter(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullReaderValidWriterPosBufSz() throws Exception {
+        IOUtil.copy(nullReader(), new DontCloseStringWriter(), 1);
     }
 
     @Test
-    public void copyEmptyReaderValidWriterPosBufSz()
-        throws Exception
-    {
+    public void copyEmptyReaderValidWriterPosBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyReader(), writer, 1 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyReader(), writer, 1);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyReaderNullWriterPosBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyReaderNullWriterPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new StringReader( probe ), nullWriter(), 1 );
+        IOUtil.copy(new StringReader(probe), nullWriter(), 1);
     }
 
     @Test
-    public void copyReaderValidWriterPosBufSz()
-        throws Exception
-    {
+    public void copyReaderValidWriterPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( new StringReader( probe ), writer, 1 );
-        assertThat( writer.toString(), is( probe ) );
+        IOUtil.copy(new StringReader(probe), writer, 1);
+        assertThat(writer.toString(), is(probe));
     }
 
     /*
      * toByteArray(InputStream,int)
      */
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toByteArrayFromInputStreamNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void toByteArrayFromInputStreamNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toByteArray( new DontCloseByteArrayInputStream( IOUtil.toByteArray( probe ) ), -1 ),
-                    is( probe.getBytes() ) );
+        assertThat(
+                IOUtil.toByteArray(new DontCloseByteArrayInputStream(IOUtil.toByteArray(probe)), -1),
+                is(probe.getBytes()));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toByteArrayNullInputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.toByteArray( nullInputStream(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void toByteArrayNullInputStreamNegBufSz() throws Exception {
+        IOUtil.toByteArray(nullInputStream(), -1);
     }
 
     @Test
-    public void toByteArrayFromInputStreamPosBufSz()
-        throws Exception
-    {
+    public void toByteArrayFromInputStreamPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toByteArray( new DontCloseByteArrayInputStream( IOUtil.toByteArray( probe ) ), +1 ),
-                    is( probe.getBytes() ) );
+        assertThat(
+                IOUtil.toByteArray(new DontCloseByteArrayInputStream(IOUtil.toByteArray(probe)), +1),
+                is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toByteArrayNullInputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.toByteArray( nullInputStream(), +1 );
+    @Test(expected = NullPointerException.class)
+    public void toByteArrayNullInputStreamPosBufSz() throws Exception {
+        IOUtil.toByteArray(nullInputStream(), +1);
     }
 
     /*
      * toByteArray(Reader,int)
      */
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toByteArrayFromReaderNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void toByteArrayFromReaderNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toByteArray( new DontCloseStringReader( probe ), -1 ),
-                    is( probe.getBytes() ) );
+        assertThat(IOUtil.toByteArray(new DontCloseStringReader(probe), -1), is(probe.getBytes()));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toByteArrayNullReaderNegBufSz()
-        throws Exception
-    {
-        IOUtil.toByteArray( nullReader(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void toByteArrayNullReaderNegBufSz() throws Exception {
+        IOUtil.toByteArray(nullReader(), -1);
     }
 
     @Test
-    public void toByteArrayFromReaderPosBufSz()
-        throws Exception
-    {
+    public void toByteArrayFromReaderPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toByteArray( new DontCloseStringReader( probe ), +1 ),
-                    is( probe.getBytes() ) );
+        assertThat(IOUtil.toByteArray(new DontCloseStringReader(probe), +1), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toByteArrayNullReaderPosBufSz()
-        throws Exception
-    {
-        IOUtil.toByteArray( nullReader(), +1 );
+    @Test(expected = NullPointerException.class)
+    public void toByteArrayNullReaderPosBufSz() throws Exception {
+        IOUtil.toByteArray(nullReader(), +1);
     }
 
     /*
      * toByteArray(String,int)
      */
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toByteArrayFromStringNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void toByteArrayFromStringNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toByteArray( probe, -1 ), is( probe.getBytes() ) );
+        assertThat(IOUtil.toByteArray(probe, -1), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toByteArrayNullStringNegBufSz()
-        throws Exception
-    {
-        IOUtil.toByteArray( nullString(), -1 );
+    @Test(expected = NullPointerException.class)
+    public void toByteArrayNullStringNegBufSz() throws Exception {
+        IOUtil.toByteArray(nullString(), -1);
     }
 
     @Test
-    public void toByteArrayFromStringPosBufSz()
-        throws Exception
-    {
+    public void toByteArrayFromStringPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toByteArray( probe, +1 ), is( probe.getBytes() ) );
+        assertThat(IOUtil.toByteArray(probe, +1), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toByteArrayNullStringPosBufSz()
-        throws Exception
-    {
-        IOUtil.toByteArray( nullString(), +1 );
+    @Test(expected = NullPointerException.class)
+    public void toByteArrayNullStringPosBufSz() throws Exception {
+        IOUtil.toByteArray(nullString(), +1);
     }
 
     /*
      * toString(Reader,int)
      */
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toStringFromReaderNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void toStringFromReaderNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new DontCloseStringReader( probe ), -1 ),
-                    is( probe) );
+        assertThat(IOUtil.toString(new DontCloseStringReader(probe), -1), is(probe));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void toStringNullReaderNegBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullReader(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void toStringNullReaderNegBufSz() throws Exception {
+        IOUtil.toString(nullReader(), -1);
     }
 
     @Test
-    public void toStringFromReaderPosBufSz()
-        throws Exception
-    {
+    public void toStringFromReaderPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        assertThat( IOUtil.toString( new DontCloseStringReader( probe ), +1 ),
-                    is( probe) );
+        assertThat(IOUtil.toString(new DontCloseStringReader(probe), +1), is(probe));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void toStringNullReaderPosBufSz()
-        throws Exception
-    {
-        IOUtil.toString( nullReader(), +1 );
+    @Test(expected = NullPointerException.class)
+    public void toStringNullReaderPosBufSz() throws Exception {
+        IOUtil.toString(nullReader(), +1);
     }
 
     /*
      * copy(Reader,OutputStream)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullReaderNullOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), nullOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullReaderNullOutputStream() throws Exception {
+        IOUtil.copy(nullReader(), nullOutputStream());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullReaderValidOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), new DontCloseByteArrayOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullReaderValidOutputStream() throws Exception {
+        IOUtil.copy(nullReader(), new DontCloseByteArrayOutputStream());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyReaderNullOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), nullOutputStream() );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyReaderNullOutputStream() throws Exception {
+        IOUtil.copy(emptyReader(), nullOutputStream());
     }
 
     @Test
-    public void copyEmptyReaderValidOutputStream()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), new DontCloseByteArrayOutputStream() );
+    public void copyEmptyReaderValidOutputStream() throws Exception {
+        IOUtil.copy(emptyReader(), new DontCloseByteArrayOutputStream());
     }
 
     @Test
-    public void copyReaderValidOutputStream()
-        throws Exception
-    {
+    public void copyReaderValidOutputStream() throws Exception {
         ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new DontCloseStringReader( probe ), outputStream );
-        assertThat( outputStream.toByteArray(), is( probe.getBytes()) );
+        IOUtil.copy(new DontCloseStringReader(probe), outputStream);
+        assertThat(outputStream.toByteArray(), is(probe.getBytes()));
     }
 
     /*
      * copy(Reader,OutputStream,int)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullReaderNullOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), nullOutputStream(), -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullReaderNullOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(nullReader(), nullOutputStream(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyNullReaderValidOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), new DontCloseByteArrayOutputStream(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyNullReaderValidOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(nullReader(), new DontCloseByteArrayOutputStream(), -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyReaderNullOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), nullOutputStream(), -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyReaderNullOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(emptyReader(), nullOutputStream(), -1);
     }
 
     @Test(expected = NegativeArraySizeException.class)
-    public void copyEmptyReaderValidOutputStreamNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), new DontCloseByteArrayOutputStream(), -1 );
+    public void copyEmptyReaderValidOutputStreamNegBufSz() throws Exception {
+        IOUtil.copy(emptyReader(), new DontCloseByteArrayOutputStream(), -1);
     }
 
     @Test(expected = NegativeArraySizeException.class)
-    public void copyReaderValidOutputStreamNegBufSz()
-        throws Exception
-    {
+    public void copyReaderValidOutputStreamNegBufSz() throws Exception {
         ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new DontCloseStringReader( probe ), outputStream, -1 );
-        assertThat( outputStream.toByteArray(), is( probe.getBytes()) );
+        IOUtil.copy(new DontCloseStringReader(probe), outputStream, -1);
+        assertThat(outputStream.toByteArray(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullReaderNullOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), nullOutputStream(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullReaderNullOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(nullReader(), nullOutputStream(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullReaderValidOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), new DontCloseByteArrayOutputStream(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullReaderValidOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(nullReader(), new DontCloseByteArrayOutputStream(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyReaderNullOutputStreamZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), nullOutputStream(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyReaderNullOutputStreamZeroBufSz() throws Exception {
+        IOUtil.copy(emptyReader(), nullOutputStream(), 0);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullReaderNullOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), nullOutputStream(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullReaderNullOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(nullReader(), nullOutputStream(), 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullReaderValidOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullReader(), new DontCloseByteArrayOutputStream(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullReaderValidOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(nullReader(), new DontCloseByteArrayOutputStream(), 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyReaderNullOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), nullOutputStream(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyReaderNullOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(emptyReader(), nullOutputStream(), 1);
     }
 
     @Test
-    public void copyEmptyReaderValidOutputStreamPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyReader(), new DontCloseByteArrayOutputStream(), 1 );
+    public void copyEmptyReaderValidOutputStreamPosBufSz() throws Exception {
+        IOUtil.copy(emptyReader(), new DontCloseByteArrayOutputStream(), 1);
     }
 
     @Test
-    public void copyReaderValidOutputStreamPosBufSz()
-        throws Exception
-    {
+    public void copyReaderValidOutputStreamPosBufSz() throws Exception {
         ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( new DontCloseStringReader( probe ), outputStream, 1 );
-        assertThat( outputStream.toByteArray(), is( probe.getBytes()) );
+        IOUtil.copy(new DontCloseStringReader(probe), outputStream, 1);
+        assertThat(outputStream.toByteArray(), is(probe.getBytes()));
     }
 
     /*
@@ -2395,649 +1827,488 @@ public void copyReaderValidOutputStreamPosBufSz()
      * copy(byte[],Writer)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullWriter()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter() );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullWriter() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter());
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyByteArrayNullWriter()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter() );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyByteArrayNullWriter() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter());
     }
 
     @Test
-    public void copyEmptyByteArrayValidWriter()
-        throws Exception
-    {
+    public void copyEmptyByteArrayValidWriter() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyByteArray(), writer );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyByteArray(), writer);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyByteArrayNullWriter()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyByteArrayNullWriter() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe.getBytes(), nullWriter() );
+        IOUtil.copy(probe.getBytes(), nullWriter());
     }
 
     @Test
-    public void copyByteArrayValidWriter()
-        throws Exception
-    {
+    public void copyByteArrayValidWriter() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes(), writer );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(probe.getBytes(), writer);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
     /*
      * copy(byte[],Writer,int)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullWriterNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullWriterNegBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyByteArrayNullWriterNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyByteArrayNullWriterNegBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyByteArrayValidWriterNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), new DontCloseStringWriter(), -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyByteArrayValidWriterNegBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), new DontCloseStringWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyByteArrayNullWriterNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyByteArrayNullWriterNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe.getBytes(), nullWriter(), -1 );
+        IOUtil.copy(probe.getBytes(), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyByteArrayValidWriterNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyByteArrayValidWriterNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes(), writer, -1 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(probe.getBytes(), writer, -1);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayNullWriterZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayNullWriterZeroBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayValidWriterZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayValidWriterZeroBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyByteArrayNullWriterZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyByteArrayNullWriterZeroBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), 0);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullWriterPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullWriterPosBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayValidWriterPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayValidWriterPosBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), 1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyByteArrayNullWriterPosBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), 1 );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyByteArrayNullWriterPosBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), 1);
     }
 
     @Test
-    public void copyEmptyByteArrayValidWriterPosBufSz()
-        throws Exception
-    {
+    public void copyEmptyByteArrayValidWriterPosBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyByteArray(), writer, 1 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyByteArray(), writer, 1);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
     @Test
-    public void copyByteArrayValidWriterPosBufSz()
-        throws Exception
-    {
+    public void copyByteArrayValidWriterPosBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes(), writer, 1 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(probe.getBytes(), writer, 1);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
     /*
      * copy(byte[],Writer,String)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullWriterNullEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), null );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullWriterNullEncoding() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayValidWriterNullEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), null );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayValidWriterNullEncoding() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyByteArrayNullWriterNullEncoding()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), null );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyByteArrayNullWriterNullEncoding() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyByteArrayValidWriterNullEncoding()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), new DontCloseStringWriter(), null );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyByteArrayValidWriterNullEncoding() throws Exception {
+        IOUtil.copy(emptyByteArray(), new DontCloseStringWriter(), null);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyByteArrayNullEncoding()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyByteArrayNullEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes(), writer, null );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(probe.getBytes(), writer, null);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullWriterJunkEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), "junk" );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullWriterJunkEncoding() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), "junk");
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayValidWriterJunkEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), "junk" );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayValidWriterJunkEncoding() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), "junk");
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyEmptyByteArrayNullWriterJunkEncoding()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), "junk" );
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyEmptyByteArrayNullWriterJunkEncoding() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), "junk");
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyEmptyByteArrayValidWriterJunkEncoding()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), new DontCloseStringWriter(), "junk" );
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyEmptyByteArrayValidWriterJunkEncoding() throws Exception {
+        IOUtil.copy(emptyByteArray(), new DontCloseStringWriter(), "junk");
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyByteArrayNullWriterJunkEncoding()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyByteArrayNullWriterJunkEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe.getBytes(), nullWriter(), "junk" );
+        IOUtil.copy(probe.getBytes(), nullWriter(), "junk");
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyByteArrayValidWriterJunkEncoding()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyByteArrayValidWriterJunkEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes(), writer, "junk" );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(probe.getBytes(), writer, "junk");
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullWriterValidEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), "utf-16" );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullWriterValidEncoding() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), "utf-16");
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyByteArrayNullWriterValidEncoding()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), "utf-16" );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyByteArrayNullWriterValidEncoding() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), "utf-16");
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayValidWriterValidEncoding()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), "utf-16" );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayValidWriterValidEncoding() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), "utf-16");
     }
 
     @Test
-    public void copyEmptyByteArrayValidWriterValidEncoding()
-        throws Exception
-    {
+    public void copyEmptyByteArrayValidWriterValidEncoding() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyByteArray(), writer, "utf-16" );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyByteArray(), writer, "utf-16");
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyByteArrayNullWriterValidEncoding()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyByteArrayNullWriterValidEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe.getBytes( "utf-16" ), nullWriter(), "utf-16" );
+        IOUtil.copy(probe.getBytes("utf-16"), nullWriter(), "utf-16");
     }
 
     @Test
-    public void copyByteArrayValidWriterValidEncoding()
-        throws Exception
-    {
+    public void copyByteArrayValidWriterValidEncoding() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes( "utf-16" ), writer, "utf-16" );
-        assertThat( writer.toString().getBytes( "utf-8" ), is( probe.getBytes( "utf-8" ) ) );
+        IOUtil.copy(probe.getBytes("utf-16"), writer, "utf-16");
+        assertThat(writer.toString().getBytes("utf-8"), is(probe.getBytes("utf-8")));
     }
 
     /*
      * copy(byte[],Writer,String,int)
      */
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullWriterNullEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), null, -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullWriterNullEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), null, -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayValidWriterNullEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), null, -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayValidWriterNullEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), null, -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyByteArrayNullWriterNullEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), null, -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyByteArrayNullWriterNullEncodingNegBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), null, -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyEmptyByteArrayValidWriterNullEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyEmptyByteArrayValidWriterNullEncodingNegBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyByteArray(), writer, null, -1 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyByteArray(), writer, null, -1);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyByteArrayNullWriterNullEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyByteArrayNullWriterNullEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe.getBytes(), nullWriter(), null, -1 );
+        IOUtil.copy(probe.getBytes(), nullWriter(), null, -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyByteArrayValidWriterNullEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class)
+    public void copyByteArrayValidWriterNullEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes(), writer, null, -1 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(probe.getBytes(), writer, null, -1);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullWriterJunkEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), "junk", -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullWriterJunkEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), "junk", -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayValidWriterJunkEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), "junk", -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayValidWriterJunkEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), "junk", -1);
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyEmptyByteArrayNullWriterJunkEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), "junk", -1 );
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyEmptyByteArrayNullWriterJunkEncodingNegBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), "junk", -1);
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyEmptyByteArrayJunkEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyEmptyByteArrayJunkEncodingNegBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyByteArray(), writer, "junk", -1 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyByteArray(), writer, "junk", -1);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyByteArrayNullWriterJunkEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyByteArrayNullWriterJunkEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe.getBytes(), nullWriter(), "junk", -1 );
+        IOUtil.copy(probe.getBytes(), nullWriter(), "junk", -1);
     }
 
-    @Test( expected = UnsupportedEncodingException.class )
-    public void copyByteArrayValidWriterJunkEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class)
+    public void copyByteArrayValidWriterJunkEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes(), writer, "junk", -1 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(probe.getBytes(), writer, "junk", -1);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayNullWriterValidEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), "utf-16", -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayNullWriterValidEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), "utf-16", -1);
     }
 
-    @Test( expected = NullPointerException.class )
-    public void copyNullByteArrayValidWriterValidEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), "utf-16", -1 );
+    @Test(expected = NullPointerException.class)
+    public void copyNullByteArrayValidWriterValidEncodingNegBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), "utf-16", -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyByteArrayNullWriterValidEncodingNegBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), "utf-16", -1 );
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyByteArrayNullWriterValidEncodingNegBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), "utf-16", -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyEmptyByteArrayValidWriterValidEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyEmptyByteArrayValidWriterValidEncodingNegBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyByteArray(), writer, "utf-16", -1 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyByteArray(), writer, "utf-16", -1);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyByteArrayNullWriterValidEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyByteArrayNullWriterValidEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe.getBytes( "utf-16" ), nullWriter(), -1 );
+        IOUtil.copy(probe.getBytes("utf-16"), nullWriter(), -1);
     }
 
-    @Test( expected = NegativeArraySizeException.class )
-    public void copyByteArrayValidEncodingNegBufSz()
-        throws Exception
-    {
+    @Test(expected = NegativeArraySizeException.class)
+    public void copyByteArrayValidEncodingNegBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes( "utf-16" ), writer, "utf-16", -1 );
-        assertThat( writer.toString().getBytes( "utf-8" ), is( probe.getBytes( "utf-8" ) ) );
+        IOUtil.copy(probe.getBytes("utf-16"), writer, "utf-16", -1);
+        assertThat(writer.toString().getBytes("utf-8"), is(probe.getBytes("utf-8")));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayNullWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), null, 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayNullWriterNullEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), null, 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayValidWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), null, 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayValidWriterNullEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), null, 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyByteArrayNullWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), null, 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyByteArrayNullWriterNullEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), null, 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyByteArrayValidWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyByteArrayValidWriterNullEncodingZeroBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyByteArray(), writer, null, 0 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyByteArray(), writer, null, 0);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyByteArrayNullWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyByteArrayNullWriterNullEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe.getBytes(), nullWriter(), null, 0 );
+        IOUtil.copy(probe.getBytes(), nullWriter(), null, 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyByteArrayValidWriterNullEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyByteArrayValidWriterNullEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes(), writer, null, 0 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(probe.getBytes(), writer, null, 0);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayNullWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), "junk", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayNullWriterJunkEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), "junk", 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayValidWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), "junk", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayValidWriterJunkEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), "junk", 0);
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyByteArrayNullWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( emptyByteArray(), nullWriter(), "junk", 0 );
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyByteArrayNullWriterJunkEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(emptyByteArray(), nullWriter(), "junk", 0);
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyEmptyByteArrayValidWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyEmptyByteArrayValidWriterJunkEncodingZeroBufSz() throws Exception {
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( emptyByteArray(), writer, "junk", 0 );
-        assertThat( writer.toString(), is( emptyString() ) );
+        IOUtil.copy(emptyByteArray(), writer, "junk", 0);
+        assertThat(writer.toString(), is(emptyString()));
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyByteArrayNullWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyByteArrayNullWriterJunkEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
-        IOUtil.copy( probe.getBytes(), nullWriter(), "junk", 0 );
+        IOUtil.copy(probe.getBytes(), nullWriter(), "junk", 0);
     }
 
-    @Test( expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyByteArrayValidWriterJunkEncodingZeroBufSz()
-        throws Exception
-    {
+    @Test(expected = UnsupportedEncodingException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyByteArrayValidWriterJunkEncodingZeroBufSz() throws Exception {
         String probe = "A string \u2345\u00ef";
         StringWriter writer = new DontCloseStringWriter();
-        IOUtil.copy( probe.getBytes(), writer, "junk", 0 );
-        assertThat( writer.toString().getBytes(), is( probe.getBytes() ) );
+        IOUtil.copy(probe.getBytes(), writer, "junk", 0);
+        assertThat(writer.toString().getBytes(), is(probe.getBytes()));
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayNullWriterValidEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), nullWriter(), "utf-16", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayNullWriterValidEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), nullWriter(), "utf-16", 0);
     }
 
-    @Test( expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT )
-    public void copyNullByteArrayValidWriterValidEncodingZeroBufSz()
-        throws Exception
-    {
-        IOUtil.copy( nullByteArray(), new DontCloseStringWriter(), "utf-16", 0 );
+    @Test(expected = NullPointerException.class, timeout = INFINITE_LOOP_TIMEOUT)
+    public void copyNullByteArrayValidWriterValidEncodingZeroBufSz() throws Exception {
+        IOUtil.copy(nullByteArray(), new DontCloseStringWriter(), "utf-16", 0);
     }
 
     /*
      * Utility methods
      */
-    private static byte[] nullByteArray()
-    {
+    private static byte[] nullByteArray() {
         return null;
     }
 
-    private static String nullString()
-    {
+    private static String nullString() {
         return null;
     }
 
-    private static OutputStream nullOutputStream()
-    {
+    private static OutputStream nullOutputStream() {
         return null;
     }
 
-    private static InputStream nullInputStream()
-    {
+    private static InputStream nullInputStream() {
         return null;
     }
 
-    private static Writer nullWriter()
-    {
+    private static Writer nullWriter() {
         return null;
     }
 
-    private static Reader nullReader()
-    {
+    private static Reader nullReader() {
         return null;
     }
 
-    private static ByteArrayInputStream emptyInputStream()
-    {
-        return new ByteArrayInputStream( emptyByteArray() );
+    private static ByteArrayInputStream emptyInputStream() {
+        return new ByteArrayInputStream(emptyByteArray());
     }
 
-    private static Reader emptyReader()
-    {
-        return new StringReader( emptyString() );
+    private static Reader emptyReader() {
+        return new StringReader(emptyString());
     }
 
-    private static String emptyString()
-    {
+    private static String emptyString() {
         return "";
     }
 
-    private static byte[] emptyByteArray()
-    {
+    private static byte[] emptyByteArray() {
         return new byte[0];
     }
 
-    private static class DontCloseStringWriter
-        extends StringWriter
-    {
+    private static class DontCloseStringWriter extends StringWriter {
         @Override
-        public void close()
-            throws IOException
-        {
-            throw new UnsupportedOperationException( "should not be called" );
+        public void close() throws IOException {
+            throw new UnsupportedOperationException("should not be called");
         }
     }
 
-    private static class DontCloseStringReader
-        extends StringReader
-    {
+    private static class DontCloseStringReader extends StringReader {
 
-        public DontCloseStringReader( String s )
-        {
-            super( s );
+        public DontCloseStringReader(String s) {
+            super(s);
         }
 
         @Override
-        public void close()
-        {
-            throw new UnsupportedOperationException( "should not be called" );
+        public void close() {
+            throw new UnsupportedOperationException("should not be called");
         }
     }
 
-    private static class DontCloseByteArrayInputStream
-        extends ByteArrayInputStream
-    {
-        public DontCloseByteArrayInputStream( byte[] input )
-        {
-            super( input );
+    private static class DontCloseByteArrayInputStream extends ByteArrayInputStream {
+        public DontCloseByteArrayInputStream(byte[] input) {
+            super(input);
         }
 
         @Override
-        public void close()
-            throws IOException
-        {
-            throw new UnsupportedOperationException( "should not be called" );
+        public void close() throws IOException {
+            throw new UnsupportedOperationException("should not be called");
         }
     }
 
-    private static class DontCloseByteArrayOutputStream
-        extends ByteArrayOutputStream
-    {
+    private static class DontCloseByteArrayOutputStream extends ByteArrayOutputStream {
         @Override
-        public void close()
-            throws IOException
-        {
-            throw new UnsupportedOperationException( "should not be called" );
+        public void close() throws IOException {
+            throw new UnsupportedOperationException("should not be called");
         }
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/MatchPatternTest.java b/src/test/java/org/apache/maven/shared/utils/io/MatchPatternTest.java
index 6c7e11d3..57157870 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/MatchPatternTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/MatchPatternTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.io;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,21 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.io;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 /**
  * @author Kristian Rosenvold
  */
-@SuppressWarnings( "deprecation" )
-public class MatchPatternTest
-{
+@SuppressWarnings("deprecation")
+public class MatchPatternTest {
     @Test
-    public void matchPath()
-    {
-        MatchPattern mp = MatchPattern.fromString( "ABC*" );
-        assertTrue( mp.matchPath( "ABCD", true ) );
+    public void matchPath() {
+        MatchPattern mp = MatchPattern.fromString("ABC*");
+        assertTrue(mp.matchPath("ABCD", true));
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/MatchPatternsTest.java b/src/test/java/org/apache/maven/shared/utils/io/MatchPatternsTest.java
index 84b41f96..8919d065 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/MatchPatternsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/MatchPatternsTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.io;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.io;
 
 import org.junit.Test;
 
@@ -26,15 +25,13 @@
 /**
  * @author Kristian Rosenvold
  */
-@SuppressWarnings( "deprecation" )
-public class MatchPatternsTest
-{
+@SuppressWarnings("deprecation")
+public class MatchPatternsTest {
     @Test
-    public void matches()
-    {
-        MatchPatterns from = MatchPatterns.from( "ABC**", "CDE**" );
-        assertTrue( from.matches( "ABCDE", true ) );
-        assertTrue( from.matches( "CDEF", true ) );
-        assertFalse( from.matches( "XYZ", true ) );
+    public void matches() {
+        MatchPatterns from = MatchPatterns.from("ABC**", "CDE**");
+        assertTrue(from.matches("ABCDE", true));
+        assertTrue(from.matches("CDEF", true));
+        assertFalse(from.matches("XYZ", true));
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java
index 750015a7..3b246361 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.io;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,67 +16,62 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import static org.junit.Assert.*;
+package org.apache.maven.shared.utils.io;
 
 import java.io.File;
 
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * Test the {@link SelectorUtils} class.
  */
-@SuppressWarnings( "deprecation" )
-public class SelectorUtilsTest
-{
+@SuppressWarnings("deprecation")
+public class SelectorUtilsTest {
 
-    @Test( expected = NullPointerException.class )
-    public void testMatchPatternStart()
-    {
-        SelectorUtils.matchPatternStart( null, null );
+    @Test(expected = NullPointerException.class)
+    public void testMatchPatternStart() {
+        SelectorUtils.matchPatternStart(null, null);
     }
 
     @Test
-    public void testEmptyStrings()
-    {
-        assertTrue( SelectorUtils.matchPatternStart( "", "" ) );
+    public void testEmptyStrings() {
+        assertTrue(SelectorUtils.matchPatternStart("", ""));
     }
 
     @Test
-    public void testRegexPrefix()
-        throws Exception
-    {
-        assertEquals( true,
-                      SelectorUtils.matchPatternStart( SelectorUtils.REGEX_HANDLER_PREFIX + File.separator + "aaa"
-                          + SelectorUtils.PATTERN_HANDLER_SUFFIX, "" ) );
+    public void testRegexPrefix() throws Exception {
+        assertEquals(
+                true,
+                SelectorUtils.matchPatternStart(
+                        SelectorUtils.REGEX_HANDLER_PREFIX + File.separator + "aaa"
+                                + SelectorUtils.PATTERN_HANDLER_SUFFIX,
+                        ""));
     }
 
     @Test
-    public void testAntPatternStrings()
-    {
-        assertAntDoesNotMatch( "/aaa", "" );
-        assertAntDoesNotMatch( "\\aaa", "" );
-        assertAntMatch( "aaa", "" );
-        assertAntMatch( "/aaa/bbb", "/aaa/bbb" );
-        assertAntMatch( "/aaa/**", "/aaa/bbb" );
-        assertAntDoesNotMatch( "/aaa/**", "/ccc/bbb" );
-        assertAntMatch( "/aaa/**", "\\aaa\\bbb" );
-        assertAntDoesNotMatch( "/aaa/**", "\\ccc\\bbb" );
-        assertAntDoesNotMatch( "/aaa/", "\\aaa\\bbb" );
+    public void testAntPatternStrings() {
+        assertAntDoesNotMatch("/aaa", "");
+        assertAntDoesNotMatch("\\aaa", "");
+        assertAntMatch("aaa", "");
+        assertAntMatch("/aaa/bbb", "/aaa/bbb");
+        assertAntMatch("/aaa/**", "/aaa/bbb");
+        assertAntDoesNotMatch("/aaa/**", "/ccc/bbb");
+        assertAntMatch("/aaa/**", "\\aaa\\bbb");
+        assertAntDoesNotMatch("/aaa/**", "\\ccc\\bbb");
+        assertAntDoesNotMatch("/aaa/", "\\aaa\\bbb");
     }
 
-    private void assertAntDoesNotMatch( String pattern, String target )
-    {
-        assertEquals( false, SelectorUtils.matchPatternStart( wrapWithAntHandler( pattern ), target ) );
+    private void assertAntDoesNotMatch(String pattern, String target) {
+        assertEquals(false, SelectorUtils.matchPatternStart(wrapWithAntHandler(pattern), target));
     }
 
-    private void assertAntMatch( String pattern, String target )
-    {
-        assertEquals( true, SelectorUtils.matchPatternStart( wrapWithAntHandler( pattern ), target ) );
+    private void assertAntMatch(String pattern, String target) {
+        assertEquals(true, SelectorUtils.matchPatternStart(wrapWithAntHandler(pattern), target));
     }
 
-    private String wrapWithAntHandler( String val )
-    {
+    private String wrapWithAntHandler(String val) {
         return SelectorUtils.ANT_HANDLER_PREFIX + val + SelectorUtils.PATTERN_HANDLER_SUFFIX;
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java b/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
index 9283c970..f6a4fa5b 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
@@ -1,12 +1,3 @@
-package org.apache.maven.shared.utils.io;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import static org.apache.commons.io.FileUtils.write;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -25,38 +16,46 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-public class SymlinkTestSetup
-{
+package org.apache.maven.shared.utils.io;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import static org.apache.commons.io.FileUtils.write;
+
+public class SymlinkTestSetup {
     /**
      * Creates a standard directory layout with symlinks and files.
      */
-    public static File createStandardSymlinkTestDir( File root )
-        throws IOException
-    {
-        File srcDir = new File( root, "/src" );
+    public static File createStandardSymlinkTestDir(File root) throws IOException {
+        File srcDir = new File(root, "/src");
         srcDir.mkdirs();
-        File target = new File( srcDir, "targetDir" );
+        File target = new File(srcDir, "targetDir");
         target.mkdirs();
-        write( new File( target, "targetFile.txt" ), "a regular File payload", StandardCharsets.UTF_8 );
-        File aRegularDir = new File( srcDir, "aRegularDir" );
+        write(new File(target, "targetFile.txt"), "a regular File payload", StandardCharsets.UTF_8);
+        File aRegularDir = new File(srcDir, "aRegularDir");
         aRegularDir.mkdirs();
-        write( new File( aRegularDir, "aRegularFile.txt" ), "a regular File payload", StandardCharsets.UTF_8 );
+        write(new File(aRegularDir, "aRegularFile.txt"), "a regular File payload", StandardCharsets.UTF_8);
 
-        File dirOnTheOutside = new File( root, "dirOnTheOutside" );
+        File dirOnTheOutside = new File(root, "dirOnTheOutside");
         dirOnTheOutside.mkdirs();
-        write( new File( dirOnTheOutside, "FileInDirOnTheOutside.txt" ), "a file in dir on the outside", StandardCharsets.UTF_8 );
-        write( new File( root, "onTheOutside.txt" ), "A file on the outside", StandardCharsets.UTF_8 );
-        write( new File( srcDir, "fileR.txt" ), "FileR payload", StandardCharsets.UTF_8 );
-        write( new File( srcDir, "fileW.txt" ), "FileW payload", StandardCharsets.UTF_8 );
-        write( new File( srcDir, "fileX.txt" ), "FileX payload", StandardCharsets.UTF_8 );
+        write(
+                new File(dirOnTheOutside, "FileInDirOnTheOutside.txt"),
+                "a file in dir on the outside",
+                StandardCharsets.UTF_8);
+        write(new File(root, "onTheOutside.txt"), "A file on the outside", StandardCharsets.UTF_8);
+        write(new File(srcDir, "fileR.txt"), "FileR payload", StandardCharsets.UTF_8);
+        write(new File(srcDir, "fileW.txt"), "FileW payload", StandardCharsets.UTF_8);
+        write(new File(srcDir, "fileX.txt"), "FileX payload", StandardCharsets.UTF_8);
         // todo: set file attributes (not used here)
 
-        FileUtils.createSymbolicLink( new File( srcDir, "symDir" ), new File( "targetDir" ) );
-        FileUtils.createSymbolicLink( new File( srcDir, "symLinkToDirOnTheOutside" ), new File( "../dirOnTheOutside" ) );
-        FileUtils.createSymbolicLink( new File( srcDir, "symLinkToFileOnTheOutside" ), new File( "../onTheOutside.txt" ) );
-        FileUtils.createSymbolicLink( new File( srcDir, "symR" ), new File( "fileR.txt" ) );
-        FileUtils.createSymbolicLink( new File( srcDir, "symW" ), new File( "fileW.txt" ) );
-        FileUtils.createSymbolicLink( new File( srcDir, "symX" ), new File( "fileX.txt" ) );
+        FileUtils.createSymbolicLink(new File(srcDir, "symDir"), new File("targetDir"));
+        FileUtils.createSymbolicLink(new File(srcDir, "symLinkToDirOnTheOutside"), new File("../dirOnTheOutside"));
+        FileUtils.createSymbolicLink(new File(srcDir, "symLinkToFileOnTheOutside"), new File("../onTheOutside.txt"));
+        FileUtils.createSymbolicLink(new File(srcDir, "symR"), new File("fileR.txt"));
+        FileUtils.createSymbolicLink(new File(srcDir, "symW"), new File("fileW.txt"));
+        FileUtils.createSymbolicLink(new File(srcDir, "symX"), new File("fileX.txt"));
         return srcDir;
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java
index 2c580e2a..030b2a42 100644
--- a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.logging;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -25,87 +24,75 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-public class AnsiMessageBuilderTest
-{
+public class AnsiMessageBuilderTest {
 
     private AnsiMessageBuilder ansiMessageBuilder;
 
     @Before
-    public void initializeAnsiMessageBuffer()
-    {
+    public void initializeAnsiMessageBuffer() {
         this.ansiMessageBuilder = new AnsiMessageBuilder();
     }
 
     @Test
-    public void should_color_debug()
-    {
-        ansiMessageBuilder.debug( "DEBUG" );
+    public void should_color_debug() {
+        ansiMessageBuilder.debug("DEBUG");
 
-        assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;36mDEBUG\u001B[m" ) );
+        assertThat(ansiMessageBuilder.toString(), equalTo("\u001B[1;36mDEBUG\u001B[m"));
     }
 
     @Test
-    public void should_color_info()
-    {
-        ansiMessageBuilder.info( "INFO" );
+    public void should_color_info() {
+        ansiMessageBuilder.info("INFO");
 
-        assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;34mINFO\u001B[m" ) );
+        assertThat(ansiMessageBuilder.toString(), equalTo("\u001B[1;34mINFO\u001B[m"));
     }
 
     @Test
-    public void should_color_warning_and_reset()
-    {
-        ansiMessageBuilder.warning( "WARNING" );
+    public void should_color_warning_and_reset() {
+        ansiMessageBuilder.warning("WARNING");
 
-        assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;33mWARNING\u001B[m" ) );
+        assertThat(ansiMessageBuilder.toString(), equalTo("\u001B[1;33mWARNING\u001B[m"));
     }
 
     @Test
-    public void should_color_error()
-    {
-        ansiMessageBuilder.error( "ERROR" );
+    public void should_color_error() {
+        ansiMessageBuilder.error("ERROR");
 
-        assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;31mERROR\u001B[m" ) );
+        assertThat(ansiMessageBuilder.toString(), equalTo("\u001B[1;31mERROR\u001B[m"));
     }
 
     @Test
-    public void should_color_success_with_message()
-    {
-        ansiMessageBuilder.success( "a success message" );
+    public void should_color_success_with_message() {
+        ansiMessageBuilder.success("a success message");
 
-        assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;32ma success message\u001B[m" ) );
+        assertThat(ansiMessageBuilder.toString(), equalTo("\u001B[1;32ma success message\u001B[m"));
     }
 
     @Test
-    public void should_color_failure_and_reset()
-    {
-        ansiMessageBuilder.failure( "a failure message" );
+    public void should_color_failure_and_reset() {
+        ansiMessageBuilder.failure("a failure message");
 
-        assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1;31ma failure message\u001B[m" ) );
+        assertThat(ansiMessageBuilder.toString(), equalTo("\u001B[1;31ma failure message\u001B[m"));
     }
 
     @Test
-    public void should_color_strong_and_reset()
-    {
-        ansiMessageBuilder.strong( "a strong message" );
+    public void should_color_strong_and_reset() {
+        ansiMessageBuilder.strong("a strong message");
 
-        assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[1ma strong message\u001B[m" ) );
+        assertThat(ansiMessageBuilder.toString(), equalTo("\u001B[1ma strong message\u001B[m"));
     }
 
     @Test
-    public void should_color_mojo_and_reset()
-    {
-        ansiMessageBuilder.mojo( "a mojo" );
+    public void should_color_mojo_and_reset() {
+        ansiMessageBuilder.mojo("a mojo");
 
-        assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[32ma mojo\u001B[m" ) );
+        assertThat(ansiMessageBuilder.toString(), equalTo("\u001B[32ma mojo\u001B[m"));
     }
 
     @Test
-    public void should_color_project_and_reset()
-    {
-        ansiMessageBuilder.project( "a project" );
+    public void should_color_project_and_reset() {
+        ansiMessageBuilder.project("a project");
 
-        assertThat( ansiMessageBuilder.toString(), equalTo( "\u001B[36ma project\u001B[m" ) );
+        assertThat(ansiMessageBuilder.toString(), equalTo("\u001B[36ma project\u001B[m"));
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
index 972ceaee..8ca3a8c8 100644
--- a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
@@ -1,109 +1,95 @@
-package org.apache.maven.shared.utils.logging;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeNoException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
-
-import org.fusesource.jansi.AnsiColors;
-import org.fusesource.jansi.AnsiConsole;
-import org.fusesource.jansi.AnsiMode;
-import org.fusesource.jansi.AnsiPrintStream;
-import org.fusesource.jansi.AnsiType;
-import org.fusesource.jansi.io.AnsiOutputStream;
-import org.junit.Test;
-
-public class MessageUtilsTest
-{
-    @Test
-    public void testSystem()
-    {
-        PrintStream currentOut = System.out;
-        try
-        {
-            MessageUtils.systemInstall();
-            assertThat( System.out, not( sameInstance( currentOut ) ) );
-        }
-        catch( LinkageError e )
-        {
-            assumeNoException( "JAnsi not supported for this platform", e );
-        }
-        finally
-        {
-            try
-            {
-                // uninstall is always necessary due to https://github.com/fusesource/jansi/issues/242 
-                // but might throw exceptions
-                MessageUtils.systemUninstall();
-            }
-            catch ( Throwable t )
-            {
-                // ignore any thrown exception like NPE here
-            }
-        }
-        assertThat( System.out, sameInstance( currentOut ) );
-    }
-
-    @Test
-    public void testTerminalWidth()
-    {
-        AnsiOutputStream.WidthSupplier width = new AnsiOutputStream.WidthSupplier()
-        {
-            @Override
-            public int getTerminalWidth()
-            {
-                return 33;
-            }
-        };
-        AnsiOutputStream aos = new AnsiOutputStream( new ByteArrayOutputStream(), width, AnsiMode.Default,
-                null, AnsiType.Emulation, AnsiColors.Colors256, StandardCharsets.UTF_8,
-                null, null, false );
-        try
-        {
-            AnsiConsole.systemInstall();
-            AnsiConsole.out = new AnsiPrintStream( aos, true );
-            assertEquals( 33, MessageUtils.getTerminalWidth() );
-        }
-        catch( LinkageError e )
-        {
-            assumeNoException( "JAnsi not supported for this platform", e );
-        }
-        finally
-        {
-            try
-            {
-                // uninstall is always necessary due to https://github.com/fusesource/jansi/issues/242 
-                // but might throw exceptions
-                AnsiConsole.systemUninstall();
-            }
-            catch ( Throwable t )
-            {
-                // ignore any thrown exception like NPE here
-            }
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.shared.utils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+
+import org.fusesource.jansi.AnsiColors;
+import org.fusesource.jansi.AnsiConsole;
+import org.fusesource.jansi.AnsiMode;
+import org.fusesource.jansi.AnsiPrintStream;
+import org.fusesource.jansi.AnsiType;
+import org.fusesource.jansi.io.AnsiOutputStream;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeNoException;
+
+public class MessageUtilsTest {
+    @Test
+    public void testSystem() {
+        PrintStream currentOut = System.out;
+        try {
+            MessageUtils.systemInstall();
+            assertThat(System.out, not(sameInstance(currentOut)));
+        } catch (LinkageError e) {
+            assumeNoException("JAnsi not supported for this platform", e);
+        } finally {
+            try {
+                // uninstall is always necessary due to https://github.com/fusesource/jansi/issues/242
+                // but might throw exceptions
+                MessageUtils.systemUninstall();
+            } catch (Throwable t) {
+                // ignore any thrown exception like NPE here
+            }
+        }
+        assertThat(System.out, sameInstance(currentOut));
+    }
+
+    @Test
+    public void testTerminalWidth() {
+        AnsiOutputStream.WidthSupplier width = new AnsiOutputStream.WidthSupplier() {
+            @Override
+            public int getTerminalWidth() {
+                return 33;
+            }
+        };
+        AnsiOutputStream aos = new AnsiOutputStream(
+                new ByteArrayOutputStream(),
+                width,
+                AnsiMode.Default,
+                null,
+                AnsiType.Emulation,
+                AnsiColors.Colors256,
+                StandardCharsets.UTF_8,
+                null,
+                null,
+                false);
+        try {
+            AnsiConsole.systemInstall();
+            AnsiConsole.out = new AnsiPrintStream(aos, true);
+            assertEquals(33, MessageUtils.getTerminalWidth());
+        } catch (LinkageError e) {
+            assumeNoException("JAnsi not supported for this platform", e);
+        } finally {
+            try {
+                // uninstall is always necessary due to https://github.com/fusesource/jansi/issues/242
+                // but might throw exceptions
+                AnsiConsole.systemUninstall();
+            } catch (Throwable t) {
+                // ignore any thrown exception like NPE here
+            }
+        }
+    }
+}
diff --git a/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java b/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java
index aa7323cd..47874690 100644
--- a/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java
+++ b/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.testhelpers;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.testhelpers;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -27,59 +26,45 @@
 import java.io.Writer;
 
 import org.apache.commons.io.FileUtils;
-
 import org.junit.rules.TemporaryFolder;
 
 /**
  * A few utility methods for file based tests.
  */
-public final class FileTestHelper
-{
+public final class FileTestHelper {
 
-    private FileTestHelper()
-    {
+    private FileTestHelper() {
         // utility function doesn't need a public constructor
     }
 
-    public static void generateTestData( OutputStream out, long size )
-        throws IOException
-    {
-        for ( int i = 0; i < size; i++ )
-        {
+    public static void generateTestData(OutputStream out, long size) throws IOException {
+        for (int i = 0; i < size; i++) {
             // nice varied byte pattern compatible with Readers and Writers
-            out.write( (byte) ( ( i % 127 ) + 1 ) );
+            out.write((byte) ((i % 127) + 1));
         }
     }
 
-    public static void generateTestFile( File testfile, int size )
-        throws IOException
-    {
-        if ( testfile.exists() )
-        {
+    public static void generateTestFile(File testfile, int size) throws IOException {
+        if (testfile.exists()) {
             //noinspection ResultOfMethodCallIgnored
             testfile.delete();
         }
 
-        try ( OutputStream os = new FileOutputStream( testfile ) ) {
-            generateTestData( os, size );
+        try (OutputStream os = new FileOutputStream(testfile)) {
+            generateTestData(os, size);
             os.flush();
         }
     }
 
-    public static void createLineBasedFile( File file, String[] data )
-        throws IOException
-    {
-        if ( file.getParentFile() != null && !file.getParentFile().exists() )
-        {
-            throw new IOException( "Cannot create file " + file + " as the parent directory does not exist" );
+    public static void createLineBasedFile(File file, String[] data) throws IOException {
+        if (file.getParentFile() != null && !file.getParentFile().exists()) {
+            throw new IOException("Cannot create file " + file + " as the parent directory does not exist");
         }
 
-        try ( Writer out = new OutputStreamWriter( new FileOutputStream( file ), "UTF-8" ) )
-        {
-            for ( String aData : data )
-            {
-                out.write( aData );
-                out.write( System.lineSeparator() );
+        try (Writer out = new OutputStreamWriter(new FileOutputStream(file), "UTF-8")) {
+            for (String aData : data) {
+                out.write(aData);
+                out.write(System.lineSeparator());
             }
         }
     }
@@ -90,14 +75,11 @@ public static void createLineBasedFile( File file, String[] data )
      * @return the File object for a new file
      * @throws IOException
      */
-    public static File newFile( TemporaryFolder folder, String filename )
-            throws IOException
-    {
-        File destination = folder.newFile( filename );
+    public static File newFile(TemporaryFolder folder, String filename) throws IOException {
+        File destination = folder.newFile(filename);
 
-        if ( destination.exists() )
-        {
-            FileUtils.deleteQuietly( destination );
+        if (destination.exists()) {
+            FileUtils.deleteQuietly(destination);
         }
         return destination;
     }
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
index fdf81302..41dee5f1 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.xml;
+
+import javax.swing.text.html.HTML;
 
 import java.io.IOException;
 import java.io.StringWriter;
-import javax.swing.text.html.HTML;
 
 import org.apache.maven.shared.utils.StringUtils;
 import org.junit.Assert;
@@ -32,172 +32,164 @@
  *
  * @author Vincent Siveton
  */
-public class PrettyPrintXmlWriterTest
-{
+public class PrettyPrintXmlWriterTest {
     private StringWriter w = new StringWriter();
-    private PrettyPrintXMLWriter writer = new PrettyPrintXMLWriter( w );
-    
+    private PrettyPrintXMLWriter writer = new PrettyPrintXMLWriter(w);
+
     @Test
-    public void testNoStartTag() throws IOException
-    {
-        
+    public void testNoStartTag() throws IOException {
+
         try {
-            writer.startElement( "" );
-            Assert.fail( "allowed empty name" );
-        } catch ( IllegalArgumentException ex ) {
-            Assert.assertEquals( "Element name cannot be empty", ex.getMessage() );
+            writer.startElement("");
+            Assert.fail("allowed empty name");
+        } catch (IllegalArgumentException ex) {
+            Assert.assertEquals("Element name cannot be empty", ex.getMessage());
         }
-        
     }
-    
+
     @Test
-    public void testDefaultPrettyPrintXMLWriter() throws IOException
-    {
-        writer.startElement( HTML.Tag.HTML.toString() );
+    public void testDefaultPrettyPrintXMLWriter() throws IOException {
+        writer.startElement(HTML.Tag.HTML.toString());
 
-        writeXhtmlHead( writer );
+        writeXhtmlHead(writer);
 
-        writeXhtmlBody( writer );
+        writeXhtmlBody(writer);
 
         writer.endElement(); // Tag.HTML
 
-        Assert.assertEquals( expectedResult(), w.toString() );
+        Assert.assertEquals(expectedResult(), w.toString());
     }
 
     @Test
-    public void testPrettyPrintXMLWriterWithGivenLineSeparator() throws IOException
-    {
-        writer.setLineSeparator( "\n" );
+    public void testPrettyPrintXMLWriterWithGivenLineSeparator() throws IOException {
+        writer.setLineSeparator("\n");
 
-        writer.startElement( HTML.Tag.HTML.toString() );
+        writer.startElement(HTML.Tag.HTML.toString());
 
-        writeXhtmlHead( writer );
+        writeXhtmlHead(writer);
 
-        writeXhtmlBody( writer );
+        writeXhtmlBody(writer);
 
         writer.endElement(); // Tag.HTML
 
-        Assert.assertEquals( expectedResult(), w.toString() );
+        Assert.assertEquals(expectedResult(), w.toString());
     }
 
     @Test
-    public void testPrettyPrintXMLWriterWithGivenLineIndenter() throws IOException
-    {
-        writer.setLineIndenter( "    " );
+    public void testPrettyPrintXMLWriterWithGivenLineIndenter() throws IOException {
+        writer.setLineIndenter("    ");
 
-        writer.startElement( HTML.Tag.HTML.toString() );
+        writer.startElement(HTML.Tag.HTML.toString());
 
-        writeXhtmlHead( writer );
+        writeXhtmlHead(writer);
 
-        writeXhtmlBody( writer );
+        writeXhtmlBody(writer);
 
         writer.endElement(); // Tag.HTML
 
-        Assert.assertEquals( expectedResult( "    " ), w.toString() );
+        Assert.assertEquals(expectedResult("    "), w.toString());
     }
 
     @Test
-    public void testEscapeXmlAttributeWindows() throws IOException
-    {
+    public void testEscapeXmlAttributeWindows() throws IOException {
         // Windows
-        writer.startElement( HTML.Tag.DIV.toString() );
-        writer.addAttribute( "class", "sect\r\nion" );
+        writer.startElement(HTML.Tag.DIV.toString());
+        writer.addAttribute("class", "sect\r\nion");
         writer.endElement(); // Tag.DIV
-        Assert.assertEquals( "
                ", w.toString() );
+        Assert.assertEquals("
                ", w.toString());
     }
 
     @Test
-    public void testEscapeXmlAttributeMac() throws IOException
-    {
+    public void testEscapeXmlAttributeMac() throws IOException {
         // Mac
-        writer.startElement( HTML.Tag.DIV.toString() );
-        writer.addAttribute( "class", "sect\rion" );
+        writer.startElement(HTML.Tag.DIV.toString());
+        writer.addAttribute("class", "sect\rion");
         writer.endElement(); // Tag.DIV
-        Assert.assertEquals( "
                ", w.toString() );
+        Assert.assertEquals("
                ", w.toString());
     }
 
     @Test
-    public void testEscapeXmlAttributeTrailingCR() throws IOException
-    {
+    public void testEscapeXmlAttributeTrailingCR() throws IOException {
         // Mac
-        writer.startElement( HTML.Tag.DIV.toString() );
-        writer.addAttribute( "class", "section\r" );
+        writer.startElement(HTML.Tag.DIV.toString());
+        writer.addAttribute("class", "section\r");
         writer.endElement(); // Tag.DIV
-        Assert.assertEquals( "
                ", w.toString() );
+        Assert.assertEquals("
                ", w.toString());
     }
 
     @Test
-    public void testEscapeXmlAttributeUnix() throws IOException
-    {
+    public void testEscapeXmlAttributeUnix() throws IOException {
         // Unix
-        writer.startElement( HTML.Tag.DIV.toString() );
-        writer.addAttribute( "class", "sect\nion" );
+        writer.startElement(HTML.Tag.DIV.toString());
+        writer.addAttribute("class", "sect\nion");
         writer.endElement(); // Tag.DIV
-        Assert.assertEquals( "
                ", w.toString() );
+        Assert.assertEquals("
                ", w.toString());
     }
 
-    private void writeXhtmlHead( XMLWriter writer ) throws IOException
-    {
-        writer.startElement( HTML.Tag.HEAD.toString() );
-        writer.startElement( HTML.Tag.TITLE.toString() );
-        writer.writeText( "title" );
+    private void writeXhtmlHead(XMLWriter writer) throws IOException {
+        writer.startElement(HTML.Tag.HEAD.toString());
+        writer.startElement(HTML.Tag.TITLE.toString());
+        writer.writeText("title");
         writer.endElement(); // Tag.TITLE
-        writer.startElement( HTML.Tag.META.toString() );
-        writer.addAttribute( "name", "author" );
-        writer.addAttribute( "content", "Author" );
+        writer.startElement(HTML.Tag.META.toString());
+        writer.addAttribute("name", "author");
+        writer.addAttribute("content", "Author");
         writer.endElement(); // Tag.META
-        writer.startElement( HTML.Tag.META.toString() );
-        writer.addAttribute( "name", "date" );
-        writer.addAttribute( "content", "Date" );
+        writer.startElement(HTML.Tag.META.toString());
+        writer.addAttribute("name", "date");
+        writer.addAttribute("content", "Date");
         writer.endElement(); // Tag.META
         writer.endElement(); // Tag.HEAD
     }
 
-    private void writeXhtmlBody( XMLWriter writer ) throws IOException
-    {
-        writer.startElement( HTML.Tag.BODY.toString() );
-        writer.startElement( HTML.Tag.P.toString() );
-        writer.writeText( "Paragraph 1, line 1. Paragraph 1, line 2." );
+    private void writeXhtmlBody(XMLWriter writer) throws IOException {
+        writer.startElement(HTML.Tag.BODY.toString());
+        writer.startElement(HTML.Tag.P.toString());
+        writer.writeText("Paragraph 1, line 1. Paragraph 1, line 2.");
         writer.endElement(); // Tag.P
-        writer.startElement( HTML.Tag.DIV.toString() );
-        writer.addAttribute( "class", "section" );
-        writer.startElement( HTML.Tag.H2.toString() );
-        writer.writeText( "Section title" );
+        writer.startElement(HTML.Tag.DIV.toString());
+        writer.addAttribute("class", "section");
+        writer.startElement(HTML.Tag.H2.toString());
+        writer.writeText("Section title");
         writer.endElement(); // Tag.H2
         writer.endElement(); // Tag.DIV
         writer.endElement(); // Tag.BODY
     }
 
-    private static String expectedResult()
-    {
-        return expectedResult( "  " );
+    private static String expectedResult() {
+        return expectedResult("  ");
     }
 
-    private static String expectedResult( String lineIndenter )
-    {
-        
+    private static String expectedResult(String lineIndenter) {
+
         String lineSeparator = "\n";
         StringBuilder expected = new StringBuilder();
 
-        expected.append( "" ).append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 1 ) ).append( "" ).append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 2 ) ).append( "title" )
-                .append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 2 ) )
-                .append( "" ).append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 2 ) ).append( "" )
-                .append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 1 ) ).append( "" ).append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 1 ) ).append( "" ).append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 2 ) )
-                .append( "
                Paragraph 1, line 1. Paragraph 1, line 2.
                " ).append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 2 ) ).append( "
                " )
-                .append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 3 ) ).append( "
                Section title
                " )
-                .append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 2 ) ).append( "
                " ).append( lineSeparator );
-        expected.append( StringUtils.repeat( lineIndenter, 1 ) ).append( "" ).append( lineSeparator );
-        expected.append( "" );
+        expected.append("").append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 1)).append("").append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 2))
+                .append("title")
+                .append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 2))
+                .append("")
+                .append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 2))
+                .append("")
+                .append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 1)).append("").append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 1)).append("").append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 2))
+                .append("
                Paragraph 1, line 1. Paragraph 1, line 2.
                ")
+                .append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 2))
+                .append("
                ")
+                .append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 3))
+                .append("
                Section title
                ")
+                .append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 2)).append("
                ").append(lineSeparator);
+        expected.append(StringUtils.repeat(lineIndenter, 1)).append("").append(lineSeparator);
+        expected.append("");
 
         return expected.toString();
     }
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java b/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
index 433e5feb..5566ef94 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/XmlWriterUtilTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,23 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.xml;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
-import org.apache.maven.shared.utils.StringUtils;
-import org.apache.maven.shared.utils.WriterFactory;
 
 import junit.framework.TestCase;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.WriterFactory;
 
 /**
  * @author Vincent Siveton
  *
  */
-public class XmlWriterUtilTest
-    extends TestCase
-{
+public class XmlWriterUtilTest extends TestCase {
     private OutputStream output;
 
     private Writer writer;
@@ -42,14 +39,12 @@ public class XmlWriterUtilTest
     private XMLWriter xmlWriter;
 
     /** {@inheritDoc} */
-    protected void setUp()
-        throws Exception
-    {
+    protected void setUp() throws Exception {
         super.setUp();
 
         output = new ByteArrayOutputStream();
-        writer = WriterFactory.newXmlWriter( output );
-        xmlWriter = new PrettyPrintXMLWriter( writer );
+        writer = WriterFactory.newXmlWriter(output);
+        xmlWriter = new PrettyPrintXMLWriter(writer);
     }
 
     /**
@@ -57,12 +52,10 @@ protected void setUp()
      *
      * @throws Exception if any
      */
-    public void testWriteLineBreakXMLWriter()
-        throws Exception
-    {
-        XmlWriterUtil.writeLineBreak( xmlWriter );
+    public void testWriteLineBreakXMLWriter() throws Exception {
+        XmlWriterUtil.writeLineBreak(xmlWriter);
         writer.close();
-        assertEquals( 1, StringUtils.countMatches( output.toString(), "\r\n" ) );
+        assertEquals(1, StringUtils.countMatches(output.toString(), "\r\n"));
     }
 
     /**
@@ -70,12 +63,10 @@ public void testWriteLineBreakXMLWriter()
      *
      * @throws Exception if any
      */
-    public void testWriteLineBreakXMLWriterInt()
-        throws Exception
-    {
-        XmlWriterUtil.writeLineBreak( xmlWriter, 10 );
+    public void testWriteLineBreakXMLWriterInt() throws Exception {
+        XmlWriterUtil.writeLineBreak(xmlWriter, 10);
         writer.close();
-        assertEquals( 10, StringUtils.countMatches( output.toString(), "\r\n" ) );
+        assertEquals(10, StringUtils.countMatches(output.toString(), "\r\n"));
     }
 
     /**
@@ -83,14 +74,14 @@ public void testWriteLineBreakXMLWriterInt()
      *
      * @throws Exception if any
      */
-    public void testWriteLineBreakXMLWriterIntInt()
-        throws Exception
-    {
-        XmlWriterUtil.writeLineBreak( xmlWriter, 10, 2 );
+    public void testWriteLineBreakXMLWriterIntInt() throws Exception {
+        XmlWriterUtil.writeLineBreak(xmlWriter, 10, 2);
         writer.close();
-        assertEquals( 10, StringUtils.countMatches( output.toString(), "\r\n" ) );
-        assertEquals( 1, StringUtils.countMatches( output.toString(), StringUtils
-            .repeat( " ", 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE ) ) );
+        assertEquals(10, StringUtils.countMatches(output.toString(), "\r\n"));
+        assertEquals(
+                1,
+                StringUtils.countMatches(
+                        output.toString(), StringUtils.repeat(" ", 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE)));
     }
 
     /**
@@ -98,13 +89,11 @@ public void testWriteLineBreakXMLWriterIntInt()
      *
      * @throws Exception if any
      */
-    public void testWriteLineBreakXMLWriterIntIntInt()
-        throws Exception
-    {
-        XmlWriterUtil.writeLineBreak( xmlWriter, 10, 2, 4 );
+    public void testWriteLineBreakXMLWriterIntIntInt() throws Exception {
+        XmlWriterUtil.writeLineBreak(xmlWriter, 10, 2, 4);
         writer.close();
-        assertEquals( 10, StringUtils.countMatches( output.toString(), "\r\n" ) );
-        assertEquals( 1, StringUtils.countMatches( output.toString(), StringUtils.repeat( " ", 2 * 4 ) ) );
+        assertEquals(10, StringUtils.countMatches(output.toString(), "\r\n"));
+        assertEquals(1, StringUtils.countMatches(output.toString(), StringUtils.repeat(" ", 2 * 4)));
     }
 
     /**
@@ -112,15 +101,14 @@ public void testWriteLineBreakXMLWriterIntIntInt()
      *
      * @throws Exception if any
      */
-    public void testWriteCommentLineBreakXMLWriter()
-        throws Exception
-    {
-        XmlWriterUtil.writeCommentLineBreak( xmlWriter );
+    public void testWriteCommentLineBreakXMLWriter() throws Exception {
+        XmlWriterUtil.writeCommentLineBreak(xmlWriter);
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() );
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertEquals(output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length());
     }
 
     /**
@@ -128,18 +116,16 @@ public void testWriteCommentLineBreakXMLWriter()
      *
      * @throws Exception if any
      */
-    public void testWriteCommentLineBreakXMLWriterInt()
-        throws Exception
-    {
-        XmlWriterUtil.writeCommentLineBreak( xmlWriter, 20 );
+    public void testWriteCommentLineBreakXMLWriterInt() throws Exception {
+        XmlWriterUtil.writeCommentLineBreak(xmlWriter, 20);
         writer.close();
-        assertEquals( output.toString(), "" + "\r\n" );
+        assertEquals(output.toString(), "" + "\r\n");
     }
 
     public void testWriteCommentLineBreak() throws IOException {
-        XmlWriterUtil.writeCommentLineBreak( xmlWriter, 10 );
+        XmlWriterUtil.writeCommentLineBreak(xmlWriter, 10);
         writer.close();
-        assertEquals( output.toString(), output.toString(), "" + "\r\n" );
+        assertEquals(output.toString(), output.toString(), "" + "\r\n");
     }
 
     /**
@@ -147,37 +133,37 @@ public void testWriteCommentLineBreak() throws IOException {
      *
      * @throws Exception if any
      */
-    public void testWriteCommentXMLWriterString()
-        throws Exception
-    {
-        XmlWriterUtil.writeComment( xmlWriter, "hello" );
+    public void testWriteCommentXMLWriterString() throws Exception {
+        XmlWriterUtil.writeComment(xmlWriter, "hello");
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() );
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertEquals(output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length());
     }
 
-    
     public void testWriteComment() throws IOException {
-        XmlWriterUtil.writeComment( xmlWriter,
-                                    "hellooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" );
+        XmlWriterUtil.writeComment(
+                xmlWriter, "hellooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo");
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( "" )
-            .append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() >= XmlWriterUtil.DEFAULT_COLUMN_LINE );
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertTrue(output.toString().length() >= XmlWriterUtil.DEFAULT_COLUMN_LINE);
     }
-    
+
     public void testWriteComment_2() throws IOException {
-        XmlWriterUtil.writeComment( xmlWriter, "hello\nworld" );
+        XmlWriterUtil.writeComment(xmlWriter, "hello\nworld");
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( "" ).append( "\r\n" );
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() ) );
+        sb.append("")
+                .append("\r\n");
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertEquals(output.toString().length(), 2 * (XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length()));
     }
 
     /**
@@ -185,33 +171,36 @@ public void testWriteComment_2() throws IOException {
      *
      * @throws Exception if any
      */
-    public void testWriteCommentXMLWriterStringInt()
-        throws Exception
-    {
-        String indent = StringUtils.repeat( " ", 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE );
+    public void testWriteCommentXMLWriterStringInt() throws Exception {
+        String indent = StringUtils.repeat(" ", 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE);
 
-        XmlWriterUtil.writeComment( xmlWriter, "hello", 2 );
+        XmlWriterUtil.writeComment(xmlWriter, "hello", 2);
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( indent );
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() + 2
-            * XmlWriterUtil.DEFAULT_INDENTATION_SIZE );
-
+        sb.append(indent);
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertEquals(
+                output.toString().length(),
+                XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() + 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE);
     }
-    
+
     public void testWriteComment_3() throws IOException {
-        String indent = StringUtils.repeat( " ", 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE );
-        XmlWriterUtil.writeComment( xmlWriter, "hello\nworld", 2 );
+        String indent = StringUtils.repeat(" ", 2 * XmlWriterUtil.DEFAULT_INDENTATION_SIZE);
+        XmlWriterUtil.writeComment(xmlWriter, "hello\nworld", 2);
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( indent );
-        sb.append( "" ).append( "\r\n" );
-        sb.append( indent );
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() ) + 2 * indent.length() );
+        sb.append(indent);
+        sb.append("")
+                .append("\r\n");
+        sb.append(indent);
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertEquals(
+                output.toString().length(),
+                2 * (XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length()) + 2 * indent.length());
     }
 
     /**
@@ -219,32 +208,33 @@ public void testWriteComment_3() throws IOException {
      *
      * @throws Exception if any
      */
-    public void testWriteCommentXMLWriterStringIntInt()
-        throws Exception
-    {
-        String repeat = StringUtils.repeat( " ", 2 * 4 );
+    public void testWriteCommentXMLWriterStringIntInt() throws Exception {
+        String repeat = StringUtils.repeat(" ", 2 * 4);
 
-        XmlWriterUtil.writeComment( xmlWriter, "hello", 2, 4 );
+        XmlWriterUtil.writeComment(xmlWriter, "hello", 2, 4);
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( repeat );
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() + 2 * 4 );
+        sb.append(repeat);
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertEquals(output.toString().length(), XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() + 2 * 4);
     }
-    
-    
+
     public void testWriteCommentXMLWriterStringIntInt_2() throws IOException {
-        String repeat = StringUtils.repeat( " ", 2 * 4 );
-        XmlWriterUtil.writeComment( xmlWriter, "hello\nworld", 2, 4 );
+        String repeat = StringUtils.repeat(" ", 2 * 4);
+        XmlWriterUtil.writeComment(xmlWriter, "hello\nworld", 2, 4);
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( repeat );
-        sb.append( "" ).append( "\r\n" );
-        sb.append( repeat );
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == 2 * ( XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length() ) + 2 * repeat.length() );
+        sb.append(repeat);
+        sb.append("")
+                .append("\r\n");
+        sb.append(repeat);
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertTrue(output.toString().length()
+                == 2 * (XmlWriterUtil.DEFAULT_COLUMN_LINE - 1 + "\r\n".length()) + 2 * repeat.length());
     }
 
     /**
@@ -252,30 +242,27 @@ public void testWriteCommentXMLWriterStringIntInt_2() throws IOException {
      *
      * @throws Exception if any
      */
-    public void testWriteCommentXMLWriterStringIntIntInt()
-        throws Exception
-    {
-        String indent = StringUtils.repeat( " ", 2 * 4 );
+    public void testWriteCommentXMLWriterStringIntIntInt() throws Exception {
+        String indent = StringUtils.repeat(" ", 2 * 4);
 
-        XmlWriterUtil.writeComment( xmlWriter, "hello", 2, 4, 50 );
+        XmlWriterUtil.writeComment(xmlWriter, "hello", 2, 4, 50);
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( indent );
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() == 50 - 1 + "\r\n".length() + 2 * 4 );
+        sb.append(indent);
+        sb.append("").append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertTrue(output.toString().length() == 50 - 1 + "\r\n".length() + 2 * 4);
     }
-    
-    public void testWriteCommentXMLWriterStringIntIntInt_2() throws IOException
-    {
-        String indent = StringUtils.repeat( " ", 2 * 4 );
-        XmlWriterUtil.writeComment( xmlWriter, "hello", 2, 4, 10 );
+
+    public void testWriteCommentXMLWriterStringIntIntInt_2() throws IOException {
+        String indent = StringUtils.repeat(" ", 2 * 4);
+        XmlWriterUtil.writeComment(xmlWriter, "hello", 2, 4, 10);
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( indent );
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertTrue( output.toString().length() >= 10 + 2 * 4 );
+        sb.append(indent);
+        sb.append("").append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertTrue(output.toString().length() >= 10 + 2 * 4);
     }
 
     /**
@@ -283,71 +270,81 @@ public void testWriteCommentXMLWriterStringIntIntInt_2() throws IOException
      *
      * @throws Exception if any
      */
-    public void testWriteCommentTextXMLWriterStringInt()
-        throws Exception
-    {
-        XmlWriterUtil.writeCommentText( xmlWriter, "hello", 0 );
+    public void testWriteCommentTextXMLWriterStringInt() throws Exception {
+        XmlWriterUtil.writeCommentText(xmlWriter, "hello", 0);
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( "\r\n" );
-        sb.append( "" ).append( "\r\n" );
-        sb.append( "" ).append( "\r\n" );
-        sb.append( "" ).append( "\r\n" );
-        sb.append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), 3 * ( 80 - 1 + "\r\n".length() ) + 2 * "\r\n".length() );
+        sb.append("\r\n");
+        sb.append("")
+                .append("\r\n");
+        sb.append("")
+                .append("\r\n");
+        sb.append("")
+                .append("\r\n");
+        sb.append("\r\n");
+        assertEquals(output.toString(), sb.toString());
+        assertEquals(output.toString().length(), 3 * (80 - 1 + "\r\n".length()) + 2 * "\r\n".length());
     }
-    
+
     public void testWriteCommentTextXMLWriterStringInt_2() throws IOException {
-        String indent = StringUtils.repeat( " ", 2 * 2 );
+        String indent = StringUtils.repeat(" ", 2 * 2);
 
-        XmlWriterUtil.writeCommentText( xmlWriter, "hello world with end of line\n and "
-            + "loooooooooooooooooooooooooooooooooooooooooooooooooooooonnnnnnnnnnong line", 2 );
+        XmlWriterUtil.writeCommentText(
+                xmlWriter,
+                "hello world with end of line\n and "
+                        + "loooooooooooooooooooooooooooooooooooooooooooooooooooooonnnnnnnnnnong line",
+                2);
         writer.close();
         StringBuffer sb = new StringBuffer();
-        sb.append( "\r\n" );
-        sb.append( indent ).append( "" )
-            .append( "\r\n" );
-        sb.append( indent ).append( "" )
-            .append( "\r\n" );
-        sb.append( indent ).append( "" )
-            .append( "\r\n" );
-        sb.append( indent ).append( "" )
-            .append( "\r\n" );
-        sb.append( indent ).append( "" )
-            .append( "\r\n" );
-        sb.append( indent ).append( "" )
-            .append( "\r\n" );
-        sb.append( "\r\n" );
-        sb.append( indent );
-        assertEquals( output.toString(), sb.toString() );
+        sb.append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append("\r\n");
+        sb.append(indent);
+        assertEquals(output.toString(), sb.toString());
     }
 
-
     /**
      * Test method for {@link org.apache.maven.shared.utils.xml.XmlWriterUtil#writeCommentText(XMLWriter, java.lang.String, int, int)}.
      *
      * @throws Exception if any
      */
-    public void testWriteCommentTextXMLWriterStringIntInt()
-        throws Exception
-    {
-        String indent = StringUtils.repeat( " ", 2 * 4 );
+    public void testWriteCommentTextXMLWriterStringIntInt() throws Exception {
+        String indent = StringUtils.repeat(" ", 2 * 4);
 
-        XmlWriterUtil.writeCommentText( xmlWriter, "hello", 2, 4 );
+        XmlWriterUtil.writeCommentText(xmlWriter, "hello", 2, 4);
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( "\r\n" );
-        sb.append( indent ).append( "" )
-            .append( "\r\n" );
-        sb.append( indent ).append( "" )
-            .append( "\r\n" );
-        sb.append( indent ).append( "" )
-            .append( "\r\n" );
-        sb.append( "\r\n" );
-        sb.append( indent );
-        assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), 3 * ( 80 - 1 + "\r\n".length() ) + 4 * 2 * 4 + 2 * "\r\n".length() );
+        sb.append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append("\r\n");
+        sb.append(indent);
+        assertEquals(output.toString(), sb.toString());
+        assertEquals(output.toString().length(), 3 * (80 - 1 + "\r\n".length()) + 4 * 2 * 4 + 2 * "\r\n".length());
     }
 
     /**
@@ -355,22 +352,26 @@ public void testWriteCommentTextXMLWriterStringIntInt()
      *
      * @throws Exception if any
      */
-    public void testWriteCommentTextXMLWriterStringIntIntInt()
-        throws Exception
-    {
-        String indent = StringUtils.repeat( " ", 2 * 4 );
+    public void testWriteCommentTextXMLWriterStringIntIntInt() throws Exception {
+        String indent = StringUtils.repeat(" ", 2 * 4);
 
-        XmlWriterUtil.writeCommentText( xmlWriter, "hello", 2, 4, 50 );
+        XmlWriterUtil.writeCommentText(xmlWriter, "hello", 2, 4, 50);
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( "\r\n" );
-        sb.append( indent ).append( "" ).append( "\r\n" );
-        sb.append( indent ).append( "" ).append( "\r\n" );
-        sb.append( indent ).append( "" ).append( "\r\n" );
-        sb.append( "\r\n" );
-        sb.append( indent );
-        assertEquals( output.toString(), sb.toString() );
-        assertEquals( output.toString().length(), 3 * ( 50 - 1 + "\r\n".length() ) + 4 * 2 * 4 + 2 * "\r\n".length() );
+        sb.append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append(indent)
+                .append("")
+                .append("\r\n");
+        sb.append("\r\n");
+        sb.append(indent);
+        assertEquals(output.toString(), sb.toString());
+        assertEquals(output.toString().length(), 3 * (50 - 1 + "\r\n".length()) + 4 * 2 * 4 + 2 * "\r\n".length());
     }
 
     /**
@@ -378,14 +379,13 @@ public void testWriteCommentTextXMLWriterStringIntIntInt()
      *
      * @throws Exception if any
      */
-    public void testWriteCommentNull()
-        throws Exception
-    {
-        XmlWriterUtil.writeComment( xmlWriter, null );
+    public void testWriteCommentNull() throws Exception {
+        XmlWriterUtil.writeComment(xmlWriter, null);
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
     }
 
     /**
@@ -393,14 +393,13 @@ public void testWriteCommentNull()
      *
      * @throws Exception if any
      */
-    public void testWriteCommentShort()
-        throws Exception
-    {
-        XmlWriterUtil.writeComment( xmlWriter, "This is a short text" );
+    public void testWriteCommentShort() throws Exception {
+        XmlWriterUtil.writeComment(xmlWriter, "This is a short text");
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
     }
 
     /**
@@ -408,18 +407,22 @@ public void testWriteCommentShort()
      *
      * @throws Exception if any
      */
-    public void testWriteCommentLong()
-        throws Exception
-    {
-        XmlWriterUtil.writeComment( xmlWriter, "Maven is a software project management and comprehension tool. "
-            + "Based on the concept of a project object model (POM), Maven can manage a project's build, reporting "
-            + "and documentation from a central piece of information." );
+    public void testWriteCommentLong() throws Exception {
+        XmlWriterUtil.writeComment(
+                xmlWriter,
+                "Maven is a software project management and comprehension tool. "
+                        + "Based on the concept of a project object model (POM), Maven can manage a project's build, reporting "
+                        + "and documentation from a central piece of information.");
         writer.close();
         StringBuilder sb = new StringBuilder();
-        sb.append( "" ).append( "\r\n" );
-        sb.append( "" ).append( "\r\n" );
-        sb.append( "" ).append( "\r\n" );
-        sb.append( "" ).append( "\r\n" );
-        assertEquals( output.toString(), sb.toString() );
+        sb.append("")
+                .append("\r\n");
+        sb.append("")
+                .append("\r\n");
+        sb.append("")
+                .append("\r\n");
+        sb.append("")
+                .append("\r\n");
+        assertEquals(output.toString(), sb.toString());
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java b/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
index cef681e5..ab921d14 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,10 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import org.apache.maven.shared.utils.xml.pull.XmlPullParserException;
-import org.junit.Assert;
-import org.junit.Test;
+package org.apache.maven.shared.utils.xml;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -31,176 +26,159 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 
+import org.apache.maven.shared.utils.xml.pull.XmlPullParserException;
+import org.junit.Assert;
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-
 /**
  * @author Kristian Rosenvold
  */
-public class Xpp3DomBuilderTest
-{
+public class Xpp3DomBuilderTest {
 
     private static final String XML_DECLARATION = "\n";
 
     @Test
-    public void selfClosingTag()
-        throws Exception
-    {
+    public void selfClosingTag() throws Exception {
 
         String domString = selfClosingTagSource();
 
-        Xpp3Dom dom = Xpp3DomBuilder.build( new StringReader( domString ) );
+        Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(domString));
 
         String expected = expectedSelfClosingTag();
         String dom1Str = dom.toString();
-        assertEquals( "check DOMs match", expected, dom1Str );
+        assertEquals("check DOMs match", expected, dom1Str);
     }
 
     @Test
-    public void testUnrecognizedEncoding()
-    {
+    public void testUnrecognizedEncoding() {
 
         byte[] data = "".getBytes(StandardCharsets.UTF_8);
-        InputStream in = new ByteArrayInputStream( data );
+        InputStream in = new ByteArrayInputStream(data);
         try {
-            Xpp3DomBuilder.build( in , "nosuch encoding" );
+            Xpp3DomBuilder.build(in, "nosuch encoding");
             fail();
-        } catch ( XmlPullParserException expected ) {
-            assertTrue( expected.getCause() instanceof UnsupportedEncodingException );
+        } catch (XmlPullParserException expected) {
+            assertTrue(expected.getCause() instanceof UnsupportedEncodingException);
         }
-
     }
 
-    
     @Test
-    public void trimming()
-        throws Exception
-    {
+    public void trimming() throws Exception {
         String domString = createDomString();
 
-        Xpp3Dom dom = Xpp3DomBuilder.build( new StringReader( domString ), true );
+        Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(domString), true);
 
-        assertEquals( "element1value", dom.getChild( "element1" ).getValue() );
+        assertEquals("element1value", dom.getChild("element1").getValue());
 
-        assertEquals( "  preserve space  ", dom.getChild( "element6" ).getValue() );
+        assertEquals("  preserve space  ", dom.getChild("element6").getValue());
 
-        dom = Xpp3DomBuilder.build( new StringReader( domString ), false );
+        dom = Xpp3DomBuilder.build(new StringReader(domString), false);
 
-        assertEquals( " element1value\n ", dom.getChild( "element1" ).getValue() );
+        assertEquals(" element1value\n ", dom.getChild("element1").getValue());
 
-        assertEquals( "  preserve space  ", dom.getChild( "element6" ).getValue() );
+        assertEquals("  preserve space  ", dom.getChild("element6").getValue());
     }
 
     @Test
-    public void testMalformedXml()
-    {
+    public void testMalformedXml() {
         try {
-            Xpp3DomBuilder.build( new StringReader( "" + createDomString() ) );
-            fail( "We're supposed to fail" );
+            Xpp3DomBuilder.build(new StringReader("" + createDomString()));
+            fail("We're supposed to fail");
         } catch (XmlPullParserException ex) {
-            Assert.assertNotNull( ex.getMessage() );
+            Assert.assertNotNull(ex.getMessage());
         }
     }
 
     @Test
-    public void attributeEscaping()
-        throws IOException, XmlPullParserException
-    {
+    public void attributeEscaping() throws IOException, XmlPullParserException {
         String s = getAttributeEncodedString();
-        Xpp3Dom dom = Xpp3DomBuilder.build( new StringReader( s ) );
+        Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(s));
 
-        assertEquals( "", dom.getChild( "el" ).getAttribute( "att" ) );
+        assertEquals("", dom.getChild("el").getAttribute("att"));
         StringWriter w = new StringWriter();
-        Xpp3DomWriter.write( w, dom );
+        Xpp3DomWriter.write(w, dom);
         String newString = w.toString();
-        assertEquals( newString, s );
+        assertEquals(newString, s);
     }
 
     @Test
-    public void contentEscaping()
-        throws IOException, XmlPullParserException
-    {
-        Xpp3Dom dom = Xpp3DomBuilder.build( new StringReader( getEncodedString() ) );
+    public void contentEscaping() throws IOException, XmlPullParserException {
+        Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(getEncodedString()));
 
-        assertEquals( "\"msg\"", dom.getChild( "a1" ).getValue() );
-        assertEquals( "\"msg\"", dom.getChild( "a2" ).getValue() );
-        assertEquals( "\"msg\"", dom.getChild( "a3" ).getValue() );
+        assertEquals("\"msg\"", dom.getChild("a1").getValue());
+        assertEquals("\"msg\"", dom.getChild("a2").getValue());
+        assertEquals("\"msg\"", dom.getChild("a3").getValue());
 
         StringWriter w = new StringWriter();
-        Xpp3DomWriter.write( w, dom );
-        assertEquals( getExpectedString(), w.toString() );
+        Xpp3DomWriter.write(w, dom);
+        assertEquals(getExpectedString(), w.toString());
     }
 
-    private static String getAttributeEncodedString()
-    {
+    private static String getAttributeEncodedString() {
         StringBuilder domString = new StringBuilder();
-        domString.append( "" );
-        domString.append( "\n" );
-        domString.append( "  bar" );
-        domString.append( "\n" );
-        domString.append( "" );
+        domString.append("");
+        domString.append("\n");
+        domString.append("  bar");
+        domString.append("\n");
+        domString.append("");
 
         return domString.toString();
     }
 
-    private static String getEncodedString()
-    {
+    private static String getEncodedString() {
         StringBuilder domString = new StringBuilder();
-        domString.append( "\n" );
-        domString.append( "  \"msg\"\n" );
-        domString.append( "  \"msg\"]]>\n" );
-        domString.append( "  <b>"msg"</b>\n" );
-        domString.append( "" );
+        domString.append("\n");
+        domString.append("  \"msg\"\n");
+        domString.append("  \"msg\"]]>\n");
+        domString.append("  <b>"msg"</b>\n");
+        domString.append("");
 
         return domString.toString();
     }
 
-    private static String getExpectedString()
-    {
+    private static String getExpectedString() {
         StringBuilder domString = new StringBuilder();
-        domString.append( "" );
-        domString.append( "\n" );
-        domString.append( "  \"msg\"" );
-        domString.append( "\n" );
-        domString.append( "  <b>\"msg\"</b>" );
-        domString.append( "\n" );
-        domString.append( "  <b>\"msg\"</b>" );
-        domString.append( "\n" );
-        domString.append( "" );
+        domString.append("");
+        domString.append("\n");
+        domString.append("  \"msg\"");
+        domString.append("\n");
+        domString.append("  <b>\"msg\"</b>");
+        domString.append("\n");
+        domString.append("  <b>\"msg\"</b>");
+        domString.append("\n");
+        domString.append("");
         return domString.toString();
     }
 
-    private static String createDomString()
-    {
+    private static String createDomString() {
         StringBuilder buf = new StringBuilder();
-        buf.append( "\n" );
-        buf.append( "  element1value\n \n" );
-        buf.append( " \n" );
-        buf.append( "  element3value\n" );
-        buf.append( " \n" );
-        buf.append( " \n" );
-        buf.append( " \n" );
-        buf.append( "   preserve space  \n" );
-        buf.append( "\n" );
+        buf.append("\n");
+        buf.append("  element1value\n \n");
+        buf.append(" \n");
+        buf.append("  element3value\n");
+        buf.append(" \n");
+        buf.append(" \n");
+        buf.append(" \n");
+        buf.append("   preserve space  \n");
+        buf.append("\n");
 
         return buf.toString();
     }
 
-    private static String selfClosingTagSource()
-    {
+    private static String selfClosingTagSource() {
         StringBuilder buf = new StringBuilder();
-        buf.append( "\n" );
-        buf.append( "  \n" );
-        buf.append( "  \n" );
-        buf.append( "" );
+        buf.append("\n");
+        buf.append("  \n");
+        buf.append("  \n");
+        buf.append("");
         return buf.toString();
     }
 
-    private static String expectedSelfClosingTag()
-    {
+    private static String expectedSelfClosingTag() {
         return XML_DECLARATION + selfClosingTagSource();
     }
-
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java b/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
index 3d594bf8..fb8315d2 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/pull/Xpp3DomTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.utils.xml.pull;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -9,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -18,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.utils.xml.pull;
 
 import java.io.IOException;
 import java.io.StringReader;
+
 import org.apache.maven.shared.utils.xml.Xpp3Dom;
 import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
-
 import org.junit.Test;
 
 import static org.apache.maven.shared.utils.xml.Xpp3Dom.mergeXpp3Dom;
@@ -32,242 +31,208 @@
 /**
  * @author Kristian Rosenvold
  */
-public class Xpp3DomTest
-{
+public class Xpp3DomTest {
 
-    private Xpp3Dom createElement( String element, String value )
-    {
-        Xpp3Dom t1s1 = new Xpp3Dom( element );
-        t1s1.setValue( value );
+    private Xpp3Dom createElement(String element, String value) {
+        Xpp3Dom t1s1 = new Xpp3Dom(element);
+        t1s1.setValue(value);
         return t1s1;
     }
 
-
     @Test
-    public void mergePrecedenceSelfClosed()
-        throws XmlPullParserException, IOException
-    {
-        Xpp3Dom parentConfig = build( "" );
-        Xpp3Dom childConfig = build( "ooopise" );
-
-        Xpp3Dom result = Xpp3Dom.mergeXpp3Dom( childConfig, parentConfig );
-        Xpp3Dom items = result.getChild( "items" );
-
-        assertEquals( 1, items.getChildCount() );
-        Xpp3Dom item = items.getChild( 0 );
-        assertEquals( "ooopise", item.getValue() );
+    public void mergePrecedenceSelfClosed() throws XmlPullParserException, IOException {
+        Xpp3Dom parentConfig = build("");
+        Xpp3Dom childConfig = build("ooopise");
+
+        Xpp3Dom result = Xpp3Dom.mergeXpp3Dom(childConfig, parentConfig);
+        Xpp3Dom items = result.getChild("items");
+
+        assertEquals(1, items.getChildCount());
+        Xpp3Dom item = items.getChild(0);
+        assertEquals("ooopise", item.getValue());
     }
 
     @Test
-    public void mergePrecedenceOpenClose()
-        throws XmlPullParserException, IOException
-    {
-        Xpp3Dom parentConfig = build( "" );
-        Xpp3Dom childConfig = build( "ooopise" );
-
-        Xpp3Dom result = Xpp3Dom.mergeXpp3Dom( childConfig, parentConfig );
-        Xpp3Dom items = result.getChild( "items" );
-
-        assertEquals( 1, items.getChildCount() );
-        Xpp3Dom item = items.getChild( 0 );
-        assertEquals( "ooopise", item.getValue() );
+    public void mergePrecedenceOpenClose() throws XmlPullParserException, IOException {
+        Xpp3Dom parentConfig = build("");
+        Xpp3Dom childConfig = build("ooopise");
+
+        Xpp3Dom result = Xpp3Dom.mergeXpp3Dom(childConfig, parentConfig);
+        Xpp3Dom items = result.getChild("items");
+
+        assertEquals(1, items.getChildCount());
+        Xpp3Dom item = items.getChild(0);
+        assertEquals("ooopise", item.getValue());
     }
 
     @Test
-    public void selfOverrideOnRootNode()
-    {
+    public void selfOverrideOnRootNode() {
         // Todo: This does not work when loaded. Probably a bug related to null vs "" handling
         //      Xpp3Dom t1 = build( "" );
 
-        Xpp3Dom t1 = new Xpp3Dom( "top" );
-        t1.setAttribute( "attr", "value" );
+        Xpp3Dom t1 = new Xpp3Dom("top");
+        t1.setAttribute("attr", "value");
 
-        t1.setAttribute( Xpp3Dom.SELF_COMBINATION_MODE_ATTRIBUTE, Xpp3Dom.SELF_COMBINATION_OVERRIDE );
+        t1.setAttribute(Xpp3Dom.SELF_COMBINATION_MODE_ATTRIBUTE, Xpp3Dom.SELF_COMBINATION_OVERRIDE);
 
-        Xpp3Dom t2 = build( "val2" );
-        Xpp3Dom result = mergeXpp3Dom( t1, t2 );
+        Xpp3Dom t2 = build("val2");
+        Xpp3Dom result = mergeXpp3Dom(t1, t2);
 
-        assertEquals( 2, result.getAttributeNames().length );
-        assertNull( result.getValue() );
+        assertEquals(2, result.getAttributeNames().length);
+        assertNull(result.getValue());
     }
 
     @Test
-    public void mergeValuesOnRootNode()
-    {
-        Xpp3Dom t1 = build( "" );
-        Xpp3Dom t2 = build( "t2Val" );
-        Xpp3Dom result = mergeXpp3Dom( t1, t2 );
-        assertEquals( 2, result.getAttributeNames().length );
-        assertEquals( result.getValue(), t2.getValue() );
+    public void mergeValuesOnRootNode() {
+        Xpp3Dom t1 = build("");
+        Xpp3Dom t2 = build("t2Val");
+        Xpp3Dom result = mergeXpp3Dom(t1, t2);
+        assertEquals(2, result.getAttributeNames().length);
+        assertEquals(result.getValue(), t2.getValue());
     }
 
     @Test
-    public void mergeAttributesOnRootNode()
-    {
-        Xpp3Dom t1 = build( "" );
-        Xpp3Dom t2 = build( "" );
+    public void mergeAttributesOnRootNode() {
+        Xpp3Dom t1 = build("");
+        Xpp3Dom t2 = build("");
 
-        Xpp3Dom dom = mergeXpp3Dom( t1, t2 );
-        assertEquals( 3, dom.getAttributeNames().length );
+        Xpp3Dom dom = mergeXpp3Dom(t1, t2);
+        assertEquals(3, dom.getAttributeNames().length);
     }
 
     @Test
-    public void combineAppend()
-    {
-        Xpp3Dom t1 = new Xpp3Dom( "root" );
-        t1.setAttribute( Xpp3Dom.CHILDREN_COMBINATION_MODE_ATTRIBUTE, Xpp3Dom.CHILDREN_COMBINATION_APPEND );
-        t1.addChild( createElement( "sub", "s1Value" ) );
+    public void combineAppend() {
+        Xpp3Dom t1 = new Xpp3Dom("root");
+        t1.setAttribute(Xpp3Dom.CHILDREN_COMBINATION_MODE_ATTRIBUTE, Xpp3Dom.CHILDREN_COMBINATION_APPEND);
+        t1.addChild(createElement("sub", "s1Value"));
 
-        Xpp3Dom t2 = new Xpp3Dom( "root" );
-        t2.addChild( createElement( "sub", "s1Value" ) );
+        Xpp3Dom t2 = new Xpp3Dom("root");
+        t2.addChild(createElement("sub", "s1Value"));
 
-        Xpp3Dom result = mergeXpp3Dom( t1, t2 );
+        Xpp3Dom result = mergeXpp3Dom(t1, t2);
 
-        assertEquals( 2, result.getChildren( "sub" ).length );
+        assertEquals(2, result.getChildren("sub").length);
     }
 
     @Test
-    public void mergeOverride()
-    {
-        Xpp3Dom t1 = new Xpp3Dom( "root" );
-        t1.setAttribute( Xpp3Dom.CHILDREN_COMBINATION_MODE_ATTRIBUTE, Xpp3Dom.CHILDREN_COMBINATION_APPEND );
-        t1.addChild( createElement( "sub", "s1Value" ) );
+    public void mergeOverride() {
+        Xpp3Dom t1 = new Xpp3Dom("root");
+        t1.setAttribute(Xpp3Dom.CHILDREN_COMBINATION_MODE_ATTRIBUTE, Xpp3Dom.CHILDREN_COMBINATION_APPEND);
+        t1.addChild(createElement("sub", "s1Value"));
 
-        Xpp3Dom t2 = new Xpp3Dom( "root" );
-        t2.addChild( createElement( "sub", "s1Value" ) );
+        Xpp3Dom t2 = new Xpp3Dom("root");
+        t2.addChild(createElement("sub", "s1Value"));
 
-        Xpp3Dom result = mergeXpp3Dom( t1, t2, Boolean.TRUE );
+        Xpp3Dom result = mergeXpp3Dom(t1, t2, Boolean.TRUE);
 
-        assertEquals( 1, result.getChildren( "sub" ).length );
+        assertEquals(1, result.getChildren("sub").length);
     }
 
-
-    @Test( expected = NullPointerException.class )
-    public void nullValue()
-    {
+    @Test(expected = NullPointerException.class)
+    public void nullValue() {
         //noinspection ConstantConditions
-        new Xpp3Dom( "top" ).setAttribute( null, "value" );
+        new Xpp3Dom("top").setAttribute(null, "value");
     }
 
-    @Test( expected = NullPointerException.class )
-    public void nullAttribute()
-    {
+    @Test(expected = NullPointerException.class)
+    public void nullAttribute() {
         //noinspection ConstantConditions
-        new Xpp3Dom( "root" ).setAttribute( "attr", null );
+        new Xpp3Dom("root").setAttribute("attr", null);
     }
 
-
     @Test
-    public void testEquals()
-    {
-        Xpp3Dom dom = new Xpp3Dom( "single" );
-        dom.addChild( new Xpp3Dom( "kid" ) );
+    public void testEquals() {
+        Xpp3Dom dom = new Xpp3Dom("single");
+        dom.addChild(new Xpp3Dom("kid"));
 
-        Xpp3Dom other = new Xpp3Dom( "single" );
-        other.addChild( new Xpp3Dom( "kid2" ) );
+        Xpp3Dom other = new Xpp3Dom("single");
+        other.addChild(new Xpp3Dom("kid2"));
 
-        assertEquals( dom, dom );
+        assertEquals(dom, dom);
         //noinspection ObjectEqualsNull
-        assertFalse( dom.equals( null ) );
-        assertFalse( dom.equals( new Xpp3Dom( (String) null ) ) );
-        assertFalse( dom.equals( other ) );
+        assertFalse(dom.equals(null));
+        assertFalse(dom.equals(new Xpp3Dom((String) null)));
+        assertFalse(dom.equals(other));
     }
 
     @Test
-    public void dominantWinsCollections()
-        throws XmlPullParserException
-    {
-        Xpp3Dom parent = build( "unodos" );
-        Xpp3Dom dominant = build( "tres" );
+    public void dominantWinsCollections() throws XmlPullParserException {
+        Xpp3Dom parent = build("unodos");
+        Xpp3Dom dominant = build("tres");
 
-        Xpp3Dom result = mergeXpp3Dom( dominant, parent );
+        Xpp3Dom result = mergeXpp3Dom(dominant, parent);
 
-        Xpp3Dom items = result.getChild( "entries" );
-        assertEquals( 1, items.getChildCount() );
+        Xpp3Dom items = result.getChild("entries");
+        assertEquals(1, items.getChildCount());
 
-        assertElemEquals( "tres", items.getChild( 0 ) );
+        assertElemEquals("tres", items.getChild(0));
     }
 
     @Test
-    public void combineChildrenAppendTest()
-        throws XmlPullParserException
-    {
+    public void combineChildrenAppendTest() throws XmlPullParserException {
         Xpp3Dom parent =
-            build( "unodostres" );
-        Xpp3Dom child = build( "quatro" );
+                build("unodostres");
+        Xpp3Dom child = build("quatro");
 
-        Xpp3Dom result = mergeXpp3Dom( child, parent );
+        Xpp3Dom result = mergeXpp3Dom(child, parent);
 
-        Xpp3Dom items = result.getChild( "entries" );
-        assertEquals( 4, items.getChildCount() );
+        Xpp3Dom items = result.getChild("entries");
+        assertEquals(4, items.getChildCount());
 
         Xpp3Dom[] item = items.getChildren();
 
-        assertElemEquals( "uno", item[0] );
-        assertElemEquals( "dos", item[1] );
-        assertElemEquals( "tres", item[2] );
-        assertElemEquals( "quatro", item[3] );
+        assertElemEquals("uno", item[0]);
+        assertElemEquals("dos", item[1]);
+        assertElemEquals("tres", item[2]);
+        assertElemEquals("quatro", item[3]);
     }
 
     @Test
-    public void unchangedWithFirstOrLastEmpty()
-        throws Exception
-    {
+    public void unchangedWithFirstOrLastEmpty() throws Exception {
         String configStr = "test";
-        Xpp3Dom dominant = build( configStr );
-        Xpp3Dom duplicatedDominant = build( configStr );
-        validateEntries( dominant );
-        Xpp3Dom result = mergeXpp3Dom( dominant, duplicatedDominant );
-        validateEntries( result );
+        Xpp3Dom dominant = build(configStr);
+        Xpp3Dom duplicatedDominant = build(configStr);
+        validateEntries(dominant);
+        Xpp3Dom result = mergeXpp3Dom(dominant, duplicatedDominant);
+        validateEntries(result);
     }
 
-    private void validateEntries( Xpp3Dom result )
-    {
-        Xpp3Dom entries = result.getChild( "entries" );
-        assertEquals( 3, entries.getChildCount() );
-        assertXpp3Null( entries.getChild( 0 ) );
-        assertEquals( "test", entries.getChild( 1 ).getValue() );
-        assertXpp3Null( entries.getChild( 2 ) );
+    private void validateEntries(Xpp3Dom result) {
+        Xpp3Dom entries = result.getChild("entries");
+        assertEquals(3, entries.getChildCount());
+        assertXpp3Null(entries.getChild(0));
+        assertEquals("test", entries.getChild(1).getValue());
+        assertXpp3Null(entries.getChild(2));
     }
 
-
-    static void assertElemEquals( String value, Xpp3Dom element )
-    {
-        assertEquals( value, element.getValue() );
+    static void assertElemEquals(String value, Xpp3Dom element) {
+        assertEquals(value, element.getValue());
     }
 
-
-    void assertXpp3Null( Xpp3Dom entry )
-    {
+    void assertXpp3Null(Xpp3Dom entry) {
         // Todo: When we used xpp3dom, all methods using this assert used to return null
-        assertEquals( "", entry.getValue() );
+        assertEquals("", entry.getValue());
     }
 
     @Test
-    public void recessiveChildrenIncludedWhenDominantEmpty()
-        throws Exception
-    {
+    public void recessiveChildrenIncludedWhenDominantEmpty() throws Exception {
         String dominant = "bazzy";
         String recessive = "barry";
 
-        Xpp3Dom merged = mergeXpp3Dom( build( dominant ), build( recessive ) );
+        Xpp3Dom merged = mergeXpp3Dom(build(dominant), build(recessive));
 
-        assertEquals( 2, merged.getChildCount() );
-        assertEquals( "bazzy", merged.getChild( "baz" ).getValue() );
-        assertEquals( "barry", merged.getChild( "bar" ).getValue() );
+        assertEquals(2, merged.getChildCount());
+        assertEquals("bazzy", merged.getChild("baz").getValue());
+        assertEquals("barry", merged.getChild("bar").getValue());
     }
 
-    static Xpp3Dom build( String stringContent )
-    {
-        return Xpp3DomBuilder.build( new StringReader( stringContent ) );
+    static Xpp3Dom build(String stringContent) {
+        return Xpp3DomBuilder.build(new StringReader(stringContent));
     }
 
     @Test
-    public void duplicatedChildren()
-        throws IOException, XmlPullParserException
-    {
+    public void duplicatedChildren() throws IOException, XmlPullParserException {
         String dupes = "xy";
-        assertEquals( "y", build( dupes ).getChild( "baz" ).getValue() );
+        assertEquals("y", build(dupes).getChild("baz").getValue());
     }
-
 }

From ff02409d35d619ed51ef98c8820a5e4b4096da32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Mar 2023 19:21:02 +0000
Subject: [PATCH 249/265] Bump maven-resources-plugin from 3.1.0 to 3.3.1

Bumps [maven-resources-plugin](https://github.com/apache/maven-resources-plugin) from 3.1.0 to 3.3.1.
- [Release notes](https://github.com/apache/maven-resources-plugin/releases)
- [Commits](https://github.com/apache/maven-resources-plugin/compare/maven-resources-plugin-3.1.0...maven-resources-plugin-3.3.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-resources-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c19bdcdf..2fbf9a0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
           
           org.apache.maven.plugins
           maven-resources-plugin
-          3.1.0
+          3.3.1
         
       
     

From 63c92f8877fa85ce560ae3a5c79fc402effe9d8b Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Fri, 21 Apr 2023 20:01:17 +0200
Subject: [PATCH 250/265] Fix package name after refactor

---
 .../apache/maven/shared/utils/logging/AnsiMessageBuilder.java   | 2 +-
 .../apache/maven/shared/utils/logging/LoggerLevelRenderer.java  | 2 +-
 .../org/apache/maven/shared/utils/logging/MessageBuilder.java   | 2 +-
 .../org/apache/maven/shared/utils/logging/MessageUtils.java     | 2 +-
 .../apache/maven/shared/utils/logging/PlainMessageBuilder.java  | 2 +-
 src/main/java/org/apache/maven/shared/utils/logging/Style.java  | 2 +-
 .../maven/shared/utils/logging/AnsiMessageBuilderTest.java      | 2 +-
 .../org/apache/maven/shared/utils/logging/MessageUtilsTest.java | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
index 0777e227..ddb9ab79 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.shared.utils;
+package org.apache.maven.shared.utils.logging;
 
 import org.fusesource.jansi.Ansi;
 
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java b/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java
index 1267075e..829487f5 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/LoggerLevelRenderer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.shared.utils;
+package org.apache.maven.shared.utils.logging;
 
 /**
  * Logger level renderer, intended for Maven slf4j logging provider implementers to render
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
index 8cd2d3c0..fa1c07b0 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.shared.utils;
+package org.apache.maven.shared.utils.logging;
 
 import java.util.Formatter;
 
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
index d3a102cc..7f2f4bea 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.shared.utils;
+package org.apache.maven.shared.utils.logging;
 
 import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.AnsiConsole;
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
index 5d6b8f69..86b3e2ad 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.shared.utils;
+package org.apache.maven.shared.utils.logging;
 
 /**
  * Message builder implementation that just ignores styling, for Maven version earlier than 3.5.0.
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/Style.java b/src/main/java/org/apache/maven/shared/utils/logging/Style.java
index a2e1c9e9..f14b3e04 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/Style.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/Style.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.shared.utils;
+package org.apache.maven.shared.utils.logging;
 
 import java.util.Locale;
 
diff --git a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java
index 030b2a42..f48de3fc 100644
--- a/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilderTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.shared.utils;
+package org.apache.maven.shared.utils.logging;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
index 8ca3a8c8..b95936fb 100644
--- a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.shared.utils;
+package org.apache.maven.shared.utils.logging;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;

From b60e8a2fbeadb5b9d150173a3e1c1e2a000f2aab Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Fri, 21 Apr 2023 21:14:30 +0200
Subject: [PATCH 251/265] [MSHARED-1072] fix blocking in StreamFeeder (#113)

If input stream has no more available data
StreamFeeder was block forever
---
 .../cli/CommandLineTimeOutException.java      | 12 ++-
 .../shared/utils/cli/CommandLineUtils.java    | 73 +++------------
 .../maven/shared/utils/cli/StreamFeeder.java  | 89 ++++++++----------
 .../shared/utils/cli/StreamFeederTest.java    | 91 +++++++++++++++++++
 4 files changed, 148 insertions(+), 117 deletions(-)
 create mode 100644 src/test/java/org/apache/maven/shared/utils/cli/StreamFeederTest.java

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
index 8aead3dc..88edb652 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
@@ -19,14 +19,13 @@
 package org.apache.maven.shared.utils.cli;
 
 /**
+ * Report a timeout for executing process.
+ *
  * @author Olivier Lamy
  *
  */
 public class CommandLineTimeOutException extends CommandLineException {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = 7322428741683224481L;
 
     /**
@@ -36,4 +35,11 @@ public class CommandLineTimeOutException extends CommandLineException {
     public CommandLineTimeOutException(String message, Throwable cause) {
         super(message, cause);
     }
+
+    /**
+     * @param message The message of the exception.
+     */
+    public CommandLineTimeOutException(String message) {
+        super(message);
+    }
 }
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
index 5422af84..850d5b16 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.maven.shared.utils.Os;
 import org.apache.maven.shared.utils.StringUtils;
@@ -45,7 +46,7 @@ public abstract class CommandLineUtils {
      */
     public static class StringStreamConsumer implements StreamConsumer {
 
-        private final StringBuffer string = new StringBuffer();
+        private final StringBuilder string = new StringBuilder();
 
         private static final String LS = System.getProperty("line.separator", "\n");
 
@@ -65,16 +66,6 @@ public String getOutput() {
         }
     }
 
-    /**
-     * Number of milliseconds per second.
-     */
-    private static final long MILLIS_PER_SECOND = 1000L;
-
-    /**
-     * Number of nanoseconds per second.
-     */
-    private static final long NANOS_PER_SECOND = 1000000000L;
-
     /**
      * @param cl The command line {@link Commandline}
      * @param systemOut {@link StreamConsumer}
@@ -277,26 +268,13 @@ public Integer call() throws CommandLineException {
                     errorPumper.setName("StreamPumper-systemErr");
                     errorPumper.start();
 
-                    int returnValue;
-                    if (timeoutInSeconds <= 0) {
-                        returnValue = p.waitFor();
-                    } else {
-                        final long now = System.nanoTime();
-                        final long timeout = now + NANOS_PER_SECOND * timeoutInSeconds;
-                        while (isAlive(p) && (System.nanoTime() < timeout)) {
-                            // The timeout is specified in seconds. Therefore we must not sleep longer than one second
-                            // but we should sleep as long as possible to reduce the number of iterations performed.
-                            Thread.sleep(MILLIS_PER_SECOND - 1L);
-                        }
-
-                        if (isAlive(p)) {
-                            throw new InterruptedException(
-                                    String.format("Process timed out after %d seconds.", timeoutInSeconds));
-                        }
-
-                        returnValue = p.exitValue();
+                    if (timeoutInSeconds > 0 && !p.waitFor(timeoutInSeconds, TimeUnit.SECONDS)) {
+                        throw new CommandLineTimeOutException(
+                                String.format("Process timed out after %d seconds.", timeoutInSeconds));
                     }
 
+                    int returnValue = p.waitFor();
+
                     // TODO Find out if waitUntilDone needs to be called using a try-finally construct. The method may
                     // throw an
                     //      InterruptedException so that calls to waitUntilDone may be skipped.
@@ -325,12 +303,8 @@ public Integer call() throws CommandLineException {
                     outputPumper.waitUntilDone();
                     errorPumper.waitUntilDone();
 
-                    if (inputFeeder != null) {
-                        inputFeeder.close();
-
-                        if (inputFeeder.getException() != null) {
-                            throw new CommandLineException("Failure processing stdin.", inputFeeder.getException());
-                        }
+                    if (inputFeeder != null && inputFeeder.getException() != null) {
+                        throw new CommandLineException("Failure processing stdin.", inputFeeder.getException());
                     }
 
                     if (outputPumper.getException() != null) {
@@ -343,13 +317,10 @@ public Integer call() throws CommandLineException {
 
                     return returnValue;
                 } catch (InterruptedException ex) {
+                    Thread.currentThread().interrupt();
                     throw new CommandLineTimeOutException(
                             "Error while executing external command, process killed.", ex);
-
                 } finally {
-                    if (inputFeeder != null) {
-                        inputFeeder.disable();
-                    }
                     if (outputPumper != null) {
                         outputPumper.disable();
                     }
@@ -363,14 +334,7 @@ public Integer call() throws CommandLineException {
                         }
                     } finally {
                         ShutdownHookUtils.removeShutdownHook(processHook);
-
-                        try {
-                            processHook.run();
-                        } finally {
-                            if (inputFeeder != null) {
-                                inputFeeder.close();
-                            }
-                        }
+                        processHook.run();
                     }
                 }
             }
@@ -405,19 +369,6 @@ public static Properties getSystemEnvVars(boolean caseSensitive) {
         return ensureCaseSensitivity(envs, caseSensitive);
     }
 
-    private static boolean isAlive(Process p) {
-        if (p == null) {
-            return false;
-        }
-
-        try {
-            p.exitValue();
-            return false;
-        } catch (IllegalThreadStateException e) {
-            return true;
-        }
-    }
-
     /**
      * @param toProcess The command line to translate.
      * @return The array of translated parts.
@@ -436,7 +387,7 @@ public static String[] translateCommandline(String toProcess) throws CommandLine
         boolean inEscape = false;
         int state = normal;
         final StringTokenizer tok = new StringTokenizer(toProcess, "\"\' \\", true);
-        List tokens = new ArrayList();
+        List tokens = new ArrayList<>();
         StringBuilder current = new StringBuilder();
 
         while (tok.hasMoreTokens()) {
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java
index e5743a8e..f26db634 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java
@@ -21,72 +21,62 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.Objects;
 
 /**
  * Read from an InputStream and write the output to an OutputStream.
  *
  * @author Trygve Laugstøl
  */
-class StreamFeeder extends AbstractStreamHandler {
+class StreamFeeder extends Thread {
 
-    private final AtomicReference input;
+    private final InputStream input;
 
-    private final AtomicReference output;
+    private final OutputStream output;
 
-    private volatile Throwable exception;
+    private Throwable exception;
+    private boolean done;
+
+    private final Object lock = new Object();
 
     /**
      * Create a new StreamFeeder
      *
-     * @param input Stream to read from
+     * @param input  Stream to read from
      * @param output Stream to write to
      */
     StreamFeeder(InputStream input, OutputStream output) {
-        super();
-        this.input = new AtomicReference(input);
-        this.output = new AtomicReference(output);
+        this.input = Objects.requireNonNull(input);
+        this.output = Objects.requireNonNull(output);
+        this.done = false;
     }
 
     @Override
+    @SuppressWarnings("checkstyle:innerassignment")
     public void run() {
         try {
-            feed();
-        } catch (Throwable e) {
-            // Catch everything so the streams will be closed and flagged as done.
-            if (this.exception != null) {
-                this.exception = e;
+            for (int data; !isInterrupted() && (data = input.read()) != -1; ) {
+                output.write(data);
             }
+            output.flush();
+        } catch (IOException e) {
+            exception = e;
         } finally {
             close();
-
-            synchronized (this) {
-                notifyAll();
-            }
         }
-    }
 
-    public void close() {
-        setDone();
-        final InputStream is = input.getAndSet(null);
-        if (is != null) {
-            try {
-                is.close();
-            } catch (IOException ex) {
-                if (this.exception != null) {
-                    this.exception = ex;
-                }
-            }
+        synchronized (lock) {
+            done = true;
+            lock.notifyAll();
         }
+    }
 
-        final OutputStream os = output.getAndSet(null);
-        if (os != null) {
-            try {
-                os.close();
-            } catch (IOException ex) {
-                if (this.exception != null) {
-                    this.exception = ex;
-                }
+    private void close() {
+        try {
+            output.close();
+        } catch (IOException e) {
+            if (exception == null) {
+                exception = e;
             }
         }
     }
@@ -98,23 +88,16 @@ public Throwable getException() {
         return this.exception;
     }
 
-    @SuppressWarnings("checkstyle:innerassignment")
-    private void feed() throws IOException {
-        InputStream is = input.get();
-        OutputStream os = output.get();
-        boolean flush = false;
-
-        if (is != null && os != null) {
-            for (int data; !isDone() && (data = is.read()) != -1; ) {
-                if (!isDisabled()) {
-                    os.write(data);
-                    flush = true;
+    public void waitUntilDone() {
+        this.interrupt();
+        synchronized (lock) {
+            while (!done) {
+                try {
+                    lock.wait();
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                 }
             }
-
-            if (flush) {
-                os.flush();
-            }
         }
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/StreamFeederTest.java b/src/test/java/org/apache/maven/shared/utils/cli/StreamFeederTest.java
new file mode 100644
index 00000000..8decce03
--- /dev/null
+++ b/src/test/java/org/apache/maven/shared/utils/cli/StreamFeederTest.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.shared.utils.cli;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class StreamFeederTest {
+    static class BlockingInputStream extends ByteArrayInputStream {
+        public BlockingInputStream(byte[] buf) {
+            super(buf);
+        }
+
+        @Override
+        public synchronized int read() {
+            int data = super.read();
+            if (data >= 0) {
+                return data;
+            }
+
+            // end test data ... block
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+            return -1;
+        }
+    }
+
+    @Test
+    public void waitUntilFeederDone() throws InterruptedException {
+
+        String TEST_DATA = "TestData";
+
+        BlockingInputStream inputStream = new BlockingInputStream(TEST_DATA.getBytes());
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+        StreamFeeder streamFeeder = new StreamFeeder(inputStream, outputStream);
+
+        streamFeeder.start();
+
+        // wait until all data from steam will be read
+        while (outputStream.size() < TEST_DATA.length()) {
+            Thread.sleep(10);
+        }
+
+        streamFeeder.waitUntilDone(); // wait until process finish
+
+        assertEquals(TEST_DATA, outputStream.toString());
+    }
+}

From 462bd1121b7a7ee9a61ff1ed6a1dbd8fcf2982e0 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Fri, 21 Apr 2023 20:17:08 +0200
Subject: [PATCH 252/265] [MSHARED-1014] Make Commandline.addSystemEnvironment
 public and deprecated

MavenInvoker still use it.
---
 .../org/apache/maven/shared/utils/cli/Commandline.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
index 4f93957f..619f5a10 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
@@ -183,8 +183,13 @@ public void addEnvironment(String name, String value) {
 
     /**
      * Add system environment variables.
+     *
+     * @deprecated please use {@link #setShellEnvironmentInherited(boolean)}
      */
-    private void addSystemEnvironment() {
+    @Deprecated
+    public void addSystemEnvironment() {}
+
+    private void copySystemEnvironment() {
         Properties systemEnvVars = CommandLineUtils.getSystemEnvVars();
 
         for (Object o : systemEnvVars.keySet()) {
@@ -202,7 +207,7 @@ private void addSystemEnvironment() {
      */
     public String[] getEnvironmentVariables() {
         if (isShellEnvironmentInherited()) {
-            addSystemEnvironment();
+            copySystemEnvironment();
         }
 
         List environmentVars = new ArrayList<>();

From 77f78d1cbc263e33efbdf7084242a80eed77c566 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Fri, 21 Apr 2023 21:16:56 +0200
Subject: [PATCH 253/265] Disable merge button, add autolink to jira

---
 .asf.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index 1b0cb95b..619a1402 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -23,3 +23,9 @@ github:
     - build-management
     - maven-shared
     - maven
+  enabled_merge_buttons:
+    squash: true
+    merge: false
+    rebase: true
+  autolink_jira:
+    - MSHARED
\ No newline at end of file

From 3b1795b7832b40e6ffae6dbe6e9c42e7201ca04a Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Fri, 21 Apr 2023 21:12:23 +0200
Subject: [PATCH 254/265] [MSHARED-1243] Refresh download page

---
 src/site/xdoc/download.xml.vm | 117 ++++++++++------------------------
 1 file changed, 33 insertions(+), 84 deletions(-)

diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 666d997c..2b848a91 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -23,102 +23,51 @@ under the License.
   
     Download ${project.name} Source
   
+
   
     
                
 
-      
                ${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build
-      ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository.
                
-
-      
                You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24
-      hours to reach all mirrors.
                
-
-      
                In order to guard against corrupted downloads/installations, it is highly recommended to
-      verify the signature
-      of the release bundles against the public KEYS used by the Apache Maven
-      developers.
                
+      
                ${project.name} ${project.version} is distributed in source format.
                
 
-      
                ${project.name} is distributed under the Apache License, version 2.0.
                
+      
                Use a source archive if you intend to build ${project.name} yourself.
                
 
-      
                We strongly encourage our users to configure a Maven repository mirror closer to their location, please read How to Use Mirrors for Repositories.
                
-
-      
-      
-
-        
                
-          [if-any logo]
-          
-            logo
-          
-          [end]
-          The currently selected mirror is
-          [preferred].
-          If you encounter a problem with this mirror,
-          please select another mirror.
-          If all mirrors are failing, there are
-          backup
-          mirrors
-          (at the end of the mirrors list) that should be available.
-        
                
+      
                Otherwise, simply use the ready-made binary artifacts from central repository.
                
 
-        
                
-          Other mirrors:
-          
-          
-        
                
+      
                ${project.name} is distributed under the Apache License, version 2.0.
                
 
-        
                
-          You may also consult the
-          complete list of
-            mirrors.
+      
+        
+        
                This is the current stable version of ${project.name}.
                
+
+        
+          
+            
+              
+              
+              
+              
+            
+          
+          
+            
+              
+              
+              
+              
+            
+          
+        
                LinkChecksumSignature
                ${project.name} ${project.version} (Source zip)${project.artifactId}-${project.version}-source-release.zip${project.artifactId}-${project.version}-source-release.zip.sha512${project.artifactId}-${project.version}-source-release.zip.asc
                
+
+        
                It is essential that you verify the integrity of the downloaded file
+          using the checksum (.sha512 file)
+          or using the signature (.asc file) against the public KEYS used by the Apache Maven developers.
         
                
 
       
-      
-      
-        
-      
                This is the current stable version of ${project.name}.
                
-        
-      
-        
-          
-            
-            
-            
-            
-          
-        
-        
-          
-            
-            
-            
-            
-          
-        
-      
                LinkChecksumSignature
                ${project.name} ${project.version} (Source zip)maven/shared/${project.artifactId}-${project.version}-source-release.zipmaven/shared/${project.artifactId}-${project.version}-source-release.zip.sha512maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc
                
-                      
 
       
-        
-      
                Older non-recommended releases can be found on our archive site.
                
-
+        
                It is strongly recommended to use the latest release version of ${project.name} to take advantage of the newest features and bug fixes.
                
+        
                Older non-recommended releases can be found on our archive site.
                
                       
     
                
   

From f9aea984658785ec98ce0998e33a9d30ec890c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= 
Date: Mon, 24 Apr 2023 16:43:31 +0200
Subject: [PATCH 255/265] Auto-link MSHARED Jira

---
 .asf.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 619a1402..1e41914e 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -28,4 +28,9 @@ github:
     merge: false
     rebase: true
   autolink_jira:
-    - MSHARED
\ No newline at end of file
+    - MSHARED
+notifications:
+  commits: commits@maven.apache.org
+  issues: issues@maven.apache.org
+  pullrequests: issues@maven.apache.org
+  jira_options: link label comment

From bf5bee692de6d31bb4c426d5cc80a5105ec1adbd Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Thu, 27 Apr 2023 21:53:36 +0200
Subject: [PATCH 256/265] [maven-release-plugin] prepare release
 maven-shared-utils-3.4.0

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2fbf9a0a..3b678597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  4.0.0-SNAPSHOT
+  3.4.0
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -41,7 +41,7 @@
   
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
-    HEAD
+    maven-shared-utils-3.4.0
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
   
   
@@ -61,7 +61,7 @@
 
   
     RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder
-    2021-04-26T13:54:25Z
+    2023-04-27T19:53:11Z
     8
     3.2.5
   

From 020cc01ad570d641ee6c054fd798767d14986d1e Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Thu, 27 Apr 2023 21:53:44 +0200
Subject: [PATCH 257/265] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b678597..55e1c98f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.4.0
+  3.4.1-SNAPSHOT
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -41,7 +41,7 @@
   
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
-    maven-shared-utils-3.4.0
+    HEAD
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
   
   
@@ -61,7 +61,7 @@
 
   
     RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder
-    2023-04-27T19:53:11Z
+    2023-04-27T19:53:44Z
     8
     3.2.5
   

From 259b796b2ae9f32de25eef5aeb87204cc446f514 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 28 Apr 2023 11:06:13 -0400
Subject: [PATCH 258/265] [MNG-7729] deprecate questionable IsEmpty/IsNotEmpty
 methods (#136)

* deprecate questionable utility methods
---
 .../apache/maven/shared/utils/xml/Xpp3Dom.java | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
index 40b7b633..aece7643 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
@@ -354,17 +354,27 @@ private PrettyPrintXMLWriter getPrettyPrintXMLWriter(StringWriter writer) {
     }
 
     /**
-     * @param str The string to be checked.
-     * @return true if the string is not empty (length > 0) and not null.
+     * Warning: this is not the reverse of {@link #isEmpty}.
+     * Whitespace only strings are both empty and not empty.
+     *
+     * @param str the string to be checked
+     * @return true if the string is not empty (length > 0) and not null
+     * @deprecated use str != null && !str.isEmpty()
      */
+    @Deprecated
     public static boolean isNotEmpty(String str) {
         return str != null && str.length() > 0;
     }
 
     /**
-     * @param str The string to be checked.
-     * @return true if the string is empty or null.
+     * Warning: this is not the reverse of {@link #isNotEmpty}.
+     * Whitespace only strings are both empty and not empty.
+     *
+     * @param str the string to be checked
+     * @return true if the string only contains whitespace or is null
+     * @deprecated use str == null || str.trim().isEmpty()
      */
+    @Deprecated
     public static boolean isEmpty(String str) {
         return str == null || str.trim().length() == 0;
     }

From 0dd10e9030a1f29416f68cbdedf053a3993bf4f6 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Fri, 28 Apr 2023 11:06:59 -0400
Subject: [PATCH 259/265] don't trim (#124)

---
 .../shared/utils/xml/Xpp3DomBuilder.java      | 33 +++++++++----------
 .../shared/utils/xml/Xpp3DomBuilderTest.java  |  7 +---
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
index 640a9c4a..b03da580 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
@@ -40,7 +40,6 @@
  * @author Kristian Rosenvold
  */
 public class Xpp3DomBuilder {
-    private static final boolean DEFAULT_TRIM = true;
 
     /**
      * @param reader {@link Reader}
@@ -48,7 +47,7 @@ public class Xpp3DomBuilder {
      * @throws XmlPullParserException in case of an error
      */
     public static Xpp3Dom build(@WillClose @Nonnull Reader reader) throws XmlPullParserException {
-        return build(reader, DEFAULT_TRIM);
+        return build(reader, false);
     }
 
     /**
@@ -58,21 +57,23 @@ public static Xpp3Dom build(@WillClose @Nonnull Reader reader) throws XmlPullPar
      * @throws XmlPullParserException in case of an error
      */
     public static Xpp3Dom build(@WillClose InputStream is, @Nonnull String encoding) throws XmlPullParserException {
-        return build(is, encoding, DEFAULT_TRIM);
+        return build(is, encoding, false);
     }
 
     /**
      * @param is {@link InputStream}
      * @param encoding the encoding
-     * @param trim true/false
+     * @param noop vestigial argument with no effect
      * @return the built DOM
      * @throws XmlPullParserException in case of an error
+     * @deprecated use the two-arg variant
      */
-    public static Xpp3Dom build(@WillClose InputStream is, @Nonnull String encoding, boolean trim)
+    @Deprecated
+    public static Xpp3Dom build(@WillClose InputStream is, @Nonnull String encoding, boolean noop)
             throws XmlPullParserException {
         try {
             Reader reader = new InputStreamReader(is, encoding);
-            return build(reader, trim);
+            return build(reader);
         } catch (UnsupportedEncodingException e) {
             throw new XmlPullParserException(e);
         }
@@ -80,13 +81,15 @@ public static Xpp3Dom build(@WillClose InputStream is, @Nonnull String encoding,
 
     /**
      * @param in {@link Reader}
-     * @param trim true/false
+     * @param noop vestigial argument with no effect
      * @return the built DOM
      * @throws XmlPullParserException in case of an error
+     * @deprecated use {#build(java.io.Reader)}
      */
-    public static Xpp3Dom build(@WillClose Reader in, boolean trim) throws XmlPullParserException {
+    @Deprecated
+    public static Xpp3Dom build(@WillClose Reader in, boolean noop) throws XmlPullParserException {
         try (Reader reader = in) {
-            DocHandler docHandler = parseSax(new InputSource(reader), trim);
+            DocHandler docHandler = parseSax(new InputSource(reader));
             reader.close();
             return docHandler.result;
         } catch (final IOException e) {
@@ -94,9 +97,9 @@ public static Xpp3Dom build(@WillClose Reader in, boolean trim) throws XmlPullPa
         }
     }
 
-    private static DocHandler parseSax(@Nonnull InputSource inputSource, boolean trim) throws XmlPullParserException {
+    private static DocHandler parseSax(@Nonnull InputSource inputSource) throws XmlPullParserException {
         try {
-            DocHandler ch = new DocHandler(trim);
+            DocHandler ch = new DocHandler();
             XMLReader parser = createXmlReader();
             parser.setContentHandler(ch);
             parser.parse(inputSource);
@@ -147,14 +150,8 @@ private static class DocHandler extends DefaultHandler {
 
         Xpp3Dom result = null;
 
-        private final boolean trim;
-
         private boolean spacePreserve = false;
 
-        DocHandler(boolean trim) {
-            this.trim = trim;
-        }
-
         @Override
         public void startElement(String uri, String localName, String qName, Attributes attributes)
                 throws SAXException {
@@ -216,7 +213,7 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
         @Override
         public void characters(char[] ch, int start, int length) throws SAXException {
             String text = new String(ch, start, length);
-            appendToTopValue((trim && !spacePreserve) ? text.trim() : text);
+            appendToTopValue(text);
         }
 
         private void appendToTopValue(String toAppend) {
diff --git a/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java b/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
index ab921d14..f5324327 100644
--- a/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilderTest.java
@@ -71,15 +71,10 @@ public void trimming() throws Exception {
         String domString = createDomString();
 
         Xpp3Dom dom = Xpp3DomBuilder.build(new StringReader(domString), true);
-
-        assertEquals("element1value", dom.getChild("element1").getValue());
-
+        assertEquals(" element1value\n ", dom.getChild("element1").getValue());
         assertEquals("  preserve space  ", dom.getChild("element6").getValue());
-
         dom = Xpp3DomBuilder.build(new StringReader(domString), false);
-
         assertEquals(" element1value\n ", dom.getChild("element1").getValue());
-
         assertEquals("  preserve space  ", dom.getChild("element6").getValue());
     }
 

From 1980a207cdf436efbacb07d2189f943c3543d4af Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold 
Date: Sun, 5 Mar 2023 14:24:18 +0000
Subject: [PATCH 260/265] suggest java.nio.Files.walkFileTree as replacement
 for DirectoryScanner

---
 .../org/apache/maven/shared/utils/io/DirectoryScanner.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
index 0ecb8650..3c613ab0 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
@@ -115,7 +115,8 @@
  * @author Magesh Umasankar
  * @author Bruce Atherton
  * @author Antoine Levy-Lambert
- * @deprecated use {@code java.nio.file.DirectoryStream} and related classes
+ * @deprecated use {@code java.nio.file.DirectoryStream} or {@code java.nio.Files.walkFileTree()}
+ *             and related classes
  */
 @Deprecated
 public class DirectoryScanner {

From 3896942e11c8f277da101d960e921b285e76426c Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Sun, 30 Apr 2023 22:50:52 +0200
Subject: [PATCH 261/265] [maven-release-plugin] prepare release
 maven-shared-utils-3.4.1

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55e1c98f..a75d7831 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.4.1-SNAPSHOT
+  3.4.1
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -41,7 +41,7 @@
   
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
-    HEAD
+    maven-shared-utils-3.4.1
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
   
   
@@ -61,7 +61,7 @@
 
   
     RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder
-    2023-04-27T19:53:44Z
+    2023-04-30T20:50:29Z
     8
     3.2.5
   

From 37fa530eb02729a81345d7121e8a57082b1e372b Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Sun, 30 Apr 2023 22:51:01 +0200
Subject: [PATCH 262/265] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a75d7831..64233cac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.4.1
+  3.4.2-SNAPSHOT
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -41,7 +41,7 @@
   
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
-    maven-shared-utils-3.4.1
+    HEAD
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
   
   
@@ -61,7 +61,7 @@
 
   
     RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder
-    2023-04-30T20:50:29Z
+    2023-04-30T20:51:00Z
     8
     3.2.5
   

From 1c264bae8d9c4488dc11beaa3c51e73227ab0cb0 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Sat, 6 May 2023 11:40:18 +0200
Subject: [PATCH 263/265] [MSHARED-1072] Poll data from input stream

Input stream can be a System.in - all read will be blocked
We need read data in no blocking mode
---
 .../shared/utils/cli/CommandLineUtils.java    |  6 +-
 ...treamFeeder.java => StreamPollFeeder.java} | 60 +++++++-----
 .../shared/utils/cli/StreamFeederTest.java    | 91 -------------------
 .../utils/cli/StreamPollFeederTest.java       | 76 ++++++++++++++++
 4 files changed, 116 insertions(+), 117 deletions(-)
 rename src/main/java/org/apache/maven/shared/utils/cli/{StreamFeeder.java => StreamPollFeeder.java} (68%)
 delete mode 100644 src/test/java/org/apache/maven/shared/utils/cli/StreamFeederTest.java
 create mode 100644 src/test/java/org/apache/maven/shared/utils/cli/StreamPollFeederTest.java

diff --git a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
index 850d5b16..96714b4e 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
@@ -250,13 +250,13 @@ public void run() {
 
             @Override
             public Integer call() throws CommandLineException {
-                StreamFeeder inputFeeder = null;
+                StreamPollFeeder inputFeeder = null;
                 StreamPumper outputPumper = null;
                 StreamPumper errorPumper = null;
                 try {
                     if (systemIn != null) {
-                        inputFeeder = new StreamFeeder(systemIn, p.getOutputStream());
-                        inputFeeder.setName("StreamFeeder-systemIn");
+                        inputFeeder = new StreamPollFeeder(systemIn, p.getOutputStream());
+                        inputFeeder.setName("StreamPollFeeder-systemIn");
                         inputFeeder.start();
                     }
 
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java b/src/main/java/org/apache/maven/shared/utils/cli/StreamPollFeeder.java
similarity index 68%
rename from src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java
rename to src/main/java/org/apache/maven/shared/utils/cli/StreamPollFeeder.java
index f26db634..27d75bb1 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/StreamPollFeeder.java
@@ -24,51 +24,64 @@
 import java.util.Objects;
 
 /**
- * Read from an InputStream and write the output to an OutputStream.
+ * Poll InputStream for available data and write the output to an OutputStream.
  *
  * @author Trygve Laugstøl
  */
-class StreamFeeder extends Thread {
+class StreamPollFeeder extends Thread {
 
-    private final InputStream input;
+    public static final int BUF_LEN = 80;
 
+    private final InputStream input;
     private final OutputStream output;
 
     private Throwable exception;
-    private boolean done;
 
+    private boolean done;
     private final Object lock = new Object();
 
     /**
-     * Create a new StreamFeeder
+     * Create a new StreamPollFeeder
      *
      * @param input  Stream to read from
      * @param output Stream to write to
      */
-    StreamFeeder(InputStream input, OutputStream output) {
+    StreamPollFeeder(InputStream input, OutputStream output) {
         this.input = Objects.requireNonNull(input);
         this.output = Objects.requireNonNull(output);
         this.done = false;
     }
 
     @Override
-    @SuppressWarnings("checkstyle:innerassignment")
     public void run() {
+
+        byte[] buf = new byte[BUF_LEN];
+
         try {
-            for (int data; !isInterrupted() && (data = input.read()) != -1; ) {
-                output.write(data);
+            while (!done) {
+                if (input.available() > 0) {
+                    int i = input.read(buf);
+                    if (i > 0) {
+                        output.write(buf, 0, i);
+                        output.flush();
+                    } else {
+                        done = true;
+                    }
+                } else {
+                    synchronized (lock) {
+                        if (!done) {
+                            lock.wait(100);
+                        }
+                    }
+                }
             }
-            output.flush();
         } catch (IOException e) {
             exception = e;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
         } finally {
             close();
         }
-
-        synchronized (lock) {
-            done = true;
-            lock.notifyAll();
-        }
     }
 
     private void close() {
@@ -89,15 +102,16 @@ public Throwable getException() {
     }
 
     public void waitUntilDone() {
-        this.interrupt();
+
         synchronized (lock) {
-            while (!done) {
-                try {
-                    lock.wait();
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                }
-            }
+            done = true;
+            lock.notifyAll();
+        }
+
+        try {
+            join();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
         }
     }
 }
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/StreamFeederTest.java b/src/test/java/org/apache/maven/shared/utils/cli/StreamFeederTest.java
deleted file mode 100644
index 8decce03..00000000
--- a/src/test/java/org/apache/maven/shared/utils/cli/StreamFeederTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.maven.shared.utils.cli;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class StreamFeederTest {
-    static class BlockingInputStream extends ByteArrayInputStream {
-        public BlockingInputStream(byte[] buf) {
-            super(buf);
-        }
-
-        @Override
-        public synchronized int read() {
-            int data = super.read();
-            if (data >= 0) {
-                return data;
-            }
-
-            // end test data ... block
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            }
-            return -1;
-        }
-    }
-
-    @Test
-    public void waitUntilFeederDone() throws InterruptedException {
-
-        String TEST_DATA = "TestData";
-
-        BlockingInputStream inputStream = new BlockingInputStream(TEST_DATA.getBytes());
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-        StreamFeeder streamFeeder = new StreamFeeder(inputStream, outputStream);
-
-        streamFeeder.start();
-
-        // wait until all data from steam will be read
-        while (outputStream.size() < TEST_DATA.length()) {
-            Thread.sleep(10);
-        }
-
-        streamFeeder.waitUntilDone(); // wait until process finish
-
-        assertEquals(TEST_DATA, outputStream.toString());
-    }
-}
diff --git a/src/test/java/org/apache/maven/shared/utils/cli/StreamPollFeederTest.java b/src/test/java/org/apache/maven/shared/utils/cli/StreamPollFeederTest.java
new file mode 100644
index 00000000..7883de74
--- /dev/null
+++ b/src/test/java/org/apache/maven/shared/utils/cli/StreamPollFeederTest.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.shared.utils.cli;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class StreamPollFeederTest {
+
+    @Test
+    public void waitUntilFeederDoneOnInputStream() throws Exception {
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        StreamPollFeeder streamPollFeeder = new StreamPollFeeder(System.in, outputStream);
+
+        // start thread
+        streamPollFeeder.start();
+
+        // wait a moment
+        Thread.sleep(100);
+
+        // wait until process finish
+        streamPollFeeder.waitUntilDone();
+        assertNull(streamPollFeeder.getException());
+    }
+
+    @Test
+    public void dataShouldBeCopied() throws InterruptedException, IOException {
+
+        StringBuilder TEST_DATA = new StringBuilder();
+        for (int i = 0; i < 100; i++) {
+            TEST_DATA.append("TestData");
+        }
+
+        ByteArrayInputStream inputStream =
+                new ByteArrayInputStream(TEST_DATA.toString().getBytes());
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+        StreamPollFeeder streamPollFeeder = new StreamPollFeeder(inputStream, outputStream);
+
+        streamPollFeeder.start();
+
+        //  wait until all data from steam will be read
+        while (outputStream.size() < TEST_DATA.length()) {
+            Thread.sleep(100);
+        }
+
+        // wait until process finish
+        streamPollFeeder.waitUntilDone();
+        assertNull(streamPollFeeder.getException());
+
+        assertEquals(TEST_DATA.toString(), outputStream.toString());
+    }
+}

From b749b10809ce57250921ec43b7a5315c83967aee Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Tue, 9 May 2023 21:38:24 +0200
Subject: [PATCH 264/265] [MSHARED-1252] Bump plexus-io to 3.4.1 for
 maven-assembly-plugin

---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index 64233cac..56dab59d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,18 @@
           maven-resources-plugin
           3.3.1
         
+        
+          org.apache.maven.plugins
+          maven-assembly-plugin
+          
+            
+            
+              org.codehaus.plexus
+              plexus-io
+              3.4.1
+            
+          
+        
       
     
 

From 2dc9eb5ea2b4ed2573bd96282a16e0340083c87a Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski 
Date: Thu, 11 May 2023 22:50:12 +0200
Subject: [PATCH 265/265] [maven-release-plugin] prepare release
 maven-shared-utils-3.4.2

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 56dab59d..1034ff05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   
 
   maven-shared-utils
-  3.4.2-SNAPSHOT
+  3.4.2
 
   Apache Maven Shared Utils
   Shared utilities for use by Maven core and plugins
@@ -41,7 +41,7 @@
   
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
     scm:git:https://gitbox.apache.org/repos/asf/maven-shared-utils.git
-    HEAD
+    maven-shared-utils-3.4.2
     https://github.com/apache/maven-shared-utils/tree/${project.scm.tag}
   
   
@@ -61,7 +61,7 @@
 
   
     RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder
-    2023-04-30T20:51:00Z
+    2023-05-11T20:49:40Z
     8
     3.2.5