Repository: maven Updated Branches: refs/heads/trailing-whitespace 365066f46 -> 0343c5260
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java index 384d0c0..5136f1b 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java @@ -25,7 +25,7 @@ import java.io.InputStream; /** * Wraps an ordinary {@link CharSequence} as a settings source. - * + * * @author Benjamin Bentmann */ public class StringSettingsSource @@ -38,7 +38,7 @@ public class StringSettingsSource /** * Creates a new settings source backed by the specified string. - * + * * @param settings The settings' string representation, may be empty or {@code null}. */ public StringSettingsSource( CharSequence settings ) @@ -48,7 +48,7 @@ public class StringSettingsSource /** * Creates a new settings source backed by the specified string. - * + * * @param settings The settings' string representation, may be empty or {@code null}. * @param location The location to report for this use, may be {@code null}. */ @@ -71,7 +71,7 @@ public class StringSettingsSource /** * Gets the character sequence of this settings source. - * + * * @return The underlying character stream, never {@code null}. */ public String getSettings() http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java index c358ecc..04a09f6 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java @@ -25,7 +25,7 @@ import java.net.URL; /** * Wraps an ordinary {@link URL} as a settings source. - * + * * @author Benjamin Bentmann */ public class UrlSettingsSource @@ -36,7 +36,7 @@ public class UrlSettingsSource /** * Creates a new model source backed by the specified URL. - * + * * @param settingsUrl The settings URL, must not be {@code null}. */ public UrlSettingsSource( URL settingsUrl ) @@ -61,7 +61,7 @@ public class UrlSettingsSource /** * Gets the settings URL of this model source. - * + * * @return The underlying settings URL, never {@code null}. */ public URL getSettingsUrl() http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java index 04c540a..c09cf4c 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java @@ -34,7 +34,7 @@ import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException; /** * Decrypts passwords in the settings. - * + * * @author Benjamin Bentmann */ @Component( role = SettingsDecrypter.class ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java index 093f49f..884a632 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java @@ -29,7 +29,7 @@ import org.apache.maven.settings.Settings; /** * Collects parameters that control the decryption of settings. - * + * * @author Benjamin Bentmann */ public class DefaultSettingsDecryptionRequest @@ -50,7 +50,7 @@ public class DefaultSettingsDecryptionRequest /** * Creates a new request to decrypt the specified settings. - * + * * @param settings The settings to decrypt, must not be {@code null}. */ public DefaultSettingsDecryptionRequest( Settings settings ) @@ -61,7 +61,7 @@ public class DefaultSettingsDecryptionRequest /** * Creates a new request to decrypt the specified server. - * + * * @param server The server to decrypt, must not be {@code null}. */ public DefaultSettingsDecryptionRequest( Server server ) @@ -71,7 +71,7 @@ public class DefaultSettingsDecryptionRequest /** * Creates a new request to decrypt the specified proxy. - * + * * @param proxy The proxy to decrypt, must not be {@code null}. */ public DefaultSettingsDecryptionRequest( Proxy proxy ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java index cfb9b67..1e9fd72 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java @@ -28,7 +28,7 @@ import org.apache.maven.settings.building.SettingsProblem; /** * Collects the output of the settings decrypter. - * + * * @author Benjamin Bentmann */ class DefaultSettingsDecryptionResult http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java index d12c525..b34c394 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java @@ -21,7 +21,7 @@ package org.apache.maven.settings.crypto; /** * Decrypts passwords in the settings. - * + * * @author Benjamin Bentmann */ public interface SettingsDecrypter @@ -29,7 +29,7 @@ public interface SettingsDecrypter /** * Decrypts passwords in the settings. - * + * * @param request The settings decryption request that holds the parameters, must not be {@code null}. * @return The result of the settings decryption, never {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java index defce89..b344a99 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java @@ -26,7 +26,7 @@ import org.apache.maven.settings.Server; /** * Collects parameters that control the decryption of settings. - * + * * @author Benjamin Bentmann */ public interface SettingsDecryptionRequest @@ -34,14 +34,14 @@ public interface SettingsDecryptionRequest /** * Gets the servers whose passwords should be decrypted. - * + * * @return The servers to decrypt, never {@code null}. */ List<Server> getServers(); /** * Sets the servers whose passwords should be decrypted. - * + * * @param servers The servers to decrypt, may be {@code null}. * @return This request, never {@code null}. */ @@ -49,14 +49,14 @@ public interface SettingsDecryptionRequest /** * Gets the proxies whose passwords should be decrypted. - * + * * @return The proxies to decrypt, never {@code null}. */ List<Proxy> getProxies(); /** * Sets the proxies whose passwords should be decrypted. - * + * * @param proxies The proxies to decrypt, may be {@code null}. * @return This request, never {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java index 2c84691..5b7b1f4 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java @@ -27,7 +27,7 @@ import org.apache.maven.settings.building.SettingsProblem; /** * Collects the output of the settings decrypter. - * + * * @author Benjamin Bentmann */ public interface SettingsDecryptionResult @@ -35,35 +35,35 @@ public interface SettingsDecryptionResult /** * Gets the decrypted server. This is a convenience method to retrieve the first element from {@link #getServers()}. - * + * * @return The decrypted server or {@code null}. */ Server getServer(); /** * Gets the decrypted servers. - * + * * @return The decrypted server, can be empty but never {@code null}. */ List<Server> getServers(); /** * Gets the decrypted proxy. This is a convenience method to retrieve the first element from {@link #getProxies()}. - * + * * @return The decrypted proxy or {@code null}. */ Proxy getProxy(); /** * Gets the decrypted proxies. - * + * * @return The decrypted proxy, can be empty but never {@code null}. */ List<Proxy> getProxies(); /** * Gets the problems that were encountered during the settings decryption. - * + * * @return The problems that were encountered during the decryption, can be empty but never {@code null}. */ List<SettingsProblem> getProblems(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java index 20ce3fb..c538c41 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java @@ -34,7 +34,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException; /** * Handles deserialization of settings from the default textual format. - * + * * @author Benjamin Bentmann */ @Component( role = SettingsReader.class ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java index b5afad3..28e09b4 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java @@ -34,7 +34,7 @@ import org.codehaus.plexus.util.WriterFactory; /** * Handles serialization of settings into the default textual format. - * + * * @author Benjamin Bentmann */ @Component( role = SettingsWriter.class ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java index 991afb8..425e6d8 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java @@ -23,7 +23,7 @@ import java.io.IOException; /** * Signals a failure to parse the settings due to invalid syntax (e.g. non-wellformed XML or unknown elements). - * + * * @author Benjamin Bentmann */ public class SettingsParseException @@ -42,7 +42,7 @@ public class SettingsParseException /** * Creates a new parser exception with the specified details. - * + * * @param message The error message, may be {@code null}. * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. @@ -56,7 +56,7 @@ public class SettingsParseException /** * Creates a new parser exception with the specified details. - * + * * @param message The error message, may be {@code null}. * @param lineNumber The one-based index of the line containing the error or {@code -1} if unknown. * @param columnNumber The one-based index of the column containing the error or {@code -1} if unknown. @@ -72,7 +72,7 @@ public class SettingsParseException /** * Gets the one-based index of the line containing the error. - * + * * @return The one-based index of the line containing the error or a non-positive value if unknown. */ public int getLineNumber() @@ -82,7 +82,7 @@ public class SettingsParseException /** * Gets the one-based index of the column containing the error. - * + * * @return The one-based index of the column containing the error or non-positive value if unknown. */ public int getColumnNumber() http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java index 1e519a5..7817df6 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java @@ -29,7 +29,7 @@ import org.apache.maven.settings.Settings; /** * Handles deserialization of settings from some kind of textual format like XML. - * + * * @author Benjamin Bentmann */ public interface SettingsReader @@ -43,7 +43,7 @@ public interface SettingsReader /** * Reads the settings from the specified file. - * + * * @param input The file to deserialize the settings from, must not be {@code null}. * @param options The options to use for deserialization, may be {@code null} to use the default values. * @return The deserialized settings, never {@code null}. @@ -56,7 +56,7 @@ public interface SettingsReader /** * Reads the settings from the specified character reader. The reader will be automatically closed before the method * returns. - * + * * @param input The reader to deserialize the settings from, must not be {@code null}. * @param options The options to use for deserialization, may be {@code null} to use the default values. * @return The deserialized settings, never {@code null}. @@ -69,7 +69,7 @@ public interface SettingsReader /** * Reads the settings from the specified byte stream. The stream will be automatically closed before the method * returns. - * + * * @param input The stream to deserialize the settings from, must not be {@code null}. * @param options The options to use for deserialization, may be {@code null} to use the default values. * @return The deserialized settings, never {@code null}. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java index 6ddf3a8..54bfcf0 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java @@ -29,7 +29,7 @@ import org.apache.maven.settings.Settings; /** * Handles serialization of settings into some kind of textual format like XML. - * + * * @author Benjamin Bentmann */ public interface SettingsWriter @@ -38,7 +38,7 @@ public interface SettingsWriter /** * Writes the supplied settings to the specified file. Any non-existing parent directories of the output file will * be created automatically. - * + * * @param output The file to serialize the settings to, must not be {@code null}. * @param options The options to use for serialization, may be {@code null} to use the default values. * @param settings The settings to serialize, must not be {@code null}. @@ -50,7 +50,7 @@ public interface SettingsWriter /** * Writes the supplied settings to the specified character writer. The writer will be automatically closed before * the method returns. - * + * * @param output The writer to serialize the settings to, must not be {@code null}. * @param options The options to use for serialization, may be {@code null} to use the default values. * @param settings The settings to serialize, must not be {@code null}. @@ -62,7 +62,7 @@ public interface SettingsWriter /** * Writes the supplied settings to the specified byte stream. The stream will be automatically closed before the * method returns. - * + * * @param output The stream to serialize the settings to, must not be {@code null}. * @param options The options to use for serialization, may be {@code null} to use the default values. * @param settings The settings to serialize, must not be {@code null}. http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java index f9943e3..79745ec 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java @@ -24,7 +24,7 @@ import org.apache.maven.settings.building.SettingsProblemCollector; /** * Validate a model settings - * + * * @author Milos Kleint */ public interface SettingsValidator @@ -32,7 +32,7 @@ public interface SettingsValidator /** * Validate the specified settings. - * + * * @param settings The settings to validate, must not be {@code null}. * @param problems The container used to collect problems that were encountered, must not be {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2f5a1a3..567f3ec 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ <properties> <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.target>1.6</maven.compiler.target> <classWorldsVersion>2.5.2</classWorldsVersion> <commonsCliVersion>1.2</commonsCliVersion> <junitVersion>4.11</junitVersion> @@ -107,7 +107,7 @@ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url> </site> </distributionManagement> - + <contributors> <contributor> <name>Stuart McCulloch</name> @@ -513,9 +513,9 @@ <configuration> <asfExtOptions> <charter>The mission of the Apache Maven project is to create and maintain software - libraries that provide a widely-used project build tool, targeting mainly Java - development. Apache Maven promotes the use of dependencies via a - standardized coordinate system, binary plugins, and a standard build + libraries that provide a widely-used project build tool, targeting mainly Java + development. Apache Maven promotes the use of dependencies via a + standardized coordinate system, binary plugins, and a standard build lifecycle.</charter> </asfExtOptions> </configuration>
