You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/11/23 13:05:21 UTC
[01/11] maven git commit: Trimmed trailing whitespace
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>
[06/11] maven git commit: Trimmed trailing whitespace
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/scripting-support/marmalade-support.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/scripting-support/marmalade-support.apt b/maven-core/src/site/apt/scripting-support/marmalade-support.apt
index 87d4815..7a80966 100644
--- a/maven-core/src/site/apt/scripting-support/marmalade-support.apt
+++ b/maven-core/src/site/apt/scripting-support/marmalade-support.apt
@@ -24,173 +24,173 @@
---
Marmalade Support
-
+
*Abstract
- This document will track the design and implementation issues involved in
+ This document will track the design and implementation issues involved in
adding support to m2 for marmalade-based mojos.
-
+
*Design Notes
[[1]] <<Marmalade mojo descriptor specification.>>
-
+
As in all mojo specifications, it is ideal that the descriptor for
a marmalade-based mojo be inline with the source code. This centralizes
all maintenance related to a single mojo to a single point of maintenance.
-
+
The following is what I'm thinking as of now:
-
+
- a marmalade-based mojo should look something like:
-
+
+---+
<mojo xmlns="m2:mojo" xmlns:marmalade-control="marmalade:marmalade-control" marmalade-control:el="none">
-
+
<metadata>
<id>mmld</id>
<name>mmldCompile</name>
<lifecyclePhase>compile</lifecyclePhase>
<description>Used to compile marmalade scripts into java beans.</description>
-
+
<requiresDependencyResolution/>
<instantiationStrategy/>
<executionStrategy/>
-
+
<parameters>
-
+
<parameter>
<name>classpath</name>
<description>The compilation classpath</description>
<type>java.util.List</type>
<expression>#pom.artifacts</expression>
-
+
<required/>
<validator/>
<default/>
-
+
</parameter>
-
+
</parameters>
-
+
</metadata>
-
+
<execute>
<!-- Do some stuff. -->
</execute>
-
+
</mojo>
+---+
[NOTE] All empty elements above signify optional elements, usage specification.
[[2]] <<Marmalade mojo packager.>>
-
+
The marmalade mojo packager will:
-
+
[[a]] Locate all *.mmld files within the scripts directory of the project.
-
+
The scripts directory should be tied to the script language within
the POM. Until we have multiple language support in the POM, we'll
use something like: <<<xpath(build/marmaladeSourceDirectory)>>>.
-
+
[[b]] For each script found:
-
+
[[i]] Execute the script with "gatherMetadata=true" in the context.
-
- [[ii]] Retrieve the mojo descriptor from the resulting "metadata"
+
+ [[ii]] Retrieve the mojo descriptor from the resulting "metadata"
variable in the context.
-
+
[[iii]] Cache the mojo descriptor in aggregator for subsequent
output to plugin descriptor file.
-
+
[[c]] Copy all scripts to the target directory. Preserve relative paths.
-
+
[[d]] <<Process Disjoint:>> <Allow other mojo-descriptor collectors to
run, aggregating their descriptors in similar fashion to [b.iii]
above.>
-
+
[[e]] Use the project's dependencies and other info to form the plugin
descriptor's header (non-mojo-specific info).
-
+
[[f]] Use the PluginGenerator from maven-plugin-tools to generate a
META-INF/plexus/plugin.xml to the target directory.
-
+
[[g]] Continue with lifecycle.
-
- This may include compilation of java helper classes, etc. and
+
+ This may include compilation of java helper classes, etc. and
plugin-artifact packaging, presumably via 'jar:jar' or similar.
-
+
[[3]] <<Marmalade mojo loader.>>
-
+
The marmalade mojo loader will:
-
+
[[a]] Retrieve the implementation spec (this is the path of the script,
- relative to the root of the plugin filesystem...jar, etc.) to
+ relative to the root of the plugin filesystem...jar, etc.) to
$path.
-
+
[[b]] Use the context classloader to retrieve a reader to $path.
-
+
[[c]] Build the ScriptBuilder corresponding to the script.
-
+
[[d]] Create a new MarmaladeMojo instance which adapts the mojo calling
semantics to the creation/execution of a marmalade script.
-
+
Execution involves:
-
+
[[i]] Creating a new MarmaladeScript instance.
-
+
[[ii]] Creating an execution context which references all I/O
from the main Maven execution thread, and embeds:
-
+
- #request == MavenExecutionRequest
-
+
- #response == MavenExecutionResponse
-
+
- Any globally configured environmental constraints, such
as a global preserve-whitespace setting
-
+
[[iii]] Execution of the script using the execution context.
-
+
[[iv]] Export of the resulting context, minus any surviving input
variables, to the MavenExecutionResponse's out-params.
*Implementation Issues
[[1]] How do we make Maven smart enough to switch loader implementations based
- on some sub-type of maven-plugin?
-
- This is important, since the default mojo loader will not be smart
- enough to do the job, and embedding this behavior in that loader is not
+ on some sub-type of maven-plugin?
+
+ This is important, since the default mojo loader will not be smart
+ enough to do the job, and embedding this behavior in that loader is not
scalable or extensible enough to accommodate future expansion into the
realms of jython, groovy, etc...
-
+
<<UPDATE:07-FEB-2005>>
-
+
We'll plan on using some sort of language specification in the mojo
descriptor to determine which mojo loader to use, then we'll populate
the PluginLoader/PluginManager with a map of known languages->loaders.
-
- [[2]] How do we make the plugin:install process smart enough to switch
+
+ [[2]] How do we make the plugin:install process smart enough to switch
generator implementations based on some sub-type of maven-plugin?
-
+
This is closely related to [1] above.
-
+
<<UPDATE:07-FEB-2005>>
-
+
See update in [3].
-
- [[3]] Do we want to allow mixed-bag plugin implementations?
-
- These might include a mix of standard-java and marmalade mojos. It
- strikes me that many marmalade-based mojos may use beans/tags that are
- actually adapter classes for other third-party APIs (why they wouldn't
- implement everything as java mojos in this cases is beyond me). If they
- have java source inside the plugin source directory, we should probably
+
+ [[3]] Do we want to allow mixed-bag plugin implementations?
+
+ These might include a mix of standard-java and marmalade mojos. It
+ strikes me that many marmalade-based mojos may use beans/tags that are
+ actually adapter classes for other third-party APIs (why they wouldn't
+ implement everything as java mojos in this cases is beyond me). If they
+ have java source inside the plugin source directory, we should probably
compile it and bundle it with the plugin scripts; but what if this source
- also has mojo annotations? This will have implications for [1] and [2]
+ also has mojo annotations? This will have implications for [1] and [2]
above.
-
+
<<UPDATE:07-FEB-2005>>
-
+
We will plan on allowing this sort of implementation, and simply start
by applying all known generators which have a source directory set in
- the POM (or later, have a <language/> section, maybe). At any rate,
+ the POM (or later, have a <language/> section, maybe). At any rate,
helper classes will be allowed for script-based mojos.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
index 8fca279..57d374f 100644
--- a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
+++ b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
@@ -92,7 +92,7 @@ public abstract class AbstractCoreMavenComponentTestCase
* We need to customize the standard Plexus container with the plugin discovery listener which
* is what looks for the META-INF/maven/plugin.xml resources that enter the system when a Maven
* plugin is loaded.
- *
+ *
* We also need to customize the Plexus container with a standard plugin discovery listener
* which is the MavenPluginCollector. When a Maven plugin is discovered the MavenPluginCollector
* collects the plugin descriptors which are found.
@@ -104,7 +104,7 @@ public abstract class AbstractCoreMavenComponentTestCase
protected MavenExecutionRequest createMavenExecutionRequest( File pom )
throws Exception
- {
+ {
MavenExecutionRequest request = new DefaultMavenExecutionRequest()
.setPom( pom )
.setProjectPresent( true )
@@ -122,16 +122,16 @@ public abstract class AbstractCoreMavenComponentTestCase
// a Maven subclass because we don't want to couple maven to the project builder which we need to
// separate.
protected MavenSession createMavenSession( File pom )
- throws Exception
+ throws Exception
{
return createMavenSession( pom, new Properties() );
}
-
+
protected MavenSession createMavenSession( File pom, Properties executionProperties )
throws Exception
{
MavenExecutionRequest request = createMavenExecutionRequest( pom );
-
+
ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest()
.setLocalRepository( request.getLocalRepository() )
.setRemoteRepositories( request.getRemoteRepositories() )
@@ -179,7 +179,7 @@ public abstract class AbstractCoreMavenComponentTestCase
model.setVersion( "1.0" );
return new MavenProject( model );
}
-
+
protected List<ArtifactRepository> getRemoteRepositories()
throws InvalidRepositoryException
{
@@ -212,7 +212,7 @@ public abstract class AbstractCoreMavenComponentTestCase
return repositorySystem.createLocalRepository( repoDir );
}
-
+
protected class ProjectBuilder
{
private MavenProject project;
@@ -228,11 +228,11 @@ public abstract class AbstractCoreMavenComponentTestCase
model.setModelVersion( "4.0.0" );
model.setGroupId( groupId );
model.setArtifactId( artifactId );
- model.setVersion( version );
+ model.setVersion( version );
model.setBuild( new Build() );
- project = new MavenProject( model );
+ project = new MavenProject( model );
}
-
+
public ProjectBuilder setGroupId( String groupId )
{
project.setGroupId( groupId );
@@ -244,30 +244,30 @@ public abstract class AbstractCoreMavenComponentTestCase
project.setArtifactId( artifactId );
return this;
}
-
+
public ProjectBuilder setVersion( String version )
{
project.setVersion( version );
return this;
}
-
+
// Dependencies
//
public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope )
{
return addDependency( groupId, artifactId, version, scope, (Exclusion)null );
}
-
+
public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, Exclusion exclusion )
{
- return addDependency( groupId, artifactId, version, scope, null, exclusion );
+ return addDependency( groupId, artifactId, version, scope, null, exclusion );
}
public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath )
{
- return addDependency( groupId, artifactId, version, scope, systemPath, null );
+ return addDependency( groupId, artifactId, version, scope, systemPath, null );
}
-
+
public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath, Exclusion exclusion )
{
Dependency d = new Dependency();
@@ -275,60 +275,60 @@ public abstract class AbstractCoreMavenComponentTestCase
d.setArtifactId( artifactId );
d.setVersion( version );
d.setScope( scope );
-
+
if ( systemPath != null && scope.equals( Artifact.SCOPE_SYSTEM ) )
{
d.setSystemPath( systemPath );
}
-
+
if ( exclusion != null )
{
d.addExclusion( exclusion );
}
-
+
project.getDependencies().add( d );
-
+
return this;
}
-
+
// Plugins
//
public ProjectBuilder addPlugin( Plugin plugin )
{
- project.getBuildPlugins().add( plugin );
+ project.getBuildPlugins().add( plugin );
return this;
}
-
+
public MavenProject get()
{
return project;
- }
- }
-
+ }
+ }
+
protected class PluginBuilder
{
private Plugin plugin;
-
+
public PluginBuilder( String groupId, String artifactId, String version )
{
plugin = new Plugin();
plugin.setGroupId( groupId );
plugin.setArtifactId( artifactId );
- plugin.setVersion( version );
+ plugin.setVersion( version );
}
-
+
// Dependencies
//
public PluginBuilder addDependency( String groupId, String artifactId, String version, String scope, Exclusion exclusion )
{
- return addDependency( groupId, artifactId, version, scope, exclusion );
+ return addDependency( groupId, artifactId, version, scope, exclusion );
}
public PluginBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath )
{
- return addDependency( groupId, artifactId, version, scope, systemPath, null );
+ return addDependency( groupId, artifactId, version, scope, systemPath, null );
}
-
+
public PluginBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath, Exclusion exclusion )
{
Dependency d = new Dependency();
@@ -336,25 +336,25 @@ public abstract class AbstractCoreMavenComponentTestCase
d.setArtifactId( artifactId );
d.setVersion( version );
d.setScope( scope );
-
+
if ( systemPath != null && scope.equals( Artifact.SCOPE_SYSTEM ) )
{
d.setSystemPath( systemPath );
}
-
+
if ( exclusion != null )
{
d.addExclusion( exclusion );
}
-
+
plugin.getDependencies().add( d );
-
+
return this;
}
-
+
public Plugin get()
{
return plugin;
- }
- }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
index 7df09f6..17aeab3 100644
--- a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
+++ b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
@@ -6,9 +6,9 @@ package org.apache.maven;
* 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
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
index 67a7575..ca75c3f 100644
--- a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
@@ -65,7 +65,7 @@ public class ProjectDependenciesResolverTest
new ProjectBuilder( project ).addDependency( "org.apache.maven.its", "b", "0.1", Artifact.SCOPE_RUNTIME,
exclusion );
-
+
Set<Artifact> artifactDependencies =
resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), session );
assertEquals( 0, artifactDependencies.size() );
@@ -75,7 +75,7 @@ public class ProjectDependenciesResolverTest
assertEquals( "b", artifactDependencies.iterator().next().getArtifactId() );
}
*/
-
+
public void testSystemScopeDependencies()
throws Exception
{
@@ -88,8 +88,8 @@ public class ProjectDependenciesResolverTest
Set<Artifact> artifactDependencies =
resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), session );
assertEquals( 1, artifactDependencies.size() );
- }
-
+ }
+
public void testSystemScopeDependencyIsPresentInTheCompileClasspathElements()
throws Exception
{
@@ -102,10 +102,10 @@ public class ProjectDependenciesResolverTest
MavenProject project = session.getCurrentProject();
project.setArtifacts( resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), session ) );
-
+
List<String> elements = project.getCompileClasspathElements();
assertEquals( 2, elements.size() );
-
+
@SuppressWarnings( "deprecation" )
List<Artifact> artifacts = project.getCompileArtifacts();
assertEquals( 1, artifacts.size() );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
index 698c6d1..fbb8b90 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
@@ -39,7 +39,7 @@ public class DefaultMavenExecutionTest
assertNotNull( copy );
assertNotSame( copy, original );
}
-
+
public void testResultWithNullTopologicallySortedProjectsIsEmptyList()
{
MavenExecutionResult result = new DefaultMavenExecutionResult();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
index b18fa10..04be08b 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
@@ -213,14 +213,14 @@ public class LifecycleExecutorTest
//[05] modello:xpp3-writer
//[06] modello:java
//[07] modello:xpp3-reader
- //[08] plugin:descriptor
+ //[08] plugin:descriptor
//[09] resources:resources
//[10] compiler:compile
//[11] resources:testResources
//[12] compiler:testCompile
//[13] surefire:test
//[14] jar:jar
- //[15] plugin:addPluginArtifactMetadata
+ //[15] plugin:addPluginArtifactMetadata
//[16] install:install
//
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
index e491629..bc87702 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
@@ -45,7 +45,7 @@ public class PluginManagerTest
super.setUp();
pluginManager = (DefaultBuildPluginManager) lookup( BuildPluginManager.class );
}
-
+
@Override
protected void tearDown()
throws Exception
@@ -62,7 +62,7 @@ public class PluginManagerTest
public void testPluginLoading()
throws Exception
{
- MavenSession session = createMavenSession( null );
+ MavenSession session = createMavenSession( null );
Plugin plugin = new Plugin();
plugin.setGroupId( "org.apache.maven.its.plugins" );
plugin.setArtifactId( "maven-it-plugin" );
@@ -72,17 +72,17 @@ public class PluginManagerTest
session.getRepositorySession() );
assertNotNull( pluginDescriptor );
}
-
+
public void testMojoDescriptorRetrieval()
throws Exception
{
- MavenSession session = createMavenSession( null );
+ MavenSession session = createMavenSession( null );
String goal = "it";
Plugin plugin = new Plugin();
plugin.setGroupId( "org.apache.maven.its.plugins" );
plugin.setArtifactId( "maven-it-plugin" );
plugin.setVersion( "0.1" );
-
+
MojoDescriptor mojoDescriptor =
pluginManager.getMojoDescriptor( plugin, goal, session.getCurrentProject().getRemotePluginRepositories(),
session.getRepositorySession() );
@@ -90,53 +90,53 @@ public class PluginManagerTest
assertEquals( goal, mojoDescriptor.getGoal() );
// igorf: plugin realm comes later
// assertNotNull( mojoDescriptor.getRealm() );
-
+
PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
assertNotNull( pluginDescriptor );
assertEquals( "org.apache.maven.its.plugins", pluginDescriptor.getGroupId() );
assertEquals( "maven-it-plugin", pluginDescriptor.getArtifactId() );
assertEquals( "0.1", pluginDescriptor.getVersion() );
}
-
+
// -----------------------------------------------------------------------------------------------
// Tests which exercise the lifecycle executor when it is dealing with individual goals.
// -----------------------------------------------------------------------------------------------
-
+
//TODO: These two tests display a lack of symmetry with respect to the input which is a free form string and the
// mojo descriptor which comes back. All the free form parsing needs to be done somewhere else, this is
// really the function of the CLI, and then the pre-processing of that output still needs to be fed into
// a hinting process which helps flesh out the full specification of the plugin. The plugin manager should
// only deal in concrete terms -- all version finding mumbo jumbo is a customization to base functionality
// the plugin manager provides.
-
+
public void testRemoteResourcesPlugin()
throws Exception
{
//TODO: turn an equivalent back on when the RR plugin is released.
-
+
/*
This will not work until the RR plugin is released to get rid of the binding to the reporting exception which is a mistake.
-
+
This happpens after removing the reporting API from the core:
-
+
java.lang.NoClassDefFoundError: org/apache/maven/reporting/MavenReportException
-
- MavenSession session = createMavenSession( getProject( "project-with-inheritance" ) );
+
+ MavenSession session = createMavenSession( getProject( "project-with-inheritance" ) );
String goal = "process";
-
+
Plugin plugin = new Plugin();
plugin.setGroupId( "org.apache.maven.plugins" );
plugin.setArtifactId( "maven-remote-resources-plugin" );
plugin.setVersion( "1.0-beta-2" );
-
- MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getCurrentProject(), session.getLocalRepository() );
+
+ MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getCurrentProject(), session.getLocalRepository() );
assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-remote-resources-plugin", "1.0-beta-2" );
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
pluginManager.executeMojo( session, mojoExecution );
*/
}
-
+
//TODO: this will be the basis of the customizable lifecycle execution so need to figure this out quickly.
public void testSurefirePlugin()
throws Exception
@@ -151,22 +151,22 @@ public class PluginManagerTest
plugin.setVersion( "2.4.2" );
// The project has already been fully interpolated so getting the raw mojoDescriptor is not going to have the processes configuration.
- MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() );
+ MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() );
assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-surefire-plugin", "2.4.2" );
-
+
System.out.println( session.getCurrentProject().getBuild().getPluginsAsMap() );
-
+
Xpp3Dom configuration = (Xpp3Dom) session.getCurrentProject().getBuild().getPluginsAsMap().get( plugin.getKey() ).getExecutions().get( 0 ).getConfiguration();
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor, configuration );
pluginManager.executeMojo( session, mojoExecution );
*/
}
-
+
public void testMojoConfigurationIsMergedCorrectly()
throws Exception
{
}
-
+
/**
* The case where the user wants to specify an alternate version of the underlying tool. Common case
* is in the Antlr plugin which comes bundled with a version of Antlr but the user often times needs
@@ -177,7 +177,7 @@ public class PluginManagerTest
{
}
- /**
+ /**
* The case where you have a plugin in the current build that you want to be used on projects in
* the current build.
*/
@@ -203,13 +203,13 @@ public class PluginManagerTest
throws Exception
{
}
-
+
// test that mojo which does not require dependency resolution trigger no downloading of dependencies
-
+
// test interpolation of basedir values in mojo configuration
-
+
// test a build where projects use different versions of the same plugin
-
+
public void testThatPluginDependencyThatHasSystemScopeIsResolved()
throws Exception
{
@@ -218,27 +218,27 @@ public class PluginManagerTest
Plugin plugin = new PluginBuilder( "org.apache.maven", "project-test", "1.0" )
.addDependency( "org.apache.maven", "system-dependency", "1.0", Artifact.SCOPE_SYSTEM, systemPath.getAbsolutePath() )
- .get();
+ .get();
MavenProject pluginProject = new ProjectBuilder( "org.apache.maven", "project-test", "1.0" )
.addPlugin( plugin )
.addDependency( "junit", "junit", "3.8.1", Artifact.SCOPE_COMPILE )
- .get();
-
+ .get();
+
// i'm making this artifact which is assumed to come from a pom in the metadata processor, then it tries to create a POM artifact
// and parse it for the dependencies and it blows up.
//
// we need to pass this through as is so it doesn't get parsed again.
Artifact pluginArtifact = new ProjectArtifact( pluginProject );
-
+
Set<Artifact> artifacts = pluginManager.getPluginArtifacts( pluginArtifact, plugin, getLocalRepository(), getPluginArtifactRepositories() );
System.out.println( artifacts );
*/
-
+
MavenSession session = createMavenSession( getProject( "project-contributing-system-scope-plugin-dep" ) );
MavenProject project = session.getCurrentProject();
- Plugin plugin = project.getPlugin( "org.apache.maven.its.plugins:maven-it-plugin" );
-
+ Plugin plugin = project.getPlugin( "org.apache.maven.its.plugins:maven-it-plugin" );
+
RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
repositoryRequest.setLocalRepository( getLocalRepository() );
repositoryRequest.setRemoteRepositories( getPluginArtifactRepositories() );
@@ -257,23 +257,23 @@ public class PluginManagerTest
return;
}
}
-
+
fail( "Can't find the system scoped dependency in the plugin artifacts." );
}
-
+
// -----------------------------------------------------------------------------------------------
// Testing help
// -----------------------------------------------------------------------------------------------
protected void assertPluginDescriptor( MojoDescriptor mojoDescriptor, String groupId, String artifactId, String version )
{
- assertNotNull( mojoDescriptor );
+ assertNotNull( mojoDescriptor );
PluginDescriptor pd = mojoDescriptor.getPluginDescriptor();
assertNotNull( pd );
assertEquals( groupId, pd.getGroupId() );
assertEquals( artifactId, pd.getArtifactId() );
- assertEquals( version, pd.getVersion() );
- }
+ assertEquals( version, pd.getVersion() );
+ }
public void testPluginRealmCache()
throws Exception
@@ -299,7 +299,7 @@ public class PluginManagerTest
assertNotNull( descriptor.getRealm() );
assertNotNull( descriptor.getImplementationClass() );
}
-
+
// reload plugin realm from cache
session = createMavenSession( getProject( "project-contributing-system-scope-plugin-dep" ) );
project = session.getCurrentProject();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
index 7f94bac..ead7ae2 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
@@ -29,7 +29,7 @@ import junit.framework.TestCase;
/**
* MNG-3131
- *
+ *
* @author Robert Scholte
*
*/
@@ -49,24 +49,24 @@ public class PluginParameterExceptionTest
Parameter parameter = new Parameter();
parameter.setType( "java.lang.String[]" );
parameter.setName( "toAddresses" );
-
+
parameter.setRequired( true );
PluginParameterException exception =
new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) );
- assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" +
- "\n" +
- "[0] Inside the definition for plugin 'artifactId', specify the following:\n" +
- "\n" +
- "<configuration>\n" +
- " ...\n" +
+ assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" +
+ "\n" +
+ "[0] Inside the definition for plugin 'artifactId', specify the following:\n" +
+ "\n" +
+ "<configuration>\n" +
+ " ...\n" +
" <toAddresses>\n" +
" <item>VALUE</item>\n" +
- " </toAddresses>\n" +
+ " </toAddresses>\n" +
"</configuration>.\n", exception.buildDiagnosticMessage() );
}
-
+
public void testMissingRequiredCollectionTypeParameter()
{
MojoDescriptor mojoDescriptor = new MojoDescriptor();
@@ -79,21 +79,21 @@ public class PluginParameterExceptionTest
Parameter parameter = new Parameter();
parameter.setType( "java.util.List" );
parameter.setName( "toAddresses" );
-
+
parameter.setRequired( true );
PluginParameterException exception =
new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) );
- assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" +
- "\n" +
- "[0] Inside the definition for plugin 'artifactId', specify the following:\n" +
- "\n" +
- "<configuration>\n" +
- " ...\n" +
+ assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" +
+ "\n" +
+ "[0] Inside the definition for plugin 'artifactId', specify the following:\n" +
+ "\n" +
+ "<configuration>\n" +
+ " ...\n" +
" <toAddresses>\n" +
" <item>VALUE</item>\n" +
- " </toAddresses>\n" +
+ " </toAddresses>\n" +
"</configuration>.\n", exception.buildDiagnosticMessage() );
}
@@ -109,21 +109,21 @@ public class PluginParameterExceptionTest
Parameter parameter = new Parameter();
parameter.setType( "java.util.Map" );
parameter.setName( "toAddresses" );
-
+
parameter.setRequired( true );
PluginParameterException exception =
new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) );
- assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" +
- "\n" +
- "[0] Inside the definition for plugin 'artifactId', specify the following:\n" +
- "\n" +
- "<configuration>\n" +
- " ...\n" +
+ assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" +
+ "\n" +
+ "[0] Inside the definition for plugin 'artifactId', specify the following:\n" +
+ "\n" +
+ "<configuration>\n" +
+ " ...\n" +
" <toAddresses>\n" +
" <KEY>VALUE</KEY>\n" +
- " </toAddresses>\n" +
+ " </toAddresses>\n" +
"</configuration>.\n", exception.buildDiagnosticMessage() );
}
@@ -139,24 +139,24 @@ public class PluginParameterExceptionTest
Parameter parameter = new Parameter();
parameter.setType( "java.util.Properties" );
parameter.setName( "toAddresses" );
-
+
parameter.setRequired( true );
PluginParameterException exception =
new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) );
- assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" +
- "\n" +
- "[0] Inside the definition for plugin 'artifactId', specify the following:\n" +
- "\n" +
- "<configuration>\n" +
- " ...\n" +
+ assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" +
+ "\n" +
+ "[0] Inside the definition for plugin 'artifactId', specify the following:\n" +
+ "\n" +
+ "<configuration>\n" +
+ " ...\n" +
" <toAddresses>\n" +
" <property>\n" +
" <name>KEY</name>\n" +
" <value>VALUE</value>\n" +
" </property>\n" +
- " </toAddresses>\n" +
+ " </toAddresses>\n" +
"</configuration>.\n", exception.buildDiagnosticMessage() );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index 4cc1e89..73bdbca 100644
--- a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -6,9 +6,9 @@ package org.apache.maven.project;
* 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
@@ -55,7 +55,7 @@ public abstract class AbstractMavenProjectTestCase
throws Exception
{
super.setUp();
-
+
if ( getContainer().hasComponent( ProjectBuilder.class, "test" ) )
{
projectBuilder = lookup( ProjectBuilder.class, "test" );
@@ -65,9 +65,9 @@ public abstract class AbstractMavenProjectTestCase
// default over to the main project builder...
projectBuilder = lookup( ProjectBuilder.class );
}
-
- repositorySystem = lookup( RepositorySystem.class );
- }
+
+ repositorySystem = lookup( RepositorySystem.class );
+ }
@Override
protected void tearDown()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index d7c2470..13c32ab 100644
--- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -143,7 +143,7 @@ public class DefaultMavenProjectBuilderTest
null, null );
return r;
}
-
+
public void xtestLoop()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
index e6b2693..8ff912f 100644
--- a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
+++ b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
@@ -34,7 +34,7 @@ import org.apache.maven.plugin.MojoExecution;
/**
* A stub implementation that assumes an empty lifecycle to bypass interaction with the plugin manager and to avoid
* plugin artifact resolution from repositories.
- *
+ *
* @author Benjamin Bentmann
*/
public class EmptyLifecycleExecutor
@@ -50,7 +50,7 @@ public class EmptyLifecycleExecutor
{
return new MavenExecutionPlan( null, null );
}
-
+
public void execute( MavenSession session )
{
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
index e59988d..21e37f1 100644
--- a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
+++ b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
@@ -28,7 +28,7 @@ import org.apache.maven.model.Repository;
/**
* A stub implementation to bypass artifact resolution from repositories.
- *
+ *
* @author Benjamin Bentmann
*/
public class EmptyProjectBuildingHelper
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
index a37ccf7..6872701 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
/**
* Tests {@link ExtensionDescriptorBuilder}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ExtensionDescriptorBuilderTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
index c6248ad..0c5cd07 100644
--- a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
@@ -47,7 +47,7 @@ public class MavenProjectTest
childModel.setArtifactId( "artifact" );
MavenProject childProject = new MavenProject( childModel );
-
+
File childFile =
new File( System.getProperty( "java.io.tmpdir" ), "maven-project-tests" + System.currentTimeMillis()
+ "/child/pom.xml" );
@@ -57,7 +57,7 @@ public class MavenProjectTest
String adjustment = parentProject.getModulePathAdjustment( childProject );
assertNotNull( adjustment );
-
+
assertEquals( "..", adjustment );
}
@@ -147,11 +147,11 @@ public class MavenProjectTest
assertEquals( "..", pathAdjustment );
}
-
+
public void testCloneWithDistributionManagement()
throws Exception
{
-
+
File f = getFileForClasspathResource( "distributionManagement-pom.xml" );
MavenProject projectToClone = getProject( f );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 392d9cd..f17539b 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -50,9 +50,9 @@ public class PomConstructionTest
private static String BASE_MIXIN_DIR = BASE_DIR + "/resources-mixins";
private DefaultProjectBuilder projectBuilder;
-
+
private RepositorySystem repositorySystem;
-
+
private File testDirectory;
@Override
@@ -71,7 +71,7 @@ public class PomConstructionTest
projectBuilder = (DefaultProjectBuilder) lookup( ProjectBuilder.class );
repositorySystem = lookup( RepositorySystem.class );
}
-
+
@Override
protected void tearDown()
throws Exception
@@ -80,13 +80,13 @@ public class PomConstructionTest
super.tearDown();
}
-
+
/**
- * Will throw exception if url is empty. MNG-4050
+ * Will throw exception if url is empty. MNG-4050
*
* @throws Exception
*/
-
+
public void testEmptyUrl()
throws Exception
{
@@ -95,7 +95,7 @@ public class PomConstructionTest
/**
* Tests that modules is not overriden by profile
- *
+ *
* @throws Exception
*/
/* MNG-786*/
@@ -137,10 +137,10 @@ public class PomConstructionTest
PomTestWrapper pom = buildPom( "plugin-config-properties" );
assertEquals( "my.property", pom.getValue( "build/plugins[1]/configuration[1]/systemProperties[1]/property[1]/name" ) );
}
-
+
/*MNG-3900*/
public void testProfilePropertiesInterpolation()
- throws Exception
+ throws Exception
{
PomTestWrapper pom = buildPom( "profile-properties-interpolation", "interpolation-profile" );
assertEquals( "PASSED", pom.getValue( "properties[1]/test" ) );
@@ -267,15 +267,15 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = buildPomFromMavenProject( "maven-build/sub/pom.xml", null );
-
- for( String s: pom.getMavenProject().getTestClasspathElements() )
+
+ for( String s: pom.getMavenProject().getTestClasspathElements() )
{
System.out.println( s );
}
-
+
}
*/
-
+
/* MNG-3567*/
public void testPluginManagementInherited()
throws Exception
@@ -349,13 +349,13 @@ public class PomConstructionTest
assertEquals( "src/main/mdo/security.xml",
( pom.getValue( "build/plugins[1]/executions[2]/configuration[1]/model" ) ) );
}
-
+
/*
public void testPluginConfigDuplicate()
throws Exception
{
PomTestWrapper pom = buildPom( "plugin-config-duplicate/dup" );
-}
+}
*/
@@ -839,14 +839,14 @@ public class PomConstructionTest
{
testAppendOfInheritedPluginConfiguration( "no-profile" );
}
-
+
/* MNG-2591*/
public void testAppendOfInheritedPluginConfigurationWithActiveProfile()
throws Exception
{
testAppendOfInheritedPluginConfiguration( "with-profile" );
}
-
+
private void testAppendOfInheritedPluginConfiguration( String test )
throws Exception
{
@@ -955,14 +955,14 @@ public class PomConstructionTest
assertEquals( "b", pom.getValue( "dependencies[3]/artifactId" ) );
assertEquals( "d", pom.getValue( "dependencies[4]/artifactId" ) );
}
-
+
/** IT-0021*/
public void testProfileDependenciesMultipleProfiles()
throws Exception
{
PomTestWrapper pom = buildPom( "profile-dependencies-multiple-profiles", "profile-1", "profile-2" );
assertEquals(2, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
- }
+ }
public void testDependencyInheritance()
throws Exception
@@ -993,7 +993,7 @@ public class PomConstructionTest
PomTestWrapper pom = this.buildPom( "profile-module-inheritance/sub", "dist" );
assertEquals( 0, ( (List<?>) pom.getValue( "modules" ) ).size() );
}
-
+
/** MNG-3621 */
public void testUncPath()
throws Exception
@@ -1001,7 +1001,7 @@ public class PomConstructionTest
PomTestWrapper pom = this.buildPom( "unc-path/sub" );
assertEquals( "file:////host/site/test-child", pom.getValue( "distributionManagement/site/url" ) );
}
-
+
/** MNG-2006 */
public void testUrlAppendWithChildPathAdjustment()
throws Exception
@@ -1012,7 +1012,7 @@ public class PomConstructionTest
assertEquals( "http://scm.project.url/child", pom.getValue( "scm/connection" ) );
assertEquals( "https://scm.project.url/child", pom.getValue( "scm/developerConnection" ) );
assertEquals( "http://site.project.url/child", pom.getValue( "distributionManagement/site/url" ) );
- }
+ }
/** MNG-0479 */
public void testRepoInheritance()
@@ -1021,15 +1021,15 @@ public class PomConstructionTest
PomTestWrapper pom = this.buildPom( "repo-inheritance" );
assertEquals( 1, ( (List<?>) pom.getValue( "repositories" ) ).size() );
assertEquals( "it0043", pom.getValue( "repositories[1]/name" ) );
- }
-
+ }
+
public void testEmptyScm()
throws Exception
{
PomTestWrapper pom = this.buildPom( "empty-scm" );
assertNull( pom.getValue( "scm" ) );
- }
-
+ }
+
public void testPluginConfigurationUsingAttributesWithoutPluginManagement()
throws Exception
{
@@ -1100,8 +1100,8 @@ public class PomConstructionTest
assertEquals( "childParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[2]" ) );
assertEquals( " preserve space ", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[3]" ) );
assertEquals( "true", pom.getValue( "reporting/plugins[1]/configuration/booleanParam" ) );
- }
-
+ }
+
public void testPropertiesNoDuplication()
throws Exception
{
@@ -1381,7 +1381,7 @@ public class PomConstructionTest
assertEquals( "CHILD", pom.getValue( "properties/overridden" ) );
assertEquals( "CHILD", pom.getValue( "properties/interpolated" ) );
}
-
+
/* MNG-3545 */
public void testProfileDefaultActivation()
throws Exception
@@ -1390,30 +1390,30 @@ public class PomConstructionTest
assertEquals( 1, pom.getMavenProject().getActiveProfiles().size() );
assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins" ) ).size() );
assertEquals( "2.1", pom.getValue( "build/plugins[1]/version" ) );
- }
-
+ }
+
/* MNG-1995 */
public void testBooleanInterpolation()
throws Exception
{
PomTestWrapper pom = buildPom( "boolean-interpolation" );
- assertTrue ((Boolean) pom.getValue( "repositories[1]/releases/enabled" ) );
- assertTrue((Boolean) pom.getValue( "build/resources[1]/filtering" ) );
- }
+ assertTrue ((Boolean) pom.getValue( "repositories[1]/releases/enabled" ) );
+ assertTrue((Boolean) pom.getValue( "build/resources[1]/filtering" ) );
+ }
+
-
/* MNG-3899 */
public void testBuildExtensionInheritance()
throws Exception
{
- PomTestWrapper pom = buildPom( "build-extension-inheritance/sub" );
+ PomTestWrapper pom = buildPom( "build-extension-inheritance/sub" );
assertEquals( 3, ( (List<?>) pom.getValue( "build/extensions" ) ).size() );
assertEquals( "b", pom.getValue( "build/extensions[1]/artifactId" ) );
assertEquals( "a", pom.getValue( "build/extensions[2]/artifactId" ) );
assertEquals( "0.2", pom.getValue( "build/extensions[2]/version" ) );
assertEquals( "c", pom.getValue( "build/extensions[3]/artifactId" ) );
}
-
+
/*MNG-1957*/
public void testJdkActivation()
throws Exception
@@ -1426,16 +1426,16 @@ public class PomConstructionTest
assertEquals( "PASSED", pom.getValue( "properties/jdkProperty3" ) );
assertEquals( "PASSED", pom.getValue( "properties/jdkProperty2" ) );
assertEquals( "PASSED", pom.getValue( "properties/jdkProperty1" ) );
- }
-
+ }
+
/* MNG-2174 */
public void testProfilePluginMngDependencies()
throws Exception
{
PomTestWrapper pom = buildPom( "profile-plugin-mng-dependencies/sub", "maven-core-it" );
assertEquals( "a", pom.getValue( "build/plugins[1]/dependencies[1]/artifactId" ) );
- }
-
+ }
+
/** MNG-4116 */
public void testPercentEncodedUrlsMustNotBeDecoded()
throws Exception
@@ -1453,7 +1453,7 @@ public class PomConstructionTest
pom.getValue( "distributionManagement/snapshotRepository/url" ) );
assertEquals( "scm:svn:svn+ssh://site.apache.org/spacy%20path",
pom.getValue( "distributionManagement/site/url" ) );
- }
+ }
public void testPluginManagementInheritance()
throws Exception
@@ -1461,57 +1461,57 @@ public class PomConstructionTest
PomTestWrapper pom = this.buildPom( "plugin-management-inheritance" );
assertEquals( "0.1-stub-SNAPSHOT",
pom.getValue( "build/pluginManagement/plugins[@artifactId='maven-compiler-plugin']/version" ) );
- }
-
+ }
+
public void testProfilePlugins()
throws Exception
{
PomTestWrapper pom = this.buildPom( "profile-plugins", "standard" );
assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" ) ).size() );
assertEquals( "maven-assembly2-plugin", pom.getValue( "build/plugins[2]/artifactId" ) );
- }
-
+ }
+
public void testPluginInheritanceSimple()
throws Exception
{
PomTestWrapper pom = this.buildPom( "plugin-inheritance-simple/sub" );
- assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" ) ).size() );
- }
-
+ assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" ) ).size() );
+ }
+
public void testPluginManagementDuplicate()
throws Exception
{
PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" );
assertEquals( 12, ( (List<?>) pom.getValue( "build/pluginManagement/plugins" ) ).size() );
- }
-
+ }
+
public void testDistributionManagement()
throws Exception
{
PomTestWrapper pom = this.buildPom( "distribution-management" );
assertEquals( "legacy", pom.getValue( "distributionManagement/repository/layout" ) );
- }
-
+ }
+
public void testDependencyScopeInheritance()
throws Exception
{
PomTestWrapper pom = buildPom( "dependency-scope-inheritance/sub" );
String scope = (String) pom.getValue( "dependencies[1]/scope" );
assertEquals( "compile", scope );
- }
-
+ }
+
public void testDependencyScope()
throws Exception
{
buildPom( "dependency-scope/sub" );
- }
-
+ }
+
//This will fail on a validation error if incorrect
public void testDependencyManagementWithInterpolation()
throws Exception
{
buildPom( "dependency-management-with-interpolation/sub" );
- }
+ }
public void testInterpolationWithSystemProperty()
throws Exception
@@ -1520,7 +1520,7 @@ public class PomConstructionTest
sysProps.setProperty( "system.property", "PASSED" );
PomTestWrapper pom = buildPom( "sytem-property-interpolation", sysProps );
assertEquals( "PASSED", pom.getValue( "name" ) );
- }
+ }
/* MNG-4129 */
public void testPluginExecutionInheritanceWhenChildDoesNotDeclarePlugin()
@@ -1543,8 +1543,8 @@ public class PomConstructionTest
(List<PluginExecution>) pom.getValue( "build/pluginsAsMap[@name='org.apache.maven.its.plugins:maven-it-plugin-log-file']/executions" );
assertEquals( 1, executions.size() );
assertEquals( "inherited-execution", executions.get( 0 ).getId() );
- }
-
+ }
+
/* MNG-4193 */
public void testValidationErrorUponNonUniqueArtifactRepositoryId()
throws Exception
@@ -1574,7 +1574,7 @@ public class PomConstructionTest
// expected
}
}
-
+
/* MNG-4193 */
public void testValidationErrorUponNonUniqueArtifactRepositoryIdInProfile()
throws Exception
@@ -1611,7 +1611,7 @@ public class PomConstructionTest
{
PomTestWrapper pom = buildPom( "prerequisites-inheritance/child" );
assertSame( null, pom.getValue( "prerequisites" ) );
- }
+ }
public void testLicensesAreInheritedButNotAggregated()
throws Exception
@@ -1620,7 +1620,7 @@ public class PomConstructionTest
assertEquals( 1, ( (List<?>) pom.getValue( "licenses" ) ).size() );
assertEquals( "child-license", pom.getValue( "licenses[1]/name" ) );
assertEquals( "http://child.url/license", pom.getValue( "licenses[1]/url" ) );
- }
+ }
public void testDevelopersAreInheritedButNotAggregated()
throws Exception
@@ -1636,7 +1636,7 @@ public class PomConstructionTest
PomTestWrapper pom = buildPom( "contributors-inheritance/child-2" );
assertEquals( 1, ( (List<?>) pom.getValue( "contributors" ) ).size() );
assertEquals( "child-contributor", pom.getValue( "contributors[1]/name" ) );
- }
+ }
public void testMailingListsAreInheritedButNotAggregated()
throws Exception
@@ -1644,7 +1644,7 @@ public class PomConstructionTest
PomTestWrapper pom = buildPom( "mailing-lists-inheritance/child-2" );
assertEquals( 1, ( (List<?>) pom.getValue( "mailingLists" ) ).size() );
assertEquals( "child-mailing-list", pom.getValue( "mailingLists[1]/name" ) );
- }
+ }
public void testPluginInheritanceOrder()
throws Exception
@@ -1818,7 +1818,7 @@ public class PomConstructionTest
{
assertEquals( new File( value.toString() ).getPath(), value.toString() );
}
-
+
private PomTestWrapper buildPom( String pomPath, String... profileIds )
throws Exception
{
@@ -1863,7 +1863,7 @@ public class PomConstructionTest
protected void assertModelEquals( PomTestWrapper pom, Object expected, String expression )
{
- assertEquals( expected, pom.getValue( expression ) );
+ assertEquals( expected, pom.getValue( expression ) );
}
private static String createPath( List<String> elements )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
index fc12b3e..add3efe 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -39,16 +39,16 @@ public class ProjectBuilderTest
throws Exception
{
File pom = getProject( "it0063" );
-
+
Properties eps = new Properties();
- eps.setProperty( "jre.home", new File( pom.getParentFile(), "jdk/jre" ).getPath() );
-
+ eps.setProperty( "jre.home", new File( pom.getParentFile(), "jdk/jre" ).getPath() );
+
MavenSession session = createMavenSession( pom, eps );
MavenProject project = session.getCurrentProject();
-
+
// Here we will actually not have any artifacts because the ProjectDependenciesResolver is not involved here. So
// right now it's not valid to ask for artifacts unless plugins require the artifacts.
-
+
project.getCompileClasspathElements();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java b/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
index 9a7a72c..67c0037 100644
--- a/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
+++ b/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
@@ -38,14 +38,14 @@ public class TestMetadataSource
public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException
- {
+ {
ResolutionGroup rg = super.retrieve( artifact, localRepository, remoteRepositories );
-
+
for ( Artifact a : rg.getArtifacts() )
{
a.setResolved( true );
}
-
+
return rg;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
index ba37803..6b103b2 100644
--- a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
@@ -75,7 +75,7 @@ public class DefaultMavenMetadataCacheTest
CacheKey k1 = new CacheKey( a1, false, lr1, Collections.singletonList( rr1 ) );
CacheKey k2 = new CacheKey( a2, false, lr2, Collections.singletonList( rr2 ) );
-
+
assertEquals(k1.hashCode(), k2.hashCode());
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
index 7b6713e..2811a84 100644
--- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
+++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java
@@ -31,7 +31,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* An attribute iterator for JXPath to support <code>Xpp3Dom</code>.
- *
+ *
* @author Benjamin Bentmann
*/
class Xpp3DomAttributeIterator
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java
index e1aa29f..04514b1 100644
--- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java
+++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java
@@ -26,7 +26,7 @@ import org.apache.commons.jxpath.ri.model.NodePointer;
/**
* An attribute pointer for JXPath to support <code>Xpp3Dom</code>.
- *
+ *
* @author Benjamin Bentmann
*/
class Xpp3DomAttributePointer
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
index bf865b2..796a5ca 100644
--- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
+++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
@@ -33,7 +33,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* A node iterator for JXPath to support <code>Xpp3Dom</code>.
- *
+ *
* @author Benjamin Bentmann
*/
class Xpp3DomNodeIterator
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java
index 59ce300..f93bd89 100644
--- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java
+++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java
@@ -30,7 +30,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* A node pointer for JXPath to support <code>Xpp3Dom</code>.
- *
+ *
* @author Benjamin Bentmann
*/
class Xpp3DomNodePointer
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java
index e3a08fb..28c0f8f 100644
--- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java
+++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java
@@ -28,7 +28,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* A node pointer factory for JXPath to support <code>Xpp3Dom</code>.
- *
+ *
* @author Benjamin Bentmann
*/
public class Xpp3DomPointerFactory
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java b/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
index d7d196e..77a6bae 100644
--- a/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
+++ b/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
@@ -39,7 +39,7 @@ public class LegacyRepositoryLayout
{
return "legacy";
}
-
+
public String pathOf( Artifact artifact )
{
ArtifactHandler artifactHandler = artifact.getArtifactHandler();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java b/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java
index 0f90e1d..db1fecb 100644
--- a/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java
+++ b/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java
@@ -23,7 +23,7 @@ import org.apache.maven.artifact.handler.ArtifactHandler;
/**
* Assists unit testing.
- *
+ *
* @author Benjamin Bentmann
*/
class TestArtifactHandler
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
index 6208c88..c4afc7a 100644
--- a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
+++ b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
@@ -66,8 +66,8 @@ public class TestRepositorySystem
private ModelReader modelReader;
@Requirement
- private ArtifactFactory artifactFactory;
-
+ private ArtifactFactory artifactFactory;
+
public ArtifactRepository buildArtifactRepository( Repository repository )
throws InvalidRepositoryException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
index da0318c..55d330a 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
@@ -40,17 +40,17 @@ public class DefaultToolchainTest
{
InputStream jdksIS = null;
InputStream jdksExtraIS = null;
- try
+ try
{
jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" );
jdksExtraIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" );
-
+
PersistedToolchains jdks = reader.read( jdksIS );
PersistedToolchains jdksExtra = reader.read( jdksExtraIS );
-
+
JavaToolchainImpl tc1 = new JavaToolchainImpl( jdks.getToolchains().get( 0 ), null );
JavaToolchainImpl tc2 = new JavaToolchainImpl( jdksExtra.getToolchains().get( 0 ), null );
-
+
assertTrue( tc1.equals( tc1 ) );
assertFalse( tc1.equals( tc2 ) );
assertFalse( tc2.equals( tc1 ) );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml b/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml
index 6a6f319..a821765 100644
--- a/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml
+++ b/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml
@@ -63,5 +63,5 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
index c3dc612..8308088 100644
--- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
+++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
@@ -66,7 +66,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>0.1</version>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java
index 1842526..826279c 100644
--- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java
+++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java
@@ -4,7 +4,7 @@ package org.apache.maven.lifecycle.test;
* Hello world!
*
*/
-public class App
+public class App
{
public static void main( String[] args )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java
index cf1e5f6..469cb2c 100644
--- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java
+++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
index ededdb9..0f49e9a 100644
--- a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
+++ b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
@@ -45,22 +45,22 @@ under the License.
<properties>
<classWorldsVersion>1.3</classWorldsVersion>
<commonsCliVersion>1.0</commonsCliVersion>
- <!--
-
+ <!--
+
Do not update this, Doxia will be decoupled completely from 3.x and someone can
- create a rendering engine for it if they like when the release stabilizes. JVZ
-
+ create a rendering engine for it if they like when the release stabilizes. JVZ
+
-->
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
- <junitVersion>3.8.1</junitVersion>
+ <junitVersion>3.8.1</junitVersion>
<plexusVersion>1.0-beta-3.0.7</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
<plexusUtilsVersion>1.5.8</plexusUtilsVersion>
<plexusJetty6Version>1.6</plexusJetty6Version>
- <plexusWebdavVersion>1.0</plexusWebdavVersion>
+ <plexusWebdavVersion>1.0</plexusWebdavVersion>
<wagonVersion>1.0-beta-4</wagonVersion>
<modelBuilderVersion>1.7-SNAPSHOT</modelBuilderVersion>
<mercuryVersion>1.0-alpha-6-SNAPSHOT</mercuryVersion>
@@ -247,7 +247,7 @@ under the License.
<module>maven-toolchain</module>
<module>maven-compat</module>
<module>maven-repository</module>
- <module>maven-repository-mercury</module>
+ <module>maven-repository-mercury</module>
</modules>
<!--start-->
<dependencies>
@@ -366,11 +366,11 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
+
<!-- Plexus test dependencies -->
<dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-jetty6</artifactId>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-jetty6</artifactId>
<version>${plexusJetty6Version}</version>
<scope>test</scope>
</dependency>
@@ -380,7 +380,7 @@ under the License.
<version>${plexusWebdavVersion}</version>
<scope>test</scope>
</dependency>
-
+
<!-- Wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml b/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml
index 00e1ce4..41b99c7 100644
--- a/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml
+++ b/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.apache.maven.lifecycle-listener.test</groupId>
<artifactId>simple</artifactId>
<version>1.0</version>
-
+
<properties>
<foo>${injected}</foo>
</properties>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml b/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml
index 376a736..a9fa3ca 100644
--- a/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml
+++ b/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml
@@ -5,7 +5,7 @@
<artifactId>test2</artifactId>
<version>1.0</version>
- <name>Maven Integration Test :: MNG-3586</name>
+ <name>Maven Integration Test :: MNG-3586</name>
<description>
Test that plugin dependencies with scope system are part of the plugin class realm.
</description>
@@ -37,7 +37,7 @@
<goal>load</goal>
</goals>
</execution>
- </executions>
+ </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
index ededdb9..0f49e9a 100644
--- a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
+++ b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
@@ -45,22 +45,22 @@ under the License.
<properties>
<classWorldsVersion>1.3</classWorldsVersion>
<commonsCliVersion>1.0</commonsCliVersion>
- <!--
-
+ <!--
+
Do not update this, Doxia will be decoupled completely from 3.x and someone can
- create a rendering engine for it if they like when the release stabilizes. JVZ
-
+ create a rendering engine for it if they like when the release stabilizes. JVZ
+
-->
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
- <junitVersion>3.8.1</junitVersion>
+ <junitVersion>3.8.1</junitVersion>
<plexusVersion>1.0-beta-3.0.7</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
<plexusUtilsVersion>1.5.8</plexusUtilsVersion>
<plexusJetty6Version>1.6</plexusJetty6Version>
- <plexusWebdavVersion>1.0</plexusWebdavVersion>
+ <plexusWebdavVersion>1.0</plexusWebdavVersion>
<wagonVersion>1.0-beta-4</wagonVersion>
<modelBuilderVersion>1.7-SNAPSHOT</modelBuilderVersion>
<mercuryVersion>1.0-alpha-6-SNAPSHOT</mercuryVersion>
@@ -247,7 +247,7 @@ under the License.
<module>maven-toolchain</module>
<module>maven-compat</module>
<module>maven-repository</module>
- <module>maven-repository-mercury</module>
+ <module>maven-repository-mercury</module>
</modules>
<!--start-->
<dependencies>
@@ -366,11 +366,11 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
+
<!-- Plexus test dependencies -->
<dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-jetty6</artifactId>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-jetty6</artifactId>
<version>${plexusJetty6Version}</version>
<scope>test</scope>
</dependency>
@@ -380,7 +380,7 @@ under the License.
<version>${plexusWebdavVersion}</version>
<scope>test</scope>
</dependency>
-
+
<!-- Wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml
index 4af8228..32124c5 100644
--- a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml
+++ b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3906</name>
+ <name>Maven Integration Test :: MNG-3906</name>
<description>
Test that project-level plugin dependencies are properly merged during inheritance.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml
index 43de398..e13262b 100644
--- a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml
+++ b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child</artifactId>
- <name>Maven Integration Test :: MNG-3906</name>
+ <name>Maven Integration Test :: MNG-3906</name>
<description>
Test that project-level plugin dependencies are properly merged during inheritance.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/project-builder/it0063/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/project-builder/it0063/pom.xml b/maven-core/src/test/projects/project-builder/it0063/pom.xml
index b12cc70..0d7b08a 100644
--- a/maven-core/src/test/projects/project-builder/it0063/pom.xml
+++ b/maven-core/src/test/projects/project-builder/it0063/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: it0063</name>
+ <name>Maven Integration Test :: it0063</name>
<description>Test the use of a system scoped dependency to a (fake) tools.jar.</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml b/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml
index 0de79bc..a70b208 100644
--- a/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml
+++ b/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>consumer</artifactId>
- <name>Maven Integration Test :: MNG-3023 :: Consumer</name>
+ <name>Maven Integration Test :: MNG-3023 :: Consumer</name>
<description>Test that reactor projects are included in dependency resolution.</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml b/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml
index 5290af2..e783f85 100644
--- a/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml
+++ b/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml
@@ -27,10 +27,10 @@ under the License.
<artifactId>parent</artifactId>
<version>1</version>
</parent>
-
+
<artifactId>dependency</artifactId>
- <name>Maven Integration Test :: MNG-3023 :: Dependency</name>
+ <name>Maven Integration Test :: MNG-3023 :: Dependency</name>
<description>Test that reactor projects are included in dependency resolution.</description>
<build>
[05/11] maven git commit: Trimmed trailing whitespace
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/project-builder/mng-3023/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/project-builder/mng-3023/pom.xml b/maven-core/src/test/projects/project-builder/mng-3023/pom.xml
index 584db7d..23f09ce 100644
--- a/maven-core/src/test/projects/project-builder/mng-3023/pom.xml
+++ b/maven-core/src/test/projects/project-builder/mng-3023/pom.xml
@@ -27,9 +27,9 @@ under the License.
<version>1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3023</name>
+ <name>Maven Integration Test :: MNG-3023</name>
<description>Test that reactor projects are included in dependency resolution.</description>
-
+
<modules>
<module>dependency</module>
<module>consumer</module>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml b/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml
index b12cc70..0d7b08a 100644
--- a/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml
+++ b/maven-core/src/test/projects/project-dependencies-resolver/it0063/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: it0063</name>
+ <name>Maven Integration Test :: it0063</name>
<description>Test the use of a system scoped dependency to a (fake) tools.jar.</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml
index e9fcd5b..1885fc4 100644
--- a/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml
+++ b/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test1</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-3822</name>
+ <name>Maven Integration Test :: MNG-3822</name>
<description>
Verify that POM interpolation uses basedir-aligned build directories.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml b/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml
index 4f055a3..1c037e6 100644
--- a/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml
+++ b/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test1</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-3944</name>
+ <name>Maven Integration Test :: MNG-3944</name>
<description>
Test that interpolation of ${basedir} works for a POM that is not named "pom.xml"
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml
index 206a54c..f1d4e6c 100644
--- a/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml
+++ b/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test1</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-3760</name>
+ <name>Maven Integration Test :: MNG-3760</name>
<description>
Test interpolation of ${project.baseUri}
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml
index 98dc8ef..992eac1 100644
--- a/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml
+++ b/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test1</artifactId>
<version>1.0</version>
- <name>Maven Integration Test :: MNG-1995</name>
+ <name>Maven Integration Test :: MNG-1995</name>
<description>
Verify that POM fields that are of type boolean can be interpolated with expressions.
</description>
@@ -53,7 +53,7 @@ under the License.
<directory>src/main/resources</directory>
<!-- That's the boolean POM field we would like to interpolate -->
<filtering>${filter.resources}</filtering>
- </resource>
+ </resource>
</resources>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml
index 2d95cb1..262af4f 100644
--- a/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml
+++ b/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3899</name>
+ <name>Maven Integration Test :: MNG-3899</name>
<description>
Test that build extensions are properly merged during inheritance.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml
index 4411b89..dc8f6f5 100644
--- a/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child</artifactId>
- <name>Maven Integration Test :: MNG-3899</name>
+ <name>Maven Integration Test :: MNG-3899</name>
<description>
Test that build extensions are properly merged during inheritance.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml b/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml
index 2fe674a..68ca28d 100644
--- a/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml
@@ -33,7 +33,7 @@ under the License.
<version>0.2</version>
<packaging>pom</packaging>
- <name>project-name</name>
+ <name>project-name</name>
<description>project-description</description>
<url>http://project.url/</url>
<inceptionYear>2009</inceptionYear>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml b/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml
index 72dd787..7b1ad79 100644
--- a/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml
+++ b/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.2</version>
<packaging>pom</packaging>
- <name>project-name</name>
+ <name>project-name</name>
<description>project-description</description>
<url>http://project.url/</url>
<inceptionYear>2009</inceptionYear>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml
index 116e5bd..788c5a7 100644
--- a/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml
@@ -21,7 +21,7 @@
<artifactId>maven-project-builder</artifactId>
<version>3.0-SNAPSHOT</version>
<name>Maven Project Builder</name>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml
index 97407e9..5882ab5 100644
--- a/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-4003</name>
+ <name>Maven Integration Test :: MNG-4003</name>
<description>
Verify that dependencies survive the project construction in the POM order.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml
index 29a37ea..57bd6d0 100644
--- a/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-4003</name>
+ <name>Maven Integration Test :: MNG-4003</name>
<description>
Verify that dependencies survive the project construction in the POM order.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/distribution-management/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/distribution-management/pom.xml b/maven-core/src/test/resources-project-builder/distribution-management/pom.xml
index 0c98793..1a0acb0 100644
--- a/maven-core/src/test/resources-project-builder/distribution-management/pom.xml
+++ b/maven-core/src/test/resources-project-builder/distribution-management/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: it0061</name>
+ <name>Maven Integration Test :: it0061</name>
<distributionManagement>
<repository>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml b/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
index fde9e14..6ebd599 100644
--- a/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
@@ -26,7 +26,7 @@
<version>1.0</version>
<executions>
<execution>
- <id>default</id>
+ <id>default</id>
<goals>
<goal>process</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml b/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml
index d24d4e1..d33b2ba 100644
--- a/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml
+++ b/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-3838</name>
+ <name>Maven Integration Test :: MNG-3838</name>
<description>
Verify that using the same dependency for different plugins doesn't blow up the project builder.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml b/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml
index d0ef617..a05d45d 100644
--- a/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml
+++ b/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-3821</name>
+ <name>Maven Integration Test :: MNG-3821</name>
<description>
Verify that using the same id for executions/reportsets of different plugins doesn't blow up the project builder.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml b/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml
index be09b06..28defaa 100644
--- a/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml
+++ b/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml
@@ -8,7 +8,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-21</version>
+ <version>1.0-alpha-21</version>
</plugin>
</plugins>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml
index 08080b3..503dadb 100644
--- a/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml
+++ b/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-3833</name>
+ <name>Maven Integration Test :: MNG-3833</name>
<description>
Test that POM interpolation fully interpolates all properties in data flow chain, i.e. where property
A depends on property B, and property B depends on property C and so on.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
index ed95efb..4db43cd 100644
--- a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
+++ b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3979</name>
+ <name>Maven Integration Test :: MNG-3979</name>
<description>
Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
POM has a non-empty element and the child POM has an empty element to join.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
index 9bd61d0..e65d26c 100644
--- a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child</artifactId>
- <name>Maven Integration Test :: MNG-3979</name>
+ <name>Maven Integration Test :: MNG-3979</name>
<description>
Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
POM has a non-empty element and the child POM has an empty element to join.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml
index bd7b458..8bbe6ea 100644
--- a/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml
+++ b/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3845</name>
+ <name>Maven Integration Test :: MNG-3845</name>
<description>
Test that inheritance is all-or-nothing for certain sub-trees of the POM.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml b/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml
index b3305c7..88c9813 100644
--- a/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml
+++ b/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-4034</name>
+ <name>Maven Integration Test :: MNG-4034</name>
<description>
Verify that dependencies defined in profiles are subject to the dependency management of the parent.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml b/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml
index 706e748..88204fc 100644
--- a/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml
@@ -32,7 +32,7 @@ under the License.
<artifactId>child</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-4034</name>
+ <name>Maven Integration Test :: MNG-4034</name>
<description>
Verify that dependencies defined in profiles are subject to the dependency management of the parent.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml b/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml
index bd15b77..6f4df9a 100644
--- a/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-4008</name>
+ <name>Maven Integration Test :: MNG-4008</name>
<description>
Verify that filter definitions are properly merged.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml
index 2d7444f..7e7155b 100644
--- a/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml
@@ -33,7 +33,7 @@ under the License.
<version>1.0</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-4008</name>
+ <name>Maven Integration Test :: MNG-4008</name>
<description>
Verify that filter definitions are properly merged.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml
index 6c4b186..aba6bdf 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3906</name>
+ <name>Maven Integration Test :: MNG-3906</name>
<description>
Test that project-level plugin dependencies are properly merged during inheritance.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml
index 85cc818..1877ea5 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child</artifactId>
- <name>Maven Integration Test :: MNG-3906</name>
+ <name>Maven Integration Test :: MNG-3906</name>
<description>
Test that project-level plugin dependencies are properly merged during inheritance.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml
index d4dcf65..10226cf 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3906</name>
+ <name>Maven Integration Test :: MNG-3906</name>
<description>
Test that project-level plugin dependencies are properly merged during inheritance.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml
index 85cc818..1877ea5 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child</artifactId>
- <name>Maven Integration Test :: MNG-3906</name>
+ <name>Maven Integration Test :: MNG-3906</name>
<description>
Test that project-level plugin dependencies are properly merged during inheritance.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml
index 97fc9c4..fc09dba 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3937</name>
+ <name>Maven Integration Test :: MNG-3937</name>
<description>
Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
ordered.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml
index b21f6a9..2148aa9 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child-2</artifactId>
- <name>Maven Integration Test :: MNG-3937</name>
+ <name>Maven Integration Test :: MNG-3937</name>
<description>
Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
ordered.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml
index b56a7a0..b9c3f18 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3937</name>
+ <name>Maven Integration Test :: MNG-3937</name>
<description>
Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
ordered.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml
index 8da0710..fab233b 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child-1</artifactId>
- <name>Maven Integration Test :: MNG-3937</name>
+ <name>Maven Integration Test :: MNG-3937</name>
<description>
Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly
ordered.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml
index cd5383c..ee4dedc 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3925</name>
+ <name>Maven Integration Test :: MNG-3925</name>
<description>
Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with
parent executions.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml
index c14f8e3..bf777db 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child</artifactId>
- <name>Maven Integration Test :: MNG-3925</name>
+ <name>Maven Integration Test :: MNG-3925</name>
<description>
Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with
parent executions.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml
index 90d2bef..a816975 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3925</name>
+ <name>Maven Integration Test :: MNG-3925</name>
<description>
Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with
parent executions.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml
index c14f8e3..bf777db 100644
--- a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child</artifactId>
- <name>Maven Integration Test :: MNG-3925</name>
+ <name>Maven Integration Test :: MNG-3925</name>
<description>
Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with
parent executions.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/micromailer/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/micromailer/pom.xml b/maven-core/src/test/resources-project-builder/micromailer/pom.xml
index 57f85dd..780faac 100644
--- a/maven-core/src/test/resources-project-builder/micromailer/pom.xml
+++ b/maven-core/src/test/resources-project-builder/micromailer/pom.xml
@@ -75,7 +75,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml
index d3c5cc1..5632fad 100644
--- a/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml
+++ b/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-3904</name>
+ <name>Maven Integration Test :: MNG-3904</name>
<description>
Test that properties which refer to build directories which in turn refer to other build directories are
properly interpolated.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml b/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml
index a5bea48..26ba294 100644
--- a/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml
+++ b/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-3877</name>
+ <name>Maven Integration Test :: MNG-3877</name>
<description>
Verify that paths to project directories use the platform-specific file separator.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml
index 52fb468..60180d5 100644
--- a/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-2591</name>
+ <name>Maven Integration Test :: MNG-2591</name>
<description>
Test aggregation of list configuration items for build plugins when using
'combine.children=append' attribute.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
index 48a8d39..72ab3f4 100644
--- a/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-2591</name>
+ <name>Maven Integration Test :: MNG-2591</name>
<description>
Test aggregation of list configuration items for build plugins when using
'combine.children=append' attribute.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml
index cfe425b..2f35071 100644
--- a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test2</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-4053</name>
+ <name>Maven Integration Test :: MNG-4053</name>
<description>
Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
plugin management is used.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml
index f22a181..f2d8c6c 100644
--- a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test3</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-4053</name>
+ <name>Maven Integration Test :: MNG-4053</name>
<description>
Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
plugin management and a profile are used.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml
index 49e2452..c844b44 100644
--- a/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test1</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-4053</name>
+ <name>Maven Integration Test :: MNG-4053</name>
<description>
Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
no plugin management is used.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml
index dd5fe00..f817244 100644
--- a/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml
@@ -32,7 +32,7 @@ under the License.
<artifactId>child</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-3836</name>
+ <name>Maven Integration Test :: MNG-3836</name>
<description>
Verify that children can *override* inherited plugin configuration.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml
index e96d6e1..12f2c2d 100644
--- a/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3836</name>
+ <name>Maven Integration Test :: MNG-3836</name>
<description>
Verify that children can *override* inherited plugin configuration.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml
index 2b3fd71..7d7dfd8 100644
--- a/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test2</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-3827</name>
+ <name>Maven Integration Test :: MNG-3827</name>
<description>
Verify that plain plugin configuration works correctly.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml
index a28796f..e300fe1 100644
--- a/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test1</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-3827</name>
+ <name>Maven Integration Test :: MNG-3827</name>
<description>
Verify that plain plugin configuration works correctly.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml
index a5ecf1b..9f66b49 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test2</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-3864</name>
+ <name>Maven Integration Test :: MNG-3864</name>
<description>
Verify that plain per-execution plugin configuration works correctly.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml
index b7a3c31..4e1eafe 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test1</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-3864</name>
+ <name>Maven Integration Test :: MNG-3864</name>
<description>
Verify that plain per-execution plugin configuration works correctly.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml
index 07450ca..d4ac3b0 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3886</name>
+ <name>Maven Integration Test :: MNG-3886</name>
<description>
Test that the goals from a plugin execution are executed in the order given by the POM, regardless whether
plugin management is present or not.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml
index 5166013..438d9d1 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3886</name>
+ <name>Maven Integration Test :: MNG-3886</name>
<description>
Test that the goals from a plugin execution are executed in the order given by the POM, regardless whether
plugin management is present or not.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml
index e243cfd..127fa25 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3916</name>
+ <name>Maven Integration Test :: MNG-3916</name>
<description>
Test that plugin executions are properly merged during inheritance, even if the child plugin section has no
version.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml
index bdeb76e..61841ae 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child</artifactId>
- <name>Maven Integration Test :: MNG-3916</name>
+ <name>Maven Integration Test :: MNG-3916</name>
<description>
Test that plugin executions are properly merged during inheritance, even if the child plugin section has no
version.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml
index e04c7b1..6bcfee5 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3938</name>
+ <name>Maven Integration Test :: MNG-3938</name>
<description>
Test that plugin executions with the same id are merged during inheritance, especially executions using the
default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
index 827b907..3129ad0 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child</artifactId>
- <name>Maven Integration Test :: MNG-3938</name>
+ <name>Maven Integration Test :: MNG-3938</name>
<description>
Test that plugin executions with the same id are merged during inheritance, especially executions using the
default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml
index e0055d0..63db85f 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3938</name>
+ <name>Maven Integration Test :: MNG-3938</name>
<description>
Test that plugin executions with the same id are merged during inheritance, especially executions using the
default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml
index 827b907..3129ad0 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>child</artifactId>
- <name>Maven Integration Test :: MNG-3938</name>
+ <name>Maven Integration Test :: MNG-3938</name>
<description>
Test that plugin executions with the same id are merged during inheritance, especially executions using the
default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml
index bb762f7..6035e81 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml
@@ -28,7 +28,7 @@ under the License.
<!-- NOTE: The upper-case packaging name is intentional and triggers a special mode in the EmptyLifecycleExecutor -->
<packaging>JAR</packaging>
- <name>Maven Integration Test :: MNG-4341</name>
+ <name>Maven Integration Test :: MNG-4341</name>
<description>
Test that plugins bound to the same phase get executed in POM order even if one of the plugins participates
in the default lifecycle bindings for the project's packaging.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml
index a8b031f..2c552d4 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3887</name>
+ <name>Maven Integration Test :: MNG-3887</name>
<description>
Test that multiple plugin executions bound to the same phase are executed in the order given by the POM.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml
index c226262..c4ceaae 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3887</name>
+ <name>Maven Integration Test :: MNG-3887</name>
<description>
Test that multiple plugin executions bound to the same phase are executed in the order given by the POM.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml
index 4cbab22..fbae181 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test2</artifactId>
<version>0.1</version>
- <name>Maven Integration Test :: MNG-4000</name>
+ <name>Maven Integration Test :: MNG-4000</name>
<description>
Test that plugin executions without id are not lost among other plugin executions.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml
index 9fcf91b..7910084 100644
--- a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test1</artifactId>
<version>0.1</version>
- <name>Maven Integration Test :: MNG-4000</name>
+ <name>Maven Integration Test :: MNG-4000</name>
<description>
Test that plugin executions without id are not lost among other plugin executions.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml
index f538919..5350fa8 100644
--- a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml
@@ -26,7 +26,7 @@ under the License.
<groupId>org.apache.maven.its.mng3808</groupId>
<artifactId>test</artifactId>
<version>0.1</version>
- </parent>
+ </parent>
<artifactId>child</artifactId>
<build>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml
index 182e1cd..f66ae25 100644
--- a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3808</name>
+ <name>Maven Integration Test :: MNG-3808</name>
<description>
Test the reports are executeed in the order given in the POM.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml
index ac4da04..85b7bd9 100644
--- a/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml
+++ b/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: it0052</name>
+ <name>Maven Integration Test :: it0052</name>
<description>Test that source attachment doesn't take place when -DperformRelease=true is missing.</description>
<!-- NOTE: Use stub versions of the core plugins referenced by the build -->
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml b/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml
index aaa433e..b338399 100644
--- a/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml
+++ b/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml
@@ -31,6 +31,6 @@ NOTE: This POM's XML declaration intentionally declares Latin-1 encoding.
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-2254 :: Latin-1</name>
+ <name>Maven Integration Test :: MNG-2254 :: Latin-1</name>
<description>TEST-CHARS: �������</description>
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml b/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml
index 07b8924..4400aa7 100644
--- a/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml
+++ b/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml
@@ -31,6 +31,6 @@ NOTE: This POM's XML declaration specified no encoding which should therefore de
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-2254 :: UTF-8</name>
+ <name>Maven Integration Test :: MNG-2254 :: UTF-8</name>
<description>TEST-CHARS: ßıΣЯא€</description>
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml
index 59cef1d..f96a940 100644
--- a/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml
+++ b/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml
@@ -31,7 +31,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>parent-name</name>
+ <name>parent-name</name>
<description>parent-description</description>
<url>http://parent.url/</url>
<inceptionYear>2008</inceptionYear>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml b/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml
index 2828fd1..d7af4e2 100644
--- a/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml
+++ b/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: it0021</name>
+ <name>Maven Integration Test :: it0021</name>
<description>
Test pom-level profile inclusion (this one is activated by system property).
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml b/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml
index fc7fab9..3fe02fb 100644
--- a/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml
+++ b/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml
@@ -26,7 +26,7 @@ under the License.
<artifactId>test</artifactId>
<version>0.1-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-1412</name>
+ <name>Maven Integration Test :: MNG-1412</name>
<description>
Check that dependencies are available in classpath in same order as declared in POM.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml b/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml
index 784996d..daf4607 100644
--- a/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml
+++ b/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-2309</name>
+ <name>Maven Integration Test :: MNG-2309</name>
<description>
Test that profiles are injected in declaration order, with the last profile being the most dominant.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml
index 118861a..e283bb0 100644
--- a/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml
+++ b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-2174</name>
+ <name>Maven Integration Test :: MNG-2174</name>
<description>
Verify that plugin dependencies defined by plugin management of a parent profile are not lost when the
parent's main plugin management section is also present.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml
index 9c06879..3614e30 100644
--- a/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml
@@ -32,7 +32,7 @@ under the License.
<artifactId>child</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: MNG-2174</name>
+ <name>Maven Integration Test :: MNG-2174</name>
<description>
Verify that plugin dependencies defined by plugin management of a parent profile are not lost when the
parent's main plugin management section is also present.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml b/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml
index 24e1753..32e94d7 100644
--- a/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml
+++ b/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>3.0-SNAPSHOT</version>
-
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml
index 67f9ee6..5c1daca 100644
--- a/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml
+++ b/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml
@@ -21,12 +21,12 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.apache.maven.its.it0043</groupId>
<artifactId>maven-it-it0043</artifactId>
<version>1.0-SNAPSHOT</version>
- <name>Maven Integration Test :: it0043</name>
+ <name>Maven Integration Test :: it0043</name>
<description>Test for repository inheritence - ensure using the same id overrides the defaults</description>
<repositories>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml b/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml
index 6a60a8e..40031e3 100644
--- a/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml
+++ b/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml
@@ -5,7 +5,7 @@
<packaging>pom</packaging>
<name>Jetty :: Administrative Parent</name>
<version>7</version>
-
+
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml
index 5081a6c..9304f5d 100644
--- a/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml
+++ b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml
@@ -100,5 +100,5 @@ under the License.
<reporting>
<outputDirectory>target/doc</outputDirectory>
</reporting>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml
index d5c7669..768a5e9 100644
--- a/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml
+++ b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3831</name>
+ <name>Maven Integration Test :: MNG-3831</name>
<description>Test POM interpolation with expressions of the form $ { * } (ugly but real)</description>
<modules>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml b/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml
index 00a4a34..f8b069f 100644
--- a/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml
+++ b/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-2006</name>
+ <name>Maven Integration Test :: MNG-2006</name>
<description>
Test that inheritance of those URLs which automatically append the child's artifact id take the child's
relative location to the parent into account.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml
index 4dc628f..ed4cdf0 100644
--- a/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml
+++ b/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>pom</packaging>
- <name>Maven Integration Test :: MNG-3846</name>
+ <name>Maven Integration Test :: MNG-3846</name>
<description>
Test that inheritance of certain URLs automatically appends the child's artifact id.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml b/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml
index 5b92e23..2dcceb9 100644
--- a/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml
+++ b/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-4116</name>
+ <name>Maven Integration Test :: MNG-4116</name>
<description>
Test that the project builder does not decode URLs (which must be done by the transport layer instead).
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml b/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml
index f7742fd..5822d8d 100644
--- a/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml
+++ b/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-3839</name>
+ <name>Maven Integration Test :: MNG-3839</name>
<description>
Test that POM parsing properly coalesces text data.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml
index aec8b6c..584712f 100644
--- a/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml
+++ b/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-3924</name>
+ <name>Maven Integration Test :: MNG-3924</name>
<description>
Test that interpolation of properties that resolve to XML markup doesn't crash the project builder.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml b/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml
index 858a82d..f5ea684 100644
--- a/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml
@@ -33,7 +33,7 @@ under the License.
<version>1.0</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-4070 :: Child</name>
+ <name>Maven Integration Test :: MNG-4070 :: Child</name>
<description>
Test that whitespace around artifact coordinates does not change artifact identity.
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-settings/settings-no-pom/settings.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-settings/settings-no-pom/settings.xml b/maven-core/src/test/resources-settings/settings-no-pom/settings.xml
index b03bb53..964e051 100644
--- a/maven-core/src/test/resources-settings/settings-no-pom/settings.xml
+++ b/maven-core/src/test/resources-settings/settings-no-pom/settings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<settings
- xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<settings
+ xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<profiles>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml b/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml
index 4d2f61d..245349a 100644
--- a/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml
+++ b/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml
@@ -27,7 +27,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Maven Integration Test :: MNG-4107</name>
+ <name>Maven Integration Test :: MNG-4107</name>
<description>
Test that POM interpolation uses the property values from the dominant profile source (POM vs. profiles.xml
vs. settings.xml). This boils down to the proper order of profile injection and interpolation, i.e.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/META-INF/plexus/components.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/META-INF/plexus/components.xml b/maven-core/src/test/resources/META-INF/plexus/components.xml
index df23693..714cb36 100644
--- a/maven-core/src/test/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/test/resources/META-INF/plexus/components.xml
@@ -70,7 +70,7 @@
<lifecycle>
<id>default</id>
<!-- START SNIPPET: pom-lifecycle -->
-
+
<phases>
<package>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/distributionManagement-pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/distributionManagement-pom.xml b/maven-core/src/test/resources/distributionManagement-pom.xml
index 9b2451b..1a8ee7f 100644
--- a/maven-core/src/test/resources/distributionManagement-pom.xml
+++ b/maven-core/src/test/resources/distributionManagement-pom.xml
@@ -8,9 +8,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
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
index 5a6b9d9..fb2f91c 100644
--- a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
+++ b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
@@ -45,22 +45,22 @@ under the License.
<properties>
<classWorldsVersion>1.3</classWorldsVersion>
<commonsCliVersion>1.0</commonsCliVersion>
- <!--
-
+ <!--
+
Do not update this, Doxia will be decoupled completely from 3.x and someone can
- create a rendering engine for it if they like when the release stabilizes. JVZ
-
+ create a rendering engine for it if they like when the release stabilizes. JVZ
+
-->
<doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
- <junitVersion>3.8.1</junitVersion>
+ <junitVersion>3.8.1</junitVersion>
<plexusVersion>1.0-beta-3.0.7-SNAPSHOT</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
<plexusUtilsVersion>1.5.8</plexusUtilsVersion>
<plexusJetty6Version>1.6</plexusJetty6Version>
- <plexusWebdavVersion>1.0</plexusWebdavVersion>
+ <plexusWebdavVersion>1.0</plexusWebdavVersion>
<wagonVersion>1.0-beta-4</wagonVersion>
<modelBuilderVersion>1.7-SNAPSHOT</modelBuilderVersion>
<mercuryVersion>1.0-alpha-6-SNAPSHOT</mercuryVersion>
@@ -247,7 +247,7 @@ under the License.
<module>maven-toolchain</module>
<module>maven-compat</module>
<module>maven-repository</module>
- <module>maven-repository-mercury</module>
+ <module>maven-repository-mercury</module>
</modules>
<!--start-->
<dependencies>
@@ -366,11 +366,11 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
+
<!-- Plexus test dependencies -->
<dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-jetty6</artifactId>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-jetty6</artifactId>
<version>${plexusJetty6Version}</version>
<scope>test</scope>
</dependency>
@@ -380,7 +380,7 @@ under the License.
<version>${plexusWebdavVersion}</version>
<scope>test</scope>
</dependency>
-
+
<!-- Wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
[04/11] maven git commit: Trimmed trailing whitespace
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml
index 45dc77d..c8a8b85 100644
--- a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml
+++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml
@@ -1,8 +1,8 @@
<project>
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.apache.maven.tests</groupId>
<artifactId>build-from-file</artifactId>
<version>1</version>
-
+
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml
index 5c62a78..8f5154f 100644
--- a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml
+++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml
@@ -1,6 +1,6 @@
<project>
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>tests</groupId>
<artifactId>build-model-lineage</artifactId>
<version>1</version>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml
index 5953c32..4d1d23e 100644
--- a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml
+++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml
@@ -5,6 +5,6 @@
<artifactId>childAndParent-parent</artifactId>
<version>1</version>
</parent>
-
+
<artifactId>childAndParent-child</artifactId>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml
index 365ec18..164506f 100644
--- a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml
+++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml
@@ -1,6 +1,6 @@
<project>
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>tests</groupId>
<artifactId>childAndParent-parent</artifactId>
<version>1</version>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml
index e0eec3a..9633029 100644
--- a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml
+++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml
@@ -5,6 +5,6 @@
<artifactId>resolve-parent-pom-parent</artifactId>
<version>1</version>
</parent>
-
+
<artifactId>resolve-parent-pom</artifactId>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml
index 322147d..35c3217 100644
--- a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml
+++ b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml
@@ -18,7 +18,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
+
<toolchains>
<toolchain>
<type>jdk</type>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml
index 01aa0e1..5233a33 100644
--- a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml
+++ b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml
@@ -18,7 +18,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
+
<toolchains>
<toolchain>
<type>jdk</type>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/project-dynamism/pom-interp.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/project-dynamism/pom-interp.xml b/maven-core/src/test/resources/project-dynamism/pom-interp.xml
index 2ad098a..40fdb41 100644
--- a/maven-core/src/test/resources/project-dynamism/pom-interp.xml
+++ b/maven-core/src/test/resources/project-dynamism/pom-interp.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.test</groupId>
<artifactId>test-build-dynamism</artifactId>
<version>1</version>
-
+
<build>
<sourceDirectory>/${project.groupId}/src/main/java</sourceDirectory>
<testSourceDirectory>/${pom.groupId}/src/test/java</testSourceDirectory>
<scriptSourceDirectory>/${groupId}/src/main/scripts</scriptSourceDirectory>
-
+
<plugins>
<plugin>
<artifactId>my-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/project-dynamism/pom-relative.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/project-dynamism/pom-relative.xml b/maven-core/src/test/resources/project-dynamism/pom-relative.xml
index a24aebe..bb22b3d 100644
--- a/maven-core/src/test/resources/project-dynamism/pom-relative.xml
+++ b/maven-core/src/test/resources/project-dynamism/pom-relative.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.test</groupId>
<artifactId>test-build-dynamism</artifactId>
<version>1</version>
-
+
<properties>
<myProperty>${pom.build.directory}</myProperty>
</properties>
@@ -18,17 +18,17 @@
<directory>${pom.build.directory}/generated-resources/plexus</directory>
</resource>
</resources>
-
+
<filters>
<filter>${pom.build.directory}/generated-filters.properties</filter>
</filters>
-
+
<directory>target</directory>
-
+
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
-
+
<outputDirectory>${pom.build.directory}/classes</outputDirectory>
<testOutputDirectory>${pom.build.directory}/test-classes</testOutputDirectory>
</build>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/project-dynamism/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/project-dynamism/pom.xml b/maven-core/src/test/resources/project-dynamism/pom.xml
index 02bbed0..37797f2 100644
--- a/maven-core/src/test/resources/project-dynamism/pom.xml
+++ b/maven-core/src/test/resources/project-dynamism/pom.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.test</groupId>
<artifactId>test-build-dynamism</artifactId>
<version>1</version>
-
+
<properties>
<myProperty>${pom.build.directory}</myProperty>
</properties>
@@ -18,17 +18,17 @@
<directory>${pom.build.directory}/generated-resources/plexus</directory>
</resource>
</resources>
-
+
<filters>
<filter>${pom.build.directory}/generated-filters.properties</filter>
</filters>
-
+
<directory>target</directory>
-
+
<sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
<testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
<scriptSourceDirectory>${pom.basedir}/src/main/scripts</scriptSourceDirectory>
-
+
<outputDirectory>${pom.build.directory}/classes</outputDirectory>
<testOutputDirectory>${pom.build.directory}/test-classes</testOutputDirectory>
</build>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml b/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml
index f4df904..58cae23 100644
--- a/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml
+++ b/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml
@@ -22,7 +22,7 @@ under the License.
<artifactId>bar</artifactId>
<name>Babar</name>
<version>4.5</version>
-
+
<!-- Build element should be inherited from the super model -->
</model>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml b/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml
index 6da9b27..7383109 100644
--- a/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml
+++ b/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml
@@ -3,7 +3,7 @@
<groupId>tests.project</groupId>
<artifactId>duplicate-plugin-defs-merged</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
@@ -44,5 +44,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml b/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml
index 537605a..95ee353 100644
--- a/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml
+++ b/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml
@@ -8,9 +8,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
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 0f1b538..97e9f09 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -84,12 +84,12 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<optional>true</optional>
- </dependency>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<optional>true</optional>
- </dependency>
+ </dependency>
<!-- CLI -->
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/examples/simple-project/settings.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/examples/simple-project/settings.xml b/maven-embedder/src/examples/simple-project/settings.xml
index 7c234c1..39709fd 100644
--- a/maven-embedder/src/examples/simple-project/settings.xml
+++ b/maven-embedder/src/examples/simple-project/settings.xml
@@ -21,6 +21,6 @@ under the License.
<settings>
<pluginGroups>
<pluginGroup>org.codehaus.tycho</pluginGroup>
- <pluginGroup>org.sonatype.pwt</pluginGroup>
+ <pluginGroup>org.sonatype.pwt</pluginGroup>
</pluginGroups>
</settings>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java b/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java
index a3cf2a3..06927bf 100644
--- a/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java
+++ b/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java
@@ -19,7 +19,7 @@ package org.apache.maven.embedder;
* Hello world!
*
*/
-public class App
+public class App
{
public static void main( String[] args )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
index cf7f8fc..ee90c20 100644
--- a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
+++ b/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
@@ -22,7 +22,7 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index cde88cb..ef81408 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -120,9 +120,9 @@ public class MavenCli
private LoggerManager plexusLoggerManager;
private ILoggerFactory slf4jLoggerFactory;
-
+
private Logger slf4jLogger;
-
+
private EventSpyDispatcher eventSpyDispatcher;
private ModelProcessor modelProcessor;
@@ -297,7 +297,7 @@ public class MavenCli
System.out.println( CLIReportingUtils.showVersion() );
throw new ExitException( 0 );
}
- }
+ }
/**
* configure logging
@@ -497,7 +497,7 @@ public class MavenCli
if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_MASTER_PASSWORD ) )
{
String passwd = cliRequest.commandLine.getOptionValue( CLIManager.ENCRYPT_MASTER_PASSWORD );
-
+
if ( passwd == null )
{
Console cons = System.console();
@@ -506,7 +506,7 @@ public class MavenCli
{
// Cipher uses Strings
passwd = String.copyValueOf( password );
-
+
// Sun/Oracle advises to empty the char array
java.util.Arrays.fill( password, ' ' );
}
@@ -522,7 +522,7 @@ public class MavenCli
else if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_PASSWORD ) )
{
String passwd = cliRequest.commandLine.getOptionValue( CLIManager.ENCRYPT_PASSWORD );
-
+
if ( passwd == null )
{
Console cons = System.console();
@@ -927,7 +927,7 @@ public class MavenCli
if ( quiet )
{
transferListener = new QuietMavenTransferListener();
- }
+ }
else if ( request.isInteractiveMode() && !cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
{
//
@@ -1009,10 +1009,10 @@ public class MavenCli
if ( commandLine.hasOption( CLIManager.PROJECT_LIST ) )
{
String[] projectOptionValues = commandLine.getOptionValues( CLIManager.PROJECT_LIST );
-
+
List<String> inclProjects = new ArrayList<String>();
List<String> exclProjects = new ArrayList<String>();
-
+
if ( projectOptionValues != null )
{
for ( String projectOptionValue : projectOptionValues )
@@ -1038,7 +1038,7 @@ public class MavenCli
}
}
}
-
+
request.setSelectedProjects( inclProjects );
request.setExcludedProjects( exclProjects );
}
@@ -1070,24 +1070,24 @@ public class MavenCli
{
request.setLocalRepositoryPath( localRepoProperty );
}
-
+
request.setCacheNotFound( true );
request.setCacheTransferError( false );
- //
+ //
// Builder, concurrency and parallelism
//
// We preserve the existing methods for builder selection which is to look for various inputs in the threading
// configuration. We don't have an easy way to allow a pluggable builder to provide its own configuration
// parameters but this is sufficient for now. Ultimately we want components like Builders to provide a way to
- // extend the command line to accept its own configuration parameters.
+ // extend the command line to accept its own configuration parameters.
//
final String threadConfiguration = commandLine.hasOption( CLIManager.THREADS )
? commandLine.getOptionValue( CLIManager.THREADS )
: request.getSystemProperties().getProperty(
MavenCli.THREADS_DEPRECATED ); // TODO: Remove this setting. Note that the int-tests use it
-
+
if ( threadConfiguration != null )
{
//
@@ -1104,15 +1104,15 @@ public class MavenCli
request.setDegreeOfConcurrency( Integer.valueOf( threadConfiguration ) );
}
}
-
+
//
// Allow the builder to be overriden by the user if requested. The builders are now pluggable.
//
if ( commandLine.hasOption( CLIManager.BUILDER ) )
- {
+ {
request.setBuilderId( commandLine.getOptionValue( CLIManager.BUILDER ) );
- }
-
+ }
+
return request;
}
@@ -1121,7 +1121,7 @@ public class MavenCli
int procs = Runtime.getRuntime().availableProcessors();
return (int) ( Float.valueOf( threadConfiguration.replace( "C", "" ) ) * procs );
}
-
+
static File resolveFile( File file, String workingDirectory )
{
if ( file == null )
@@ -1250,21 +1250,21 @@ public class MavenCli
}
}
-
+
//
// Customizations available via the CLI
//
-
- protected TransferListener getConsoleTransferListener()
+
+ protected TransferListener getConsoleTransferListener()
{
return new ConsoleMavenTransferListener( System.out );
}
-
+
protected TransferListener getBatchTransferListener()
{
return new Slf4jMavenTransferListener();
}
-
+
protected void customizeContainer( PlexusContainer container )
{
}
@@ -1273,5 +1273,5 @@ public class MavenCli
throws ComponentLookupException
{
return container.lookup( ModelProcessor.class );
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java
index 44c79f4..33e9920 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
/**
* Abstract implementation.
- *
+ *
* @author Hervé Boutemy
* @since 3.1.0
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
index c7b8900..5f4b64d 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java
@@ -22,7 +22,7 @@ package org.apache.maven.cli.logging;
/**
* Interface for configuration operations on loggers, which are not available in slf4j, then require per-slf4f-binding
* implementation.
- *
+ *
* @author Hervé Boutemy
* @since 3.1.0
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
index 3f06f37..3957464 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
@@ -24,7 +24,7 @@ import org.codehaus.plexus.logging.Logger;
/**
* Adapt an SLF4J logger to a Plexus logger, ignoring Plexus logger API parts that are not classical and
* probably not really used.
- *
+ *
* @author Jason van Zyl
* @since 3.1.0
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java
index d32ea83..64b9bfd 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java
@@ -36,7 +36,7 @@ public class Slf4jStdoutLogger
//
// These are the only methods we need in our primordial logger
- //
+ //
public void error( String msg )
{
out.print( ERROR );
@@ -50,12 +50,12 @@ public class Slf4jStdoutLogger
if ( null != t )
{
t.printStackTrace( out );
- }
- }
+ }
+ }
//
// Don't need any of this
- //
+ //
public String getName()
{
return null;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
index 27fae1f..b24ea9c 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java
@@ -23,7 +23,7 @@ import org.apache.maven.cli.logging.BaseSlf4jConfiguration;
/**
* Configuration for slf4j-log4j2.
- *
+ *
* @author Hervé Boutemy
* @since 3.1.0
*/
@@ -39,7 +39,7 @@ public class Log4j2Configuration
case DEBUG:
value = "debug";
break;
-
+
case INFO:
value = "info";
break;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
index 5d04961..5d9fab7 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
/**
* Configuration for slf4j-logback.
- *
+ *
* @author Hervé Boutemy
* @since 3.1.0
*/
@@ -41,7 +41,7 @@ public class LogbackConfiguration
case DEBUG:
value = ch.qos.logback.classic.Level.DEBUG;
break;
-
+
case INFO:
value = ch.qos.logback.classic.Level.INFO;
break;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
index 5d12d5a..3961059 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
@@ -25,7 +25,7 @@ import org.slf4j.impl.MavenSlf4jSimpleFriend;
/**
* Configuration for slf4j-simple.
- *
+ *
* @author Hervé Boutemy
* @since 3.1.0
*/
@@ -41,7 +41,7 @@ public class Slf4jSimpleConfiguration
case DEBUG:
value = "debug";
break;
-
+
case INFO:
value = "info";
break;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java
index a96ddc6..2e91b25 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
/**
* Pseudo-configuration for unsupported slf4j binding.
- *
+ *
* @author Hervé Boutemy
* @since 3.2.4
*/
@@ -59,7 +59,7 @@ public class UnsupportedSlf4jBindingConfiguration
for ( Map.Entry<URL, Set<Object>> entry : supported.entrySet() )
{
StringBuilder sb = new StringBuilder();
- sb.append( "(from " ).append( entry.getKey().toExternalForm() ).append( ")" );
+ sb.append( "(from " ).append( entry.getKey().toExternalForm() ).append( ")" );
for ( Object binding : entry.getValue() )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
index f8911cc..4672502 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
@@ -29,7 +29,7 @@ import org.eclipse.aether.transfer.TransferResource;
/**
* Console download progress meter.
- *
+ *
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
public class ConsoleMavenTransferListener
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt
index b903f8c..cc9257d 100644
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@ -32,12 +32,12 @@ Maven Logging
Maven uses
{{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html}Plexus
- Container logging API}}, like any other Plexus components, ie
+ Container logging API}}, like any other Plexus components, ie
{{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/LoggerManager.html}LoggerManager}}
/ {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/Logger.html}Logger}}.
Starting with Maven 3.1.0:
-
+
* Maven supports SLF4J API logging API too, ie {{{http://slf4j.org/apidocs/org/slf4j/LoggerFactory.html}LoggerFactory}} /
{{{http://slf4j.org/apidocs/org/slf4j/Logger.html}Logger}},
@@ -86,7 +86,7 @@ public class DefaultMyComponent
Starting with Maven 3.1.0, SLF4J Logger can be used directly too, without Plexus. Of course, this will only work when run under
Maven 3.1.0, then this technique can be used safely only in Maven core components or in plugins/component not requiring
compatibility with previous Maven versions.
-
+
+-----+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java b/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java
index dc4f5ec..3902bac 100644
--- a/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java
+++ b/maven-embedder/src/test/embedder-test-project/src/main/java/org/apache/maven/App.java
@@ -4,7 +4,7 @@ package org.apache.maven;
* Hello world!
*
*/
-public class App
+public class App
{
public static void main( String[] args )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java b/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java
index 9dd685d..7a879ce 100644
--- a/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java
+++ b/maven-embedder/src/test/embedder-test-project/src/test/java/org/apache/maven/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml
index 181b40a..cfd2970 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/bad-dep-version/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>bad-dep-version</artifactId>
<version>1</version>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml
index f7a5b5e..6d06469 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven.errortest</groupId>
<artifactId>bad-ext-direct-deps</artifactId>
<version>1</version>
-
+
<build>
<extensions>
<extension>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml
index 9139736..2c3da51 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/pom.xml
@@ -5,14 +5,14 @@
<artifactId>bad-ext-plugin-maven-ver-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1</version>
-
- <!--
+
+ <!--
<prerequisites>
<maven>10</maven>
</prerequisites>
-
+
-->
-
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java
index 703166d..5836f1e 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java
+++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/plugin/src/main/java/org/plugin/TestPlugin.java
@@ -13,7 +13,7 @@ public class TestPlugin
{
private Log log;
-
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml
index c70309d..9001cdc 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>bad-ext-plugin-dep-ver</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
@@ -33,5 +33,5 @@ under the License.
</plugin>
</plugins>
</build>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml
index 9139736..2c3da51 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/pom.xml
@@ -5,14 +5,14 @@
<artifactId>bad-ext-plugin-maven-ver-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1</version>
-
- <!--
+
+ <!--
<prerequisites>
<maven>10</maven>
</prerequisites>
-
+
-->
-
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java
index 703166d..5836f1e 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java
+++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/plugin/src/main/java/org/plugin/TestPlugin.java
@@ -13,7 +13,7 @@ public class TestPlugin
{
private Log log;
-
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml
index bcbc4d4..3ab2818 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>bad-ext-plugin-maven-ver</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
@@ -33,5 +33,5 @@ under the License.
</plugin>
</plugins>
</build>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml
index fde0ed7..db547ca 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/bad-maven-version/pom.xml
@@ -3,7 +3,7 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>bad-maven-version</artifactId>
<version>1</version>
-
+
<prerequisites>
<maven>10</maven>
</prerequisites>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml
index 940758b..4bb4c46 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/bad-mg-dep-version/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>bad-mg-dep-version</artifactId>
<version>1</version>
-
+
<dependencyManagement>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml
index 37816e7..dd2cff3 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/bad-non-dep-version/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>bad-non-dep-version</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml b/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml
index 1a30d09..d7a7375 100644
--- a/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/bad-profile-repo/pom.xml
@@ -3,5 +3,5 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>bad-profile-repo</artifactId>
<version>1</version>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java
index 91e481e..6aa5c33 100644
--- a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java
+++ b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java
@@ -13,7 +13,7 @@ public class TestPlugin
{
private Log log;
-
+
/**
* @parameter default-value="something"
* @required
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml
index e6df01b..e2c7412 100644
--- a/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/config-rdonly-mojo-param/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>config-rdonly-mojo-param</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml b/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml
index d9594d5..d766e41 100644
--- a/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/deploy-repo-creation-err/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>deploy-repo-creation-err</artifactId>
<version>1</version>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -30,7 +30,7 @@ under the License.
<version>3.8.1</version>
</dependency>
</dependencies>
-
+
<distributionManagement>
<repository>
<id>test</id>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml
index 5e04826..c210cfb 100644
--- a/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>err-loading-plugin</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
@@ -41,5 +41,5 @@ under the License.
</plugin>
</plugins>
</build>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml
index d9b3bca..1339c66 100644
--- a/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/project/pom.xml
@@ -3,7 +3,7 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>err-resolving-ext-plugin</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
@@ -14,5 +14,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml
index 2a142af..d0b755c 100644
--- a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/pom.xml
@@ -3,7 +3,7 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>err-resolving-project-dep</artifactId>
<version>1</version>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -17,7 +17,7 @@
<type>pom</type>
</dependency>
</dependencies>
-
+
<repositories>
<repository>
<id>repo</id>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
index 39ae671..7e0144a 100644
--- a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
+++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml
index 968ea71..8da1560 100644
--- a/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven.errortest</groupId>
<artifactId>ext-deps-resolve-err</artifactId>
<version>1</version>
-
+
<build>
<extensions>
<extension>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml
index d9b0199..6565fd4 100644
--- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>ext-plugin-artifact-missing</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
@@ -33,5 +33,5 @@ under the License.
</plugin>
</plugins>
</build>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml
index 4bc809e..ddc1eee 100644
--- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/plugin/src/main/resources/META-INF/plexus/components.xml
@@ -10,7 +10,7 @@
</requirement>
</requirements>
</component>
-
+
<component>
<role>org.test.ComponentTwo</role>
<role-hint>default</role-hint>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml
index f7e341e..513e00c 100644
--- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-realm-error/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven.errortest</groupId>
<artifactId>ext-plugin-realm-error</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml
index 9139736..2c3da51 100644
--- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/pom.xml
@@ -5,14 +5,14 @@
<artifactId>bad-ext-plugin-maven-ver-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1</version>
-
- <!--
+
+ <!--
<prerequisites>
<maven>10</maven>
</prerequisites>
-
+
-->
-
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java
index 703166d..5836f1e 100644
--- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java
+++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/plugin/src/main/java/org/plugin/TestPlugin.java
@@ -13,7 +13,7 @@ public class TestPlugin
{
private Log log;
-
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml
index bade9b7..ad6effc 100644
--- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>ext-plugin-version-err</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
@@ -32,5 +32,5 @@ under the License.
</plugin>
</plugins>
</build>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml
index 40b95f0..a567706 100644
--- a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>test-maven-ext</artifactId>
<version>1</version>
-
+
<build>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java
index 85ab5c4..0701b7a 100644
--- a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java
+++ b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/ext/src/main/java/org/ext/App.java
@@ -4,7 +4,7 @@ package org.ext;
* Hello world!
*
*/
-public class App
+public class App
{
public static void main( String[] args )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml
index 78ebb93..85e9a9f 100644
--- a/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/ext-realm-error/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven.errortest</groupId>
<artifactId>ext-realm-error</artifactId>
<version>1</version>
-
+
<build>
<extensions>
<extension>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml
index 0fe1170..bb50b45 100644
--- a/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/pom.xml
@@ -3,7 +3,7 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>interp-from-project</artifactId>
<version>1</version>
-
+
<dependencies>
<dependency>
<groupId>org.test</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml
index a8aa884..2a924b8 100644
--- a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex/pom.xml
@@ -3,5 +3,5 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>load-extern-profiles-ioex</artifactId>
<version>1</version>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml
index 574a9e4..fdaa3d4 100644
--- a/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-xex/pom.xml
@@ -3,5 +3,5 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>load-extern-profiles-xex</artifactId>
<version>1</version>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java
index 0b3975d..2c825a0 100644
--- a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java
+++ b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/main/java/org/test/App.java
@@ -4,7 +4,7 @@ package org.test;
* Hello world!
*
*/
-public class App
+public class App
{
public static void main( String[] args )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java
index b84ebc6..e4e81e2 100644
--- a/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java
+++ b/maven-embedder/src/test/error-reporting-projects/missing-module-pom/child1/src/test/java/org/test/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml b/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml
index 951f841..e0ab9f6 100644
--- a/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/missing-parent-pom/pom.xml
@@ -5,7 +5,7 @@
<artifactId>missing-parent-pom-parent</artifactId>
<version>1</version>
</parent>
-
+
<artifactId>missing-parent-pom</artifactId>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java
index 2ce5b5d..51b71a8 100644
--- a/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java
+++ b/maven-embedder/src/test/error-reporting-projects/missing-req-mojo-param/plugin/src/main/java/org/plugin/TestPlugin.java
@@ -13,7 +13,7 @@ public class TestPlugin
{
private Log log;
-
+
/**
* @parameter
* @required
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml
index 0b52969..de32947 100644
--- a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>mojo-config-error-maven-plugin</artifactId>
<version>1</version>
-
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java
index 703166d..5836f1e 100644
--- a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java
+++ b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/plugin/src/main/java/org/plugin/TestPlugin.java
@@ -13,7 +13,7 @@ public class TestPlugin
{
private Log log;
-
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml
index 1bfb2af..9d63df5 100644
--- a/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/mojo-config-error/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>mojo-config-error</artifactId>
<version>1</version>
-
+
<build>
<plugins>
<plugin>
@@ -41,5 +41,5 @@ under the License.
</plugin>
</plugins>
</build>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java
index 703166d..5836f1e 100644
--- a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java
+++ b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/plugin/src/main/java/org/plugin/TestPlugin.java
@@ -13,7 +13,7 @@ public class TestPlugin
{
private Log log;
-
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml
index ab53542..1f10d0f 100644
--- a/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/mojo-exec-err/project/pom.xml
@@ -22,5 +22,5 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>mojo-exec-err</artifactId>
<version>1</version>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java b/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java
index a1507b0..bc2e712 100644
--- a/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java
+++ b/maven-embedder/src/test/error-reporting-projects/mojo-lookup-err/plugin/src/main/java/org/plugin/TestPlugin.java
@@ -17,7 +17,7 @@ public class TestPlugin
{
private Log log;
-
+
/**
* @component role-hint="nonexistant"
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml b/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml
index e434d57..b70261d 100644
--- a/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/child/pom.xml
@@ -6,5 +6,5 @@
<version>1</version>
</parent>
<artifactId>parent-parse-ioex-child</artifactId>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml
index ca60420..3961dd4 100644
--- a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/child/pom.xml
@@ -6,5 +6,5 @@
<version>1</version>
</parent>
<artifactId>parent-parse-xex-child</artifactId>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml
index 072d885..7ac14c6 100644
--- a/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/parent-parse-xex/pom.xml
@@ -3,5 +3,5 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>parent-parse-xex</artifactId>
<version>1</ver>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml b/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml
index e8fc832..031ce1e 100644
--- a/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-err/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>profile-activator-err</artifactId>
<version>1</version>
-
+
<profiles>
<profile>
<id>faulty</id>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml
index e802e70..0f93b9e 100644
--- a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>profile-activator-lookup-err-ext</artifactId>
<version>1</version>
-
+
<build>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java
index 85ab5c4..0701b7a 100644
--- a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java
+++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/ext/src/main/java/org/ext/App.java
@@ -4,7 +4,7 @@ package org.ext;
* Hello world!
*
*/
-public class App
+public class App
{
public static void main( String[] args )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml
index fabf381..a34b838 100644
--- a/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/profile-activator-lookup-err/project/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven.errortest</groupId>
<artifactId>profile-activator-lookup-err</artifactId>
<version>1</version>
-
+
<profiles>
<profile>
<id>test-profile</id>
@@ -33,7 +33,7 @@ under the License.
</activation>
</profile>
</profiles>
-
+
<build>
<extensions>
<extension>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml
index 5f1ed10..ebb7ee7 100644
--- a/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/project-collision/mod1/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.apache.maven.errortest</groupId>
<artifactId>module</artifactId>
<version>1</version>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml
index 5f1ed10..ebb7ee7 100644
--- a/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/project-collision/mod2/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.apache.maven.errortest</groupId>
<artifactId>module</artifactId>
<version>1</version>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml
index 0ecb5b9..9e11c6d 100644
--- a/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/project-collision/pom.xml
@@ -4,7 +4,7 @@
<artifactId>project-collision</artifactId>
<version>1</version>
<packaging>pom</packaging>
-
+
<modules>
<module>mod1</module>
<module>mod2</module>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml
index cc96cb4..eb1f08f 100644
--- a/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/project-cycle/dep/pom.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.maven.errortest</groupId>
<artifactId>project-cycle</artifactId>
<version>1</version>
</parent>
-
+
<groupId>org.apache.maven.errortest</groupId>
<artifactId>project-cycle-dep</artifactId>
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml
index aba34bf..75c53e7 100644
--- a/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/project-cycle/pom.xml
@@ -4,11 +4,11 @@
<artifactId>project-cycle</artifactId>
<version>1</version>
<packaging>pom</packaging>
-
+
<modules>
<module>dep</module>
</modules>
-
+
<dependencies>
<dependency>
<groupId>org.apache.maven.errortest</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml
index 26a1029..3c297ac 100644
--- a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/pom.xml
@@ -3,14 +3,14 @@
<groupId>org.apache.maven.errortest</groupId>
<artifactId>project-dep-missing</artifactId>
<version>1</version>
-
+
<repositories>
<repository>
<id>central</id>
<url>file://${java.io.tmpdir}</url>
</repository>
</repositories>
-
+
<dependencies>
<dependency>
<groupId>not</groupId>
@@ -18,5 +18,5 @@
<version>3.8.1</version>
</dependency>
</dependencies>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
index 39ae671..7e0144a 100644
--- a/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
+++ b/maven-embedder/src/test/error-reporting-projects/project-dep-missing/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java b/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
index 39ae671..7e0144a 100644
--- a/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
+++ b/maven-embedder/src/test/error-reporting-projects/project-mojo-failure/src/test/java/org/apache/maven/test/error/mojoFailure/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml b/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml
index a49b9dc..d0574bd 100644
--- a/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml
+++ b/maven-embedder/src/test/error-reporting-projects/repo-creation-err/pom.xml
@@ -22,7 +22,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>repo-creation-err</artifactId>
<version>1</version>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -30,7 +30,7 @@ under the License.
<version>3.8.1</version>
</dependency>
</dependencies>
-
+
<repositories>
<repository>
<id>test</id>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml b/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml
index 4bbef51..169b392 100644
--- a/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml
+++ b/maven-embedder/src/test/eventing-projects/read-with-deps/pom.xml
@@ -3,7 +3,7 @@
<groupId>testing</groupId>
<artifactId>read-with-deps</artifactId>
<version>1</version>
-
+
<dependencies>
<dependency>
<groupId>tests</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/extensions/META-INF/plexus/components.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/extensions/META-INF/plexus/components.xml b/maven-embedder/src/test/extensions/META-INF/plexus/components.xml
index c71f2a2..f38af59 100644
--- a/maven-embedder/src/test/extensions/META-INF/plexus/components.xml
+++ b/maven-embedder/src/test/extensions/META-INF/plexus/components.xml
@@ -21,7 +21,7 @@ under the License.
<components>
<component>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- <role-hint>default</role-hint>
+ <role-hint>default</role-hint>
<implementation>org.apache.maven.embedder.CustomArtifactFactory</implementation>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
index 9df1768..163d9d9 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
@@ -34,7 +34,7 @@ import org.codehaus.plexus.util.FileUtils;
/**
* Pseudo test to generate documentation fragment about supported CLI options.
* TODO such documentation generation code should not be necessary as unit test but should be run
- * during site generation (Velocity? Doxia macro?)
+ * during site generation (Velocity? Doxia macro?)
*/
public class CLIManagerTest
extends PlexusTestCase
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
index ba26467..6e06cc5 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
@@ -25,20 +25,20 @@ public class MavenCliTest
extends TestCase
{
private MavenCli cli;
-
+
protected void setUp()
{
- cli = new MavenCli();
+ cli = new MavenCli();
}
-
+
public void testCalculateDegreeOfConcurrencyWithCoreMultiplier()
{
- int cores = Runtime.getRuntime().availableProcessors();
+ int cores = Runtime.getRuntime().availableProcessors();
// -T2.2C
assertEquals( (int) ( cores * 2.2 ), cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "C2.2" ) );
// -TC2.2
assertEquals( (int) ( cores * 2.2 ), cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "2.2C" ) );
-
+
try
{
cli.calculateDegreeOfConcurrencyWithCoreMultiplier( "CXXX" );
@@ -47,6 +47,6 @@ public class MavenCliTest
catch ( NumberFormatException e )
{
// carry on
- }
- }
+ }
+ }
}
[10/11] maven git commit: Trimmed trailing whitespace
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
index a4cf6df..7b20eb5 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
@@ -29,7 +29,7 @@ import junit.framework.TestCase;
/**
* Tests {@link ArtifactUtils}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ArtifactUtilsTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
index 5eefaa9..0d109ac 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
@@ -26,19 +26,19 @@ import org.codehaus.plexus.PlexusTestCase;
public class DefaultArtifactFactoryTest
extends PlexusTestCase
{
-
+
public void testPropagationOfSystemScopeRegardlessOfInheritedScope() throws Exception
{
ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
-
+
Artifact artifact = factory.createDependencyArtifact( "test-grp", "test-artifact", VersionRange.createFromVersion("1.0"), "type", null, "system", "provided" );
Artifact artifact2 = factory.createDependencyArtifact( "test-grp", "test-artifact-2", VersionRange.createFromVersion("1.0"), "type", null, "system", "test" );
Artifact artifact3 = factory.createDependencyArtifact( "test-grp", "test-artifact-3", VersionRange.createFromVersion("1.0"), "type", null, "system", "runtime" );
Artifact artifact4 = factory.createDependencyArtifact( "test-grp", "test-artifact-4", VersionRange.createFromVersion("1.0"), "type", null, "system", "compile" );
-
+
// this one should never happen in practice...
Artifact artifact5 = factory.createDependencyArtifact( "test-grp", "test-artifact-5", VersionRange.createFromVersion("1.0"), "type", null, "system", "system" );
-
+
assertEquals( "system", artifact.getScope() );
assertEquals( "system", artifact2.getScope() );
assertEquals( "system", artifact3.getScope() );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java b/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java
index 9418680..f8bb167 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java
@@ -37,7 +37,7 @@ public class TestMetadataSource
{
@Requirement
private ArtifactFactory factory;
-
+
public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException
{
@@ -56,7 +56,7 @@ public class TestMetadataSource
throw new ArtifactMetadataRetrievalException( "Error retrieving metadata", e, a );
}
}
-
+
if ( "i".equals( artifact.getArtifactId() ) )
{
Artifact a = null;
@@ -70,7 +70,7 @@ public class TestMetadataSource
throw new ArtifactMetadataRetrievalException( "Error retrieving metadata", e, a );
}
}
-
+
return new ResolutionGroup( artifact, dependencies, remoteRepositories );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
index ca9ef2a..533f304 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
@@ -28,7 +28,7 @@ public class MavenArtifactRepositoryTest
private static class MavenArtifactRepositorySubclass extends MavenArtifactRepository
{
String id;
-
+
public MavenArtifactRepositorySubclass(String id)
{
this.id = id;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
index 39c99c9..aeacfb8 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
/**
* Test the artifact resolution exception message
- *
+ *
* @author Mauro Talevi
*/
public class ArtifactResolutionExceptionTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
index 5ab0d58..117c0e2 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
@@ -63,7 +63,7 @@ public class ArtifactResolverTest
projectArtifact = createLocalArtifact( "project", "3.0" );
}
-
+
@Override
protected void tearDown()
throws Exception
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java
index b9f4d19..c78c190 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java
@@ -30,7 +30,7 @@ import org.apache.maven.wagon.providers.file.FileWagon;
import org.apache.maven.wagon.resource.Resource;
/**
- * Wagon used for test cases that annotates some methods. Note that this is not a thread-safe implementation.
+ * Wagon used for test cases that annotates some methods. Note that this is not a thread-safe implementation.
*/
public class TestFileWagon
extends FileWagon
@@ -38,10 +38,10 @@ public class TestFileWagon
private TestTransferListener testTransferListener;
private boolean insideGet;
- protected void getTransfer( Resource resource,
- File destination,
- InputStream input,
- boolean closeInput,
+ protected void getTransfer( Resource resource,
+ File destination,
+ InputStream input,
+ boolean closeInput,
int maxSize )
throws TransferFailedException
{
@@ -50,16 +50,16 @@ public class TestFileWagon
}
public void get( String resourceName, File destination )
- throws TransferFailedException,
- ResourceDoesNotExistException,
+ throws TransferFailedException,
+ ResourceDoesNotExistException,
AuthorizationException
{
addTransfer( "get " + resourceName );
-
+
insideGet = true;
-
+
super.get( resourceName, destination );
-
+
insideGet = false;
}
@@ -72,8 +72,8 @@ public class TestFileWagon
}
public boolean getIfNewer( String resourceName, File destination, long timestamp )
- throws TransferFailedException,
- ResourceDoesNotExistException,
+ throws TransferFailedException,
+ ResourceDoesNotExistException,
AuthorizationException
{
if ( !insideGet )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
index 27d96bd..bca112b 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
/**
* Tests {@link AndArtifactFilter}.
- *
+ *
* @author Benjamin Bentmann
*/
public class AndArtifactFilterTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
index 9dfb373..fb46566 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
@@ -42,7 +42,7 @@ public class FilterHashEqualsTest
assertTrue( f1.equals(f2) );
assertTrue( f2.equals(f1) );
assertTrue( f1.hashCode() == f2.hashCode() );
-
+
IncludesArtifactFilter f3 = new IncludesArtifactFilter( Arrays.asList( "d", "c", "e" ) );
assertTrue( f1.equals( f3 ) );
assertTrue( f1.hashCode() == f3.hashCode() );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
index e17c0d4..e161437 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
/**
* Tests {@link OrArtifactFilter}.
- *
+ *
* @author Benjamin Bentmann
*/
public class OrArtifactFilterTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java
index d50750a..1a65eca 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
/**
* Tests {@link ScopeArtifactFilter}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ScopeArtifactFilterTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
index 8f01977..8e3b86a 100644
--- a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
@@ -111,7 +111,7 @@ public class DefaultProfileManagerTest
assertEquals( 1, active.size() );
assertEquals( "syspropActivated", ( (Profile) active.get( 0 ) ).getId() );
}
-
+
public void testShouldNotActivateReversalOfPresentSystemProperty()
throws Exception
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index 71f79a4..7e3f7e6 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -6,9 +6,9 @@ package org.apache.maven.project;
* 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
@@ -55,7 +55,7 @@ public abstract class AbstractMavenProjectTestCase
throws Exception
{
super.setUp();
-
+
if ( getContainer().hasComponent( ProjectBuilder.class, "test" ) )
{
projectBuilder = lookup( ProjectBuilder.class, "test" );
@@ -65,9 +65,9 @@ public abstract class AbstractMavenProjectTestCase
// default over to the main project builder...
projectBuilder = lookup( ProjectBuilder.class );
}
-
- repositorySystem = lookup( RepositorySystem.class );
- }
+
+ repositorySystem = lookup( RepositorySystem.class );
+ }
@Override
protected void tearDown()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
index d5ab60e..024917d 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
@@ -35,7 +35,7 @@ import org.apache.maven.plugin.MojoExecution;
/**
* A stub implementation that assumes an empty lifecycle to bypass interaction with the plugin manager and to avoid
* plugin artifact resolution from repositories.
- *
+ *
* @author Benjamin Bentmann
*/
public class EmptyLifecycleExecutor
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
index f696675..d9e7beb 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
@@ -45,9 +45,9 @@ public class ProjectClasspathTest
// the metadata source looks up the default impl, so we have to trick it
getContainer().addComponent( projectBuilder, ProjectBuilder.class, "default" );
- repositorySystem = lookup( RepositorySystem.class );
+ repositorySystem = lookup( RepositorySystem.class );
}
-
+
@Override
protected String getCustomConfigurationName()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java b/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java
index c02171f..754487f 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java
@@ -26,16 +26,16 @@ import org.codehaus.plexus.component.annotations.Component;
@Component(role=ProjectBuilder.class,hint="classpath")
public class TestProjectBuilder
extends DefaultProjectBuilder
-{
-
+{
+
@Override
public ProjectBuildingResult build( Artifact artifact, ProjectBuildingRequest request )
throws ProjectBuildingException
- {
+ {
if ( "maven-test".equals( artifact.getGroupId() ) )
{
String scope = artifact.getArtifactId().substring( "scope-".length() );
-
+
try
{
artifact.setFile( ProjectClasspathTest.getFileForClasspathResource( ProjectClasspathTest.dir + "transitive-" + scope + "-dep.xml" ) );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
index 1e40631..339c81f 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
@@ -63,16 +63,16 @@ public class ProjectInheritanceTest
throws Exception
{
File localRepo = getLocalRepositoryPath();
-
+
System.out.println( "Local repository is at: " + localRepo.getAbsolutePath() );
-
+
File pom0 = new File( localRepo, "p0/pom.xml" );
File pom1 = new File( pom0.getParentFile(), "p1/pom.xml" );
File pom2 = new File( pom1.getParentFile(), "p2/pom.xml" );
File pom3 = new File( pom2.getParentFile(), "p3/pom.xml" );
File pom4 = new File( pom3.getParentFile(), "p4/pom.xml" );
File pom5 = new File( pom4.getParentFile(), "p5/pom.xml" );
-
+
System.out.println( "Location of project-4's POM: " + pom4.getPath() );
// load everything...
@@ -114,22 +114,22 @@ public class ProjectInheritanceTest
// ----------------------------------------------------------------------
assertEquals( "4.0.0", project4.getModelVersion() );
-
+
Build build = project4.getBuild();
List<Plugin> plugins = build.getPlugins();
-
+
Map validPluginCounts = new HashMap();
-
+
String testPluginArtifactId = "maven-compiler-plugin";
-
+
// this is the plugin we're looking for.
validPluginCounts.put( testPluginArtifactId, 0 );
-
+
// these are injected if -DperformRelease=true
validPluginCounts.put( "maven-deploy-plugin", 0 );
validPluginCounts.put( "maven-javadoc-plugin", 0 );
validPluginCounts.put( "maven-source-plugin", 0 );
-
+
Plugin testPlugin = null;
for ( Plugin plugin : plugins )
@@ -161,9 +161,9 @@ public class ProjectInheritanceTest
}
}
}
-
+
List executions = testPlugin.getExecutions();
-
+
assertEquals( 1, executions.size() );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
index ba6a4a6..fb32f0f 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
@@ -1,24 +1,24 @@
package org.apache.maven.repository;
-/*
- * 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.
- */
-
+/*
+ * 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.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.codehaus.plexus.PlexusTestCase;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
index d7d196e..77a6bae 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
@@ -39,7 +39,7 @@ public class LegacyRepositoryLayout
{
return "legacy";
}
-
+
public String pathOf( Artifact artifact )
{
ArtifactHandler artifactHandler = artifact.getArtifactHandler();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
index 9dc7cc0..96af590 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
@@ -6,9 +6,9 @@ package org.apache.maven.repository;
* 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
@@ -41,7 +41,7 @@ import org.eclipse.aether.repository.LocalRepository;
/**
* Tests {@link LegacyRepositorySystem}.
- *
+ *
* @author Benjamin Bentmann
*/
public class LegacyRepositorySystemTest
@@ -76,7 +76,7 @@ public class LegacyRepositorySystemTest
resolutionErrorHandler = null;
super.tearDown();
}
-
+
protected List<ArtifactRepository> getRemoteRepositories()
throws Exception
{
@@ -116,14 +116,14 @@ public class LegacyRepositorySystemTest
d.setVersion( "0.1" );
d.setScope( Artifact.SCOPE_COMPILE );
Artifact artifact = repositorySystem.createDependencyArtifact( d );
-
+
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
.setArtifact( artifact )
.setResolveRoot( true )
.setResolveTransitively( true )
.setRemoteRepositories( getRemoteRepositories() )
- .setLocalRepository( getLocalRepository() );
-
+ .setLocalRepository( getLocalRepository() );
+
DefaultRepositorySystemSession session = new DefaultRepositorySystemSession();
LocalRepository localRepo = new LocalRepository( request.getLocalRepository().getBasedir() );
session.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( session, localRepo ) );
@@ -132,19 +132,19 @@ public class LegacyRepositorySystemTest
new DefaultMavenExecutionResult() ) );
ArtifactResolutionResult result = repositorySystem.resolve( request );
- resolutionErrorHandler.throwErrors( request, result );
+ resolutionErrorHandler.throwErrors( request, result );
assertEquals( 2, result.getArtifacts().size() );
-
+
+ //
+ // System scoped version which should
//
- // System scoped version which should
- //
d.setScope( Artifact.SCOPE_SYSTEM );
File file = new File( getBasedir(), "src/test/repository-system/maven-core-2.1.0.jar" );
assertTrue( file.exists() );
d.setSystemPath( file.getCanonicalPath() );
-
+
artifact = repositorySystem.createDependencyArtifact( d );
-
+
//
// The request has not set any local or remote repositories as the system scoped dependency being resolved should only
// give us the dependency off the disk and nothing more.
@@ -153,19 +153,19 @@ public class LegacyRepositorySystemTest
.setArtifact( artifact )
.setResolveRoot( true )
.setResolveTransitively( true );
-
+
result = repositorySystem.resolve( request );
- resolutionErrorHandler.throwErrors( request, result );
- assertEquals( 1, result.getArtifacts().size() );
+ resolutionErrorHandler.throwErrors( request, result );
+ assertEquals( 1, result.getArtifacts().size() );
//
// Put in a bogus file to make sure missing files cause the resolution to fail.
- //
+ //
file = new File( getBasedir(), "src/test/repository-system/maven-monkey-2.1.0.jar" );
assertFalse( file.exists() );
d.setSystemPath( file.getCanonicalPath() );
artifact = repositorySystem.createDependencyArtifact( d );
-
+
//
// The request has not set any local or remote repositories as the system scoped dependency being resolved should only
// give us the dependency off the disk and nothing more.
@@ -174,7 +174,7 @@ public class LegacyRepositorySystemTest
.setArtifact( artifact )
.setResolveRoot( true )
.setResolveTransitively( true );
-
+
try
{
result = repositorySystem.resolve( request );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
index c5ec6f6..1c5f34c 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
@@ -59,7 +59,7 @@ public class DefaultUpdateCheckManagerTest
ArtifactRepository localRepository = localRepository();
Artifact a = createArtifact( "a", "0.0.1-SNAPSHOT" );
- File file = new File( localRepository.getBasedir(),
+ File file = new File( localRepository.getBasedir(),
localRepository.pathOf( a ) );
file.delete();
a.setFile( file );
@@ -77,7 +77,7 @@ public class DefaultUpdateCheckManagerTest
assertNull( updateCheckManager.readLastUpdated( touchFile,
updateCheckManager.getRepositoryKey( remoteRepository ) ) );
-
+
assertFalse( updateCheckManager.getTouchfile( a ).exists() );
}
@@ -89,7 +89,7 @@ public class DefaultUpdateCheckManagerTest
ArtifactRepository localRepository = localRepository();
Artifact a = createArtifact( "a", "0.0.1-SNAPSHOT" );
- File file = new File( localRepository.getBasedir(),
+ File file = new File( localRepository.getBasedir(),
localRepository.pathOf( a ) );
file.delete();
a.setFile( file );
@@ -115,7 +115,7 @@ public class DefaultUpdateCheckManagerTest
ArtifactRepository localRepository = localRepository();
Artifact a = createArtifact( "a", "0.0.1", "pom" );
- File file = new File( localRepository.getBasedir(),
+ File file = new File( localRepository.getBasedir(),
localRepository.pathOf( a ) );
file.delete();
a.setFile( file );
@@ -133,7 +133,7 @@ public class DefaultUpdateCheckManagerTest
assertNull( updateCheckManager.readLastUpdated( touchFile,
updateCheckManager.getRepositoryKey( remoteRepository ) ) );
-
+
assertFalse( updateCheckManager.getTouchfile( a ).exists() );
}
@@ -145,7 +145,7 @@ public class DefaultUpdateCheckManagerTest
ArtifactRepository localRepository = localRepository();
Artifact a = createArtifact( "a", "0.0.1", "pom" );
- File file = new File( localRepository.getBasedir(),
+ File file = new File( localRepository.getBasedir(),
localRepository.pathOf( a ) );
file.delete();
a.setFile( file );
@@ -223,14 +223,14 @@ public class DefaultUpdateCheckManagerTest
ArtifactRepository localRepository = localRepository();
Artifact a = artifactFactory.createArtifactWithClassifier( "groupdId", "a", "0.0.1-SNAPSHOT", "jar", null );
- File file = new File( localRepository.getBasedir(),
+ File file = new File( localRepository.getBasedir(),
localRepository.pathOf( a ) );
a.setFile( file );
assertEquals( "a-0.0.1-SNAPSHOT.jar.lastUpdated", updateCheckManager.getTouchfile( a ).getName() );
a = artifactFactory.createArtifactWithClassifier( "groupdId", "a", "0.0.1-SNAPSHOT", "jar", "classifier" );
- file = new File( localRepository.getBasedir(),
+ file = new File( localRepository.getBasedir(),
localRepository.pathOf( a ) );
a.setFile( file );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
index 01ab3b9..f34c05f 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
@@ -6,9 +6,9 @@ package org.apache.maven.repository.legacy;
* 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
@@ -28,7 +28,7 @@ import org.codehaus.plexus.PlexusTestCase;
/**
* Tests {@link LegacyRepositorySystem}.
- *
+ *
* @author Benjamin Bentmann
*/
public class LegacyRepositorySystemTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
index f5f561e..d0325db 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
@@ -42,7 +42,7 @@ public class StringWagon
extends StreamWagon
{
private Map<String, String> expectedContent = new HashMap<String, String>();
-
+
public void addExpectedContent( String resourceName, String expectedContent )
{
this.expectedContent.put( resourceName, expectedContent );
@@ -66,7 +66,7 @@ public class StringWagon
Resource resource = inputData.getResource();
String content = expectedContent.get( resource.getName() );
-
+
if ( content != null )
{
resource.setContentLength( content.length() );
@@ -102,6 +102,6 @@ public class StringWagon
public void clearExpectedContent()
{
- expectedContent.clear();
+ expectedContent.clear();
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
index ddfa8bb..601eefa 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
@@ -24,7 +24,7 @@ import org.codehaus.plexus.component.annotations.Component;
/**
* Wagon for testing, for protocol <code>a</code>
- *
+ *
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
index 581bcad..ecaef64 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
@@ -24,7 +24,7 @@ import org.codehaus.plexus.component.annotations.Component;
/**
* Wagon for testing, for protocols <code>b1</code> and <code>b2</code>
- *
+ *
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
index 2908eee..29316ed 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
@@ -24,7 +24,7 @@ import org.codehaus.plexus.component.annotations.Component;
/**
* Wagon for testing, for protocol <code>c</code>
- *
+ *
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java
index 9a28b9b..c516360 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java
@@ -23,7 +23,7 @@ import org.apache.maven.wagon.providers.file.FileWagon;
/**
* Mock of a Wagon for testing
- *
+ *
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
*/
public class WagonMock
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
index b02dacd..bfab0d2 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
@@ -36,11 +36,11 @@ public abstract class AbstractConflictResolverTest
extends PlexusTestCase
{
// constants --------------------------------------------------------------
-
+
private static final String GROUP_ID = "test";
-
+
// fields -----------------------------------------------------------------
-
+
protected Artifact a1;
protected Artifact a2;
@@ -48,21 +48,21 @@ public abstract class AbstractConflictResolverTest
protected Artifact b1;
private final String roleHint;
-
+
private ArtifactFactory artifactFactory;
private ConflictResolver conflictResolver;
-
+
// constructors -----------------------------------------------------------
-
+
public AbstractConflictResolverTest( String roleHint )
throws Exception
{
this.roleHint = roleHint;
}
-
+
// TestCase methods -------------------------------------------------------
-
+
/*
* @see junit.framework.TestCase#setUp()
*/
@@ -72,12 +72,12 @@ public abstract class AbstractConflictResolverTest
artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
conflictResolver = (ConflictResolver) lookup( ConflictResolver.ROLE, roleHint );
-
+
a1 = createArtifact( "a", "1.0" );
a2 = createArtifact( "a", "2.0" );
b1 = createArtifact( "b", "1.0" );
}
-
+
/*
* @see org.codehaus.plexus.PlexusTestCase#tearDown()
*/
@@ -86,24 +86,24 @@ public abstract class AbstractConflictResolverTest
a1 = null;
a2 = null;
b1 = null;
-
+
artifactFactory = null;
conflictResolver = null;
-
+
super.tearDown();
}
-
+
// protected methods ------------------------------------------------------
-
+
protected ConflictResolver getConflictResolver()
{
return conflictResolver;
}
-
+
protected void assertResolveConflict( ResolutionNode expectedNode, ResolutionNode actualNode1, ResolutionNode actualNode2 )
{
ResolutionNode resolvedNode = getConflictResolver().resolveConflict( actualNode1, actualNode2 );
-
+
assertNotNull( "Expected resolvable", resolvedNode );
assertEquals( "Resolution node", expectedNode, resolvedNode );
}
@@ -111,7 +111,7 @@ public abstract class AbstractConflictResolverTest
protected void assertUnresolvableConflict( ResolutionNode actualNode1, ResolutionNode actualNode2 )
{
ResolutionNode resolvedNode = getConflictResolver().resolveConflict( actualNode1, actualNode2 );
-
+
assertNull( "Expected unresolvable", resolvedNode );
}
@@ -136,7 +136,7 @@ public abstract class AbstractConflictResolverTest
throws InvalidVersionSpecificationException
{
VersionRange versionRange = VersionRange.createFromVersionSpec( version );
-
+
return artifactFactory.createDependencyArtifact( GROUP_ID, id, versionRange, "jar", null, scope,
inheritedScope, optional );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
index d4a48ad..96e283d 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
@@ -34,13 +34,13 @@ public class FarthestConflictResolverTest
extends AbstractConflictResolverTest
{
// constructors -----------------------------------------------------------
-
+
public FarthestConflictResolverTest()
throws Exception
{
super("farthest");
}
-
+
// tests ------------------------------------------------------------------
/**
@@ -55,7 +55,7 @@ public class FarthestConflictResolverTest
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n );
-
+
assertResolveConflict( a2n, a1n, a2n );
}
@@ -71,7 +71,7 @@ public class FarthestConflictResolverTest
ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n );
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a2n, a2n, a1n );
}
@@ -86,7 +86,7 @@ public class FarthestConflictResolverTest
{
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a1n, a1n, a2n );
}
@@ -101,7 +101,7 @@ public class FarthestConflictResolverTest
{
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST );
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a2n, a2n, a1n );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
index cdf1812..0c7b035 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
@@ -34,13 +34,13 @@ public class NearestConflictResolverTest
extends AbstractConflictResolverTest
{
// constructors -----------------------------------------------------------
-
+
public NearestConflictResolverTest()
throws Exception
{
super("nearest");
}
-
+
// tests ------------------------------------------------------------------
/**
@@ -55,7 +55,7 @@ public class NearestConflictResolverTest
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n );
-
+
assertResolveConflict( a1n, a1n, a2n );
}
@@ -71,7 +71,7 @@ public class NearestConflictResolverTest
ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n );
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a1n, a2n, a1n );
}
@@ -86,7 +86,7 @@ public class NearestConflictResolverTest
{
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a1n, a1n, a2n );
}
@@ -101,7 +101,7 @@ public class NearestConflictResolverTest
{
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST );
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a2n, a2n, a1n );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
index bea73db..68d19d6 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
@@ -34,13 +34,13 @@ public class NewestConflictResolverTest
extends AbstractConflictResolverTest
{
// constructors -----------------------------------------------------------
-
+
public NewestConflictResolverTest()
throws Exception
{
super("newest");
}
-
+
// tests ------------------------------------------------------------------
/**
@@ -55,7 +55,7 @@ public class NewestConflictResolverTest
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n );
-
+
assertResolveConflict( a2n, a1n, a2n );
}
@@ -71,7 +71,7 @@ public class NewestConflictResolverTest
ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n );
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a2n, a2n, a1n );
}
@@ -86,7 +86,7 @@ public class NewestConflictResolverTest
{
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a2n, a1n, a2n );
}
@@ -101,7 +101,7 @@ public class NewestConflictResolverTest
{
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST );
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a2n, a2n, a1n );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
index bf2b003..6b06d34 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
@@ -34,13 +34,13 @@ public class OldestConflictResolverTest
extends AbstractConflictResolverTest
{
// constructors -----------------------------------------------------------
-
+
public OldestConflictResolverTest()
throws Exception
{
super("oldest");
}
-
+
// tests ------------------------------------------------------------------
/**
@@ -55,7 +55,7 @@ public class OldestConflictResolverTest
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n );
-
+
assertResolveConflict( a1n, a1n, a2n );
}
@@ -71,7 +71,7 @@ public class OldestConflictResolverTest
ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n );
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a1n, a2n, a1n );
}
@@ -86,7 +86,7 @@ public class OldestConflictResolverTest
{
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a1n, a1n, a2n );
}
@@ -101,7 +101,7 @@ public class OldestConflictResolverTest
{
ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST );
ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST );
-
+
assertResolveConflict( a1n, a2n, a1n );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
index e4edb3c..4f40516 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
@@ -27,7 +27,7 @@ import org.codehaus.plexus.PlexusTestCase;
/**
*
* @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
- *
+ *
*/
public class DefaultClasspathTransformationTest
@@ -53,7 +53,7 @@ extends PlexusTestCase
* v2
* v1<
* v3-v4
- *
+ *
*/
v1 = graph.addVertex(new ArtifactMetadata("g","a1","1.0"));
graph.setEntry(v1);
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
index 990e1b8..31832c3 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
@@ -22,7 +22,7 @@ import org.codehaus.plexus.PlexusTestCase;
/**
*
* @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
- *
+ *
*/
public class DefaultGraphConflictResolutionPolicyTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
index d195567..4fba8f5 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
@@ -27,7 +27,7 @@ import org.codehaus.plexus.logging.Logger;
/**
*
* @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
- *
+ *
*/
public class DefaultGraphConflictResolverTest
@@ -54,7 +54,7 @@ extends PlexusTestCase
* v2
* v1<
* v3-v4
- *
+ *
*/
graph = new MetadataGraph( 4, 3 );
v1 = graph.addVertex(new ArtifactMetadata("g","a1","1.0"));
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
index 15a247e..dd9a900 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
@@ -40,7 +40,7 @@ public class TestMetadataSource
{
@Requirement
private ArtifactFactory factory;
-
+
public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException
{
@@ -59,7 +59,7 @@ public class TestMetadataSource
throw new ArtifactMetadataRetrievalException( "Error retrieving metadata", e, a );
}
}
-
+
if ( "i".equals( artifact.getArtifactId() ) )
{
Artifact a = null;
@@ -73,7 +73,7 @@ public class TestMetadataSource
throw new ArtifactMetadataRetrievalException( "Error retrieving metadata", e, a );
}
}
-
+
return new ResolutionGroup( artifact, dependencies, remoteRepositories );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml
index c979956..15115cb 100644
--- a/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml
+++ b/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>p1</artifactId>
<packaging>jar</packaging>
-
+
<build>
<plugins>
<plugin>
@@ -16,7 +16,7 @@
<executions>
<execution>
<id>normal</id>
-
+
<goals>
<goal>compile</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml
index 5435661..4f2e642 100644
--- a/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml
+++ b/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml
@@ -4,7 +4,7 @@
<artifactId>p0</artifactId>
<packaging>pom</packaging>
<version>1.0</version>
-
+
<build>
<plugins>
<plugin>
@@ -13,10 +13,10 @@
<executions>
<execution>
<id>test</id>
-
+
<!-- The key to this test... -->
<inherited>false</inherited>
-
+
<goals>
<goal>compile</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml
index e9ddf0d..736b515 100644
--- a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml
+++ b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml
@@ -7,5 +7,5 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>p1</artifactId>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml
index 97bf7cc..a22df68 100644
--- a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml
+++ b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml
@@ -4,13 +4,13 @@
<artifactId>p0</artifactId>
<packaging>pom</packaging>
<version>1.0</version>
-
+
<scm>
<connection>scm:svn:http://host/p0</connection>
<developerConnection>scm:svn:https://host/p0</developerConnection>
<url>http://host/viewer?path=/p0</url>
</scm>
-
+
<modules>
<module>modules/p1</module>
</modules>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/lifecycle-executor.txt
----------------------------------------------------------------------
diff --git a/maven-core/lifecycle-executor.txt b/maven-core/lifecycle-executor.txt
index 13ac545..41e98bf 100644
--- a/maven-core/lifecycle-executor.txt
+++ b/maven-core/lifecycle-executor.txt
@@ -36,7 +36,7 @@ We need to turn this list of phases into a set of plugin objects that have an xm
.
.
</plugins>
-
+
We need this form so that the model builder can make the first pass at merging. Full merging cannot be done because we don't know what the version of the plugin is yet that the user has requested. For plugins in the default lifecycle they are typically defined in the plugin management section of the parent POM. When the merging is complete we are going to have something that looks like the following:
<plugins>
@@ -57,11 +57,11 @@ We need this form so that the model builder can make the first pass at merging.
.
</plugins>
-Once we have the version of the plugins the appropriate call to the plugin manager can be made to get the MojoDescriptor for the goal that needs to be run. In the MojoDescriptor we are interested in the <configuration/> element and <parameters/> element. From these elements we need to make a component configuration for the MojoExecution. The actual DOM like structure we create is of type PlexusConfiguration and is the type we use with the ComponentConfigurator to initialize fields in a Plexus component. Typically this is done within Plexus with the configuration supplied with component configuration, but in Maven we take configuration values from the POM. So we have to use the ComponentConfigurator outside of Plexus in order to configurure the Maven Mojo which is just a Plexus component. We can use the information from the MojoDescriptor along with the merged configuration information that is now present in the POM to create the complete PlexusConfiguration used to populate values i
n the Maven Mojo.
+Once we have the version of the plugins the appropriate call to the plugin manager can be made to get the MojoDescriptor for the goal that needs to be run. In the MojoDescriptor we are interested in the <configuration/> element and <parameters/> element. From these elements we need to make a component configuration for the MojoExecution. The actual DOM like structure we create is of type PlexusConfiguration and is the type we use with the ComponentConfigurator to initialize fields in a Plexus component. Typically this is done within Plexus with the configuration supplied with component configuration, but in Maven we take configuration values from the POM. So we have to use the ComponentConfigurator outside of Plexus in order to configurure the Maven Mojo which is just a Plexus component. We can use the information from the MojoDescriptor along with the merged configuration information that is now present in the POM to create the complete PlexusConfiguration used to populate values i
n the Maven Mojo.
foreach configuration element:
- if read only and being set squawk
-
+
- find the parameter
- get value from expression or default
- if required and null squawk
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/plugin-manager.txt
----------------------------------------------------------------------
diff --git a/maven-core/plugin-manager.txt b/maven-core/plugin-manager.txt
index 43cccd3..f3fcf8e 100644
--- a/maven-core/plugin-manager.txt
+++ b/maven-core/plugin-manager.txt
@@ -47,50 +47,50 @@ i'l
// - plugins with a dependency the same as the core but different versions, make it fail then fix it
/*
- *
+ *
* h2. Concerns for the plugin manager
- *
+ *
* h3. resolving the dependencies of a plugin - these could be resolved remotely at runtime or, -
* they could be resolved from a local repository - i think we need a simple dependency model here
* that is more mercury related and not Maven related i.e no POMs - workspace resolver - we need
* tools to pre-populate this repository
- *
+ *
* h3. create an isolated classloader
- *
+ *
* h3. lookup the plugin with a configuration
- *
+ *
* h3. execute the plugin
- *
+ *
* h3. plugins may have to deal with particular actions when a plugin is - installed - loaded -
* unloaded - update - uninstalled
- *
+ *
* h3. plugins should be able to have specific metadata for a plugin model and that be translated -
* dependencies - resources - configuration - extension points of plugins
- *
+ *
* For a particular application plugin there will be a declarative descriptor for that plugin type.
- *
+ *
* - nexus - the plugin class - UI to contribute - what JS to hook into the UI - what resources to
* load into the UI - having packed or unpacked plugins, and positioning resources if necessary -
* maven can work out of the classloader, nexus plugins probably couldn't given the js and image
* resources
- *
+ *
* We need to look at Maven, and Nexus as use cases and figure out what each of them needs to be
* able to do
- *
+ *
* - now what is really the difference between this and loading a component in plexus - custom
* classloading capability - remote resolution of dependencies - do we want a model for sharing
* information among plugins, is this more like an extension point - do we need a sort of bus for
* application data - do we need a dictionary for our applications like Apple does. We could easily
* hook into this and this is the model we need to follow - how many of our REST services do not map
* directory to a method in the application interface?
- *
+ *
* - research extension points versus plugins
- *
+ *
* from igor: two plugins A and B, both depend on the same library but use different versions, say
* lib 1.0 and lib 2.0 when debugger hits a breakpoint inside a class from the library, IDE needs to
* know which version of library the class comes from
*/
-
+
This document outlines the concerns of a general plugin manager that would be used in conjunction with any Plexus-based application. The following outlined concerns are an attempt to describe what a plugin manager would need to do for Maven and for Nexus.
h2. Concerns for the plugin manager
@@ -144,8 +144,8 @@ Each application will have its own model for plugins. Much of this model will be
* Configuration metadata and default configuration values
* Extension points that plugins might expose
-h3. The plugin manager may have to deal with particular actions when a plugin is
-
+h3. The plugin manager may have to deal with particular actions when a plugin is
+
* installation
* activation
* update
@@ -158,7 +158,7 @@ We might want to separate between installation and activation, it might be nice
These particular phases in a plugin’s lifecycle can probably be generalized to all plugins so could be something implemented in all plugins. Here we could have the descriptor either point to methods for each of these phases to execute or we could create a lifecycle in Plexus for these phases.
-For a particular application plugin there will be a declarative descriptor for that plugin type.
+For a particular application plugin there will be a declarative descriptor for that plugin type.
h3. Some general notes on Nexus
@@ -168,11 +168,11 @@ The plugin metadata:
* what JS to hook into the UI
* what resources to load into the UI
* having packed or unpacked plugins, and positioning resources if necessary
-* maven can work out of the classloader, nexus plugins probably couldn't given the js and image resources
-
+* maven can work out of the classloader, nexus plugins probably couldn't given the js and image resources
+
h3. Other issues
-We need to look at Maven, and Nexus as use cases and figure out what each of them needs to be able to do
+We need to look at Maven, and Nexus as use cases and figure out what each of them needs to be able to do
* now what is really the difference between this and loading a component in plexus
* do we want a model for sharing information among plugins, is this more like an extension point
@@ -182,4 +182,3 @@ We need to look at Maven, and Nexus as use cases and figure out what each of the
- an example of adding js
- an example of adding a URI
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
index 03db5e6..84b5298 100644
--- a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
+++ b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
@@ -69,7 +69,7 @@ public abstract class AbstractMavenLifecycleParticipant
* code.
*/
public void afterSessionEnd( MavenSession session )
- throws MavenExecutionException
+ throws MavenExecutionException
{
// do nothing
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
index da88508..dda35bd 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
@@ -38,7 +38,7 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
* @todo this should probably be a component with some dynamic control of filtering
*/
@Component( role = ArtifactFilterManager.class )
-public class DefaultArtifactFilterManager
+public class DefaultArtifactFilterManager
implements ArtifactFilterManager
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index fb70bfe..8fc35e8 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -145,7 +145,7 @@ public class DefaultMaven
@Requirement
private SessionScope sessionScope;
-
+
public MavenExecutionResult execute( MavenExecutionRequest request )
{
MavenExecutionResult result;
@@ -176,7 +176,7 @@ public class DefaultMaven
return result;
}
- //
+ //
// 1) Setup initial properties.
//
// 2) Validate local repository directory is accessible.
@@ -208,7 +208,7 @@ public class DefaultMaven
private MavenExecutionResult doExecute( MavenExecutionRequest request )
{
request.setStartTime( new Date() );
-
+
MavenExecutionResult result = new DefaultMavenExecutionResult();
try
@@ -223,14 +223,14 @@ public class DefaultMaven
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) newRepositorySession( request );
MavenSession session = new MavenSession( container, repoSession, request, result );
-
+
//
// We enter the session scope right after the MavenSession creation and before any of the AbstractLifecycleParticipant lookups
// so that @SessionScoped components can be @Injected into AbstractLifecycleParticipants.
- //
+ //
sessionScope.enter();
sessionScope.seed( MavenSession.class, session );
-
+
legacySupport.setSession( session );
try
@@ -285,7 +285,7 @@ public class DefaultMaven
{
return addExceptionToResult( result, e );
}
-
+
WorkspaceReader reactorWorkspace;
try
{
@@ -295,14 +295,14 @@ public class DefaultMaven
{
return addExceptionToResult( result, e );
}
-
+
//
// Desired order of precedence for local artifact repositories
//
// Reactor
// Workspace
// User Local Repository
- //
+ //
repoSession.setWorkspaceReader( ChainedWorkspaceReader.newInstance( reactorWorkspace,
repoSession.getWorkspaceReader() ) );
@@ -380,7 +380,7 @@ public class DefaultMaven
return result;
}
- private void afterSessionEnd( Collection<MavenProject> projects, MavenSession session )
+ private void afterSessionEnd( Collection<MavenProject> projects, MavenSession session )
throws MavenExecutionException
{
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
@@ -641,7 +641,7 @@ public class DefaultMaven
throws ProjectBuildingException
{
MavenExecutionRequest request = session.getRequest();
-
+
request.getProjectBuildingRequest().setRepositorySession( session.getRepositorySession() );
List<MavenProject> projects = new ArrayList<MavenProject>();
@@ -761,7 +761,7 @@ public class DefaultMaven
for ( MavenProject project : projects )
{
- // MNG-1911 / MNG-5572: Building plugins with extensions cannot be part of reactor
+ // MNG-1911 / MNG-5572: Building plugins with extensions cannot be part of reactor
for ( Plugin plugin : project.getBuildPlugins() )
{
if ( plugin.isExtensions() )
@@ -940,7 +940,7 @@ public class DefaultMaven
return result;
}
-
+
private List<MavenProject> trimExcludedProjects( List<MavenProject> projects, MavenExecutionRequest request )
throws MavenExecutionException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java b/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java
index c58749d..b139872 100644
--- a/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java
+++ b/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java
@@ -26,7 +26,7 @@ import java.util.Map;
/**
* Signals a collision of two or more projects with the same g:a:v during a reactor build.
- *
+ *
* @author Benjamin Bentmann
*/
public class DuplicateProjectException
@@ -37,7 +37,7 @@ public class DuplicateProjectException
/**
* Creates a new exception with specified details.
- *
+ *
* @param message The message text, may be {@code null}.
* @param collisions The POM files of the projects that collided, indexed by their g:a:v, may be {@code null}.
*/
@@ -50,7 +50,7 @@ public class DuplicateProjectException
/**
* Gets the POM files of the projects that collided.
- *
+ *
* @return The POM files of the projects that collided, indexed by their g:a:v, never {@code null}.
*/
public Map<String, List<File>> getCollisions()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java
index 8d748c9..e5db6bd 100644
--- a/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java
@@ -30,7 +30,7 @@ import org.apache.maven.project.MavenProject;
/**
* Provides a sub view of another dependency graph.
- *
+ *
* @author Benjamin Bentmann
*/
class FilteredProjectDependencyGraph
@@ -45,7 +45,7 @@ class FilteredProjectDependencyGraph
/**
* Creates a new project dependency graph from the specified graph.
- *
+ *
* @param projectDependencyGraph The project dependency graph to create a sub view from, must not be {@code null}.
* @param whiteList The projects on which the dependency view should focus, must not be {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/InternalErrorException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/InternalErrorException.java b/maven-core/src/main/java/org/apache/maven/InternalErrorException.java
index 1fd7a78..afe92c1 100644
--- a/maven-core/src/main/java/org/apache/maven/InternalErrorException.java
+++ b/maven-core/src/main/java/org/apache/maven/InternalErrorException.java
@@ -21,7 +21,7 @@ package org.apache.maven;
/**
* Signals an internal error in Maven itself, e.g. a programming bug.
- *
+ *
* @author Benjamin Bentmann
*/
public class InternalErrorException
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/Maven.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java b/maven-core/src/main/java/org/apache/maven/Maven.java
index 05fb6ed..8563847 100644
--- a/maven-core/src/main/java/org/apache/maven/Maven.java
+++ b/maven-core/src/main/java/org/apache/maven/Maven.java
@@ -30,5 +30,5 @@ public interface Maven
@Deprecated
String POMv4 = "pom.xml";
- MavenExecutionResult execute( MavenExecutionRequest request );
+ MavenExecutionResult execute( MavenExecutionRequest request );
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/ReactorReader.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
index de31eb8..3aca28d 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -43,7 +43,7 @@ import org.eclipse.aether.util.artifact.ArtifactIdUtils;
/**
* An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either
* as packaged jar if it has been built, or only compile output directory if packaging hasn't happened yet.
- *
+ *
* @author Jason van Zyl
*/
@Named( ReactorReader.HINT )
@@ -52,7 +52,7 @@ class ReactorReader
implements WorkspaceReader
{
public static final String HINT = "reactor";
-
+
private static final Collection<String> COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" );
private Map<String, MavenProject> projectsByGAV;
@@ -193,7 +193,7 @@ class ReactorReader
/**
* Tries to resolve the specified artifact from the artifacts of the given project.
- *
+ *
* @param project The project to try to resolve the artifact from, must not be <code>null</code>.
* @param requestedArtifact The artifact to resolve, must not be <code>null</code>.
* @return The matching artifact from the project or <code>null</code> if not found. Note that this
@@ -234,7 +234,7 @@ class ReactorReader
/**
* Determines whether the specified artifact refers to test classes.
- *
+ *
* @param artifact The artifact to check, must not be {@code null}.
* @return {@code true} if the artifact refers to test classes, {@code false} otherwise.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 9190c0c..d7fd88e 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -49,7 +49,7 @@ import org.eclipse.aether.util.repository.AuthenticationBuilder;
/**
* <strong>Warning:</strong> This is an internal utility class that is only public for technical reasons, it is not part
* of the public API. In particular, this class can be changed or deleted without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public class RepositoryUtils
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/SessionScoped.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/SessionScoped.java b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
index 3a1692f..f44ddbf 100644
--- a/maven-core/src/main/java/org/apache/maven/SessionScoped.java
+++ b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
@@ -29,7 +29,7 @@ import com.google.inject.ScopeAnnotation;
/**
* Indicates that annotated component should be instantiated before session starts and discarded after session execution completes.
- *
+ *
* @author Jason van Zyl
* @since 3.2.0
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
index 16cdeff..6b18789 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
@@ -27,7 +27,7 @@ import org.apache.maven.project.MavenProject;
/**
* Collects basic settings to access the repository system.
- *
+ *
* @author Benjamin Bentmann
*/
public class DefaultRepositoryRequest
@@ -52,7 +52,7 @@ public class DefaultRepositoryRequest
/**
* Creates a shallow copy of the specified repository request.
- *
+ *
* @param repositoryRequest The repository request to copy from, must not be {@code null}.
*/
public DefaultRepositoryRequest( RepositoryRequest repositoryRequest )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
index 159d3e3..f56fb45 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
@@ -47,7 +47,7 @@ import org.eclipse.aether.repository.RemoteRepository;
/**
* <strong>Warning:</strong> This is an internal utility class that is only public for technical reasons, it is not part
* of the public API. In particular, this class can be changed or deleted without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public class LegacyLocalRepositoryManager
[07/11] maven git commit: Trimmed trailing whitespace
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 9a65b7f..2289465 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -227,7 +227,7 @@ public class MavenProject
/**
* Returns the project corresponding to a declared parent.
- *
+ *
* @return the parent, or null if no parent is declared or there was an error building it
*/
public MavenProject getParent()
@@ -690,7 +690,7 @@ public class MavenProject
* All dependencies that this project has, including transitive ones. Contents are lazily populated, so depending on
* what phases have run dependencies in some scopes won't be included. eg. if only compile phase has run,
* dependencies with scope test won't be included.
- *
+ *
* @return {@link Set} < {@link Artifact} >
* @see #getDependencyArtifacts() to get only direct dependencies
*/
@@ -894,7 +894,7 @@ public class MavenProject
* {@code settings.xml}. The profile identifiers are grouped by the identifier of their source, e.g.
* {@code <groupId>:<artifactId>:<version>} for a POM profile or {@code external} for profiles from the
* {@code settings.xml}.
- *
+ *
* @return The identifiers of all injected profiles, indexed by the source from which the profiles originated, never
* {@code null}.
*/
@@ -909,7 +909,7 @@ public class MavenProject
* 3.0.x. Historically, it logged and ignored a second addition of the same g/a/v/c/t. Now it replaces the file for
* the artifact, so that plugins (e.g. shade) can change the pathname of the file for a particular set of
* coordinates.
- *
+ *
* @param artifact the artifact to add or replace.
* @throws DuplicateArtifactAttachmentException
*/
@@ -986,7 +986,7 @@ public class MavenProject
/**
* Direct dependencies that this project has.
- *
+ *
* @return {@link Set} < {@link Artifact} >
* @see #getArtifacts() to get all transitive dependencies
*/
@@ -1352,7 +1352,7 @@ public class MavenProject
* Sets the project's class realm. <strong>Warning:</strong> This is an internal utility method that is only public
* for technical reasons, it is not part of the public API. In particular, this method can be changed or deleted
* without prior notice and must not be used by plugins.
- *
+ *
* @param classRealm The class realm hosting the build extensions of this project, may be {@code null}.
*/
public void setClassRealm( ClassRealm classRealm )
@@ -1365,7 +1365,7 @@ public class MavenProject
* <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not
* part of the public API. In particular, this method can be changed or deleted without prior notice and must not be
* used by plugins.
- *
+ *
* @return The project's class realm or {@code null}.
*/
public ClassRealm getClassRealm()
@@ -1377,7 +1377,7 @@ public class MavenProject
* Sets the artifact filter used to exclude shared extension artifacts from plugin realms. <strong>Warning:</strong>
* This is an internal utility method that is only public for technical reasons, it is not part of the public API.
* In particular, this method can be changed or deleted without prior notice and must not be used by plugins.
- *
+ *
* @param extensionDependencyFilter The dependency filter to apply to plugins, may be {@code null}.
*/
public void setExtensionDependencyFilter( DependencyFilter extensionDependencyFilter )
@@ -1390,7 +1390,7 @@ public class MavenProject
* <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not
* part of the public API. In particular, this method can be changed or deleted without prior notice and must not be
* used by plugins.
- *
+ *
* @return The dependency filter or {@code null}.
*/
public DependencyFilter getExtensionDependencyFilter()
@@ -1403,7 +1403,7 @@ public class MavenProject
* <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not
* part of the public API. In particular, this method can be changed or deleted without prior notice and must not be
* used by plugins.
- *
+ *
* @param artifacts The set of artifacts, may be {@code null}.
*/
public void setResolvedArtifacts( Set<Artifact> artifacts )
@@ -1418,7 +1418,7 @@ public class MavenProject
* <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not
* part of the public API. In particular, this method can be changed or deleted without prior notice and must not be
* used by plugins.
- *
+ *
* @param artifactFilter The artifact filter, may be {@code null} to exclude all artifacts.
*/
public void setArtifactFilter( ArtifactFilter artifactFilter )
@@ -1432,7 +1432,7 @@ public class MavenProject
* <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not
* part of the public API. In particular, this method can be changed or deleted without prior notice and must not be
* used by plugins.
- *
+ *
* @param phase The phase to check for, must not be {@code null}.
* @return {@code true} if the phase has been seen.
*/
@@ -1445,7 +1445,7 @@ public class MavenProject
* <strong>Warning:</strong> This is an internal utility method that is only public for technical reasons, it is not
* part of the public API. In particular, this method can be changed or deleted without prior notice and must not be
* used by plugins.
- *
+ *
* @param lifecyclePhase The lifecycle phase to add, must not be {@code null}.
*/
public void addLifecyclePhase( String lifecyclePhase )
@@ -1523,8 +1523,8 @@ public class MavenProject
}
return moduleAdjustments.get( module );
- }
-
+ }
+
@Deprecated
public Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, String inheritedScope, ArtifactFilter filter )
throws InvalidDependencyVersionException
@@ -1688,8 +1688,8 @@ public class MavenProject
}
}
return list;
- }
-
+ }
+
@Deprecated
public List<Artifact> getRuntimeArtifacts()
{
@@ -1706,8 +1706,8 @@ public class MavenProject
}
}
return list;
- }
-
+ }
+
@Deprecated
public List<String> getSystemClasspathElements()
throws DependencyResolutionRequiredException
@@ -1944,7 +1944,7 @@ public class MavenProject
/**
* Gets the project building request from which this project instance was created. <strong>Warning:</strong> This is
* an utility method that is meant to assist integrators of Maven, it must not be used by Maven plugins.
- *
+ *
* @return The project building request or {@code null}.
* @since 2.1
*/
@@ -1957,7 +1957,7 @@ public class MavenProject
/**
* Sets the project building request from which this project instance was created. <strong>Warning:</strong> This is
* an utility method that is meant to assist integrators of Maven, it must not be used by Maven plugins.
- *
+ *
* @param projectBuildingRequest The project building request, may be {@code null}.
* @since 2.1
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
index 70eb5b4..4ac8397 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
@@ -33,7 +33,7 @@ public interface ProjectBuilder
/**
* Builds a project descriptor from the specified POM file.
- *
+ *
* @param projectFile The POM file to build the project from, must not be {@code null}.
* @param request The project building request that holds further parameters, must not be {@code null}.
* @return The result of the project building, never {@code null}.
@@ -44,7 +44,7 @@ public interface ProjectBuilder
/**
* Builds a project descriptor for the specified artifact.
- *
+ *
* @param projectArtifact The POM artifact to build the project from, must not be {@code null}.
* @param request The project building request that holds further parameters, must not be {@code null}.
* @return The result of the project building, never {@code null}.
@@ -55,7 +55,7 @@ public interface ProjectBuilder
/**
* Builds a project descriptor for the specified artifact.
- *
+ *
* @param projectArtifact The POM artifact to build the project from, must not be {@code null}.
* @param allowStubModel A flag controlling the case of a missing POM artifact. If {@code true} and the specified
* POM artifact does not exist, a simple stub model will be returned. If {@code false}, an exception will
@@ -69,12 +69,12 @@ public interface ProjectBuilder
/**
* Builds a project descriptor for the specified model source.
- *
+ *
* @param modelSource The source of the model to built the project descriptor from, must not be {@code null}.
* @param request The project building request that holds further parameters, must not be {@code null}.
* @return The result of the project building, never {@code null}.
* @throws ProjectBuildingException If the project descriptor could not be successfully built.
- *
+ *
* @see org.apache.maven.model.building.ModelSource2
*/
ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest request )
@@ -82,7 +82,7 @@ public interface ProjectBuilder
/**
* Builds the projects for the specified POM files and optionally their children.
- *
+ *
* @param pomFiles The POM files to build, must not be {@code null}.
* @param recursive {@code true} to recursively build sub modules referenced by the POM files, {@code false} to
* build only the specified POM files.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
index 32818af..0380278 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
@@ -31,7 +31,7 @@ public interface ProjectBuildingRequest
{
ProjectBuildingRequest setLocalRepository( ArtifactRepository localRepository );
-
+
ArtifactRepository getLocalRepository();
ProjectBuildingRequest setRemoteRepositories( List<ArtifactRepository> remoteRepositories );
@@ -45,7 +45,7 @@ public interface ProjectBuildingRequest
/**
* Sets the system properties to use for interpolation and profile activation. The system properties are collected
* from the runtime environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @param systemProperties The system properties, may be {@code null}.
* @return This request, never {@code null}.
*/
@@ -54,7 +54,7 @@ public interface ProjectBuildingRequest
/**
* Gets the system properties to use for interpolation and profile activation. The system properties are collected
* from the runtime environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @return The system properties, never {@code null}.
*/
Properties getSystemProperties();
@@ -63,7 +63,7 @@ public interface ProjectBuildingRequest
* Sets the user properties to use for interpolation and profile activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @param userProperties The user properties, may be {@code null}.
* @return This request, never {@code null}.
*/
@@ -73,7 +73,7 @@ public interface ProjectBuildingRequest
* Gets the user properties to use for interpolation and profile activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @return The user properties, never {@code null}.
*/
Properties getUserProperties();
@@ -92,7 +92,7 @@ public interface ProjectBuildingRequest
/**
* Controls the level of validation to perform on processed models. By default, models are validated in strict mode.
- *
+ *
* @param validationLevel The level of validation to perform on processed models, e.g.
* {@link org.apache.maven.model.building.ModelBuildingRequest#VALIDATION_LEVEL_STRICT}.
* @return This configuration, never {@code null}.
@@ -101,47 +101,47 @@ public interface ProjectBuildingRequest
/**
* Gets the level of validation to perform on processed models.
- *
+ *
* @return The level of validation to perform on processed models.
*/
int getValidationLevel();
// Profiles
-
+
/**
* Set any active profiles that the {@link ProjectBuilder} should consider while constructing
* a {@link MavenProject}.
*/
void setActiveProfileIds( List<String> activeProfileIds );
-
+
List<String> getActiveProfileIds();
void setInactiveProfileIds( List<String> inactiveProfileIds );
List<String> getInactiveProfileIds();
-
+
/**
* Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom
* configuration like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse.
- *
+ *
* @param profile
*/
void addProfile( Profile profile );
-
+
void setProfiles( List<Profile> profiles );
-
+
List<Profile> getProfiles();
/**
* Gets the start time of the build.
- *
+ *
* @return The start time of the build or {@code null} if unknown.
*/
Date getBuildStartTime();
/**
* Sets the start time of the build.
- *
+ *
* @param buildStartTime The start time of the build, may be {@code null}.
*/
void setBuildStartTime( Date buildStartTime );
@@ -153,7 +153,7 @@ public interface ProjectBuildingRequest
/**
* Sets the merge mode used to combine repositories declared in the POM with the repositories specified in this
* request.
- *
+ *
* @param mode The repository merge mode, must not be {@code null}.
* @return This request for chaining, never {@code null}.
* @see #setRemoteRepositories(List)
@@ -163,7 +163,7 @@ public interface ProjectBuildingRequest
/**
* Gets the merge mode used to combine repositories declared in the POM with the repositories specified in this
* request
- *
+ *
* @return The merge mode, never {@code null}.
*/
RepositoryMerging getRepositoryMerging();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java
index bf9d265..9a43154 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java
@@ -26,7 +26,7 @@ import org.apache.maven.model.building.ModelProblem;
/**
* Collects the output of the project builder.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ProjectBuildingResult
@@ -36,21 +36,21 @@ public interface ProjectBuildingResult
* Gets the identifier of the project that could not be built. The general format of the identifier is {@code
* <groupId>:<artifactId>:<version>} but some of these coordinates may still be unknown at the point the exception
* is thrown so this information is merely meant to assist the user.
- *
+ *
* @return The identifier of the project or an empty string if not known, never {@code null}.
*/
String getProjectId();
/**
* Gets the POM file from which the project was built.
- *
+ *
* @return The POM file or {@code null} if unknown.
*/
File getPomFile();
/**
* Gets the project that was built.
- *
+ *
* @return The project that was built or {@code null} if an error occurred and this result accompanies a
* {@link ProjectBuildingException}.
*/
@@ -58,14 +58,14 @@ public interface ProjectBuildingResult
/**
* Gets the problems that were encountered during the project building.
- *
+ *
* @return The problems that were encountered during the project building, can be empty but never {@code null}.
*/
List<ModelProblem> getProblems();
/**
* Gets the result of the dependency resolution for the project.
- *
+ *
* @return The result of the dependency resolution for the project or {@code null} if the project dependencies were
* not requested.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java
index 36572c2..539055c 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java
@@ -21,7 +21,7 @@ package org.apache.maven.project;
/**
* Resolves the transitive dependencies of a project.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ProjectDependenciesResolver
@@ -29,7 +29,7 @@ public interface ProjectDependenciesResolver
/**
* Resolves the transitive dependencies of a project.
- *
+ *
* @param request The resolution request holding the parameters, must not be {@code null}.
* @return The resolution result, never {@code null}.
* @throws DependencyResolutionException If any project dependency could not be resolved.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 43609ce..c64dd73 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -52,7 +52,7 @@ import org.eclipse.aether.resolution.VersionRangeResult;
/**
* A model resolver to assist building of projects. This resolver gives priority to those repositories that have been
* declared in the POM.
- *
+ *
* @author Benjamin Bentmann
*/
class ProjectModelResolver
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
index 779d96b..9265b89 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
@@ -28,7 +28,7 @@ import org.eclipse.aether.graph.DependencyFilter;
* Caches project class realms. <strong>Warning:</strong> This is an internal utility interface that is only public for
* technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without
* prior notice.
- *
+ *
* @author Igor Fedorenko
* @author Benjamin Bentmann
*/
@@ -70,7 +70,7 @@ public interface ProjectRealmCache
* Registers the specified cache record for usage with the given project. Integrators can use the information
* collected from this method in combination with a custom cache implementation to dispose unused records from the
* cache.
- *
+ *
* @param project The project that employs the plugin realm, must not be {@code null}.
* @param record The cache record being used for the project, must not be {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
index 63d9ca5..24425da 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
@@ -26,7 +26,7 @@ import org.apache.maven.model.building.ModelCache;
/**
* A simple model cache used to accelerate model building during a reactor build.
- *
+ *
* @author Benjamin Bentmann
*/
class ReactorModelCache
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
index e0e9615..294fccd 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
@@ -26,7 +26,7 @@ import java.util.Map;
/**
* Holds all POM files that are known to the reactor. This allows the project builder to resolve imported POMs from the
* reactor when building another project's effective model.
- *
+ *
* @author Benjamin Bentmann
*/
class ReactorModelPool
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
index d021107..91f665b 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
@@ -26,7 +26,7 @@ import org.codehaus.plexus.component.annotations.Component;
* This realizes the metadata source via the default hint to provide backward-compat with Maven 2.x whose Plexus version
* registered component descriptors twice: once keyed by role+roleHint and once keyed by role only. This effectively
* made the metadata source available with its original role hint ("maven") as well as the default hint.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ArtifactMetadataSource.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index 1750a7b..becd880 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -200,7 +200,7 @@ public class MavenMetadataSource
if ( rel.project == null )
{
- // When this happens we have a Maven 1.x POM, or some invalid POM.
+ // When this happens we have a Maven 1.x POM, or some invalid POM.
// It should have never found its way into Maven 2.x repository but it did.
dependencies = Collections.emptyList();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java b/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
index cdcd545..2c3196f 100644
--- a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
@@ -29,7 +29,7 @@ import org.codehaus.plexus.util.Os;
* Assists the project builder. <strong>Warning:</strong> This is an internal utility class that is only public for
* technical reasons, it is not part of the public API. In particular, this class can be changed or deleted without
* prior notice.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -43,7 +43,7 @@ public class EnvironmentUtils
* env.PATH}. Unlike native environment variables, properties are always case-sensitive. For the sake of
* determinism, the environment variable names will be normalized to upper case on platforms with case-insensitive
* variable lookup.
- *
+ *
* @param props The properties to add the environment variables to, may be {@code null}.
*/
public static void addEnvVars( Properties props )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
index 81489a2..608df2d 100644
--- a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
+++ b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
@@ -28,7 +28,7 @@ public class SystemProperties
{
/**
* Thread-safe System.properties copy implementation.
- *
+ *
* @see http://jira.codehaus.org/browse/MNG-5670
*/
public static void addSystemProperties( Properties props )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
index 885048e..80189e7 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
@@ -339,5 +339,5 @@ public class ArtifactTransferEvent
}
return true;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java
index dd91e7a..8ed081f 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java
@@ -21,7 +21,7 @@ package org.apache.maven.repository;
/**
* Describes a resource being uploaded or downloaded by the repository system.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ArtifactTransferResource
@@ -30,35 +30,35 @@ public interface ArtifactTransferResource
/**
* The base URL of the repository, e.g. "http://repo1.maven.org/maven2/". Unless the URL is unknown, it will be
* terminated by a trailing slash.
- *
+ *
* @return The base URL of the repository or an empty string if unknown, never {@code null}.
*/
String getRepositoryUrl();
/**
* The path of the artifact relative to the repository's base URL.
- *
+ *
* @return The path of the artifact, never {@code null}.
*/
String getName();
/**
* Gets the full URL of the artifact.
- *
+ *
* @return The full URL of the artifact, never {@code null}.
*/
String getUrl();
/**
* The size of the artifact in bytes.
- *
+ *
* @return The of the artifact in bytes or a negative value if unknown.
*/
long getContentLength();
/**
* Gets the timestamp when the transfer of this artifact was started.
- *
+ *
* @return The timestamp when the transfer of this artifact was started.
*/
long getTransferStartTime();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
index 491d575..f47cb4b 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
@@ -185,7 +185,7 @@ public class DelegatingLocalArtifactRepository
{
return false;
}
-
+
DelegatingLocalArtifactRepository other = (DelegatingLocalArtifactRepository) obj;
return eq( buildReactor, other.buildReactor )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
index 7e54487..e33789e 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
@@ -24,10 +24,10 @@ import org.apache.maven.artifact.repository.MavenArtifactRepository;
public abstract class LocalArtifactRepository
extends MavenArtifactRepository
-{
+{
public static final String IDE_WORKSPACE = "ide-workspace";
public abstract Artifact find( Artifact artifact );
- public abstract boolean hasLocalMetadata();
+ public abstract boolean hasLocalMetadata();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java b/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java
index 72c2311..54e4ef4 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java
@@ -23,7 +23,7 @@ import java.io.IOException;
/**
* Signals a failure to store files within the local repository.
- *
+ *
* @author Benjamin Bentmann
*/
public class LocalRepositoryNotAccessibleException
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
index d334f6b..8d1e516 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
@@ -140,7 +140,7 @@ public interface RepositorySystem
void injectProxy( RepositorySystemSession session, List<ArtifactRepository> repositories );
void injectAuthentication( RepositorySystemSession session, List<ArtifactRepository> repositories );
-
+
ArtifactResolutionResult resolve( ArtifactResolutionRequest request );
// Install
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java
index 072baac..67b4080 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java
@@ -27,7 +27,7 @@ import org.apache.maven.artifact.Artifact;
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*/
public class ArtifactMetadataRetrievalException
- extends Exception
+ extends Exception
{
private Artifact artifact;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
index 63627db..93b9d5d 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
@@ -29,7 +29,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
/**
* Forms a request to retrieve artifact metadata.
- *
+ *
* @author Benjamin Bentmann
*/
public class DefaultMetadataResolutionRequest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java
index f0fab77..a652c97 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java
@@ -27,7 +27,7 @@ import org.apache.maven.artifact.repository.RepositoryRequest;
/**
* Forms a request to retrieve artifact metadata.
- *
+ *
* @author Benjamin Bentmann
*/
public interface MetadataResolutionRequest
@@ -36,14 +36,14 @@ public interface MetadataResolutionRequest
/**
* Indicates whether network access to remote repositories has been disabled.
- *
+ *
* @return {@code true} if remote access has been disabled, {@code false} otherwise.
*/
boolean isOffline();
/**
* Enables/disables network access to remote repositories.
- *
+ *
* @param offline {@code true} to disable remote access, {@code false} to allow network access.
* @return This request, never {@code null}.
*/
@@ -51,14 +51,14 @@ public interface MetadataResolutionRequest
/**
* Gets the artifact to resolve metadata for.
- *
+ *
* @return The artifact to resolve metadata for or {@code null} if not set.
*/
Artifact getArtifact();
/**
* Sets the artifact for which to resolve metadata.
- *
+ *
* @param artifact The artifact for which to resolve metadata.
* @return This request, never {@code null}.
*/
@@ -66,14 +66,14 @@ public interface MetadataResolutionRequest
/**
* Gets the local repository to use for the resolution.
- *
+ *
* @return The local repository to use for the resolution or {@code null} if not set.
*/
ArtifactRepository getLocalRepository();
/**
* Sets the local repository to use for the resolution.
- *
+ *
* @param localRepository The local repository to use for the resolution.
* @return This request, never {@code null}.
*/
@@ -81,14 +81,14 @@ public interface MetadataResolutionRequest
/**
* Gets the remote repositories to use for the resolution.
- *
+ *
* @return The remote repositories to use for the resolution, never {@code null}.
*/
List<ArtifactRepository> getRemoteRepositories();
/**
* Sets the remote repositories to use for the resolution.
- *
+ *
* @param remoteRepositories The remote repositories to use for the resolution.
* @return This request, never {@code null}.
*/
@@ -96,14 +96,14 @@ public interface MetadataResolutionRequest
/**
* Determines whether the managed version information should be retrieved.
- *
+ *
* @return {@code true} if the dependency management information should be retrieved, {@code false} otherwise.
*/
boolean isResolveManagedVersions();
/**
* Enables/disables resolution of the dependency manageemnt information.
- *
+ *
* @param resolveManagedVersions {@code true} if the dependency management information should be retrieved, {@code
* false} otherwise.
* @return This request, never {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java b/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java
index 5f5fe47..4e3520d 100644
--- a/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java
+++ b/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java
@@ -21,7 +21,7 @@ package org.apache.maven.rtinfo;
/**
* Provides information about the current Maven runtime.
- *
+ *
* @since 3.0.2
*/
public interface RuntimeInformation
@@ -29,7 +29,7 @@ public interface RuntimeInformation
/**
* Retrieves the current Maven version, for example "3.0.2".
- *
+ *
* @return The current Maven version or an empty string if unknown, never {@code null}.
*/
String getMavenVersion();
@@ -38,7 +38,7 @@ public interface RuntimeInformation
* Checks whether the current Maven runtime matches the specified version range. A version range can either use the
* usual mathematical syntax "[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short form for
* "[2.2.1,)", i.e. denotes the minimum version required.
- *
+ *
* @param versionRange The version range to match the current Maven runtime against, must not be {@code null}.
* @return {@code true} if the current Maven runtime matches the specified version range, {@code false} otherwise.
* @throws IllegalArgumentException If the specified version range is {@code null}, empty or otherwise not a valid
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
index ea8b677..ae62ea2 100644
--- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
+++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
@@ -31,7 +31,7 @@ import com.google.inject.util.Providers;
public class SessionScope
implements Scope
-{
+{
private static final Provider<Object> SEEDED_KEY_PROVIDER = new Provider<Object>()
{
public Object get()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
index 7c39474..733f308 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
@@ -112,17 +112,17 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
{
return false;
}
-
+
if ( this == obj )
{
return true;
}
-
+
if ( !( obj instanceof DefaultToolchain ) )
{
return false;
}
-
+
DefaultToolchain other = (DefaultToolchain) obj;
if ( type == null ? other.type != null : !type.equals( other.type ) )
@@ -132,12 +132,12 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
Properties thisProvides = this.getModel().getProvides();
Properties otherProvides = other.getModel().getProvides();
-
+
if ( thisProvides == null ? otherProvides != null : !thisProvides.equals( otherProvides ) )
{
return false;
}
-
+
return true;
}
@@ -145,7 +145,7 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
public int hashCode()
{
int hashCode = ( type == null ) ? 0 : type.hashCode();
-
+
if ( this.getModel().getProvides() != null )
{
hashCode = 31 * hashCode + this.getModel().getProvides().hashCode();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
index 95fe15f..591afd8 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
@@ -84,7 +84,7 @@ public class DefaultToolchainManager
desc.setArtifactId( PluginDescriptor.getDefaultPluginArtifactId( "toolchains" ) );
MavenProject current = session.getCurrentProject();
-
+
if ( current != null )
{
//TODO: why is this using the context
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
index c6c6ebf..2a71346 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
@@ -21,7 +21,7 @@ package org.apache.maven.toolchain;
/**
* Toolchain interface.
- *
+ *
* @author Milos Kleint
* @author Jason van Zyl
* @since 2.0.9
@@ -31,7 +31,7 @@ public interface Toolchain
/**
* get the type of toolchain.
- *
+ *
* @return the toolchain type
*/
String getType();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
index c1c2aa9..115eede 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
@@ -23,7 +23,7 @@ import org.apache.maven.toolchain.model.ToolchainModel;
/**
* Internal toolchain factory, to prepare toolchains instances.
- *
+ *
* @author mkleint
* @since 2.0.9
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
index 2150a19..249a1a5 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
@@ -24,7 +24,7 @@ import org.apache.maven.execution.MavenSession;
/**
* Public API for a toolchain-aware plugin to get expected toolchain instance.
- *
+ *
* @author mkleint
* @since 2.0.9
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
index a877772..67131ac 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
@@ -24,7 +24,7 @@ import org.apache.maven.execution.MavenSession;
/**
* Component for use by the <code>maven-toolchains-plugin</code> only.
- *
+ *
* @author mkleint
* @since 2.0.9
*/
@@ -33,7 +33,7 @@ public interface ToolchainManagerPrivate
/**
* Retrieves the toolchains of given type from the user settings.
- *
+ *
* @since 3.0 (addition of the <code>MavenSession</code> parameter)
*/
ToolchainPrivate[] getToolchainsForType( String type, MavenSession context )
@@ -41,7 +41,7 @@ public interface ToolchainManagerPrivate
/**
* Stores the toolchain into build context.
- *
+ *
* @since 2.0.9
*/
void storeToolchainToBuildContext( ToolchainPrivate toolchain, MavenSession context );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
index 4d94a13..4bb4052 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
@@ -26,7 +26,7 @@ import org.apache.maven.toolchain.model.PersistedToolchains;
/**
* Builds the toolchains model from a previously configured filesystem path to the toolchains file.
* <strong>Note:</strong> This is an internal component whose interface can change without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ToolchainsBuilder
@@ -34,7 +34,7 @@ public interface ToolchainsBuilder
/**
* Builds the toolchains model from the configured toolchain files.
- *
+ *
* @param userToolchainsFile The path to the toolchains file, may be <code>null</code> to disable parsing.
* @return The toolchains model or <code>null</code> if no toolchain file was configured or the configured file does
* not exist.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java
index 494aaf8..cb14ada 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java
@@ -23,7 +23,7 @@ import org.apache.maven.toolchain.Toolchain;
/**
* JDK toolchain interface.
- *
+ *
* @author Jason van Zyl
* @author Milos Kleint
* @since 2.0.9, renamed from JavaToolChain in 3.2.4
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
index 9b790d8..017caa6 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
@@ -39,7 +39,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
* JDK toolchain factory.
* This is a <code>ToolchainFactory</code> Plexus component registered with
* <code>jdk</code> hint.
- *
+ *
* @author mkleint
* @since 2.0.9, renamed from <code>DefaultJavaToolchainFactory</code> in 3.2.4
*/
@@ -62,7 +62,7 @@ public class JavaToolchainFactory
JavaToolchainImpl jtc = new JavaToolchainImpl( model, logger );
// populate the provides section
- Properties provides = model.getProvides();
+ Properties provides = model.getProvides();
for ( Entry<Object, Object> provide : provides.entrySet() )
{
String key = (String) provide.getKey();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
index 71c2ce8..e65bcb1 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
@@ -29,7 +29,7 @@ import org.codehaus.plexus.util.Os;
/**
* JDK toolchain implementation.
- *
+ *
* @author Milos Kleint
* @since 2.0.9, renamed from DefaultJavaToolChain in 3.2.4
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/mdo/toolchains.mdo
----------------------------------------------------------------------
diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo
index 101d724..2ea3389 100644
--- a/maven-core/src/main/mdo/toolchains.mdo
+++ b/maven-core/src/main/mdo/toolchains.mdo
@@ -61,10 +61,10 @@
<![CDATA[
public static final String USER_LEVEL = "user-level";
public static final String GLOBAL_LEVEL = "global-level";
-
+
private String sourceLevel = USER_LEVEL;
private boolean sourceLevelSet = false;
-
+
public void setSourceLevel( String sourceLevel )
{
if ( sourceLevelSet )
@@ -81,7 +81,7 @@
this.sourceLevelSet = true;
}
}
-
+
public String getSourceLevel()
{
return sourceLevel;
@@ -139,7 +139,7 @@
<p>Toolchain identification information, which will be matched against project requirements.</p>
<p>Actual content structure is completely open: each toolchain type will define its own format and semantics.</p>
<p>In general, this is a properties format: <code><name>value</name></code> with
- predefined properties names.</p>
+ predefined properties names.</p>
]]></description>
</field>
<field>
@@ -168,7 +168,7 @@
<p>Toolchain configuration information, like location or any information that is to be retrieved.</p>
<p>Actual content structure is completely open: each toochain type will define its own format and semantics.</p>
<p>In general, this is a properties format: <code><name>value</name></code> with
- per-toolchain defined properties names.</p>
+ per-toolchain defined properties names.</p>
]]></description>
</field>
</fields>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index 855e9b7..05795be 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
-<!--
+<!--
Artifact handlers are required by the dependency resolution mechanism.
@@ -37,8 +37,8 @@ Artifact handlers are required by the dependency resolution mechanism.
<configuration>
<type>pom</type>
</configuration>
- </component>
-
+ </component>
+
<!--
| JAR
|-->
@@ -52,9 +52,9 @@ Artifact handlers are required by the dependency resolution mechanism.
<addedToClasspath>true</addedToClasspath>
</configuration>
</component>
-
+
<!--
- | EJB
+ | EJB
|-->
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
@@ -90,7 +90,7 @@ Artifact handlers are required by the dependency resolution mechanism.
<language>java</language>
<addedToClasspath>false</addedToClasspath>
</configuration>
- </component>
+ </component>
<!--
| TEST JAR
@@ -141,7 +141,7 @@ Artifact handlers are required by the dependency resolution mechanism.
</component>
<!--
- | JAVADOC JAR
+ | JAVADOC JAR
|-->
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
@@ -157,7 +157,7 @@ Artifact handlers are required by the dependency resolution mechanism.
</component>
<!--
- | WAR
+ | WAR
|-->
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
@@ -172,7 +172,7 @@ Artifact handlers are required by the dependency resolution mechanism.
</component>
<!--
- | EAR
+ | EAR
|-->
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 7149f2d..79d6c52 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
under the License.
-->
-<!--
+<!--
Mappings to default lifecycle, specific for each packaging.
@@ -51,8 +51,8 @@ Mappings to default lifecycle, specific for each packaging.
</lifecycle>
</lifecycles>
</configuration>
- </component>
-
+ </component>
+
<!--
| JAR
|-->
@@ -96,9 +96,9 @@ Mappings to default lifecycle, specific for each packaging.
</lifecycles>
</configuration>
</component>
-
+
<!--
- | EJB
+ | EJB
|-->
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
@@ -139,7 +139,7 @@ Mappings to default lifecycle, specific for each packaging.
</lifecycle>
</lifecycles>
</configuration>
- </component>
+ </component>
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
<role-hint>ejb3</role-hint>
@@ -179,7 +179,7 @@ Mappings to default lifecycle, specific for each packaging.
</lifecycle>
</lifecycles>
</configuration>
- </component>
+ </component>
<!--
| MAVEN PLUGIN
@@ -202,7 +202,7 @@ Mappings to default lifecycle, specific for each packaging.
</compile>
<process-classes>
org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor
- </process-classes>
+ </process-classes>
<process-test-resources>
org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
</process-test-resources>
@@ -227,10 +227,10 @@ Mappings to default lifecycle, specific for each packaging.
</lifecycle>
</lifecycles>
</configuration>
- </component>
+ </component>
<!--
- | WAR
+ | WAR
|-->
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
@@ -271,10 +271,10 @@ Mappings to default lifecycle, specific for each packaging.
</lifecycle>
</lifecycles>
</configuration>
- </component>
+ </component>
<!--
- | EAR
+ | EAR
|-->
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
@@ -350,7 +350,7 @@ Mappings to default lifecycle, specific for each packaging.
</lifecycle>
</lifecycles>
</configuration>
- </component>
+ </component>
<!--
| PAR
@@ -394,6 +394,6 @@ Mappings to default lifecycle, specific for each packaging.
</lifecycle>
</lifecycles>
</configuration>
- </component>
+ </component>
</components>
</component-set>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties b/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties
index 8360f59..36a292b 100644
--- a/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties
+++ b/maven-core/src/main/resources/org/apache/maven/messages/messages_pl.properties
@@ -25,8 +25,8 @@ not.directory.warning={0} nie jest katalogiem.
not.writable.warning=Nie mo\u017cesz zapisa\u0107 {0}.
cannot.create.directory.warning=Nie mo\u017cesz utworzy\u0107 katalogu {0}.
maven.repo.local.unset.warning=maven.repo.local nie jest zdefiniowane.
-single.unsatisfied.dependency.error=Budownaie przerwane z powodu nast\u0119puj\u0105cej niespe\u0142nionej zale\u017cno\u015bci:
-multiple.unsatisfied.dependency.error=Budownaie przerwane z powodu nast\u0119puj\u0105cych niespe\u0142nionych zale\u017cno\u015bci:
+single.unsatisfied.dependency.error=Budownaie przerwane z powodu nast\u0119puj\u0105cej niespe\u0142nionej zale\u017cno\u015bci:
+multiple.unsatisfied.dependency.error=Budownaie przerwane z powodu nast\u0119puj\u0105cych niespe\u0142nionych zale\u017cno\u015bci:
offline.snapshot.warning=Pracujesz w trybie offline, wi\u0119c budowanie b\u0119dzie kontunuowane, cho\u0107 {0} mo\u017ce by\u0107 nieaktualny!
download.message=Pr\u00f3buj\u0119 \u015bci\u0105gn\u0105\u0107 {0}.
plugin.loading.error=Nie uda\u0142o si\u0119 za\u0142adowa\u0107 pluginu {0}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/configuration-management.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/configuration-management.apt b/maven-core/src/site/apt/configuration-management.apt
index 7c70abc..4af0f0b 100644
--- a/maven-core/src/site/apt/configuration-management.apt
+++ b/maven-core/src/site/apt/configuration-management.apt
@@ -23,10 +23,10 @@
Configuration levels in maven
- In maven configuration control happens on four differ levels: the site level, the group level,
+ In maven configuration control happens on four differ levels: the site level, the group level,
the project level, and the user level. On the site level you can configure maven for all users
- utilizing the local installation, the group level allows configuration management for all the projects
- that belong to the same group, the project level allows configuration management at
+ utilizing the local installation, the group level allows configuration management for all the projects
+ that belong to the same group, the project level allows configuration management at
the project level, and the user level allows users to override settings on
the site level, group level and project level.
@@ -81,7 +81,7 @@ ${maven.home}
User configuration which is utilized site wide are controlled with the ${user.home}/.m2/maven.properties.
- User configuration which is utilized at the project level are controlled with the
+ User configuration which is utilized at the project level are controlled with the
${project.home}/maven.properties file.
Plugin configuration
@@ -111,7 +111,7 @@ Unified source directory
in a known location. This would also help with developer setup i.e. getting
new developers up and running. They could run a maven command and have all
their source trees set up in the same way as their collegues.
-
+
here's what I do currently in the netbeans part of the mevenide project to
find the relevant subprojects/sibling projects. I check if the user has
defined the maven.multiproject.includes property in any of his properties
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/default-bindings.apt.vm
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/default-bindings.apt.vm b/maven-core/src/site/apt/default-bindings.apt.vm
index 607f244..02d6c4a 100644
--- a/maven-core/src/site/apt/default-bindings.apt.vm
+++ b/maven-core/src/site/apt/default-bindings.apt.vm
@@ -22,7 +22,7 @@
---
2013-08-02
---
-
+
Plugin Bindings for <<<default>>> Lifecycle Reference
The {{{./lifecycles.html}<<<default>>> lifecycle}} is defined without any plugin binding; plugin bindings are defined separately
@@ -65,4 +65,3 @@ Plugin Bindings for <<<default>>> Lifecycle Reference
* Plugin bindings for <<<par>>> packaging
%{snippet|id=par-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/getting-to-container-configured-mojos.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/getting-to-container-configured-mojos.apt b/maven-core/src/site/apt/getting-to-container-configured-mojos.apt
index 4daa6c1..1c4a487 100644
--- a/maven-core/src/site/apt/getting-to-container-configured-mojos.apt
+++ b/maven-core/src/site/apt/getting-to-container-configured-mojos.apt
@@ -34,9 +34,9 @@ Abstract
If these mojos are to be first-class components, the configuration from these
various sources must be consolidated and injected using the container.
- Currently, mojo configuration is done externally to the container, in the
+ Currently, mojo configuration is done externally to the container, in the
DefaultPluginManager in the maven-core API. In order to get from here to
- there, we need to do several things to add capability to the default
+ there, we need to do several things to add capability to the default
configuration of plexus. This document will detail those changes.
Container Enhancements
@@ -59,7 +59,7 @@ Container Enhancements
components. This wouldn't be a problem, except for the local instance of
DefaultExpressionEvaluator used within. See the above discussion for more
on why this evaluator is bad. We need to provide either an alternative
- implementation under a different roleHint, or else replace the
+ implementation under a different roleHint, or else replace the
BasicComponentConfigurator.
* Other
@@ -95,7 +95,7 @@ Maven Modifications
* MavenSession
- We may need to enable the context injection here, since this will be
+ We may need to enable the context injection here, since this will be
instantiated per-project. If we always inject the same context parameters,
and are careful to inject nulls where things are missing, we should be
able to minimize reconfiguration artifacts injected from basic parameters.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/inheritance.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/inheritance.apt b/maven-core/src/site/apt/inheritance.apt
index 41fa3f9..dbf0e2c 100644
--- a/maven-core/src/site/apt/inheritance.apt
+++ b/maven-core/src/site/apt/inheritance.apt
@@ -30,7 +30,7 @@ Inheritance in Maven
* how parent poms are processed
* the order in which elements in the POM are overridden
-
+
* minimum element-set for a valid project pom
@@ -70,31 +70,31 @@ Extending the POM in the future
In order to anticipate changes in the structure of the POM as new releases of
maven occur, the maven inheritance model must be pinned against a particular
- modelVersion. This is required so that a change from modelVersion 4.0.0 to
- 4.1.0 doesn't cause compatibility problems with users who have not upgraded
+ modelVersion. This is required so that a change from modelVersion 4.0.0 to
+ 4.1.0 doesn't cause compatibility problems with users who have not upgraded
their projects. It also allows for a certain amount of legacy support into the
future. Therefore, we should rename this file from pom.xml in the maven-core
- jarfile to pom-4.0.0.xml (and successive revisions to the base pom made to
+ jarfile to pom-4.0.0.xml (and successive revisions to the base pom made to
accommodate changes in the model will be named accordingly - 4.0.1, 4.0.2, ...).
-
+
Minimum Element-Set for a Project POM
In order to furnish a basic set of information which we need to distinguish one
project from another, maven requires a minimum set of elements to be specified
in each project's pom.xml.
-
+
- [modelVersion] tells maven which version of the object model this project
is compliant with (to support future legacy concerns)
-
+
- [artifactId] tells maven what the artifact name is for this particular
project. Each project should have a distinct artifactId.
-
+
- [version] tells maven what release of this artifact we're trying to produce.
The fact that a project has a distinct pom.xml should indicate a separate
release cycle that is also distinct to that project, so a concrete version
declaration is required.
-
- - [name] tells maven what the user-friendly name of this project is. The name
+
+ - [name] tells maven what the user-friendly name of this project is. The name
element is similar to artifactId in that it is a unique descriptor for
this and only this project, and therefore should be concretely defined.
-
+
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/lifecycles.apt.vm
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/lifecycles.apt.vm b/maven-core/src/site/apt/lifecycles.apt.vm
index 584a77d..3e47bc9 100644
--- a/maven-core/src/site/apt/lifecycles.apt.vm
+++ b/maven-core/src/site/apt/lifecycles.apt.vm
@@ -22,7 +22,7 @@
-----
2013-08-02
-----
-
+
Lifecycles Reference
Maven defines 3 lifecycles in <<<META-INF/plexus/components.xml>>>:
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/offline-mode.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/offline-mode.apt b/maven-core/src/site/apt/offline-mode.apt
index b64e2da..faec70f 100644
--- a/maven-core/src/site/apt/offline-mode.apt
+++ b/maven-core/src/site/apt/offline-mode.apt
@@ -22,21 +22,21 @@
---
08-April-2005
---
-
+
Offline Mode Design
* UPDATE: 18-April-2005
- We cannot take the approach outlined below of detecting which remote
- repositories are "really" offline, since offline mode is more of a behavior,
+ We cannot take the approach outlined below of detecting which remote
+ repositories are "really" offline, since offline mode is more of a behavior,
and this will lead to counter-intuitive results. A different feature may exist
unimplemented, which is to detect when the network is down and provide better
- feedback for that case. However, when offline mode is declared, nothing
+ feedback for that case. However, when offline mode is declared, nothing
earmarked as remote should be accessed, regardless of whether it is actually
a physically local resource.
-
+
NOTE: One side-effect of this design change is that all offline-mode code can
- be isolated to maven-core, maven-plugin-descriptor, and [possibly]
+ be isolated to maven-core, maven-plugin-descriptor, and [possibly]
maven-artifact. Usage of maven-wagon will be determined by an offline-aware
manager.
@@ -64,11 +64,11 @@ Offline Mode Design
* Not all "remote" repositories will fail. Specifically, if the remote
repo uses the file:// protocol, and it doesn't refer to a shared
filesystem, it will continue to be available.
-
+
The question remaining is: Which level of offline mode will we support? It
seems reasonable to assume that users will be able to tell when localhost is
not active (in most cases, localhost should be available, even if the rest of
- the network is not). Therefore, let's concentrate on the state where no
+ the network is not). Therefore, let's concentrate on the state where no
network <beyond localhost> exists, and leave the more extreme state to users
to diagnose and correct as necessary.
@@ -77,31 +77,31 @@ Offline Mode Design
Offline mode is essential for breaking the requirement that m2 operate in a
network-connected environment. It means legitimizing a development environment
in which there is no network connection, and providing a robust m2 service
- offering in such circumstances. Introduction of offline mode allows m2 to
+ offering in such circumstances. Introduction of offline mode allows m2 to
anticipate the inevitable network failures that accompany being physically
disconnected from the network, and adjust it's behavior accordingly.
-
+
It is more than simply understanding that m2 cannot go and check for the
- latest version of some snapshot artifact. If m2 is offline, SCM operations
- cannot succeed; no artifact downloads can take place, regardless of whether
- they are snapshot versions; artifact deployment cannot take place; certain
- types of tests cannot be setup, since the container used to run them cannot be
+ latest version of some snapshot artifact. If m2 is offline, SCM operations
+ cannot succeed; no artifact downloads can take place, regardless of whether
+ they are snapshot versions; artifact deployment cannot take place; certain
+ types of tests cannot be setup, since the container used to run them cannot be
reached or started.
-
+
All of these operations will produce their own unique errors in the absence of
a coordinated offline strategy. In addition, efforts to unite these failing
- behaviors behind a consistent user interface is much, much more difficult if
+ behaviors behind a consistent user interface is much, much more difficult if
the system can't tell whether it has access to the network required by these
operations.
-
+
Offline mode really means anticipating a lack of network connectivity, and as
a result turning off certain services provided by m2 and providing a coherent
way of predicting and reporting when network-related failures will take place.
- It means warning users that since the network is missing, certain features and
- operations will be unavailable, rather than simply waiting for those
- operations to fail, then trying to help users decipher the error messages they
+ It means warning users that since the network is missing, certain features and
+ operations will be unavailable, rather than simply waiting for those
+ operations to fail, then trying to help users decipher the error messages they
get as a result.
-
+
* Implications for Resolution
** Dependency Resolution
@@ -131,7 +131,7 @@ Offline Mode Design
This can be a problem if the tests are more than simple unit tests;
that is, if they require configuration of a server process, and
subsequent testing in-container.
-
+
Since we're only going to concern ourselves with states where localhost is
still active, we only need to worry about this case when the server container
is <<not>> installed on localhost. This allows the popular pattern of starting
@@ -165,11 +165,11 @@ Offline Mode Design
** Maven-Artifact
This is wholly dependent on Maven-Wagon, above.
-
+
We could possibly use a flag on a particular Wagon to see whether it supports
offline mode, and then test to see if the file-based basedir for an aritfact
repository works...if it doesn't work, we can mark that repository offline...
-
+
OTOH, all offline-mode checks can probably be run from Wagon-based APIs.
** Maven-SCM
@@ -178,7 +178,7 @@ Offline Mode Design
having access to the versioning server. Therefore, it is assumed that
any SCM-related activity will be unavailable when m2 is in offline
mode.
-
+
** Maven-Core
We'll examine the different parts of maven-core on a case-by-case
@@ -195,14 +195,14 @@ Offline Mode Design
[true] Online status is required for this mojo to function
correctly.
- [false] <<(Default)>> Either status is acceptable for the mojo to
+ [false] <<(Default)>> Either status is acceptable for the mojo to
execute. It doesn't care.
The majority of mojos will leave the requiresOnline == false,
since online/offline status will be irrelevant, provided they have
access to their required artifacts and other classpath elements. In the case
- of required artifacts and other classpath elemtents, this is assumed by the
- mojo API to be in a correct state, and will be handled by the Wagon
+ of required artifacts and other classpath elemtents, this is assumed by the
+ mojo API to be in a correct state, and will be handled by the Wagon
modifications.
@@ -226,44 +226,44 @@ Offline Mode Design
a offline status parameter which is used when retrieving the specific Wagon.
If <<<offline == true>>>:
-
+
* If the wagon is not bound to "file://", then ignore the request and print
a debug message.
* If the wagon is bound to "file://" then:
Retrieve the file or base-url file to be "downloaded".
-
+
* If the file (or more usefully, the base-url file) exists, proceed.
* If the file (or base-url file) doesn't exist, assume that this location
- is part of a file-share. Ignore the request and print a debug message
+ is part of a file-share. Ignore the request and print a debug message
as above.
** Control over mojos in the lifecycle
- When binding a mojo to the project's lifecycle instance, check the mojo
+ When binding a mojo to the project's lifecycle instance, check the mojo
descriptor's requiredConnectivity field.
* If <<<(offline == true) && (requiresOnline != true)>>>, bind
- the mojo to the lifecycle.
-
+ the mojo to the lifecycle.
+
In this case, the client is <<offline>>, and the mojo does not require
online status.
* If <<<(offline == false) && (requiresOnline == true)>>>, bind
the mojo to the lifecycle.
- In this case, the client is <<online>>, and the mojo either requires
+ In this case, the client is <<online>>, and the mojo either requires
<<online>> status, or else doesn't care.
* Otherwise, don't bind the mojo. Log a debug message to indicate that it is
sensitive the the online state of the application, and that this state is
currently wrong for execution.
- <<NOTE:>> Do we want to fail when we cannot bind a mojo to the lifecycle
- because of offline/online status? That would probably indicate that the user
- was trying to do something they cannot succeed at for now...so we probably
+ <<NOTE:>> Do we want to fail when we cannot bind a mojo to the lifecycle
+ because of offline/online status? That would probably indicate that the user
+ was trying to do something they cannot succeed at for now...so we probably
should throw an exception in this case.
-
+
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/plugin-execution-isolation.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/plugin-execution-isolation.apt b/maven-core/src/site/apt/plugin-execution-isolation.apt
index e64ae26..983a9fd 100644
--- a/maven-core/src/site/apt/plugin-execution-isolation.apt
+++ b/maven-core/src/site/apt/plugin-execution-isolation.apt
@@ -22,7 +22,7 @@
-----
Maven plugin execution isolation
-
+
Maven2 takes advantage of Plexus' ability to execute a component using a
ClassWorlds ClassRealm that is populated with the JAR containing the
component in question and all of its dependencies. Using ClassWorlds
@@ -45,13 +45,13 @@ Maven plugin execution isolation
in a hierachical structure where the resources in the parent realms are
available but the <<realm is searched first before a search is made in
the parent realm>>.
-
+
Plugins are guaranteed to be provided the resources found in
<<<plexus.core>>> and <<<plexus.core.maven>>> realms at run-time if required.
Plugins can state compile-time dependencies on any of the resources found in
the core realms listed above and these dependencies will be included in the
- plugin descriptor that is generated but when running within Maven these
+ plugin descriptor that is generated but when running within Maven these
resources will be filtered out. In other words these resources will not
be added the realm created for the plugins execution as they are provided
in the parent realms.
-
+
[03/11] maven git commit: Trimmed trailing whitespace
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/main/java/org/codehaus/m2eclipse/App.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/main/java/org/codehaus/m2eclipse/App.java b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/main/java/org/codehaus/m2eclipse/App.java
index f413a56..f959dc4 100644
--- a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/main/java/org/codehaus/m2eclipse/App.java
+++ b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/main/java/org/codehaus/m2eclipse/App.java
@@ -4,7 +4,7 @@ package org.codehaus.m2eclipse;
* Hello world!
*
*/
-public class App
+public class App
{
public static void main( String[] args )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java
index b669134..69af061 100644
--- a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java
+++ b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project/src/test/java/org/codehaus/m2eclipse/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/settings.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/settings.xml b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/settings.xml
index 9328b53..60c25eb 100644
--- a/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/settings.xml
+++ b/maven-embedder/src/test/projects/isolated-project-getting-parent-pom/settings.xml
@@ -15,9 +15,9 @@
</releases>
</repository>
</repositories>
- </profile>
+ </profile>
</profiles>
<activeProfiles>
<activeProfile>company</activeProfile>
- </activeProfiles>
+ </activeProfiles>
</settings>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/projects/optional-dep/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/projects/optional-dep/pom.xml b/maven-embedder/src/test/projects/optional-dep/pom.xml
index 47bb16e..56c99e1 100644
--- a/maven-embedder/src/test/projects/optional-dep/pom.xml
+++ b/maven-embedder/src/test/projects/optional-dep/pom.xml
@@ -5,7 +5,7 @@
<groupId>optionaldependency</groupId>
<artifactId>p01</artifactId>
<version>0.0.1-SNAPSHOT</version>
-
+
<!--
<dependencies>
<dependency>
@@ -16,5 +16,5 @@
</dependency>
</dependencies>
-->
-
+
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/projects/readProject-missingModuleIgnored/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/projects/readProject-missingModuleIgnored/pom.xml b/maven-embedder/src/test/projects/readProject-missingModuleIgnored/pom.xml
index eecfc12..851987f 100644
--- a/maven-embedder/src/test/projects/readProject-missingModuleIgnored/pom.xml
+++ b/maven-embedder/src/test/projects/readProject-missingModuleIgnored/pom.xml
@@ -5,7 +5,7 @@
<artifactId>parent</artifactId>
<version>1</version>
<packaging>pom</packaging>
-
+
<modules>
<module>child1</module>
</modules>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml b/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml
index cec339e..3323e47 100644
--- a/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml
+++ b/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml
@@ -5,13 +5,13 @@
<artifactId>parent</artifactId>
<version>1</version>
<packaging>pom</packaging>
-
+
<scm>
<connection>scm:svn:http://host/trunk/parent</connection>
<developerConnection>scm:svn:https://host/trunk/parent</developerConnection>
<url>http://host/viewer?path=/trunk/parent</url>
</scm>
-
+
<modules>
<module>modules/child1</module>
</modules>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-embedder/src/test/resources/settings/valid-settings.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/resources/settings/valid-settings.xml b/maven-embedder/src/test/resources/settings/valid-settings.xml
index fd5ff6a..a769334 100644
--- a/maven-embedder/src/test/resources/settings/valid-settings.xml
+++ b/maven-embedder/src/test/resources/settings/valid-settings.xml
@@ -22,6 +22,6 @@ under the License.
<localRepository>/global/maven/local-repository</localRepository>
<pluginGroups>
<pluginGroup>org.codehaus.tycho</pluginGroup>
- <pluginGroup>org.sonatype.pwt</pluginGroup>
+ <pluginGroup>org.sonatype.pwt</pluginGroup>
</pluginGroups>
</settings>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java
index 7cbb0d5..bdb69ef 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java
@@ -21,7 +21,7 @@ package org.apache.maven.model.building;
/**
* Provides a skeleton implementation for model building listeners. The methods of this class are empty.
- *
+ *
* @author Benjamin Bentmann
*/
public class AbstractModelBuildingListener
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
index b1d46de..6f7be63 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
@@ -70,7 +70,7 @@ import org.apache.maven.model.validation.ModelValidator;
* only meant as a utility for developers that want to employ the model builder outside of the Maven build system, Maven
* plugins should always acquire model builder instances via dependency injection. Developers might want to subclass
* this factory to provide custom implementations for some of the components used by the model builder.
- *
+ *
* @author Benjamin Bentmann
*/
public class DefaultModelBuilderFactory
@@ -201,7 +201,7 @@ public class DefaultModelBuilderFactory
/**
* Creates a new model builder instance.
- *
+ *
* @return The new model builder instance, never {@code null}.
*/
public DefaultModelBuilder newInstance()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java
index e34f099..4fb9b8a 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java
@@ -23,7 +23,7 @@ import org.apache.maven.model.Model;
/**
* Holds data relevant for a model building event.
- *
+ *
* @author Benjamin Bentmann
*/
class DefaultModelBuildingEvent
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
index 4719b88..513f4f6 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
@@ -30,7 +30,7 @@ import org.apache.maven.model.resolution.ModelResolver;
/**
* Collects settings that control building of effective models.
- *
+ *
* @author Benjamin Bentmann
*/
public class DefaultModelBuildingRequest
@@ -76,7 +76,7 @@ public class DefaultModelBuildingRequest
/**
* Creates a shallow copy of the specified request.
- *
+ *
* @param request The request to copy, must not be {@code null}.
*/
public DefaultModelBuildingRequest( ModelBuildingRequest request )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
index 739c696..998c694 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
@@ -29,7 +29,7 @@ import org.apache.maven.model.Profile;
/**
* Collects the output of the model builder.
- *
+ *
* @author Benjamin Bentmann
*/
class DefaultModelBuildingResult
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
index ba37cac..5da2ee7 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.Model;
* Describes a problem that was encountered during model building. A problem can either be an exception that was thrown
* or a simple string message. In addition, a problem carries a hint about its source, e.g. the POM file that exhibits
* the problem.
- *
+ *
* @author Benjamin Bentmann
*/
public class DefaultModelProblem
@@ -51,7 +51,7 @@ public class DefaultModelProblem
/**
* Creates a new problem with the specified message and exception.
- *
+ *
* @param message The message describing the problem, may be {@code null}.
* @param severity The severity level of the problem, may be {@code null} to default to
* {@link ModelProblem.Severity#ERROR}.
@@ -70,7 +70,7 @@ public class DefaultModelProblem
/**
* Creates a new problem with the specified message and exception.
- *
+ *
* @param message The message describing the problem, may be {@code null}.
* @param severity The severity level of the problem, may be {@code null} to default to
* {@link ModelProblem.Severity#ERROR}.
@@ -150,7 +150,7 @@ public class DefaultModelProblem
{
return version;
}
-
+
@Override
public String toString()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
index 114afeb..f434334 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
@@ -32,7 +32,7 @@ import org.apache.maven.model.io.ModelParseException;
* an expressive source hint for the model problem. Instead, the source hint is configured by the model builder before
* it delegates to other components that potentially encounter problems. Then, the problem reporter can focus on
* providing a simple error message, leaving the donkey work of creating a nice model problem to this component.
- *
+ *
* @author Benjamin Bentmann
*/
class DefaultModelProblemCollector
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
index 12c7813..fcc85a8 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
@@ -27,7 +27,7 @@ import java.net.URI;
/**
* Wraps an ordinary {@link File} as a model source.
- *
+ *
* @author Benjamin Bentmann
*/
public class FileModelSource
@@ -37,7 +37,7 @@ public class FileModelSource
/**
* Creates a new model source backed by the specified file.
- *
+ *
* @param pomFile The POM file, must not be {@code null}.
*/
public FileModelSource( File pomFile )
@@ -62,7 +62,7 @@ public class FileModelSource
/**
* Gets the POM file of this model source.
- *
+ *
* @return The underlying POM file, never {@code null}.
*/
public File getPomFile()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
index b5c2ff3..700b9cc 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
@@ -30,7 +30,7 @@ import org.apache.maven.model.resolution.ModelResolver;
/**
* A model building request that delegates all methods invocations to another request, meant for easy transformations by
* subclassing.
- *
+ *
* @author Benjamin Bentmann
*/
class FilterModelBuildingRequest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java
index c29f279..c6c75f9 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java
@@ -21,7 +21,7 @@ package org.apache.maven.model.building;
/**
* Builds the effective model from a POM.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelBuilder
@@ -29,7 +29,7 @@ public interface ModelBuilder
/**
* Builds the effective model of the specified POM.
- *
+ *
* @param request The model building request that holds the parameters, must not be {@code null}.
* @return The result of the model building, never {@code null}.
* @throws ModelBuildingException If the effective model could not be built.
@@ -42,7 +42,7 @@ public interface ModelBuilder
* {@link #build(ModelBuildingRequest)} with {@link ModelBuildingRequest#isTwoPhaseBuilding()} being {@code true}.
* The model building request passed to this method must be the same as the one used for the first phase of the
* model building.
- *
+ *
* @param request The model building request that holds the parameters, must not be {@code null}.
* @param result The interim result of the first phase of model building, must not be {@code null}.
* @return The result of the model building, never {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java
index 848a1d3..2995b1b 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java
@@ -23,7 +23,7 @@ import org.apache.maven.model.Model;
/**
* Holds data relevant for a model building event.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelBuildingEvent
@@ -31,21 +31,21 @@ public interface ModelBuildingEvent
/**
* Gets the model being built. The precise state of this model depends on the event being fired.
- *
+ *
* @return The model being built, never {@code null}.
*/
Model getModel();
/**
* Gets the model building request being processed.
- *
+ *
* @return The model building request being processed, never {@code null}.
*/
ModelBuildingRequest getRequest();
/**
* Gets the container used to collect problems that were encountered while processing the event.
- *
+ *
* @return The container used to collect problems that were encountered, never {@code null}.
*/
ModelProblemCollector getProblems();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
index 193a6b4..434cb59 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
@@ -30,7 +30,7 @@ import org.apache.maven.model.Model;
* Signals one ore more errors during model building. The model builder tries to collect as many problems as possible
* before eventually failing to provide callers with rich error information. Use {@link #getProblems()} to query the
* details of the failure.
- *
+ *
* @author Benjamin Bentmann
*/
public class ModelBuildingException
@@ -41,7 +41,7 @@ public class ModelBuildingException
/**
* Creates a new exception with the specified problems.
- *
+ *
* @param model The model that could not be built, may be {@code null}.
* @param modelId The identifier of the model that could not be built, may be {@code null}.
* @param problems The problems that causes this exception, may be {@code null}.
@@ -72,7 +72,7 @@ public class ModelBuildingException
/**
* Creates a new exception from the specified interim result and its associated problems.
- *
+ *
* @param result The interim result, may be {@code null}.
*/
public ModelBuildingException( ModelBuildingResult result )
@@ -83,7 +83,7 @@ public class ModelBuildingException
/**
* Gets the interim result of the model building up to the point where it failed.
- *
+ *
* @return The interim model building result or {@code null} if not available.
*/
public ModelBuildingResult getResult()
@@ -93,7 +93,7 @@ public class ModelBuildingException
/**
* Gets the model that could not be built properly.
- *
+ *
* @return The erroneous model or {@code null} if not available.
*/
public Model getModel()
@@ -113,7 +113,7 @@ public class ModelBuildingException
* Gets the identifier of the POM whose effective model could not be built. The general format of the identifier is
* {@code <groupId>:<artifactId>:<version>} but some of these coordinates may still be unknown at the point the
* exception is thrown so this information is merely meant to assist the user.
- *
+ *
* @return The identifier of the POM or an empty string if not known, never {@code null}.
*/
public String getModelId()
@@ -127,7 +127,7 @@ public class ModelBuildingException
/**
* Gets the problems that caused this exception.
- *
+ *
* @return The problems that caused this exception, never {@code null}.
*/
public List<ModelProblem> getProblems()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java
index f165023..21029cc 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java
@@ -24,7 +24,7 @@ package org.apache.maven.model.building;
* errors while processing the event, it can report these problems via {@link ModelBuildingEvent#getProblems()}.
* <em>Note:</em> To cope with future extensions to this interface, it is strongly recommended to extend
* {@link AbstractModelBuildingListener} rather than to directly implement this interface.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelBuildingListener
@@ -32,7 +32,7 @@ public interface ModelBuildingListener
/**
* Notifies the listener that the model has been constructed to the extent where build extensions can be processed.
- *
+ *
* @param event The details about the event.
*/
void buildExtensionsAssembled( ModelBuildingEvent event );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
index ab1dba8..2a3a25a 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
@@ -157,7 +157,7 @@ public interface ModelBuildingRequest
/**
* Indicates whether the model should track the line/column number of the model source from which it was parsed.
- *
+ *
* @return {@code true} if location tracking is enabled, {@code false} otherwise.
*/
boolean isLocationTracking();
@@ -165,7 +165,7 @@ public interface ModelBuildingRequest
/**
* Enables/disables the tracking of line/column numbers for the model source being parsed. By default, input
* locations are not tracked.
- *
+ *
* @param locationTracking {@code true} to enable location tracking, {@code false} to disable it.
* @return This request, never {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
index 7af3f5f..44b1295 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
@@ -26,7 +26,7 @@ import org.apache.maven.model.Profile;
/**
* Collects the output of the model builder.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelBuildingResult
@@ -37,14 +37,14 @@ public interface ModelBuildingResult
* constructed. Model identifiers have the form {@code <groupId>:<artifactId>:<version>}. The first identifier from
* the list denotes the model on which the model builder was originally invoked. The last identifier will always be
* an empty string that by definition denotes the super POM.
- *
+ *
* @return The model identifiers from the lineage of models, never {@code null}.
*/
List<String> getModelIds();
/**
* Gets the assembled model.
- *
+ *
* @return The assembled model, never {@code null}.
*/
Model getEffectiveModel();
@@ -52,7 +52,7 @@ public interface ModelBuildingResult
/**
* Gets the raw model as it was read from the input model source. Apart from basic validation, the raw model has not
* undergone any updates by the model builder, e.g. reflects neither inheritance nor interpolation.
- *
+ *
* @return The raw model, never {@code null}.
*/
Model getRawModel();
@@ -62,7 +62,7 @@ public interface ModelBuildingResult
* undergone any updates by the model builder, e.g. reflects neither inheritance nor interpolation. The model
* identifier should be from the collection obtained by {@link #getModelIds()}. As a special case, an empty string
* can be used as the identifier for the super POM.
- *
+ *
* @param modelId The identifier of the desired raw model, must not be {@code null}.
* @return The raw model or {@code null} if the specified model id does not refer to a known model.
*/
@@ -72,7 +72,7 @@ public interface ModelBuildingResult
* Gets the profiles from the specified model that were active during model building. The model identifier should be
* from the collection obtained by {@link #getModelIds()}. As a special case, an empty string can be used as the
* identifier for the super POM.
- *
+ *
* @param modelId The identifier of the model whose active profiles should be retrieved, must not be {@code null}.
* @return The active profiles of the model or an empty list if none or {@code null} if the specified model id does
* not refer to a known model.
@@ -82,7 +82,7 @@ public interface ModelBuildingResult
/**
* Gets the external profiles that were active during model building. External profiles are those that were
* contributed by {@link ModelBuildingRequest#getProfiles()}.
- *
+ *
* @return The active external profiles or an empty list if none, never {@code null}.
*/
List<Profile> getActiveExternalProfiles();
@@ -91,7 +91,7 @@ public interface ModelBuildingResult
* Gets the problems that were encountered during the model building. Note that only problems of severity
* {@link ModelProblem.Severity#WARNING} and below are reported here. Problems with a higher severity level cause
* the model builder to fail with a {@link ModelBuildingException}.
- *
+ *
* @return The problems that were encountered during the model building, can be empty but never {@code null}.
*/
List<ModelProblem> getProblems();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java
index 3bf4093..132a511 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java
@@ -25,7 +25,7 @@ package org.apache.maven.model.building;
* formed by a combination of group id, artifact id, version and tag. The first three components generally refer to the
* identify of a model. The tag allows for further classification of the associated data on the sole discretion of the
* model builder.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelCache
@@ -33,7 +33,7 @@ public interface ModelCache
/**
* Puts the specified data into the cache.
- *
+ *
* @param groupId The group id of the cache record, must not be {@code null}.
* @param artifactId The artifact id of the cache record, must not be {@code null}.
* @param version The version of the cache record, must not be {@code null}.
@@ -44,7 +44,7 @@ public interface ModelCache
/**
* Gets the specified data from the cache.
- *
+ *
* @param groupId The group id of the cache record, must not be {@code null}.
* @param artifactId The artifact id of the cache record, must not be {@code null}.
* @param version The version of the cache record, must not be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
index e4c7527..4fefe0d 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
@@ -27,7 +27,7 @@ import org.apache.maven.model.Profile;
/**
* Holds a model along with some auxiliary information. This internal utility class assists the model builder during POM
* processing by providing a means to transport information that cannot be (easily) extracted from the model itself.
- *
+ *
* @author Benjamin Bentmann
*/
class ModelData
@@ -48,7 +48,7 @@ class ModelData
/**
* Creates a new container for the specified model.
- *
+ *
* @param model The model to wrap, may be {@code null}.
*/
public ModelData( ModelSource source, Model model )
@@ -59,7 +59,7 @@ class ModelData
/**
* Creates a new container for the specified model.
- *
+ *
* @param model The model to wrap, may be {@code null}.
* @param groupId The effective group identifier of the model, may be {@code null}.
* @param artifactId The effective artifact identifier of the model, may be {@code null}.
@@ -81,7 +81,7 @@ class ModelData
/**
* Gets the model being wrapped.
- *
+ *
* @return The model or {@code null} if not set.
*/
public Model getModel()
@@ -91,7 +91,7 @@ class ModelData
/**
* Sets the model being wrapped.
- *
+ *
* @param model The model, may be {@code null}.
*/
public void setModel( Model model )
@@ -101,7 +101,7 @@ class ModelData
/**
* Gets the raw model being wrapped.
- *
+ *
* @return The raw model or {@code null} if not set.
*/
public Model getRawModel()
@@ -111,7 +111,7 @@ class ModelData
/**
* Sets the raw model being wrapped.
- *
+ *
* @param rawModel The raw model, may be {@code null}.
*/
public void setRawModel( Model rawModel )
@@ -121,7 +121,7 @@ class ModelData
/**
* Gets the active profiles from the model.
- *
+ *
* @return The active profiles or {@code null} if not set.
*/
public List<Profile> getActiveProfiles()
@@ -131,7 +131,7 @@ class ModelData
/**
* Sets the active profiles from the model.
- *
+ *
* @param activeProfiles The active profiles, may be {@code null}.
*/
public void setActiveProfiles( List<Profile> activeProfiles )
@@ -141,7 +141,7 @@ class ModelData
/**
* Gets the effective group identifier of the model.
- *
+ *
* @return The effective group identifier of the model or an empty string if unknown, never {@code null}.
*/
public String getGroupId()
@@ -151,7 +151,7 @@ class ModelData
/**
* Sets the effective group identifier of the model.
- *
+ *
* @param groupId The effective group identifier of the model, may be {@code null}.
*/
public void setGroupId( String groupId )
@@ -161,7 +161,7 @@ class ModelData
/**
* Gets the effective artifact identifier of the model.
- *
+ *
* @return The effective artifact identifier of the model or an empty string if unknown, never {@code null}.
*/
public String getArtifactId()
@@ -171,7 +171,7 @@ class ModelData
/**
* Sets the effective artifact identifier of the model.
- *
+ *
* @param artifactId The effective artifact identifier of the model, may be {@code null}.
*/
public void setArtifactId( String artifactId )
@@ -181,7 +181,7 @@ class ModelData
/**
* Gets the effective version of the model.
- *
+ *
* @return The effective version of the model or an empty string if unknown, never {@code null}.
*/
public String getVersion()
@@ -191,7 +191,7 @@ class ModelData
/**
* Sets the effective version of the model.
- *
+ *
* @param version The effective version of the model, may be {@code null}.
*/
public void setVersion( String version )
@@ -201,7 +201,7 @@ class ModelData
/**
* Gets the effective identifier of the model in the form {@code <groupId>:<artifactId>:<version>}.
- *
+ *
* @return The effective identifier of the model, never {@code null}.
*/
public String getId()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
index 08a1483..43272ba 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
@@ -23,7 +23,7 @@ package org.apache.maven.model.building;
* Describes a problem that was encountered during model building. A problem can either be an exception that was thrown
* or a simple string message. In addition, a problem carries a hint about its source, e.g. the POM file that exhibits
* the problem.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelProblem
@@ -55,7 +55,7 @@ public interface ModelProblem
* creator of the problem, the general expectation is that the hint provides sufficient information to the user to
* track the problem back to its origin. A concrete example for such a source hint can be the file path or URL from
* which a POM was read.
- *
+ *
* @return The hint about the source of the problem or an empty string if unknown, never {@code null}.
*/
String getSource();
@@ -63,7 +63,7 @@ public interface ModelProblem
/**
* Gets the one-based index of the line containing the problem. The line number should refer to some text file that
* is given by {@link #getSource()}.
- *
+ *
* @return The one-based index of the line containing the problem or a non-positive value if unknown.
*/
int getLineNumber();
@@ -71,7 +71,7 @@ public interface ModelProblem
/**
* Gets the one-based index of the column containing the problem. The column number should refer to some text file
* that is given by {@link #getSource()}.
- *
+ *
* @return The one-based index of the column containing the problem or non-positive value if unknown.
*/
int getColumnNumber();
@@ -81,7 +81,7 @@ public interface ModelProblem
* <code>groupId:artifactId:version</code> the returned identifier need not be complete. The identifier is derived
* from the information that is available at the point the problem occurs and as such merely serves as a best effort
* to provide information to the user to track the problem back to its origin.
- *
+ *
* @return The identifier of the model from which the problem originated or an empty string if unknown, never
* {@code null}.
*/
@@ -89,21 +89,21 @@ public interface ModelProblem
/**
* Gets the exception that caused this problem (if any).
- *
+ *
* @return The exception that caused this problem or {@code null} if not applicable.
*/
Exception getException();
/**
* Gets the message that describes this problem.
- *
+ *
* @return The message describing this problem, never {@code null}.
*/
String getMessage();
/**
* Gets the severity level of this problem.
- *
+ *
* @return The severity level of this problem, never {@code null}.
*/
Severity getSeverity();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java
index 961d40a..e9561e5 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java
@@ -25,7 +25,7 @@ package org.apache.maven.model.building;
* an expressive source hint for the model problem. Instead, the source hint is configured by the model builder before
* it delegates to other components that potentially encounter problems. Then, the problem reporter can focus on
* providing a simple error message, leaving the donkey work of creating a nice model problem to this component.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelProblemCollector
@@ -33,7 +33,7 @@ public interface ModelProblemCollector
/**
* Adds the specified problem.
- *
+ *
* @param req must not be null
*/
void add( ModelProblemCollectorRequest req );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java
index 30143c6..7977d3a 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
public interface ModelProblemCollectorExt extends ModelProblemCollector
{
-
+
/**
* The collected problems.
* @return a list of model problems encountered, never {@code null}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java
index 60bfdde..d213cc4 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java
@@ -36,11 +36,11 @@ public final class ModelProblemCollectorRequest
private Exception exception;
private String message;
private InputLocation location;
-
+
/**
* Create a new request with mandatory parameters.
* @param severity
- * @param version
+ * @param version
*/
public ModelProblemCollectorRequest( Severity severity, Version version )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java
index 6554b19..806c28d 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.Model;
/**
* Assists in the handling of model problems.
- *
+ *
* @author Benjamin Bentmann
*/
public class ModelProblemUtils
@@ -33,7 +33,7 @@ public class ModelProblemUtils
/**
* Creates a user-friendly source hint for the specified model.
- *
+ *
* @param model The model to create a source hint for, may be {@code null}.
* @return The user-friendly source hint, never {@code null}.
*/
@@ -100,7 +100,7 @@ public class ModelProblemUtils
/**
* Creates a user-friendly artifact id from the specified coordinates.
- *
+ *
* @param groupId The group id, may be {@code null}.
* @param artifactId The artifact id, may be {@code null}.
* @param version The version, may be {@code null}.
@@ -123,7 +123,7 @@ public class ModelProblemUtils
* Creates a string with all location details for the specified model problem. If the project identifier is
* provided, the generated location will omit the model id and source information and only give line/column
* information for problems originating directly from this POM.
- *
+ *
* @param problem The problem whose location should be formatted, must not be {@code null}.
* @param projectId The {@code <groupId>:<artifactId>:<version>} of the corresponding project, may be {@code null}
* to force output of model id and source.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java
index 65ce7ab..dc648bf 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java
@@ -27,7 +27,7 @@ import java.io.InputStream;
* <p>
* This interface does not support loading of parent POM(s) from the same backing store, integrators are strongly
* encouraged to implement {@link ModelSource2} instead of implementing this interface directly.
- *
+ *
* @author Benjamin Bentmann
* @see ModelSource2
*/
@@ -36,7 +36,7 @@ public interface ModelSource
/**
* Gets a byte stream to the POM contents. Closing the returned stream is the responsibility of the caller.
- *
+ *
* @return A byte stream to the POM contents, never {@code null}.
*/
InputStream getInputStream()
@@ -45,7 +45,7 @@ public interface ModelSource
/**
* Provides a user-friendly hint about the location of the POM. This could be a local file path, a URI or just an
* empty string. The intention is to assist users during error reporting.
- *
+ *
* @return A user-friendly hint about the location of the POM, never {@code null}.
*/
String getLocation();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java
index ea3872b..3e123d0 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java
@@ -43,7 +43,7 @@ public interface ModelSource2
* <li>point either at file or directory, in the latter case POM file name 'pom.xml' needs to be used by the
* requested model source.</li>
* </ul>
- *
+ *
* @param relPath is the path of the requested model source relative to this model source POM.
* @return related model source or <code>null</code> if no such model source.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java
index 3a7ab02..edc4d31 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java
@@ -25,7 +25,7 @@ import java.io.InputStream;
/**
* Wraps an ordinary {@link CharSequence} as a model source.
- *
+ *
* @author Benjamin Bentmann
*/
public class StringModelSource
@@ -38,7 +38,7 @@ public class StringModelSource
/**
* Creates a new model source backed by the specified string.
- *
+ *
* @param pom The POM's string representation, may be empty or {@code null}.
*/
public StringModelSource( CharSequence pom )
@@ -48,7 +48,7 @@ public class StringModelSource
/**
* Creates a new model source backed by the specified string.
- *
+ *
* @param pom The POM's 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 StringModelSource
/**
* Gets the character sequence of this model source.
- *
+ *
* @return The underlying character stream, never {@code null}.
*/
public String getModel()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java
index 053254b..07058b3 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java
@@ -25,7 +25,7 @@ import java.net.URL;
/**
* Wraps an ordinary {@link URL} as a model source.
- *
+ *
* @author Benjamin Bentmann
*/
public class UrlModelSource
@@ -36,7 +36,7 @@ public class UrlModelSource
/**
* Creates a new model source backed by the specified URL.
- *
+ *
* @param pomUrl The POM file, must not be {@code null}.
*/
public UrlModelSource( URL pomUrl )
@@ -61,7 +61,7 @@ public class UrlModelSource
/**
* Gets the POM URL of this model source.
- *
+ *
* @return The underlying POM URL, never {@code null}.
*/
public URL getPomUrl()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
index a61eba3..71ec63c 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
@@ -33,7 +33,7 @@ import org.codehaus.plexus.component.annotations.Component;
/**
* Handles the import of dependency management from other models into the target model.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = DependencyManagementImporter.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java
index b6cd7b9..0649642 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java
@@ -28,7 +28,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Handles the import of dependency management from other models into the target model.
- *
+ *
* @author Benjamin Bentmann
*/
public interface DependencyManagementImporter
@@ -36,7 +36,7 @@ public interface DependencyManagementImporter
/**
* Imports the specified dependency management sections into the given target model.
- *
+ *
* @param target The model into which to import the dependency management section, must not be <code>null</code>.
* @param sources The dependency management sections to import, may be <code>null</code>.
* @param request The model building request that holds further settings, must not be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
index 01ff9d7..0d1fc8d 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
@@ -59,7 +59,7 @@ public class DefaultInheritanceAssembler
/**
* Calculates the relative path from the base directory of the parent to the parent directory of the base directory
* of the child. The general idea is to adjust inherited URLs to match the project layout (in SCM).
- *
+ *
* <p>This calculation is only a heuristic based on our conventions.
* In detail, the algo relies on the following assumptions: <ul>
* <li>The parent uses aggregation and refers to the child via the modules section</li>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java
index 9ce5d78..a191e52 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Handles inheritance of model values.
- *
+ *
* @author Benjamin Bentmann
*/
public interface InheritanceAssembler
@@ -35,7 +35,7 @@ public interface InheritanceAssembler
* Merges values from the specified parent model into the given child model. Implementations are expected to keep
* parent and child completely decoupled by injecting deep copies of objects into the child rather than the original
* objects from the parent.
- *
+ *
* @param child The child model into which to merge the values inherited from the parent, must not be
* <code>null</code>.
* @param parent The (read-only) parent model from which to inherit the values, may be <code>null</code>.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java
index 4542a3f..04b4cf6 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java
@@ -28,7 +28,7 @@ class BuildTimestampValueSource
extends AbstractValueSource
{
private final MavenBuildTimestamp mavenBuildTimestamp;
-
+
public BuildTimestampValueSource( Date startTime, Properties properties )
{
super( false );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
index 8167baf..06ac3b4 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
@@ -29,7 +29,7 @@ import org.codehaus.plexus.interpolation.ValueSource;
/**
* Wraps another value source and intercepts interpolated expressions, checking for problems.
- *
+ *
* @author Benjamin Bentmann
*/
class ProblemDetectingValueSource
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
index d0106ed..a4d2323 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
@@ -27,7 +27,7 @@ import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
/**
* Ensures that expressions referring to URLs evaluate to normalized URLs.
- *
+ *
* @author Benjamin Bentmann
*/
class UrlNormalizingPostProcessor
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
index c1c3891..5c1e58f 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
@@ -37,7 +37,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* Handles deserialization of a model from some kind of textual format like XML.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ModelReader.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
index 7813483..25c9ebc 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
@@ -34,7 +34,7 @@ import org.codehaus.plexus.util.WriterFactory;
/**
* Handles serialization of a model into some kind of textual format like XML.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ModelWriter.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java
index 234cf66..1b2cbc3 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java
@@ -23,7 +23,7 @@ import java.io.IOException;
/**
* Signals a failure to parse the POM due to invalid syntax (e.g. non-wellformed XML or unknown elements).
- *
+ *
* @author Benjamin Bentmann
*/
public class ModelParseException
@@ -42,7 +42,7 @@ public class ModelParseException
/**
* 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 ModelParseException
/**
* 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 ModelParseException
/**
* 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 ModelParseException
/**
* 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-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java
index 481c113..af7e0ca 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java
@@ -29,7 +29,7 @@ import org.apache.maven.model.Model;
/**
* Handles serialization of a model into some kind of textual format like XML.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelWriter
@@ -38,7 +38,7 @@ public interface ModelWriter
/**
* Writes the supplied model to the specified file. Any non-existing parent directories of the output file will be
* created automatically.
- *
+ *
* @param output The file to serialize the model to, must not be {@code null}.
* @param options The options to use for serialization, may be {@code null} to use the default values.
* @param model The model to serialize, must not be {@code null}.
@@ -50,7 +50,7 @@ public interface ModelWriter
/**
* Writes the supplied model to the specified character writer. The writer will be automatically closed before the
* method returns.
- *
+ *
* @param output The writer to serialize the model to, must not be {@code null}.
* @param options The options to use for serialization, may be {@code null} to use the default values.
* @param model The model to serialize, must not be {@code null}.
@@ -62,7 +62,7 @@ public interface ModelWriter
/**
* Writes the supplied model to the specified byte stream. The stream will be automatically closed before the method
* returns.
- *
+ *
* @param output The stream to serialize the model to, must not be {@code null}.
* @param options The options to use for serialization, may be {@code null} to use the default values.
* @param model The model to serialize, must not be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java b/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java
index 1d9871d..ff67f45 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java
@@ -25,7 +25,7 @@ import org.codehaus.plexus.component.annotations.Component;
/**
* Locates a POM file within a project base directory.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ModelLocator.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java b/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java
index a5c8d04..3aa0045 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java
@@ -23,7 +23,7 @@ import java.io.File;
/**
* Locates a POM file within a project base directory.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelLocator
@@ -34,7 +34,7 @@ public interface ModelLocator
* or does not contain a POM file, the return value indicates the expected path to the POM file. Sub directories of
* the project directory will not be considered when locating the POM file. The return value will be an absolute
* path if the project directory is given as an absolute path.
- *
+ *
* @param projectDirectory The (possibly non-existent) base directory to locate the POM file in, must not be {@code
* null}.
* @return The path to the (possibly non-existent) POM file, never {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java
index 8524dde..3b70a09 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Handles injection of dependency management into the model.
- *
+ *
* @author Benjamin Bentmann
*/
public interface DependencyManagementInjector
@@ -33,7 +33,7 @@ public interface DependencyManagementInjector
/**
* Merges default values from the dependency management section of the given model into itself.
- *
+ *
* @param model The model into which to merge the values specified by its dependency management sections, must not
* be <code>null</code>.
* @param request The model building request that holds further settings, must not be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java
index 2576b5e..7384fdf 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Handles injection of plugin management into the model.
- *
+ *
* @author Benjamin Bentmann
*/
public interface PluginManagementInjector
@@ -33,7 +33,7 @@ public interface PluginManagementInjector
/**
* Merges default values from the plugin management section of the given model into itself.
- *
+ *
* @param model The model into which to merge the values specified by its plugin management section, must not be
* <code>null</code>.
* @param request The model building request that holds further settings, must not be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
index 9163286..4307856 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
@@ -37,7 +37,7 @@ import org.codehaus.plexus.util.StringUtils;
/**
* Handles normalization of a model.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ModelNormalizer.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java
index a2e642e..7cab86b 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java
@@ -26,7 +26,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Handles normalization of a model. In this context, normalization is the process of producing a canonical
* representation for models that physically look different but are semantically equivalent.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelNormalizer
@@ -34,7 +34,7 @@ public interface ModelNormalizer
/**
* Merges duplicate elements like multiple declarations of the same build plugin in the specified model.
- *
+ *
* @param model The model whose duplicate elements should be merged, must not be {@code null}.
* @param request The model building request that holds further settings, must not be {@code null}.
* @param problems The container used to collect problems that were encountered, must not be {@code null}.
@@ -44,7 +44,7 @@ public interface ModelNormalizer
/**
* Sets default values in the specified model that for technical reasons cannot be set directly in the Modello
* definition.
- *
+ *
* @param model The model in which to set the default values, must not be {@code null}.
* @param request The model building request that holds further settings, 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/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java
index 3bc4925..469e623 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java
@@ -33,7 +33,7 @@ import org.codehaus.plexus.component.annotations.Requirement;
/**
* Resolves relative paths within a model against a specific base directory.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ModelPathTranslator.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java
index 78b8260..0d40d48 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java
@@ -30,7 +30,7 @@ import org.codehaus.plexus.component.annotations.Requirement;
/**
* Normalizes URLs to remove the ugly parent references "../" that got potentially inserted by URL adjustment during
* model inheritance.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ModelUrlNormalizer.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java
index 757e278..7965253 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java
@@ -25,7 +25,7 @@ import org.codehaus.plexus.component.annotations.Component;
/**
* Resolves relative paths against a specific base directory.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = PathTranslator.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java
index 538820d..54d8a36 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java
@@ -23,7 +23,7 @@ import org.codehaus.plexus.component.annotations.Component;
/**
* Normalizes a URL.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = UrlNormalizer.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java
index 1ba2509..2bd39c5 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java
@@ -26,7 +26,7 @@ import org.apache.maven.model.building.ModelBuildingRequest;
/**
* Resolves relative paths of a model against a specific base directory.
- *
+ *
* @author Jason van Zyl
*/
public interface ModelPathTranslator
@@ -35,7 +35,7 @@ public interface ModelPathTranslator
/**
* Resolves the well-known paths of the specified model against the given base directory. Paths within plugin
* configuration are not processed.
- *
+ *
* @param model The model whose paths should be resolved, may be {@code null}.
* @param basedir The base directory to resolve relative paths against, may be {@code null}.
* @param request The model building request that holds further settings, must not be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java
index 6fa9caa..8325b05 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.building.ModelBuildingRequest;
/**
* Normalizes URLs to remove the ugly parent references "../" that got potentially inserted by URL adjustment during
* model inheritance.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ModelUrlNormalizer
@@ -33,7 +33,7 @@ public interface ModelUrlNormalizer
/**
* Normalizes the well-known URLs of the specified model.
- *
+ *
* @param model The model whose URLs should be normalized, may be {@code null}.
* @param request The model building request that holds further settings, must not be {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java
index 3613af8..c416e6a 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java
@@ -23,7 +23,7 @@ import java.io.File;
/**
* Resolves relative paths against a specific base directory.
- *
+ *
* @author Jason van Zyl
*/
public interface PathTranslator
@@ -33,7 +33,7 @@ public interface PathTranslator
* Resolves the specified path against the given base directory. The resolved path will be absolute and uses the
* platform-specific file separator if a base directory is given. Otherwise, the input path will be returned
* unaltered.
- *
+ *
* @param path The path to resolve, may be {@code null}.
* @param basedir The base directory to resolve relative paths against, may be {@code null}.
* @return The resolved path or {@code null} if the input path was {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java
index dbcc902..b2e4a7b 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java
@@ -22,7 +22,7 @@ package org.apache.maven.model.path;
/**
* Normalizes a URL to remove the ugly parent references "../" that got potentially inserted by URL adjustment during
* model inheritance.
- *
+ *
* @author Benjamin Bentmann
*/
public interface UrlNormalizer
@@ -30,7 +30,7 @@ public interface UrlNormalizer
/**
* Normalizes the specified URL.
- *
+ *
* @param url The URL to normalize, may be {@code null}.
* @return The normalized URL or {@code null} if the input was {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java
index 04a57c5..82430ed 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java
@@ -33,7 +33,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* Handles expansion of general build plugin configuration into individual executions.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = PluginConfigurationExpander.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java
index 3e6e3e0..6b28499 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java
@@ -30,7 +30,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* Handles expansion of general report plugin configuration into individual report sets.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ReportConfigurationExpander.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
index 4d4d315..9b81ccb 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
@@ -34,7 +34,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* Handles conversion of the legacy reporting section into the configuration of the new Maven Site Plugin.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ReportingConverter.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java
index f6c55e9..9c0f06d 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Handles injection of plugin executions induced by the lifecycle bindings for a packaging.
- *
+ *
* @author Benjamin Bentmann
*/
public interface LifecycleBindingsInjector
@@ -35,7 +35,7 @@ public interface LifecycleBindingsInjector
* Injects plugin executions induced by lifecycle bindings into the specified model. The model has already undergone
* injection of plugin management so any plugins that are injected by lifecycle bindings and are not already present
* in the model's plugin section need to be subjected to the model's plugin management.
- *
+ *
* @param model The model into which to inject the default plugin executions for its packaging, must not be
* <code>null</code>.
* @param request The model building request that holds further settings, must not be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java
index 1e08477..23994aa 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Handles expansion of general build plugin configuration into individual executions.
- *
+ *
* @author Benjamin Bentmann
*/
public interface PluginConfigurationExpander
@@ -33,7 +33,7 @@ public interface PluginConfigurationExpander
/**
* Merges values from general build plugin configuration into the individual plugin executions of the given model.
- *
+ *
* @param model The model whose build plugin configuration should be expanded, must not be <code>null</code>.
* @param request The model building request that holds further settings, 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/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java
index b403236..28ad596 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Handles expansion of general report plugin configuration into individual report sets.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ReportConfigurationExpander
@@ -33,7 +33,7 @@ public interface ReportConfigurationExpander
/**
* Merges values from general report plugin configuration into the individual reports sets of the given model.
- *
+ *
* @param model The model whose report plugin configuration should be expanded, must not be <code>null</code>.
* @param request The model building request that holds further settings, must not be {@code null}.
* @param problems The container used to collect problems that were encountered, must not be {@code null}.
[08/11] maven git commit: Trimmed trailing whitespace
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java
index 54de061..0b5fff3 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java
@@ -23,7 +23,7 @@ package org.apache.maven.lifecycle.internal;
* A task that is a lifecycle
* <p/>
* NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java
index 6fe7e58..a721355 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java
@@ -34,7 +34,7 @@ import java.util.List;
/**
* Calculates the task segments in the build
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
* @author Jason van Zyl
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
index 4347b3c..da04b23 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
@@ -51,7 +51,7 @@ import java.util.StringTokenizer;
/**
* Resolves dependencies for the artifacts in context of the lifecycle build
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
* @author Jason van Zyl
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
index 2e71199..fedb462 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
@@ -51,7 +51,7 @@ import java.util.TreeSet;
/**
* Executes an individual mojo
- *
+ *
* @since 3.0
* @author Jason van Zyl
* @author Benjamin Bentmann
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
index ee335db..6c8fd50 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
@@ -35,7 +35,7 @@ import org.apache.maven.project.MavenProject;
/**
* A list of project segments, ordered so that all ProjectSegments from first TaskSegment come before any
* subsequent TaskSegments.
- *
+ *
* @since 3.0
* @author Kristian Rosenvold
* <p/>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java
index 3f78baf..b1b1d18 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* Provides the positional index of the project
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
* @author Kristian Rosenvold (extracted class only)
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java
index e7104b1..5ef7745 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java
@@ -43,7 +43,7 @@ import java.util.List;
* <p/>
* Additionally this class contains a clone of the MavenSession, which is *only* needed
* because it has as notion of a "current" project.
- *
+ *
* @since 3.0
* @author Jason van Zyl
* @author Benjamin Bentmann
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java
index eff4e92..2e2c3fd 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java
@@ -29,7 +29,7 @@ import java.util.HashSet;
/**
* Contains status information that is global to an entire reactor build.
- *
+ *
* @since 3.0
* @author <a href="mailto:kristian.rosenvold@gmail.com">Kristian Rosenvold</a>
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java
index 5bba9a6..a6adc95 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java
@@ -23,7 +23,7 @@ import org.apache.maven.execution.MavenExecutionResult;
/**
* Context that is fixed for the entire reactor build.
- *
+ *
* @since 3.0
* @author Jason van Zyl
* @author Kristian Rosenvold
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java
index 39487a3..9551887 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java
@@ -25,7 +25,7 @@ import java.util.List;
/**
* Describes the required task segment as provided on the maven command line; i.e. "clean jetty:run install"
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
* @author Kristian Rosenvold (extracted class only)
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
index 6d5a6ab..84f9431 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
@@ -29,21 +29,21 @@ import org.apache.maven.lifecycle.internal.ReactorContext;
import org.apache.maven.lifecycle.internal.TaskSegment;
/**
- *
+ *
* A {@link Builder} encapsulates a strategy for building a set of Maven projects. The default strategy in Maven builds the
* the projects serially, but a {@link Builder} can employ any type of concurrency model to build the projects.
- *
+ *
* @author jvanzyl
- * @provisional
+ * @provisional
*
*/
public interface Builder
{
//
- // Be nice to whittle this down to Session, maybe add task segments to the session. The session really is the
+ // Be nice to whittle this down to Session, maybe add task segments to the session. The session really is the
// the place to store reactor related information.
//
void build( MavenSession session, ReactorContext reactorContext, ProjectBuildList projectBuilds,
List<TaskSegment> taskSegments, ReactorBuildStatus reactorBuildStatus )
throws ExecutionException, InterruptedException;
-}
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java
index 53be344..de6a5a3 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java
@@ -31,7 +31,7 @@ import java.util.Set;
/**
* Presents a view of the Dependency Graph that is suited for concurrent building.
- *
+ *
* @since 3.0
* @author Kristian Rosenvold
* <p/>
@@ -59,7 +59,7 @@ public class ConcurrencyDependencyGraph
/**
* Gets all the builds that have no reactor-dependencies
- *
+ *
* @return A list of all the initial builds
*/
@@ -78,7 +78,7 @@ public class ConcurrencyDependencyGraph
/**
* Marks the provided project as finished. Returns a list of
- *
+ *
* @param mavenProject The project
* @return The list of builds that are eligible for starting now that the provided project is done
*/
@@ -129,7 +129,7 @@ public class ConcurrencyDependencyGraph
/**
* For the given {@link MavenProject} {@code p}, return all of {@code p}'s dependencies.
- *
+ *
* @param p
* @return List of prerequisite projects
*/
@@ -140,7 +140,7 @@ public class ConcurrencyDependencyGraph
/**
* For the given {@link MavenProject} {@code p} return {@code p}'s uncompleted dependencies.
- *
+ *
* @param p
* @return List of uncompleted prerequisite projects
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index 15499ef..88fa81b 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -45,7 +45,7 @@ import org.codehaus.plexus.logging.Logger;
/**
* Builds the full lifecycle in weave-mode (phase by phase as opposed to project-by-project)
- *
+ *
* @since 3.0
* @author Kristian Rosenvold
* Builds one or more lifecycles for a full module
@@ -79,7 +79,7 @@ public class MultiThreadedBuilder
CompletionService<ProjectSegment> service = new ExecutorCompletionService<ProjectSegment>( executor );
ConcurrencyDependencyGraph analyzer =
new ConcurrencyDependencyGraph( projectBuilds, session.getProjectDependencyGraph() );
-
+
// Currently disabled
ThreadOutputMuxer muxer = null; // new ThreadOutputMuxer( analyzer.getProjectBuilds(), System.out );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
index 20c61eb..e656cc9 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
public interface LifecycleMapping
-{
+{
@Deprecated
String ROLE = LifecycleMapping.class.getName();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index f120b49..1702aa1 100644
--- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -44,7 +44,7 @@ import org.codehaus.plexus.component.annotations.Requirement;
/**
* Handles injection of plugin executions induced by the lifecycle bindings for a packaging.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = LifecycleBindingsInjector.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java b/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java
index 8ea89e4..3e72674 100644
--- a/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java
+++ b/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java
@@ -27,9 +27,9 @@ public interface EventMonitor
{
void startEvent( String eventName, String target, long timestamp );
-
+
void endEvent( String eventName, String target, long timestamp );
-
- void errorEvent( String eventName, String target, long timestamp, Throwable cause );
+
+ void errorEvent( String eventName, String target, long timestamp, Throwable cause );
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java b/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java
index cbe1cb0..a73e1ef 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java
@@ -137,7 +137,7 @@ class CacheUtils
{
return eq( a.getArtifactId(), b.getArtifactId() ) //
&& eq( a.getGroupId(), b.getGroupId() ) //
- && eq( a.getVersion(), b.getVersion() ) //
+ && eq( a.getVersion(), b.getVersion() ) //
&& a.isExtensions() == b.isExtensions() //
&& dependenciesEquals( a.getDependencies(), b.getDependencies() );
}
@@ -159,7 +159,7 @@ class CacheUtils
boolean r = eq( aD.getGroupId(), bD.getGroupId() ) //
&& eq( aD.getArtifactId(), bD.getArtifactId() ) //
- && eq( aD.getVersion(), bD.getVersion() ) //
+ && eq( aD.getVersion(), bD.getVersion() ) //
&& eq( aD.getType(), bD.getType() ) //
&& eq( aD.getClassifier(), bD.getClassifier() ) //
&& eq( aD.getScope(), bD.getScope() );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java b/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java
index 537307c..f77461f 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java
@@ -34,7 +34,7 @@ public class CycleDetectedInPluginGraphException
public CycleDetectedInPluginGraphException( Plugin plugin, CycleDetectedInComponentGraphException e )
{
- super( "A cycle was detected in the component graph of the plugin: " + plugin.getArtifactId() );
+ super( "A cycle was detected in the component graph of the plugin: " + plugin.getArtifactId() );
this.plugin = plugin;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java
index 5fd16f6..57084ce 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java
@@ -58,7 +58,7 @@ public class DebugConfigurationListener
/**
* Creates a human-friendly string represenation of the specified object.
- *
+ *
* @param obj The object to create a string representation for, may be <code>null</code>.
* @return The string representation, never <code>null</code>.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
index c61c9fb..97b69be 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
@@ -73,7 +73,7 @@ public class DefaultBuildPluginManager
* @return PluginDescriptor The component descriptor for the Maven plugin.
* @throws PluginNotFoundException The plugin could not be found in any repositories.
* @throws PluginResolutionException The plugin could be found but could not be resolved.
- * @throws InvalidPluginDescriptorException
+ * @throws InvalidPluginDescriptorException
*/
public PluginDescriptor loadPlugin( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, InvalidPluginDescriptorException
@@ -215,9 +215,9 @@ public class DefaultBuildPluginManager
/**
* TODO pluginDescriptor classRealm and artifacts are set as a side effect of this
* call, which is not nice.
- * @throws PluginResolutionException
+ * @throws PluginResolutionException
*/
- public ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor )
+ public ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor )
throws PluginResolutionException, PluginManagerException
{
ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
index 4242a32..4927726 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
@@ -41,7 +41,7 @@ import org.eclipse.aether.repository.WorkspaceRepository;
* data like the plugin realm. <strong>Warning:</strong> This is an internal utility interface that is only public for
* technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without
* prior notice.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
index 61d3058..3dfb5fd 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
@@ -30,7 +30,7 @@ import org.eclipse.aether.artifact.Artifact;
* Caches extension class realms. <strong>Warning:</strong> This is an internal utility interface that is only public
* for technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted
* without prior notice.
- *
+ *
* @author Igor Fedorenko
* @author Benjamin Bentmann
*/
@@ -71,7 +71,7 @@ public interface ExtensionRealmCache
* Registers the specified cache record for usage with the given project. Integrators can use the information
* collected from this method in combination with a custom cache implementation to dispose unused records from the
* cache.
- *
+ *
* @param project The project that employs the plugin realm, must not be {@code null}.
* @param record The cache record being used for the project, must not be {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java b/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java
index 30f4d0f..223ccd8 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java
@@ -24,7 +24,7 @@ import java.util.List;
public class InvalidPluginDescriptorException
extends Exception
{
-
+
public InvalidPluginDescriptorException( String message, List<String> errors )
{
super( toMessage( message, errors ) );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java b/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java
index eef9b4f..b246ed1 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java
@@ -26,7 +26,7 @@ import org.eclipse.aether.RepositorySystemSession;
* Helps to provide backward-compatibility with plugins that use legacy components. <strong>Warning:</strong> This is an
* internal utility interface that is only public for technical reasons, it is not part of the public API. In
* particular, this interface can be changed or deleted without prior notice.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -37,21 +37,21 @@ public interface LegacySupport
* Sets the currently active session. Some legacy components are basically stateful and their API is missing
* parameters that would be required to delegate to a stateless component. Saving the session (in a thread-local
* variable) is our best effort to record any state that is required to enable proper delegation.
- *
+ *
* @param session The currently active session, may be {@code null}.
*/
void setSession( MavenSession session );
/**
* Gets the currently active session.
- *
+ *
* @return The currently active session or {@code null} if none.
*/
MavenSession getSession();
/**
* Gets the currently active repository session.
- *
+ *
* @return The currently active repository session or {@code null} if none.
*/
RepositorySystemSession getRepositorySession();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
index e62cb9b..8f6c3a8 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
@@ -33,7 +33,7 @@ import org.eclipse.aether.repository.RemoteRepository;
* Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such
* that the plugins/mojos can be used in arbitrary contexts. In particular, the mojos can be used for ordinary build
* plugins as well as special purpose plugins like reports.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -42,7 +42,7 @@ public interface MavenPluginManager
/**
* Retrieves the descriptor for the specified plugin from its main artifact.
- *
+ *
* @param plugin The plugin whose descriptor should be retrieved, must not be {@code null}.
* @param repositories The plugin repositories to use for resolving the plugin's main artifact, must not be {@code
* null}.
@@ -54,7 +54,7 @@ public interface MavenPluginManager
/**
* Retrieves the descriptor for the specified plugin goal from the plugin's main artifact.
- *
+ *
* @param plugin The plugin whose mojo descriptor should be retrieved, must not be {@code null}.
* @param goal The simple name of the mojo whose descriptor should be retrieved, must not be {@code null}.
* @param repositories The plugin repositories to use for resolving the plugin's main artifact, must not be {@code
@@ -69,7 +69,7 @@ public interface MavenPluginManager
/**
* Verifies the specified plugin is compatible with the current Maven runtime.
- *
+ *
* @param pluginDescriptor The descriptor of the plugin to check, must not be {@code null}.
*/
void checkRequiredMavenVersion( PluginDescriptor pluginDescriptor )
@@ -78,7 +78,7 @@ public interface MavenPluginManager
/**
* Sets up the class realm for the specified plugin. Both the class realm and the plugin artifacts that constitute
* it will be stored in the plugin descriptor.
- *
+ *
* @param pluginDescriptor The plugin descriptor in which to save the class realm and the plugin artifacts, must not
* be {@code null}.
* @param session The build session from which to pick the current project and repository settings, must not be
@@ -97,7 +97,7 @@ public interface MavenPluginManager
* lookup the mojo from. <strong>Warning:</strong> The returned mojo instance must be released via
* {@link #releaseMojo(Object, MojoExecution)} when the mojo is no longer needed to free any resources allocated for
* it.
- *
+ *
* @param mojoInterface The component role of the mojo, must not be {@code null}.
* @param session The build session in whose context the mojo will be used, must not be {@code null}.
* @param mojoExecution The mojo execution to retrieve the mojo for, must not be {@code null}.
@@ -108,7 +108,7 @@ public interface MavenPluginManager
/**
* Releases the specified mojo back to the container.
- *
+ *
* @param mojo The mojo to release, may be {@code null}.
* @param mojoExecution The mojo execution the mojo was originally retrieved for, must not be {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
index 9417e8d..a417219 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
@@ -31,11 +31,11 @@ public class MojoExecution
{
private Plugin plugin;
-
+
private String goal;
-
+
private String executionId;
-
+
private MojoDescriptor mojoDescriptor;
private Xpp3Dom configuration;
@@ -77,7 +77,7 @@ public class MojoExecution
this.goal = goal;
this.executionId = executionId;
}
-
+
public MojoExecution( MojoDescriptor mojoDescriptor )
{
this.mojoDescriptor = mojoDescriptor;
@@ -109,7 +109,7 @@ public class MojoExecution
/**
* Gets the source of this execution.
- *
+ *
* @return The source of this execution or {@code null} if unknown.
*/
public Source getSource()
@@ -146,14 +146,14 @@ public class MojoExecution
{
this.configuration = configuration;
}
-
+
public String identify()
{
StringBuilder sb = new StringBuilder( 256 );
-
+
sb.append( executionId );
sb.append( configuration.toString() );
-
+
return sb.toString();
}
@@ -165,7 +165,7 @@ public class MojoExecution
public void setLifecyclePhase( String lifecyclePhase )
{
this.lifecyclePhase = lifecyclePhase;
- }
+ }
@Override
public String toString()
@@ -185,7 +185,7 @@ public class MojoExecution
{
return mojoDescriptor.getPluginDescriptor().getGroupId();
}
-
+
return plugin.getGroupId();
}
@@ -195,7 +195,7 @@ public class MojoExecution
{
return mojoDescriptor.getPluginDescriptor().getArtifactId();
}
-
+
return plugin.getArtifactId();
}
@@ -204,8 +204,8 @@ public class MojoExecution
if ( mojoDescriptor != null )
{
return mojoDescriptor.getPluginDescriptor().getVersion();
- }
-
+ }
+
return plugin.getVersion();
}
@@ -215,7 +215,7 @@ public class MojoExecution
{
return mojoDescriptor.getGoal();
}
-
+
return goal;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
index e4d256f..1232052 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
@@ -32,7 +32,7 @@ import org.eclipse.aether.repository.RemoteRepository;
* Caches plugin artifacts. <strong>Warning:</strong> This is an internal utility interface that is only public for
* technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without
* prior notice.
- *
+ *
* @author Igor Fedorenko
* @author Benjamin Bentmann
*/
@@ -52,7 +52,7 @@ public interface PluginArtifactsCache
public final List<Artifact> artifacts;
- public final PluginResolutionException exception;
+ public final PluginResolutionException exception;
public CacheRecord( List<Artifact> artifacts )
{
@@ -82,7 +82,7 @@ public interface PluginArtifactsCache
* Registers the specified cache record for usage with the given project. Integrators can use the information
* collected from this method in combination with a custom cache implementation to dispose unused records from the
* cache.
- *
+ *
* @param project The project that employs the plugin realm, must not be {@code null}.
* @param record The cache record being used for the project, must not be {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java
index 4b4f368..08b4f1b 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java
@@ -32,7 +32,7 @@ import org.eclipse.aether.repository.RemoteRepository;
* data like the plugin realm. <strong>Warning:</strong> This is an internal utility interface that is only public for
* technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without
* prior notice.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
index 283c349..1a3100e 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
@@ -62,7 +62,7 @@ public interface PluginManager
Map getPluginComponents( Plugin plugin, String role )
throws ComponentLookupException, PluginManagerException;
-
+
/**
* @since 2.2.1
*/
@@ -70,7 +70,7 @@ public interface PluginManager
throws ArtifactResolutionException, PluginVersionResolutionException, ArtifactNotFoundException,
InvalidVersionSpecificationException, InvalidPluginException, PluginManagerException, PluginNotFoundException,
PluginVersionNotFoundException;
-
+
/**
* @since 2.2.1
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
index dfdd432..dcf459e 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
@@ -78,7 +78,7 @@ public class PluginParameterException
StringBuilder messageBuffer )
{
String expression = param.getExpression();
-
+
if ( param.isEditable() )
{
boolean isArray = param.getType().endsWith( "[]" );
@@ -99,7 +99,7 @@ public class PluginParameterException
// assume it is not assignable from Collection or Map
}
}
-
+
messageBuffer.append( "Inside the definition for plugin \'" );
messageBuffer.append( mojo.getPluginDescriptor().getArtifactId() );
messageBuffer.append( "\', specify the following:\n\n<configuration>\n ...\n" );
@@ -137,7 +137,7 @@ public class PluginParameterException
{
messageBuffer.append( "</KEY>\n" );
messageBuffer.append( " " );
- }
+ }
messageBuffer.append( "</" ).append( param.getName() ).append( ">\n" );
messageBuffer.append( "</configuration>" );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
index 593cd87..df47fa4 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
@@ -57,7 +57,7 @@ import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
* <tr><td><code>*</code></td> <td></td> <td>project properties</td></tr>
* </table>
* <i>Notice:</i> <code>reports</code> was supported in Maven 2.x but was removed in Maven 3
- *
+ *
* @author Jason van Zyl
* @see MavenSession
* @see MojoExecution
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
index 4eea338..1ffa157 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
@@ -34,7 +34,7 @@ import org.eclipse.aether.repository.RemoteRepository;
* Caches plugin class realms. <strong>Warning:</strong> This is an internal utility interface that is only public for
* technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without
* prior notice.
- *
+ *
* @author Igor Fedorenko
* @author Benjamin Bentmann
*/
@@ -76,7 +76,7 @@ public interface PluginRealmCache
* Registers the specified cache record for usage with the given project. Integrators can use the information
* collected from this method in combination with a custom cache implementation to dispose unused records from the
* cache.
- *
+ *
* @param project The project that employs the plugin realm, must not be {@code null}.
* @param record The cache record being used for the project, must not be {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
index 59047eb..bafbcb3 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
@@ -29,7 +29,7 @@ import org.eclipse.aether.RepositorySystemSession;
* Helps to provide backward-compatibility with plugins that use legacy components. <strong>Warning:</strong> This is an
* internal utility component that is only public for technical reasons, it is not part of the public API. In
* particular, this component can be changed or deleted without prior notice.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 020d6b1..842987b 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -102,7 +102,7 @@ import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;
* Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such
* that the plugins/mojos can be used in arbitrary contexts. In particular, the mojos can be used for ordinary build
* plugins as well as special purpose plugins like reports.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index a1b735e..5a0edf5 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -64,7 +64,7 @@ import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
* Assists in resolving the dependencies of a plugin. <strong>Warning:</strong> This is an internal utility class that
* is only public for technical reasons, it is not part of the public API. In particular, this class can be changed or
* deleted without prior notice.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
index 2112748..16a0b63 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
@@ -32,7 +32,7 @@ import org.eclipse.aether.util.artifact.JavaScopes;
/**
* Injects plexus-utils:1.1 into a plugin's class path if it doesn't already declare a dependency on plexus-utils. This
* is another legacy bit to provide backward-compat with Maven 2.x.
- *
+ *
* @author Benjamin Bentmann
*/
class PlexusUtilsInjector
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java
index 632d1d5..4194297 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java
@@ -33,7 +33,7 @@ import org.eclipse.aether.repository.RemoteRepository;
* Assists in resolving the dependencies of a plugin. <strong>Warning:</strong> This is an internal utility interface
* that is only public for technical reasons, it is not part of the public API. In particular, this interface can be
* changed or deleted without prior notice.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -42,7 +42,7 @@ public interface PluginDependenciesResolver
/**
* Resolves the main artifact of the specified plugin.
- *
+ *
* @param plugin The plugin for which to resolve the main artifact, must not be {@code null}.
* @param repositories The plugin repositories to use for resolving the plugin's main artifact, must not be {@code
* null}.
@@ -55,7 +55,7 @@ public interface PluginDependenciesResolver
/**
* Resolves the runtime dependencies of the specified plugin.
- *
+ *
* @param plugin The plugin for which to resolve the dependencies, must not be {@code null}.
* @param pluginArtifact The plugin's main artifact, may be {@code null}.
* @param dependencyFilter A filter to exclude artifacts from resolution (but not collection), may be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
index 038fa00..533920a 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
@@ -36,7 +36,7 @@ import org.apache.maven.artifact.versioning.VersionRange;
* for its use. However, the (old) wagons pulled in transitively via legacy Maven core artifacts are usually not
* intended as dependencies and more importantly screw up artifact resolution because they would get preferred over the
* core wagon versions. This is a hack to provide backward-compat with Maven 2 (MNG-4528, MNG-4561).
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
index 3c59fb4..706694b 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
@@ -30,7 +30,7 @@ import org.codehaus.plexus.component.configurator.ConfigurationListener;
/**
* A configuration listener to help validate the plugin configuration. For instance, check for required but missing
* parameters.
- *
+ *
* @author Benjamin Bentmann
*/
class ValidatingConfigurationListener
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
index f0e2107..43e8cfc 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
@@ -30,7 +30,7 @@ import org.eclipse.aether.graph.Dependency;
* for its use. However, the (old) wagons pulled in transitively via legacy Maven core artifacts are usually not
* intended as dependencies and more importantly screw up artifact resolution because they would get preferred over the
* core wagon versions. This is a hack to provide backward-compat with Maven 2 (MNG-4528, MNG-4561).
- *
+ *
* @author Benjamin Bentmann
*/
class WagonExcluder
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
index 27c5f5b..7ab86cf 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
@@ -30,7 +30,7 @@ import org.eclipse.aether.repository.RemoteRepository;
/**
* Collects settings required to resolve a plugin prefix.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -59,7 +59,7 @@ public class DefaultPluginPrefixRequest
* Creates a request for the specified plugin prefix and build session. The provided build session will be used to
* configure repository settings. If the session has a current project, its plugin repositories and model will be
* used as well.
- *
+ *
* @param prefix The plugin prefix to resolve, must not be {@code null}.
* @param session The build session from which to derive further settings, must not be {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java
index c23368e..23df66e 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java
@@ -27,7 +27,7 @@ import org.eclipse.aether.repository.RemoteRepository;
/**
* Collects settings required to resolve a plugin prefix.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -36,14 +36,14 @@ public interface PluginPrefixRequest
/**
* Gets the prefix of the plugin.
- *
+ *
* @return The prefix of the plugin.
*/
String getPrefix();
/**
* Sets the prefix of the plugin.
- *
+ *
* @param prefix The prefix of the plugin.
* @return This request, never {@code null}.
*/
@@ -51,14 +51,14 @@ public interface PluginPrefixRequest
/**
* Gets the list of group ids to scan for the plugin prefix.
- *
+ *
* @return The list of group ids to scan for the plugin prefix, never {@code null}.
*/
List<String> getPluginGroups();
/**
* Sets the list of group ids to scan for the plugin prefix.
- *
+ *
* @param pluginGroups The list of group ids to scan for the plugin prefix, may be {@code null}.
* @return This request, never {@code null}.
*/
@@ -66,7 +66,7 @@ public interface PluginPrefixRequest
/**
* Gets the POM whose build plugins are to be scanned for the prefix.
- *
+ *
* @return The POM whose build plugins are to be scanned for the prefix or {@code null} to only search the plugin
* repositories.
*/
@@ -74,7 +74,7 @@ public interface PluginPrefixRequest
/**
* Sets the POM whose build plugins are to be scanned for the prefix.
- *
+ *
* @param pom The POM whose build plugins are to be scanned for the prefix, may be {@code null} to only search the
* plugin repositories.
* @return This request, never {@code null}.
@@ -83,7 +83,7 @@ public interface PluginPrefixRequest
/**
* Gets the remote repositories to use.
- *
+ *
* @return The remote repositories to use, never {@code null}.
*/
List<RemoteRepository> getRepositories();
@@ -91,7 +91,7 @@ public interface PluginPrefixRequest
/**
* Sets the remote repositories to use. <em>Note:</em> When creating a request from a project, be sure to use the
* plugin repositories and not the regular project repositories.
- *
+ *
* @param repositories The remote repositories to use.
* @return This request, never {@code null}.
*/
@@ -99,14 +99,14 @@ public interface PluginPrefixRequest
/**
* Gets the session to use for repository access.
- *
+ *
* @return The repository session or {@code null} if not set.
*/
RepositorySystemSession getRepositorySession();
/**
* Sets the session to use for repository access.
- *
+ *
* @param repositorySession The repository session to use.
* @return This request, never {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java
index 6f11bcd..943e683 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.prefix;
/**
* Resolves a plugin prefix.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -30,7 +30,7 @@ public interface PluginPrefixResolver
/**
* Resolves the plugin prefix for the specified request.
- *
+ *
* @param request The request that holds the details about the plugin and the repositories to consult, must not be
* {@code null}.
* @return The result of the prefix resolution, never {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
index 6fe1f72..8fe1a71 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
@@ -23,7 +23,7 @@ import org.eclipse.aether.repository.ArtifactRepository;
/**
* Describes the result of a plugin prefix resolution request.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -32,21 +32,21 @@ public interface PluginPrefixResult
/**
* The resolved group id for the plugin.
- *
+ *
* @return The resolved group id for the plugin, never {@code null}.
*/
String getGroupId();
/**
* The resolved artifact id for the plugin.
- *
+ *
* @return The resolved artifact id for the plugin, never {@code null}.
*/
String getArtifactId();
/**
* The repository from which the plugin prefix was resolved.
- *
+ *
* @return The repository from which the plugin prefix was resolved or {@code null} if the prefix was resolved from
* the supplied POM.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
index 76814fd..8d2ad0f 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
@@ -54,7 +54,7 @@ import org.eclipse.aether.resolution.MetadataResult;
/**
* Resolves a plugin prefix.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java
index 9917387..6a248bf 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java
@@ -25,7 +25,7 @@ import org.eclipse.aether.repository.ArtifactRepository;
/**
* Describes the result of a plugin prefix resolution request.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
index b672090..f88dba5 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
@@ -31,7 +31,7 @@ import org.eclipse.aether.repository.RemoteRepository;
/**
* Collects settings required to resolve the version for a plugin.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -59,7 +59,7 @@ public class DefaultPluginVersionRequest
/**
* Creates a request for the specified plugin by copying settings from the specified build session. If the session
* has a current project, its plugin repositories will be used as well.
- *
+ *
* @param plugin The plugin for which to resolve a version, must not be {@code null}.
* @param session The Maven session to use, must not be {@code null}.
*/
@@ -79,7 +79,7 @@ public class DefaultPluginVersionRequest
/**
* Creates a request for the specified plugin using the given repository session and plugin repositories.
- *
+ *
* @param plugin The plugin for which to resolve a version, must not be {@code null}.
* @param session The repository session to use, must not be {@code null}.
* @param repositories The plugin repositories to query, may be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java
index 5d2b63d..b22f9e1 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java
@@ -27,7 +27,7 @@ import org.eclipse.aether.repository.RemoteRepository;
/**
* Collects settings required to resolve the version for a plugin.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -36,14 +36,14 @@ public interface PluginVersionRequest
/**
* Gets the group id of the plugin.
- *
+ *
* @return The group id of the plugin.
*/
String getGroupId();
/**
* Sets the group id of the plugin.
- *
+ *
* @param groupId The group id of the plugin.
* @return This request, never {@code null}.
*/
@@ -51,14 +51,14 @@ public interface PluginVersionRequest
/**
* Gets the artifact id of the plugin.
- *
+ *
* @return The artifact id of the plugin.
*/
String getArtifactId();
/**
* Sets the artifact id of the plugin.
- *
+ *
* @param artifactId The artifact id of the plugin.
* @return This request, never {@code null}.
*/
@@ -66,7 +66,7 @@ public interface PluginVersionRequest
/**
* Gets the POM whose build plugins are to be scanned for the version.
- *
+ *
* @return The POM whose build plugins are to be scanned for the verion or {@code null} to only search the plugin
* repositories.
*/
@@ -74,7 +74,7 @@ public interface PluginVersionRequest
/**
* Sets the POM whose build plugins are to be scanned for the version.
- *
+ *
* @param pom The POM whose build plugins are to be scanned for the version, may be {@code null} to only search the
* plugin repositories.
* @return This request, never {@code null}.
@@ -83,7 +83,7 @@ public interface PluginVersionRequest
/**
* Gets the remote repositories to use.
- *
+ *
* @return The remote repositories to use, never {@code null}.
*/
List<RemoteRepository> getRepositories();
@@ -91,7 +91,7 @@ public interface PluginVersionRequest
/**
* Sets the remote repositories to use. <em>Note:</em> When creating a request from a project, be sure to use the
* plugin repositories and not the regular project repositories.
- *
+ *
* @param repositories The remote repositories to use.
* @return This request, never {@code null}.
*/
@@ -99,14 +99,14 @@ public interface PluginVersionRequest
/**
* Gets the session to use for repository access.
- *
+ *
* @return The repository session or {@code null} if not set.
*/
RepositorySystemSession getRepositorySession();
/**
* Sets the session to use for repository access.
- *
+ *
* @param repositorySession The repository session to use.
* @return This request, never {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java
index b5c3c10..935fdfc 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.version;
/**
* Resolves a version for a plugin.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -30,7 +30,7 @@ public interface PluginVersionResolver
/**
* Resolves the version for the specified request.
- *
+ *
* @param request The request that holds the details about the plugin and the repositories to consult, must not be
* {@code null}.
* @return The result of the version resolution, never {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java
index bc3a2d2..09a69e9 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java
@@ -23,7 +23,7 @@ import org.eclipse.aether.repository.ArtifactRepository;
/**
* Describes the result of a plugin version resolution request.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -32,14 +32,14 @@ public interface PluginVersionResult
/**
* The resolved plugin version.
- *
+ *
* @return The resolved plugin version, never {@code null}.
*/
String getVersion();
/**
* The repository from which the plugin version was resolved.
- *
+ *
* @return The repository from which the plugin version was resolved, never {@code null}.
*/
ArtifactRepository getRepository();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
index de007b3..76b6bfd 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
@@ -61,7 +61,7 @@ import org.eclipse.aether.version.VersionScheme;
/**
* Resolves a version for a plugin.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java
index c67516c..9027a53 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java
@@ -24,7 +24,7 @@ import org.eclipse.aether.repository.ArtifactRepository;
/**
* Describes the result of a plugin version resolution request.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
index 6f26ec4..596f853 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
@@ -92,7 +92,7 @@ public class DefaultMavenProjectHelper
/**
* Add an attached artifact or replace the file for an existing artifact.
- *
+ *
* @see MavenProject#addAttachedArtifact(org.apache.maven.artifact.Artifact)
* @param project project reference.
* @param artifact artifact to add or replace.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
index 3aebe9b..5d97cfc 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
@@ -33,7 +33,7 @@ import org.apache.maven.plugin.version.PluginVersionResolutionException;
/**
* Processes events from the model builder while building the effective model for a {@link MavenProject} instance.
- *
+ *
* @author Benjamin Bentmann
*/
class DefaultModelBuildingListener
@@ -76,7 +76,7 @@ class DefaultModelBuildingListener
/**
* Gets the project whose model is being built.
- *
+ *
* @return The project, never {@code null}.
*/
public MavenProject getProject()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 4d77049..e359bcf 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -131,7 +131,7 @@ public class DefaultProjectBuilder
try
{
- ProjectBuildingRequest projectBuildingRequest = config.request;
+ ProjectBuildingRequest projectBuildingRequest = config.request;
MavenProject project = projectBuildingRequest.getProject();
@@ -731,9 +731,9 @@ public class DefaultProjectBuilder
//
// All the parts that were taken out of MavenProject for Maven 4.0.0
//
-
+
project.setProjectBuildingRequest( projectBuildingRequest );
-
+
// pluginArtifacts
Set<Artifact> pluginArtifacts = new HashSet<Artifact>();
for ( Plugin plugin : project.getBuildPlugins() )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
index 3d04637..035b42b 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
@@ -66,7 +66,7 @@ import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;
* Assists the project builder. <strong>Warning:</strong> This is an internal utility class that is only public for
* technical reasons, it is not part of the public API. In particular, this class can be changed or deleted without
* prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ProjectBuildingHelper.class )
@@ -255,7 +255,7 @@ public class DefaultProjectBuildingHelper
ClassRealm extensionRealm;
ExtensionDescriptor extensionDescriptor = null;
-
+
final ExtensionRealmCache.Key extensionKey = extensionRealmCache.createKey( artifacts );
ExtensionRealmCache.CacheRecord recordRealm = extensionRealmCache.get( extensionKey );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index f3cafdb..185e4ca 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
@@ -208,7 +208,7 @@ public class DefaultProjectBuildingRequest
this.processPlugins = processPlugins;
return this;
}
-
+
public ProjectBuildingRequest setResolveDependencies( boolean resolveDependencies )
{
this.resolveDependencies = resolveDependencies;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
index 3a3c37f..b64a395 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
@@ -27,7 +27,7 @@ import org.apache.maven.model.building.ModelProblem;
/**
* Collects the output of the project builder.
- *
+ *
* @author Benjamin Bentmann
*/
class DefaultProjectBuildingResult
@@ -46,7 +46,7 @@ class DefaultProjectBuildingResult
/**
* Creates a new result with the specified contents.
- *
+ *
* @param project The project that was built, may be {@code null}.
* @param problems The problems that were encouterned, may be {@code null}.
* @param dependencyResolutionResult The result of the resolution for the project dependencies, may be {@code null}.
@@ -65,7 +65,7 @@ class DefaultProjectBuildingResult
/**
* Creates a new result with the specified contents.
- *
+ *
* @param projectId The identifier of the project, may be {@code null}.
* @param pomFile The POM file from which the project was built, may be {@code null}.
* @param problems The problems that were encouterned, may be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java
index 758c491..c120a13 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java
@@ -24,7 +24,7 @@ import org.eclipse.aether.graph.DependencyFilter;
/**
* A request to resolve the dependencies of a project.
- *
+ *
* @author Benjamin Bentmann
*/
public interface DependencyResolutionRequest
@@ -32,14 +32,14 @@ public interface DependencyResolutionRequest
/**
* Gets the project to resolve dependencies for.
- *
+ *
* @return The project to resolve dependencies for or {@code null} if not set.
*/
MavenProject getMavenProject();
/**
* Sets the project to resolve dependencies for.
- *
+ *
* @param project The project to resolve dependencies for, may be {@code null}.
* @return This request for chaining, never {@code null}.
*/
@@ -47,7 +47,7 @@ public interface DependencyResolutionRequest
/**
* Gets the filter used to exclude some dependencies from resolution.
- *
+ *
* @return The filter to exclude dependencies from resolution or {@code null} to resolve all dependencies.
*/
DependencyFilter getResolutionFilter();
@@ -56,7 +56,7 @@ public interface DependencyResolutionRequest
* Sets the filter used to exclude some dependencies from resolution. Note that this filter only controls the
* resolution/download of dependency artifacts, not the inclusion of dependency nodes in the resolved dependency
* graph.
- *
+ *
* @param filter The filter to exclude dependencies from resolution, may be {@code null} to resolve all
* dependencies.
* @return This request for chaining, never {@code null}.
@@ -65,14 +65,14 @@ public interface DependencyResolutionRequest
/**
* Gets the session to use for repository access.
- *
+ *
* @return The repository session or {@code null} if not set.
*/
RepositorySystemSession getRepositorySession();
/**
* Sets the session to use for repository access.
- *
+ *
* @param repositorySession The repository session to use.
* @return This request for chaining, never {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java
index 2f62d80..6ad55fa 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java
@@ -26,7 +26,7 @@ import org.eclipse.aether.graph.DependencyNode;
/**
* The result of a project dependency resolution.
- *
+ *
* @author Benjamin Bentmann
*/
public interface DependencyResolutionResult
@@ -34,7 +34,7 @@ public interface DependencyResolutionResult
/**
* Gets the dependency graph of the project.
- *
+ *
* @return The dependency graph or {@code null} if not available.
*/
DependencyNode getDependencyGraph();
@@ -43,35 +43,35 @@ public interface DependencyResolutionResult
* Gets the transitive dependencies of the project that were not excluded by
* {@link DependencyResolutionRequest#getResolutionFilter()}. This list is a union of the results from
* {@link #getResolvedDependencies()} and {@link #getUnresolvedDependencies()}.
- *
+ *
* @return The transitive dependencies, never {@code null}.
*/
List<Dependency> getDependencies();
/**
* Gets the dependencies that were successfully resolved.
- *
+ *
* @return The resolved dependencies, never {@code null}.
*/
List<Dependency> getResolvedDependencies();
/**
* Gets the dependencies that could not be resolved.
- *
+ *
* @return The unresolved dependencies, never {@code null}.
*/
List<Dependency> getUnresolvedDependencies();
/**
* Gets the errors that occurred while building the dependency graph.
- *
+ *
* @return The errors that occurred while building the dependency graph, never {@code null}.
*/
List<Exception> getCollectionErrors();
/**
* Gets the errors that occurred while resolving the specified dependency.
- *
+ *
* @param dependency The dependency for which to retrieve the errors, must not be {@code null}.
* @return The resolution errors for the specified dependency, never {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java
index 9750e65..062b8b7 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java
@@ -26,7 +26,7 @@ import java.util.List;
* Provides metadata about a build extension. <strong>Warning:</strong> This is an internal utility class that is only
* public for technical reasons, it is not part of the public API. In particular, this class can be changed or deleted
* without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public class ExtensionDescriptor
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
index 89f394f..c18f87f 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
@@ -37,7 +37,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* Creates an extension descriptor from some XML stream.
- *
+ *
* @author Benjamin Bentmann
*/
class ExtensionDescriptorBuilder
@@ -50,7 +50,7 @@ class ExtensionDescriptorBuilder
/**
* Extracts the extension descriptor (if any) from the specified JAR file.
- *
+ *
* @param extensionJar The JAR file or directory to extract the descriptor from, must not be {@code null}.
* @return The extracted descriptor or {@code null} if no descriptor was found.
* @throws IOException If the descriptor is present but could not be parsed.
[11/11] maven git commit: Trimmed trailing whitespace
Posted by mi...@apache.org.
Trimmed trailing whitespace
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0343c526
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0343c526
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0343c526
Branch: refs/heads/trailing-whitespace
Commit: 0343c52601f7623415511e4f05fc79b03c283455
Parents: 365066f
Author: Michael Osipov <mi...@apache.org>
Authored: Sun Nov 23 13:00:59 2014 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Nov 23 13:04:30 2014 +0100
----------------------------------------------------------------------
apache-maven/src/conf/settings.xml | 26 ++--
.../maven/settings/GlobalSettingsTest.java | 2 +-
maven-aether-provider/pom.xml | 2 +-
.../internal/ArtifactDescriptorUtils.java | 2 +-
.../repository/internal/DefaultModelCache.java | 2 +-
.../internal/DefaultModelResolver.java | 2 +-
.../internal/MavenRepositorySystemUtils.java | 8 +-
.../DefaultArtifactDescriptorReaderTest.java | 16 +--
.../internal/RepositorySystemTest.java | 2 +-
.../org/apache/maven/artifact/Artifact.java | 2 +-
.../artifact/metadata/ArtifactMetadata.java | 2 +-
.../artifact/repository/Authentication.java | 16 +--
.../AbstractArtifactResolutionException.java | 2 +-
.../artifact/versioning/ComparableVersion.java | 2 +-
.../artifact/versioning/VersionRangeTest.java | 2 +-
.../installer/DefaultArtifactInstaller.java | 4 +-
.../repository/metadata/MetadataBridge.java | 2 +-
.../repository/metadata/MetadataUtils.java | 2 +-
.../resolver/DefaultArtifactResolver.java | 30 ++--
.../filter/InversionArtifactFilter.java | 6 +-
.../resolver/filter/OrArtifactFilter.java | 10 +-
.../resolver/filter/TypeArtifactFilter.java | 6 +-
.../execution/DefaultRuntimeInformation.java | 2 +-
.../maven/profiles/ProfilesConversionUtils.java | 6 +-
.../OperatingSystemProfileActivator.java | 20 +--
.../BuildTimestampValueSource.java | 4 +-
.../RegexBasedModelInterpolator.java | 2 +-
.../project/validation/ModelValidator.java | 2 +-
.../apache/maven/repository/MirrorSelector.java | 4 +-
.../repository/UserLocalArtifactRepository.java | 10 +-
.../repository/legacy/DefaultWagonManager.java | 12 +-
.../plugin-expressions/project.paramdoc.xml | 10 +-
.../plugin-expressions/rootless.paramdoc.xml | 4 +-
.../AbstractArtifactComponentTestCase.java | 10 +-
.../maven/artifact/ArtifactUtilsTest.java | 2 +-
.../factory/DefaultArtifactFactoryTest.java | 8 +-
.../artifact/metadata/TestMetadataSource.java | 6 +-
.../repository/MavenArtifactRepositoryTest.java | 2 +-
.../ArtifactResolutionExceptionTest.java | 2 +-
.../artifact/resolver/ArtifactResolverTest.java | 2 +-
.../maven/artifact/resolver/TestFileWagon.java | 24 ++--
.../resolver/filter/AndArtifactFilterTest.java | 2 +-
.../resolver/filter/FilterHashEqualsTest.java | 2 +-
.../resolver/filter/OrArtifactFilterTest.java | 2 +-
.../filter/ScopeArtifactFilterTest.java | 2 +-
.../manager/DefaultProfileManagerTest.java | 2 +-
.../project/AbstractMavenProjectTestCase.java | 12 +-
.../maven/project/EmptyLifecycleExecutor.java | 2 +-
.../maven/project/ProjectClasspathTest.java | 4 +-
.../maven/project/TestProjectBuilder.java | 8 +-
.../inheritance/t02/ProjectInheritanceTest.java | 22 +--
.../repository/DefaultMirrorSelectorTest.java | 38 ++---
.../repository/LegacyRepositoryLayout.java | 2 +-
.../repository/LegacyRepositorySystemTest.java | 38 ++---
.../legacy/DefaultUpdateCheckManagerTest.java | 16 +--
.../legacy/LegacyRepositorySystemTest.java | 6 +-
.../maven/repository/legacy/StringWagon.java | 6 +-
.../apache/maven/repository/legacy/WagonA.java | 2 +-
.../apache/maven/repository/legacy/WagonB.java | 2 +-
.../apache/maven/repository/legacy/WagonC.java | 2 +-
.../maven/repository/legacy/WagonMock.java | 2 +-
.../conflict/AbstractConflictResolverTest.java | 36 ++---
.../conflict/FarthestConflictResolverTest.java | 12 +-
.../conflict/NearestConflictResolverTest.java | 12 +-
.../conflict/NewestConflictResolverTest.java | 12 +-
.../conflict/OldestConflictResolverTest.java | 12 +-
.../DefaultClasspathTransformationTest.java | 4 +-
...efaultGraphConflictResolutionPolicyTest.java | 2 +-
.../DefaultGraphConflictResolverTest.java | 4 +-
.../repository/metadata/TestMetadataSource.java | 6 +-
.../inheritance-repo/t12/p0/p1/pom.xml | 4 +-
.../resources/inheritance-repo/t12/p0/pom.xml | 6 +-
.../t12scm/p0/modules/p1/pom.xml | 2 +-
.../inheritance-repo/t12scm/p0/pom.xml | 4 +-
maven-core/lifecycle-executor.txt | 6 +-
maven-core/plugin-manager.txt | 41 +++---
.../AbstractMavenLifecycleParticipant.java | 2 +-
.../maven/DefaultArtifactFilterManager.java | 2 +-
.../java/org/apache/maven/DefaultMaven.java | 26 ++--
.../apache/maven/DuplicateProjectException.java | 6 +-
.../maven/FilteredProjectDependencyGraph.java | 4 +-
.../apache/maven/InternalErrorException.java | 2 +-
.../src/main/java/org/apache/maven/Maven.java | 2 +-
.../java/org/apache/maven/ReactorReader.java | 8 +-
.../java/org/apache/maven/RepositoryUtils.java | 2 +-
.../java/org/apache/maven/SessionScoped.java | 2 +-
.../repository/DefaultRepositoryRequest.java | 4 +-
.../LegacyLocalRepositoryManager.java | 2 +-
.../repository/MavenArtifactRepository.java | 2 +-
.../artifact/repository/RepositoryCache.java | 6 +-
.../artifact/repository/RepositoryRequest.java | 18 +--
.../metadata/AbstractRepositoryMetadata.java | 4 +-
.../metadata/io/DefaultMetadataReader.java | 2 +-
.../metadata/io/MetadataParseException.java | 10 +-
.../resolver/ArtifactResolutionRequest.java | 36 ++---
.../resolver/filter/AndArtifactFilter.java | 10 +-
.../filter/CumulativeScopeArtifactFilter.java | 6 +-
.../resolver/filter/ExclusionSetFilter.java | 6 +-
.../resolver/filter/IncludesArtifactFilter.java | 6 +-
.../maven/bridge/MavenRepositorySystem.java | 8 +-
.../maven/classrealm/ClassRealmConstituent.java | 14 +-
.../maven/classrealm/ClassRealmManager.java | 12 +-
.../classrealm/ClassRealmManagerDelegate.java | 2 +-
.../maven/classrealm/ClassRealmRequest.java | 12 +-
.../classrealm/DefaultClassRealmManager.java | 4 +-
.../BasedirBeanConfigurationPathTranslator.java | 4 +-
.../BeanConfigurationException.java | 2 +-
.../BeanConfigurationPathTranslator.java | 4 +-
.../configuration/BeanConfigurationRequest.java | 32 ++---
.../BeanConfigurationValuePreprocessor.java | 4 +-
.../maven/configuration/BeanConfigurator.java | 4 +-
.../DefaultBeanConfigurationRequest.java | 4 +-
.../internal/DefaultBeanConfigurator.java | 2 +-
.../org/apache/maven/eventspy/EventSpy.java | 6 +-
.../maven/exception/ExceptionHandler.java | 2 +-
.../apache/maven/execution/BuildFailure.java | 6 +-
.../apache/maven/execution/BuildSuccess.java | 4 +-
.../apache/maven/execution/BuildSummary.java | 8 +-
.../execution/DefaultMavenExecutionRequest.java | 2 +-
.../DefaultMavenExecutionRequestPopulator.java | 4 +-
.../apache/maven/execution/ExecutionEvent.java | 12 +-
.../maven/execution/ExecutionListener.java | 2 +-
.../maven/execution/MavenExecutionRequest.java | 16 +--
.../MavenExecutionRequestPopulator.java | 6 +-
.../maven/execution/MavenExecutionResult.java | 2 +-
.../apache/maven/execution/MavenSession.java | 10 +-
.../maven/execution/MojoExecutionEvent.java | 2 +-
.../maven/execution/MojoExecutionListener.java | 2 +-
.../maven/execution/ProjectDependencyGraph.java | 8 +-
.../maven/execution/ProjectExecutionEvent.java | 2 +-
.../execution/ProjectExecutionListener.java | 2 +-
.../execution/scope/MojoExecutionScoped.java | 2 +-
.../scope/WeakMojoExecutionListener.java | 2 +-
.../lifecycle/LifecycleExecutionException.java | 4 +-
.../lifecycle/LifecycleMappingDelegate.java | 2 +-
.../lifecycle/LifecycleNotFoundException.java | 6 +-
.../LifecyclePhaseNotFoundException.java | 6 +-
.../lifecycle/MissingProjectException.java | 4 +-
.../lifecycle/NoGoalSpecifiedException.java | 4 +-
.../internal/DefaultExecutionEvent.java | 2 +-
.../internal/DefaultExecutionEventCatapult.java | 2 +-
...DefaultLifecycleExecutionPlanCalculator.java | 2 +-
.../DefaultLifecycleTaskSegmentCalculator.java | 2 +-
.../lifecycle/internal/DependencyContext.java | 2 +-
.../internal/ExecutionEventCatapult.java | 2 +-
.../lifecycle/internal/ExecutionPlanItem.java | 2 +-
.../maven/lifecycle/internal/GoalTask.java | 2 +-
.../internal/LifecycleDebugLogger.java | 2 +-
.../internal/LifecycleDependencyResolver.java | 2 +-
.../internal/LifecycleModuleBuilder.java | 4 +-
.../lifecycle/internal/LifecycleStarter.java | 2 +-
.../maven/lifecycle/internal/LifecycleTask.java | 2 +-
.../LifecycleTaskSegmentCalculator.java | 2 +-
.../internal/MojoDescriptorCreator.java | 2 +-
.../maven/lifecycle/internal/MojoExecutor.java | 2 +-
.../lifecycle/internal/ProjectBuildList.java | 2 +-
.../maven/lifecycle/internal/ProjectIndex.java | 2 +-
.../lifecycle/internal/ProjectSegment.java | 2 +-
.../lifecycle/internal/ReactorBuildStatus.java | 2 +-
.../lifecycle/internal/ReactorContext.java | 2 +-
.../maven/lifecycle/internal/TaskSegment.java | 2 +-
.../lifecycle/internal/builder/Builder.java | 10 +-
.../ConcurrencyDependencyGraph.java | 10 +-
.../multithreaded/MultiThreadedBuilder.java | 4 +-
.../lifecycle/mapping/LifecycleMapping.java | 2 +-
.../DefaultLifecycleBindingsInjector.java | 2 +-
.../maven/monitor/event/EventMonitor.java | 6 +-
.../org/apache/maven/plugin/CacheUtils.java | 4 +-
.../CycleDetectedInPluginGraphException.java | 2 +-
.../plugin/DebugConfigurationListener.java | 2 +-
.../maven/plugin/DefaultBuildPluginManager.java | 6 +-
.../plugin/DefaultPluginDescriptorCache.java | 2 +-
.../maven/plugin/ExtensionRealmCache.java | 4 +-
.../InvalidPluginDescriptorException.java | 2 +-
.../org/apache/maven/plugin/LegacySupport.java | 8 +-
.../apache/maven/plugin/MavenPluginManager.java | 14 +-
.../org/apache/maven/plugin/MojoExecution.java | 28 ++--
.../maven/plugin/PluginArtifactsCache.java | 6 +-
.../maven/plugin/PluginDescriptorCache.java | 2 +-
.../org/apache/maven/plugin/PluginManager.java | 4 +-
.../maven/plugin/PluginParameterException.java | 6 +-
.../PluginParameterExpressionEvaluator.java | 2 +-
.../apache/maven/plugin/PluginRealmCache.java | 4 +-
.../plugin/internal/DefaultLegacySupport.java | 2 +-
.../internal/DefaultMavenPluginManager.java | 2 +-
.../DefaultPluginDependenciesResolver.java | 2 +-
.../plugin/internal/PlexusUtilsInjector.java | 2 +-
.../internal/PluginDependenciesResolver.java | 6 +-
.../PluginDependencyResolutionListener.java | 2 +-
.../ValidatingConfigurationListener.java | 2 +-
.../maven/plugin/internal/WagonExcluder.java | 2 +-
.../prefix/DefaultPluginPrefixRequest.java | 4 +-
.../plugin/prefix/PluginPrefixRequest.java | 22 +--
.../plugin/prefix/PluginPrefixResolver.java | 4 +-
.../maven/plugin/prefix/PluginPrefixResult.java | 8 +-
.../internal/DefaultPluginPrefixResolver.java | 2 +-
.../internal/DefaultPluginPrefixResult.java | 2 +-
.../version/DefaultPluginVersionRequest.java | 6 +-
.../plugin/version/PluginVersionRequest.java | 22 +--
.../plugin/version/PluginVersionResolver.java | 4 +-
.../plugin/version/PluginVersionResult.java | 6 +-
.../internal/DefaultPluginVersionResolver.java | 2 +-
.../internal/DefaultPluginVersionResult.java | 2 +-
.../project/DefaultMavenProjectHelper.java | 2 +-
.../project/DefaultModelBuildingListener.java | 4 +-
.../maven/project/DefaultProjectBuilder.java | 6 +-
.../project/DefaultProjectBuildingHelper.java | 4 +-
.../project/DefaultProjectBuildingRequest.java | 2 +-
.../project/DefaultProjectBuildingResult.java | 6 +-
.../project/DependencyResolutionRequest.java | 14 +-
.../project/DependencyResolutionResult.java | 14 +-
.../maven/project/ExtensionDescriptor.java | 2 +-
.../project/ExtensionDescriptorBuilder.java | 4 +-
.../org/apache/maven/project/MavenProject.java | 42 +++---
.../apache/maven/project/ProjectBuilder.java | 12 +-
.../maven/project/ProjectBuildingRequest.java | 34 ++---
.../maven/project/ProjectBuildingResult.java | 12 +-
.../project/ProjectDependenciesResolver.java | 4 +-
.../maven/project/ProjectModelResolver.java | 2 +-
.../apache/maven/project/ProjectRealmCache.java | 4 +-
.../apache/maven/project/ReactorModelCache.java | 2 +-
.../apache/maven/project/ReactorModelPool.java | 2 +-
.../project/artifact/DefaultMetadataSource.java | 2 +-
.../project/artifact/MavenMetadataSource.java | 2 +-
.../properties/internal/EnvironmentUtils.java | 4 +-
.../properties/internal/SystemProperties.java | 2 +-
.../maven/repository/ArtifactTransferEvent.java | 2 +-
.../repository/ArtifactTransferResource.java | 12 +-
.../DelegatingLocalArtifactRepository.java | 2 +-
.../repository/LocalArtifactRepository.java | 4 +-
.../LocalRepositoryNotAccessibleException.java | 2 +-
.../maven/repository/RepositorySystem.java | 2 +-
.../ArtifactMetadataRetrievalException.java | 2 +-
.../DefaultMetadataResolutionRequest.java | 2 +-
.../metadata/MetadataResolutionRequest.java | 22 +--
.../apache/maven/rtinfo/RuntimeInformation.java | 6 +-
.../session/scope/internal/SessionScope.java | 2 +-
.../maven/toolchain/DefaultToolchain.java | 12 +-
.../toolchain/DefaultToolchainManager.java | 2 +-
.../org/apache/maven/toolchain/Toolchain.java | 4 +-
.../maven/toolchain/ToolchainFactory.java | 2 +-
.../maven/toolchain/ToolchainManager.java | 2 +-
.../toolchain/ToolchainManagerPrivate.java | 6 +-
.../maven/toolchain/ToolchainsBuilder.java | 4 +-
.../maven/toolchain/java/JavaToolchain.java | 2 +-
.../toolchain/java/JavaToolchainFactory.java | 4 +-
.../maven/toolchain/java/JavaToolchainImpl.java | 2 +-
maven-core/src/main/mdo/toolchains.mdo | 10 +-
.../META-INF/plexus/artifact-handlers.xml | 18 +--
.../META-INF/plexus/default-bindings.xml | 28 ++--
.../maven/messages/messages_pl.properties | 4 +-
.../src/site/apt/configuration-management.apt | 10 +-
maven-core/src/site/apt/default-bindings.apt.vm | 3 +-
.../getting-to-container-configured-mojos.apt | 8 +-
maven-core/src/site/apt/inheritance.apt | 22 +--
maven-core/src/site/apt/lifecycles.apt.vm | 2 +-
maven-core/src/site/apt/offline-mode.apt | 78 +++++------
.../src/site/apt/plugin-execution-isolation.apt | 8 +-
.../apt/scripting-support/marmalade-support.apt | 140 +++++++++----------
.../AbstractCoreMavenComponentTestCase.java | 78 +++++------
.../maven/MavenLifecycleParticipantTest.java | 4 +-
.../maven/ProjectDependenciesResolverTest.java | 12 +-
.../execution/DefaultMavenExecutionTest.java | 2 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 4 +-
.../apache/maven/plugin/PluginManagerTest.java | 82 +++++------
.../plugin/PluginParameterExceptionTest.java | 68 ++++-----
.../project/AbstractMavenProjectTestCase.java | 12 +-
.../project/DefaultMavenProjectBuilderTest.java | 2 +-
.../maven/project/EmptyLifecycleExecutor.java | 4 +-
.../project/EmptyProjectBuildingHelper.java | 2 +-
.../project/ExtensionDescriptorBuilderTest.java | 2 +-
.../apache/maven/project/MavenProjectTest.java | 8 +-
.../maven/project/PomConstructionTest.java | 136 +++++++++---------
.../maven/project/ProjectBuilderTest.java | 10 +-
.../maven/project/TestMetadataSource.java | 6 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 2 +-
.../harness/Xpp3DomAttributeIterator.java | 2 +-
.../harness/Xpp3DomAttributePointer.java | 2 +-
.../project/harness/Xpp3DomNodeIterator.java | 2 +-
.../project/harness/Xpp3DomNodePointer.java | 2 +-
.../project/harness/Xpp3DomPointerFactory.java | 2 +-
.../repository/LegacyRepositoryLayout.java | 2 +-
.../maven/repository/TestArtifactHandler.java | 2 +-
.../maven/repository/TestRepositorySystem.java | 4 +-
.../maven/toolchain/DefaultToolchainTest.java | 8 +-
.../mojo-configuration/pom.xml | 2 +-
.../pom.xml | 4 +-
.../org/apache/maven/lifecycle/test/App.java | 2 +-
.../apache/maven/lifecycle/test/AppTest.java | 2 +-
.../project-with-inheritance/pom.xml | 22 +--
.../pom.xml | 2 +-
.../pom.xml | 4 +-
.../project-with-inheritance/pom.xml | 22 +--
.../pom.xml | 2 +-
.../sub/pom.xml | 2 +-
.../projects/project-builder/it0063/pom.xml | 2 +-
.../project-builder/mng-3023/consumer/pom.xml | 2 +-
.../project-builder/mng-3023/dependency/pom.xml | 4 +-
.../projects/project-builder/mng-3023/pom.xml | 4 +-
.../it0063/pom.xml | 2 +-
.../basedir-aligned-interpolation/pom.xml | 2 +-
.../pom-with-unusual-name.xml | 2 +-
.../baseurl-interpolation/pom.xml | 2 +-
.../boolean-interpolation/pom.xml | 4 +-
.../build-extension-inheritance/pom.xml | 2 +-
.../build-extension-inheritance/sub/pom.xml | 2 +-
.../complete-model/w-parent/sub/pom.xml | 2 +-
.../complete-model/wo-parent/pom.xml | 2 +-
.../dependency-inheritance/sub/pom.xml | 2 +-
.../dependency-order/w-plugin-mngt/pom.xml | 2 +-
.../dependency-order/wo-plugin-mngt/pom.xml | 2 +-
.../distribution-management/pom.xml | 2 +-
.../dual-execution-ids/sub/pom.xml | 2 +-
.../equal-plugin-deps/pom.xml | 2 +-
.../equal-plugin-exec-ids/pom.xml | 2 +-
.../execution-configuration-join/pom.xml | 2 +-
.../full-interpolation/pom.xml | 2 +-
.../pom.xml | 2 +-
.../sub/pom.xml | 2 +-
.../limited-inheritance/pom.xml | 2 +-
.../managed-profile-dependency/pom.xml | 2 +-
.../managed-profile-dependency/sub/pom.xml | 2 +-
.../merged-filter-order/pom.xml | 2 +-
.../merged-filter-order/sub/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../micromailer/pom.xml | 2 +-
.../nested-build-dir-interpolation/pom.xml | 2 +-
.../platform-file-separator/pom.xml | 2 +-
.../plugin-config-append/no-profile/pom.xml | 2 +-
.../plugin-config-append/with-profile/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../plugin-config-attributes/w-profile/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../plugin-config-merging/child/pom.xml | 2 +-
.../plugin-config-merging/pom.xml | 2 +-
.../plugin-config-order/w-plugin-mngt/pom.xml | 2 +-
.../plugin-config-order/wo-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-merging-wo-version/pom.xml | 2 +-
.../plugin-exec-merging-wo-version/sub/pom.xml | 2 +-
.../plugin-exec-merging/w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../plugin-exec-merging/wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../plugin-exec-order-with-lifecycle/pom.xml | 2 +-
.../plugin-exec-order/w-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-order/wo-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../plugin-inheritance-order/child/pom.xml | 2 +-
.../plugin-inheritance-order/pom.xml | 2 +-
.../plugin-management-inheritance/pom.xml | 2 +-
.../pom-encoding/latin-1/pom.xml | 2 +-
.../pom-encoding/utf-8/pom.xml | 2 +-
.../pom-inheritance/pom.xml | 2 +-
.../pom.xml | 2 +-
.../profile-injected-dependencies/pom.xml | 2 +-
.../profile-injection-order/pom.xml | 2 +-
.../profile-plugin-mng-dependencies/pom.xml | 2 +-
.../profile-plugin-mng-dependencies/sub/pom.xml | 2 +-
.../profile-plugins/pom.xml | 2 +-
.../repo-inheritance/pom.xml | 4 +-
.../jetty-parent.xml | 2 +-
.../child/pom.xml | 2 +-
.../unprefixed-expression-interpolation/pom.xml | 2 +-
.../url-append/parent/pom.xml | 2 +-
.../url-inheritance/pom.xml | 2 +-
.../url-no-decoding/pom.xml | 2 +-
.../xml-coalesce-text/pom.xml | 2 +-
.../xml-markup-interpolation/pom.xml | 2 +-
.../xml-whitespace/sub/pom.xml | 2 +-
.../settings-no-pom/settings.xml | 6 +-
.../test-pom-and-settings-interpolation/pom.xml | 2 +-
.../resources/META-INF/plexus/components.xml | 2 +-
.../resources/distributionManagement-pom.xml | 4 +-
.../org/apache/maven/lifecycle/pom.xml | 22 +--
.../project/workspace/buildFromFile/pom.xml | 4 +-
.../project/workspace/buildModelLineage/pom.xml | 2 +-
.../childAndParent/child/pom.xml | 2 +-
.../resolveParentPom/childAndParent/pom.xml | 2 +-
.../project/workspace/resolveParentPom/pom.xml | 2 +-
.../toolchain/model/toolchains-jdks-extra.xml | 2 +-
.../maven/toolchain/model/toolchains-jdks.xml | 2 +-
.../resources/project-dynamism/pom-interp.xml | 10 +-
.../resources/project-dynamism/pom-relative.xml | 16 +--
.../src/test/resources/project-dynamism/pom.xml | 16 +--
.../child-which-inherits-from-super-model.xml | 2 +-
.../projects/duplicate-plugins-merged-pom.xml | 4 +-
.../withActiveByDefaultProfile-pom.xml | 4 +-
maven-embedder/pom.xml | 4 +-
.../src/examples/simple-project/settings.xml | 2 +-
.../java/org/apache/maven/embedder/App.java | 2 +-
.../java/org/apache/maven/embedder/AppTest.java | 2 +-
.../java/org/apache/maven/cli/MavenCli.java | 50 +++----
.../cli/logging/BaseSlf4jConfiguration.java | 2 +-
.../maven/cli/logging/Slf4jConfiguration.java | 2 +-
.../apache/maven/cli/logging/Slf4jLogger.java | 2 +-
.../maven/cli/logging/Slf4jStdoutLogger.java | 8 +-
.../cli/logging/impl/Log4j2Configuration.java | 4 +-
.../cli/logging/impl/LogbackConfiguration.java | 4 +-
.../logging/impl/Slf4jSimpleConfiguration.java | 4 +-
.../UnsupportedSlf4jBindingConfiguration.java | 4 +-
.../transfer/ConsoleMavenTransferListener.java | 2 +-
maven-embedder/src/site/apt/logging.apt | 6 +-
.../src/main/java/org/apache/maven/App.java | 2 +-
.../src/test/java/org/apache/maven/AppTest.java | 2 +-
.../bad-dep-version/pom.xml | 2 +-
.../bad-ext-direct-deps/project/pom.xml | 2 +-
.../bad-ext-plugin-dep-ver/plugin/pom.xml | 8 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../bad-ext-plugin-dep-ver/project/pom.xml | 4 +-
.../bad-ext-plugin-maven-ver/plugin/pom.xml | 8 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../bad-ext-plugin-maven-ver/project/pom.xml | 4 +-
.../bad-maven-version/pom.xml | 2 +-
.../bad-mg-dep-version/pom.xml | 2 +-
.../bad-non-dep-version/pom.xml | 2 +-
.../bad-profile-repo/pom.xml | 2 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../config-rdonly-mojo-param/project/pom.xml | 2 +-
.../deploy-repo-creation-err/pom.xml | 4 +-
.../err-loading-plugin/project/pom.xml | 4 +-
.../err-resolving-ext-plugin/project/pom.xml | 4 +-
.../err-resolving-project-dep/project/pom.xml | 4 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../ext-deps-resolve-err/project/pom.xml | 2 +-
.../ext-plugin-artifact-missing/project/pom.xml | 4 +-
.../resources/META-INF/plexus/components.xml | 2 +-
.../ext-plugin-realm-error/project/pom.xml | 2 +-
.../ext-plugin-version-err/plugin/pom.xml | 8 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../ext-plugin-version-err/project/pom.xml | 4 +-
.../ext-realm-error/ext/pom.xml | 2 +-
.../ext/src/main/java/org/ext/App.java | 2 +-
.../ext-realm-error/project/pom.xml | 2 +-
.../interp-from-project/project/pom.xml | 2 +-
.../load-extern-profiles-ioex/pom.xml | 2 +-
.../load-extern-profiles-xex/pom.xml | 2 +-
.../child1/src/main/java/org/test/App.java | 2 +-
.../child1/src/test/java/org/test/AppTest.java | 2 +-
.../missing-parent-pom/pom.xml | 4 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../mojo-config-error/plugin/pom.xml | 2 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../mojo-config-error/project/pom.xml | 4 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../mojo-exec-err/project/pom.xml | 2 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../parent-parse-ioex/child/pom.xml | 2 +-
.../parent-parse-xex/child/pom.xml | 2 +-
.../parent-parse-xex/pom.xml | 2 +-
.../profile-activator-err/pom.xml | 2 +-
.../profile-activator-lookup-err/ext/pom.xml | 2 +-
.../ext/src/main/java/org/ext/App.java | 2 +-
.../project/pom.xml | 4 +-
.../project-collision/mod1/pom.xml | 2 +-
.../project-collision/mod2/pom.xml | 2 +-
.../project-collision/pom.xml | 2 +-
.../project-cycle/dep/pom.xml | 4 +-
.../project-cycle/pom.xml | 4 +-
.../project-dep-missing/pom.xml | 6 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../repo-creation-err/pom.xml | 4 +-
.../eventing-projects/read-with-deps/pom.xml | 2 +-
.../extensions/META-INF/plexus/components.xml | 2 +-
.../org/apache/maven/cli/CLIManagerTest.java | 2 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 14 +-
.../main/java/org/codehaus/m2eclipse/App.java | 2 +-
.../java/org/codehaus/m2eclipse/AppTest.java | 2 +-
.../settings.xml | 4 +-
.../src/test/projects/optional-dep/pom.xml | 4 +-
.../readProject-missingModuleIgnored/pom.xml | 2 +-
.../readProject-withScmInheritance/pom.xml | 4 +-
.../test/resources/settings/valid-settings.xml | 2 +-
.../building/AbstractModelBuildingListener.java | 2 +-
.../building/DefaultModelBuilderFactory.java | 4 +-
.../building/DefaultModelBuildingEvent.java | 2 +-
.../building/DefaultModelBuildingRequest.java | 4 +-
.../building/DefaultModelBuildingResult.java | 2 +-
.../model/building/DefaultModelProblem.java | 8 +-
.../building/DefaultModelProblemCollector.java | 2 +-
.../maven/model/building/FileModelSource.java | 6 +-
.../building/FilterModelBuildingRequest.java | 2 +-
.../maven/model/building/ModelBuilder.java | 6 +-
.../model/building/ModelBuildingEvent.java | 8 +-
.../model/building/ModelBuildingException.java | 14 +-
.../model/building/ModelBuildingListener.java | 4 +-
.../model/building/ModelBuildingRequest.java | 4 +-
.../model/building/ModelBuildingResult.java | 16 +--
.../apache/maven/model/building/ModelCache.java | 6 +-
.../apache/maven/model/building/ModelData.java | 32 ++---
.../maven/model/building/ModelProblem.java | 16 +--
.../model/building/ModelProblemCollector.java | 4 +-
.../building/ModelProblemCollectorExt.java | 2 +-
.../building/ModelProblemCollectorRequest.java | 4 +-
.../maven/model/building/ModelProblemUtils.java | 8 +-
.../maven/model/building/ModelSource.java | 6 +-
.../maven/model/building/ModelSource2.java | 2 +-
.../maven/model/building/StringModelSource.java | 8 +-
.../maven/model/building/UrlModelSource.java | 6 +-
.../DefaultDependencyManagementImporter.java | 2 +-
.../DependencyManagementImporter.java | 4 +-
.../DefaultInheritanceAssembler.java | 2 +-
.../model/inheritance/InheritanceAssembler.java | 4 +-
.../BuildTimestampValueSource.java | 2 +-
.../ProblemDetectingValueSource.java | 2 +-
.../UrlNormalizingPostProcessor.java | 2 +-
.../maven/model/io/DefaultModelReader.java | 2 +-
.../maven/model/io/DefaultModelWriter.java | 2 +-
.../maven/model/io/ModelParseException.java | 10 +-
.../org/apache/maven/model/io/ModelWriter.java | 8 +-
.../model/locator/DefaultModelLocator.java | 2 +-
.../maven/model/locator/ModelLocator.java | 4 +-
.../DependencyManagementInjector.java | 4 +-
.../management/PluginManagementInjector.java | 4 +-
.../normalization/DefaultModelNormalizer.java | 2 +-
.../model/normalization/ModelNormalizer.java | 6 +-
.../model/path/DefaultModelPathTranslator.java | 2 +-
.../model/path/DefaultModelUrlNormalizer.java | 2 +-
.../maven/model/path/DefaultPathTranslator.java | 2 +-
.../maven/model/path/DefaultUrlNormalizer.java | 2 +-
.../maven/model/path/ModelPathTranslator.java | 4 +-
.../maven/model/path/ModelUrlNormalizer.java | 4 +-
.../apache/maven/model/path/PathTranslator.java | 4 +-
.../apache/maven/model/path/UrlNormalizer.java | 4 +-
.../DefaultPluginConfigurationExpander.java | 2 +-
.../DefaultReportConfigurationExpander.java | 2 +-
.../model/plugin/DefaultReportingConverter.java | 2 +-
.../model/plugin/LifecycleBindingsInjector.java | 4 +-
.../plugin/PluginConfigurationExpander.java | 4 +-
.../plugin/ReportConfigurationExpander.java | 4 +-
.../maven/model/plugin/ReportingConverter.java | 4 +-
.../model/profile/DefaultProfileInjector.java | 2 +-
.../model/profile/DefaultProfileSelector.java | 2 +-
.../model/profile/ProfileActivationContext.java | 12 +-
.../maven/model/profile/ProfileInjector.java | 4 +-
.../maven/model/profile/ProfileSelector.java | 4 +-
.../activation/FileProfileActivator.java | 2 +-
.../activation/JdkVersionProfileActivator.java | 2 +-
.../OperatingSystemProfileActivator.java | 2 +-
.../profile/activation/ProfileActivator.java | 4 +-
.../activation/PropertyProfileActivator.java | 2 +-
.../resolution/InvalidRepositoryException.java | 8 +-
.../resolution/UnresolvableModelException.java | 12 +-
.../maven/model/superpom/SuperPomProvider.java | 4 +-
.../model/validation/DefaultModelValidator.java | 2 +-
.../maven/model/validation/ModelValidator.java | 6 +-
.../model/building/SimpleProblemCollector.java | 2 +-
.../StringSearchModelInterpolatorTest.java | 16 +--
.../AbstractProfileActivatorTest.java | 2 +-
.../JdkVersionProfileActivatorTest.java | 2 +-
.../PropertyProfileActivatorTest.java | 2 +-
.../validation/DefaultModelValidatorTest.java | 4 +-
.../invalid-aggregator-packaging-pom.xml | 2 +-
.../maven/model/io/xpp3/package-info.java | 2 +-
.../apache/maven/model/ActivationFileTest.java | 2 +-
.../apache/maven/model/ActivationOSTest.java | 2 +-
.../maven/model/ActivationPropertyTest.java | 2 +-
.../org/apache/maven/model/ActivationTest.java | 2 +-
.../java/org/apache/maven/model/BuildTest.java | 2 +-
.../apache/maven/model/CiManagementTest.java | 2 +-
.../org/apache/maven/model/ContributorTest.java | 2 +-
.../maven/model/DependencyManagementTest.java | 2 +-
.../org/apache/maven/model/DependencyTest.java | 2 +-
.../maven/model/DeploymentRepositoryTest.java | 2 +-
.../org/apache/maven/model/DeveloperTest.java | 2 +-
.../maven/model/DistributionManagementTest.java | 2 +-
.../org/apache/maven/model/ExclusionTest.java | 2 +-
.../org/apache/maven/model/ExtensionTest.java | 2 +-
.../apache/maven/model/IssueManagementTest.java | 2 +-
.../org/apache/maven/model/LicenseTest.java | 2 +-
.../org/apache/maven/model/MailingListTest.java | 2 +-
.../java/org/apache/maven/model/ModelTest.java | 2 +-
.../org/apache/maven/model/NotifierTest.java | 2 +-
.../apache/maven/model/OrganizationTest.java | 2 +-
.../java/org/apache/maven/model/ParentTest.java | 2 +-
.../maven/model/PluginConfigurationTest.java | 2 +-
.../apache/maven/model/PluginContainerTest.java | 2 +-
.../apache/maven/model/PluginExecutionTest.java | 2 +-
.../maven/model/PluginManagementTest.java | 2 +-
.../java/org/apache/maven/model/PluginTest.java | 2 +-
.../apache/maven/model/PrerequisitesTest.java | 2 +-
.../org/apache/maven/model/ProfileTest.java | 2 +-
.../org/apache/maven/model/RelocationTest.java | 2 +-
.../apache/maven/model/ReportPluginTest.java | 2 +-
.../org/apache/maven/model/ReportSetTest.java | 2 +-
.../org/apache/maven/model/ReportingTest.java | 2 +-
.../maven/model/RepositoryPolicyTest.java | 2 +-
.../org/apache/maven/model/RepositoryTest.java | 2 +-
.../org/apache/maven/model/ResourceTest.java | 2 +-
.../java/org/apache/maven/model/ScmTest.java | 2 +-
.../java/org/apache/maven/model/SiteTest.java | 2 +-
.../maven/plugin/MojoNotFoundException.java | 4 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 2 +-
.../plugin/descriptor/PluginDescriptor.java | 2 +-
.../descriptor/PluginDescriptorBuilderTest.java | 2 +-
maven-plugin-api/src/test/resources/plugin.xml | 2 +-
.../building/DefaultSettingsBuilder.java | 2 +-
.../building/DefaultSettingsBuilderFactory.java | 4 +-
.../DefaultSettingsBuildingRequest.java | 2 +-
.../building/DefaultSettingsBuildingResult.java | 2 +-
.../building/DefaultSettingsProblem.java | 4 +-
.../DefaultSettingsProblemCollector.java | 2 +-
.../settings/building/FileSettingsSource.java | 6 +-
.../settings/building/SettingsBuilder.java | 4 +-
.../building/SettingsBuildingException.java | 6 +-
.../building/SettingsBuildingRequest.java | 26 ++--
.../building/SettingsBuildingResult.java | 6 +-
.../settings/building/SettingsProblem.java | 16 +--
.../building/SettingsProblemCollector.java | 4 +-
.../maven/settings/building/SettingsSource.java | 6 +-
.../settings/building/StringSettingsSource.java | 8 +-
.../settings/building/UrlSettingsSource.java | 6 +-
.../crypto/DefaultSettingsDecrypter.java | 2 +-
.../DefaultSettingsDecryptionRequest.java | 8 +-
.../crypto/DefaultSettingsDecryptionResult.java | 2 +-
.../settings/crypto/SettingsDecrypter.java | 4 +-
.../crypto/SettingsDecryptionRequest.java | 10 +-
.../crypto/SettingsDecryptionResult.java | 12 +-
.../settings/io/DefaultSettingsReader.java | 2 +-
.../settings/io/DefaultSettingsWriter.java | 2 +-
.../settings/io/SettingsParseException.java | 10 +-
.../maven/settings/io/SettingsReader.java | 8 +-
.../maven/settings/io/SettingsWriter.java | 8 +-
.../settings/validation/SettingsValidator.java | 4 +-
pom.xml | 10 +-
641 files changed, 1844 insertions(+), 1846 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/apache-maven/src/conf/settings.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/settings.xml b/apache-maven/src/conf/settings.xml
index 204e334..19d7a97 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -22,7 +22,7 @@ under the License.
<!--
| This is the configuration file for Maven. It can be specified at two levels:
|
- | 1. User Level. This settings.xml file provides configuration for a single user,
+ | 1. User Level. This settings.xml file provides configuration for a single user,
| and is normally provided in ${user.home}/.m2/settings.xml.
|
| NOTE: This location can be overridden with the CLI option:
@@ -31,7 +31,7 @@ under the License.
|
| 2. Global Level. This settings.xml file provides configuration for all Maven
| users on a machine (assuming they're all using the same Maven
- | installation). It's normally provided in
+ | installation). It's normally provided in
| ${maven.home}/conf/settings.xml.
|
| NOTE: This location can be overridden with the CLI option:
@@ -43,8 +43,8 @@ under the License.
| values (values used when the setting is not specified) are provided.
|
|-->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<!-- localRepository
| The path to the local repository maven will use to store artifacts.
@@ -112,8 +112,8 @@ under the License.
<!-- server
| Specifies the authentication information to use when connecting to a particular server, identified by
| a unique name within the system (referred to by the 'id' attribute below).
- |
- | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
+ |
+ | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
| used together.
|
<server>
@@ -122,7 +122,7 @@ under the License.
<password>repopwd</password>
</server>
-->
-
+
<!-- Another sample, using keys to authenticate.
<server>
<id>siteServer</id>
@@ -134,13 +134,13 @@ under the License.
<!-- mirrors
| This is a list of mirrors to be used in downloading artifacts from remote repositories.
- |
+ |
| It works like this: a POM may declare a repository to use in resolving certain artifacts.
| However, this repository may have problems with heavy traffic at times, so people have mirrored
| it to several places.
|
| That repository definition will have a unique id, so we can create a mirror reference for that
- | repository, to be used as an alternate download site. The mirror site will be the preferred
+ | repository, to be used as an alternate download site. The mirror site will be the preferred
| server for that repository.
|-->
<mirrors>
@@ -157,20 +157,20 @@ under the License.
</mirror>
-->
</mirrors>
-
+
<!-- profiles
| This is a list of profiles which can be activated in a variety of ways, and which can modify
| the build process. Profiles provided in the settings.xml are intended to provide local machine-
| specific paths and repository locations which allow the build to work in the local environment.
|
| For example, if you have an integration testing plugin - like cactus - that needs to know where
- | your Tomcat instance is installed, you can provide a variable here such that the variable is
+ | your Tomcat instance is installed, you can provide a variable here such that the variable is
| dereferenced during the build process to configure the cactus plugin.
|
| As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
| section of this document (settings.xml) - will be discussed later. Another way essentially
| relies on the detection of a system property, either matching a particular value for the property,
- | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
+ | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
| value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
| Finally, the list of active profiles can be specified directly from the command line.
|
@@ -219,7 +219,7 @@ under the License.
| <plugin>
| <groupId>org.myco.myplugins</groupId>
| <artifactId>myplugin</artifactId>
- |
+ |
| <configuration>
| <tomcatLocation>${tomcatPath}</tomcatLocation>
| </configuration>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
----------------------------------------------------------------------
diff --git a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
index ffca5c3..b728be3 100644
--- a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
+++ b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
@@ -30,7 +30,7 @@ import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
/**
* Tests that the global settings.xml shipped with the distribution is in good state.
- *
+ *
* @author Benjamin Bentmann
*/
public class GlobalSettingsTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 16e2f64..0533d71 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -114,7 +114,7 @@ under the License.
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
index 8515803..7d4ede8 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java
@@ -28,7 +28,7 @@ import org.eclipse.aether.repository.RepositoryPolicy;
/**
* <strong>Warning:</strong> This is an internal utility class that is only public for technical reasons, it is not part
* of the public API. In particular, this class can be changed or deleted without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public class ArtifactDescriptorUtils
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
index 2d4fa7d..f13495d 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java
@@ -25,7 +25,7 @@ import org.eclipse.aether.RepositorySystemSession;
/**
* A model builder cache backed by the repository system cache.
- *
+ *
* @author Benjamin Bentmann
*/
class DefaultModelCache
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index bb5bf3c..7cd4747 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -52,7 +52,7 @@ import org.eclipse.aether.resolution.VersionRangeResult;
/**
* A model resolver to assist building of dependency POMs. This resolver gives priority to those repositories that have
* been initially specified and repositories discovered in dependency POMs are recessively merged into the search chain.
- *
+ *
* @author Benjamin Bentmann
* @see DefaultArtifactDescriptorReader
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index dbc4b86..5b240ef 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -52,7 +52,7 @@ import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
* A utility class to assist in setting up a Maven-like repository system. <em>Note:</em> This component is meant to
* assist those clients that employ the repository system outside of an IoC container, Maven plugins should instead
* always use regular dependency injection to acquire the repository system.
- *
+ *
* @author Benjamin Bentmann
*/
public final class MavenRepositorySystemUtils
@@ -66,7 +66,7 @@ public final class MavenRepositorySystemUtils
/**
* Creates a new service locator that already knows about all service implementations included in this library. To
* acquire a complete repository system, clients need to add some repository connectors for remote transfers.
- *
+ *
* @return The new service locator, never {@code null}.
*/
public static DefaultServiceLocator newServiceLocator()
@@ -85,7 +85,7 @@ public final class MavenRepositorySystemUtils
* Maven-based resolution. In more detail, this method configures settings relevant for the processing of dependency
* graphs, most other settings remain at their generic default value. Use the various setters to further configure
* the session with authentication, mirror, proxy and other information required for your environment.
- *
+ *
* @return The new repository system session, never {@code null}.
*/
public static DefaultRepositorySystemSession newSession()
@@ -126,7 +126,7 @@ public final class MavenRepositorySystemUtils
session.setArtifactDescriptorPolicy( new SimpleArtifactDescriptorPolicy( true, true ) );
- // MNG-5670 guard against ConcurrentModificationException
+ // MNG-5670 guard against ConcurrentModificationException
Properties sysProps = new Properties();
for ( String key : System.getProperties().stringPropertyNames() )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
index a7b1db2..e873138 100644
--- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
+++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
@@ -39,19 +39,19 @@ public class DefaultArtifactDescriptorReaderTest
{
// prepare
DefaultArtifactDescriptorReader reader = (DefaultArtifactDescriptorReader) lookup( ArtifactDescriptorReader.class );
-
+
RepositoryEventDispatcher eventDispatcher = mock( RepositoryEventDispatcher.class );
-
+
ArgumentCaptor<RepositoryEvent> event = ArgumentCaptor.forClass( RepositoryEvent.class );
-
+
reader.setRepositoryEventDispatcher( eventDispatcher );
ArtifactDescriptorRequest request = new ArtifactDescriptorRequest();
-
+
request.addRepository( newTestRepository() );
-
+
request.setArtifact( new DefaultArtifact( "org.apache.maven.its", "dep-mng5459", "jar", "0.4.0-SNAPSHOT" ) );
-
+
// execute
reader.readArtifactDescriptor( session, request );
@@ -59,7 +59,7 @@ public class DefaultArtifactDescriptorReaderTest
verify( eventDispatcher ).dispatch( event.capture() );
boolean missingArtifactDescriptor = false;
-
+
for( RepositoryEvent evt : event.getAllValues() )
{
if ( EventType.ARTIFACT_DESCRIPTOR_MISSING.equals( evt.getType() ) )
@@ -68,7 +68,7 @@ public class DefaultArtifactDescriptorReaderTest
missingArtifactDescriptor = true;
}
}
-
+
if( !missingArtifactDescriptor )
{
fail( "Expected missing artifact descriptor for org.apache.maven.its:dep-mng5459:pom:0.4.0-20130404.090532-2" );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
index 36bb9c5..db77a44 100644
--- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
+++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
@@ -59,7 +59,7 @@ public class RepositorySystemTest
ArtifactDescriptorRequest request = new ArtifactDescriptorRequest();
request.setArtifact( artifact );
request.addRepository( newTestRepository() );
-
+
ArtifactDescriptorResult result = system.readArtifactDescriptor( session, request );
List<Dependency> deps = result.getDependencies();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
index b26ad9f..6cc0022 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
@@ -34,7 +34,7 @@ import org.apache.maven.artifact.versioning.VersionRange;
/**
* Maven Artifact interface. Notice that it mixes artifact definition concepts (groupId, artifactId, version)
- * with dependency information (version range, scope).
+ * with dependency information (version range, scope).
*/
public interface Artifact
extends Comparable<Artifact>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
index f73b104..452c9f4 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
@@ -23,5 +23,5 @@ package org.apache.maven.artifact.metadata;
public interface ArtifactMetadata
extends org.apache.maven.repository.legacy.metadata.ArtifactMetadata
{
- void merge( ArtifactMetadata metadata );
+ void merge( ArtifactMetadata metadata );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
index ff28907..323fb25 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
@@ -44,7 +44,7 @@ public class Authentication
/**
* Get the user's password which is used when connecting to the repository.
- *
+ *
* @return password of user
*/
public String getPassword()
@@ -54,7 +54,7 @@ public class Authentication
/**
* Set the user's password which is used when connecting to the repository.
- *
+ *
* @param password password of the user
*/
public void setPassword( String password )
@@ -64,7 +64,7 @@ public class Authentication
/**
* Get the username used to access the repository.
- *
+ *
* @return username at repository
*/
public String getUsername()
@@ -74,7 +74,7 @@ public class Authentication
/**
* Set username used to access the repository.
- *
+ *
* @param userName the username used to access repository
*/
public void setUsername( final String userName )
@@ -85,7 +85,7 @@ public class Authentication
/**
* Get the passphrase of the private key file. The passphrase is used only when host/protocol supports
* authentication via exchange of private/public keys and private key was used for authentication.
- *
+ *
* @return passphrase of the private key file
*/
public String getPassphrase()
@@ -95,7 +95,7 @@ public class Authentication
/**
* Set the passphrase of the private key file.
- *
+ *
* @param passphrase passphrase of the private key file
*/
public void setPassphrase( final String passphrase )
@@ -105,7 +105,7 @@ public class Authentication
/**
* Get the absolute path to the private key file.
- *
+ *
* @return absolute path to private key
*/
public String getPrivateKey()
@@ -115,7 +115,7 @@ public class Authentication
/**
* Set the absolute path to private key file.
- *
+ *
* @param privateKey path to private key in local file system
*/
public void setPrivateKey( final String privateKey )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
index 75192d0..66e147c 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
@@ -44,7 +44,7 @@ public class AbstractArtifactResolutionException
private String classifier;
- private Artifact artifact;
+ private Artifact artifact;
private List<ArtifactRepository> remoteRepositories;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 508f79c..c83cbd1 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -31,7 +31,7 @@ import java.util.Stack;
/**
* Generic implementation of version comparison.
- *
+ *
* <p>Features:
* <ul>
* <li>mixing of '<code>-</code>' (dash) and '<code>.</code>' (dot) separators,</li>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
index e155941..14b16cb 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
@@ -53,7 +53,7 @@ public class VersionRangeTest
throws InvalidVersionSpecificationException, OverConstrainedVersionException
{
Artifact artifact = null;
-
+
VersionRange range = VersionRange.createFromVersionSpec( "(,1.0]" );
List<Restriction> restrictions = range.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
index aa924e8..a252975 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
@@ -54,10 +54,10 @@ public class DefaultArtifactInstaller
@Requirement
private RepositorySystem repoSystem;
-
+
@Requirement
private LegacySupport legacySupport;
-
+
/** @deprecated we want to use the artifact method only, and ensure artifact.file is set correctly. */
@Deprecated
public void install( String basedir, String finalName, Artifact artifact, ArtifactRepository localRepository )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
index 4ee80ec..bf19921 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
@@ -35,7 +35,7 @@ import org.eclipse.aether.metadata.Metadata;
/**
* <strong>Warning:</strong> This is an internal utility class that is only public for technical reasons, it is not part
* of the public API. In particular, this class can be changed or deleted without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public final class MetadataBridge
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
index 9130796..bdc4a79 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java
@@ -21,7 +21,7 @@ package org.apache.maven.artifact.repository.metadata;
/**
* Assists in handling repository metadata.
- *
+ *
* @author Benjamin Bentmann
*/
class MetadataUtils
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 17ca487..1631a01 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -74,7 +74,7 @@ import org.eclipse.aether.resolution.ArtifactResult;
public class DefaultArtifactResolver
implements ArtifactResolver, Disposable
{
- @Requirement
+ @Requirement
private Logger logger;
@Requirement
@@ -88,7 +88,7 @@ public class DefaultArtifactResolver
@Requirement
private ArtifactMetadataSource source;
-
+
@Requirement
private PlexusContainer container;
@@ -169,7 +169,7 @@ public class DefaultArtifactResolver
{
return;
}
-
+
if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
{
File systemFile = artifact.getFile();
@@ -190,7 +190,7 @@ public class DefaultArtifactResolver
}
artifact.setResolved( true );
-
+
return;
}
@@ -322,7 +322,7 @@ public class DefaultArtifactResolver
.setArtifact( originatingArtifact )
.setResolveRoot( false )
// This is required by the surefire plugin
- .setArtifactDependencies( artifacts )
+ .setArtifactDependencies( artifacts )
.setManagedVersionMap( managedVersions )
.setLocalRepository( localRepository )
.setRemoteRepositories( remoteRepositories )
@@ -358,10 +358,10 @@ public class DefaultArtifactResolver
Set<Artifact> artifacts = request.getArtifactDependencies();
Map<String, Artifact> managedVersions = request.getManagedVersionMap();
List<ResolutionListener> listeners = request.getListeners();
- ArtifactFilter collectionFilter = request.getCollectionFilter();
+ ArtifactFilter collectionFilter = request.getCollectionFilter();
ArtifactFilter resolutionFilter = request.getResolutionFilter();
RepositorySystemSession session = getSession( request.getLocalRepository() );
-
+
//TODO: hack because metadata isn't generated in m2e correctly and i want to run the maven i have in the workspace
if ( source == null )
{
@@ -393,9 +393,9 @@ public class DefaultArtifactResolver
// This is often an artifact like a POM that is taken from disk and we already have hold of the
// file reference. But this may be a Maven Plugin that we need to resolve from a remote repository
// as well as its dependencies.
-
+
if ( request.isResolveRoot() /* && rootArtifact.getFile() == null */ )
- {
+ {
try
{
resolve( rootArtifact, request.getRemoteRepositories(), session );
@@ -470,7 +470,7 @@ public class DefaultArtifactResolver
return result;
}
}
-
+
if ( artifacts == null || artifacts.isEmpty() )
{
if ( request.isResolveRoot() )
@@ -478,13 +478,13 @@ public class DefaultArtifactResolver
result.addArtifact( rootArtifact );
}
return result;
- }
+ }
// After the collection we will have the artifact object in the result but they will not be resolved yet.
result =
artifactCollector.collect( artifacts, rootArtifact, managedVersions, collectionRequest, source,
collectionFilter, listeners, null );
-
+
// We have metadata retrieval problems, or there are cycles that have been detected
// so we give this back to the calling code and let them deal with this information
// appropriately.
@@ -528,14 +528,14 @@ public class DefaultArtifactResolver
// We want to send the root artifact back in the result but we need to do this after the other dependencies
// have been resolved.
if ( request.isResolveRoot() )
- {
+ {
// Add the root artifact (as the first artifact to retain logical order of class path!)
Set<Artifact> allArtifacts = new LinkedHashSet<Artifact>();
allArtifacts.add( rootArtifact );
allArtifacts.addAll( result.getArtifacts() );
result.setArtifacts( allArtifacts );
- }
-
+ }
+
return result;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
index d7006ec..0499db5 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java
@@ -51,14 +51,14 @@ public class InversionArtifactFilter
{
return true;
}
-
+
if ( !( obj instanceof InversionArtifactFilter ) )
{
return false;
}
-
+
InversionArtifactFilter other = (InversionArtifactFilter) obj;
-
+
return toInvert.equals( other.toInvert );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
index d8499c4..8cd02cc 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
@@ -27,7 +27,7 @@ import org.apache.maven.artifact.Artifact;
/**
* Apply multiple filters, accepting an artifact if at least one of the filters accepts it.
- *
+ *
* @author Benjamin Bentmann
*/
public class OrArtifactFilter
@@ -79,15 +79,15 @@ public class OrArtifactFilter
{
return true;
}
-
+
if ( !( obj instanceof OrArtifactFilter ) )
{
return false;
}
-
+
OrArtifactFilter other = (OrArtifactFilter) obj;
-
+
return filters.equals( other.filters );
}
-
+
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
index 6750372..76c39ec 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java
@@ -52,14 +52,14 @@ public class TypeArtifactFilter
{
return true;
}
-
+
if ( !( obj instanceof TypeArtifactFilter ) )
{
return false;
}
-
+
TypeArtifactFilter other = (TypeArtifactFilter) obj;
-
+
return type.equals( other.type );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java b/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
index b5759c7..7767aff 100644
--- a/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
@@ -29,7 +29,7 @@ import org.codehaus.plexus.util.StringUtils;
/**
* Describes runtime information about the application.
- *
+ *
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
index 0427d71..72527b0 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
@@ -64,9 +64,9 @@ public class ProfilesConversionUtils
activation.setProperty( prop );
}
-
+
ActivationOS profileOs = profileActivation.getOs();
-
+
if ( profileOs != null )
{
org.apache.maven.model.ActivationOS os = new org.apache.maven.model.ActivationOS();
@@ -78,7 +78,7 @@ public class ProfilesConversionUtils
activation.setOs( os );
}
-
+
org.apache.maven.profiles.ActivationFile profileFile = profileActivation.getFile();
if ( profileFile != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
index 49e8b4b..7464a30 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
@@ -70,15 +70,15 @@ public class OperatingSystemProfileActivator
{
String test = version;
boolean reverse = false;
-
+
if ( test.startsWith( "!" ) )
{
reverse = true;
test = test.substring( 1 );
}
-
+
boolean result = Os.isVersion( test );
-
+
if ( reverse )
{
return !result;
@@ -93,15 +93,15 @@ public class OperatingSystemProfileActivator
{
String test = arch;
boolean reverse = false;
-
+
if ( test.startsWith( "!" ) )
{
reverse = true;
test = test.substring( 1 );
}
-
+
boolean result = Os.isArch( test );
-
+
if ( reverse )
{
return !result;
@@ -116,7 +116,7 @@ public class OperatingSystemProfileActivator
{
String test = name;
boolean reverse = false;
-
+
if ( test.startsWith( "!" ) )
{
reverse = true;
@@ -139,15 +139,15 @@ public class OperatingSystemProfileActivator
{
String test = family;
boolean reverse = false;
-
+
if ( test.startsWith( "!" ) )
{
reverse = true;
test = test.substring( 1 );
}
-
+
boolean result = Os.isFamily( test );
-
+
if ( reverse )
{
return !result;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
index ab270c5..f6319fa 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
@@ -35,7 +35,7 @@ public class BuildTimestampValueSource
private final Date startTime;
private final String format;
-
+
private String formattedDate;
public BuildTimestampValueSource( Date startTime, String format )
@@ -53,7 +53,7 @@ public class BuildTimestampValueSource
{
formattedDate = new SimpleDateFormat( format ).format( startTime );
}
-
+
return formattedDate;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
index a34bf50..4e251ae 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
@@ -41,7 +41,7 @@ public class RegexBasedModelInterpolator
throws IOException
{
}
-
+
public RegexBasedModelInterpolator( PathTranslator pathTranslator )
{
super( pathTranslator );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java
index 239de76..54fd04c 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java
@@ -23,7 +23,7 @@ import org.apache.maven.model.Model;
/**
* Checks the model for missing or invalid values.
- *
+ *
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java b/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
index 09fcb24..c15899e 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
@@ -26,7 +26,7 @@ import org.apache.maven.settings.Mirror;
/**
* Handles the selection of mirrors for repositories.
- *
+ *
* @author Benjamin Bentmann
*/
public interface MirrorSelector
@@ -34,7 +34,7 @@ public interface MirrorSelector
/**
* Determines the mirror for the specified repository.
- *
+ *
* @param repository The repository to determine the mirror for, must not be {@code null}.
* @param mirrors The available mirrors, may be {@code null}.
* @return The mirror specification for the repository or {@code null} if no mirror matched.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java b/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
index 3d7be9b..70d3e0a 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
@@ -29,18 +29,18 @@ public class UserLocalArtifactRepository
extends LocalArtifactRepository
{
private ArtifactRepository localRepository;
-
+
public UserLocalArtifactRepository( ArtifactRepository localRepository )
{
this.localRepository = localRepository;
setLayout( localRepository.getLayout() );
}
-
+
@Override
public Artifact find( Artifact artifact )
{
File artifactFile = new File( localRepository.getBasedir(), pathOf( artifact ) );
-
+
// We need to set the file here or the resolver will fail with an NPE, not fully equipped to deal
// with multiple local repository implementations yet.
artifact.setFile( artifactFile );
@@ -53,13 +53,13 @@ public class UserLocalArtifactRepository
{
return localRepository.getId();
}
-
+
@Override
public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository )
{
return localRepository.pathOfLocalRepositoryMetadata( metadata, repository );
}
-
+
@Override
public String pathOf( Artifact artifact )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index 0c796ae..78898a9 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -79,8 +79,8 @@ public class DefaultWagonManager
@Requirement
private LegacySupport legacySupport;
-
-
+
+
//
// Retriever
//
@@ -235,12 +235,12 @@ public class DefaultWagonManager
private void connectWagon( Wagon wagon, ArtifactRepository repository )
throws ConnectionException, AuthenticationException
{
- // MNG-5509
+ // MNG-5509
// See org.eclipse.aether.connector.wagon.WagonRepositoryConnector.connectWagon(Wagon)
if( legacySupport.getRepositorySession() != null )
{
Properties headers = new Properties();
-
+
headers.put( "User-Agent", ConfigUtils.getString( legacySupport.getRepositorySession(), "Maven",
ConfigurationProperties.USER_AGENT ) );
try
@@ -257,7 +257,7 @@ public class DefaultWagonManager
logger.debug( "Could not set user agent for wagon " + wagon.getClass().getName() + ": " + e );
}
}
-
+
if ( repository.getProxy() != null && logger.isDebugEnabled() )
{
logger.debug( "Using proxy " + repository.getProxy().getHost() + ":" + repository.getProxy().getPort()
@@ -802,7 +802,7 @@ public class DefaultWagonManager
throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: "
+ protocol, e );
}
-
+
return wagon;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml b/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
index 0db2a6d..9acebef 100644
--- a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
+++ b/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml
@@ -88,8 +88,8 @@ under the License.
<![CDATA[
This is a set of Artifact instances resolved from the set of dependencies for
the current project.
-
- NOTE: This will likely contain much more than the direct dependencies of the
+
+ NOTE: This will likely contain much more than the direct dependencies of the
current POM, since Maven uses transitive, or chained, dependency resolution.
]]></description>
</expression>
@@ -120,7 +120,7 @@ under the License.
<![CDATA[
This is the list of Artifact instances for plugins used in the current build
for this project.
-
+
NOTE: This list may contain plugin Artifacts which are implied by the current POM's
packaging and the lifecycle phase being built.
]]></description>
@@ -137,7 +137,7 @@ under the License.
<![CDATA[
This is a list of ArtifactRepository instances used to resolve the Artifacts associated
with the current POM.
-
+
NOTE: This list will contain entries for repositories specified by ancestor POMs, including
the default built-in super-POM, which is the parent of all POMs.
]]></description>
@@ -154,7 +154,7 @@ under the License.
<![CDATA[
This is a list of ArtifactRepository instances used to resolve the Artifacts associated
with plugins used in building the current POM.
-
+
NOTE: This list will contain entries for repositories specified by ancestor POMs, including
the default built-in super-POM, which is the parent of all POMs.
]]></description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml b/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
index 19dc065..27f0343 100644
--- a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
+++ b/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
@@ -27,8 +27,8 @@ under the License.
<configuration>
<![CDATA[
Inside ~/.m2/settings.xml:
-
- <localRepository>/path/to/local/repository</localRepository>
+
+ <localRepository>/path/to/local/repository</localRepository>
]]></configuration>
<description>The ArtifactRepository instance referencing the local artifact
repository.</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 91265db..010c566 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -85,7 +85,7 @@ public abstract class AbstractArtifactComponentTestCase
throws Exception
{
super.setUp();
- artifactFactory = lookup( ArtifactFactory.class);
+ artifactFactory = lookup( ArtifactFactory.class);
artifactRepositoryFactory = lookup( ArtifactRepositoryFactory.class );
RepositorySystemSession repoSession = initRepoSession();
@@ -96,13 +96,13 @@ public abstract class AbstractArtifactComponentTestCase
LegacySupport legacySupport = lookup(LegacySupport.class);
legacySupport.setSession( session );
}
-
+
@Override
protected void tearDown()
throws Exception
{
release( artifactFactory );
-
+
super.tearDown();
}
@@ -110,7 +110,7 @@ public abstract class AbstractArtifactComponentTestCase
/**
* Return an existing file, not a directory - causes creation to fail.
- *
+ *
* @throws Exception
*/
protected ArtifactRepository badLocalRepository()
@@ -314,7 +314,7 @@ public abstract class AbstractArtifactComponentTestCase
throws Exception
{
Artifact a = artifactFactory.createBuildArtifact( groupId, artifactId, version, type );
-
+
return a;
}
[09/11] maven git commit: Trimmed trailing whitespace
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
index 8f47443..8e45b20 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
@@ -142,7 +142,7 @@ public class MavenArtifactRepository
{
sb.append( " proxy: " ).append( proxy.getHost() ).append( ":" ).append( proxy.getPort() ).append( "\n" );
}
-
+
if ( snapshots != null )
{
sb.append( "snapshots: [enabled => " ).append( snapshots.isEnabled() );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java
index 3afe33d..bf79d69 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java
@@ -22,7 +22,7 @@ package org.apache.maven.artifact.repository;
/**
* Caches auxiliary data used during repository access like already processed metadata. The data in the cache is meant
* for exclusive consumption by the repository system and is opaque to the cache implementation.
- *
+ *
* @author Benjamin Bentmann
*/
@Deprecated
@@ -37,7 +37,7 @@ public interface RepositoryCache
* Puts the specified data into the cache. <strong>Warning:</strong> The cache will directly save the provided
* reference. If the cached data is mutable, i.e. could be modified after being put into the cache, the caller is
* responsible for creating a copy of the original data and store the copy in the cache.
- *
+ *
* @param request The repository request from which this cache was retrieved, must not be {@code null}.
* @param key The key to use associate the data with, must not be {@code null}.
* @param data The data to store in the cache, may be {@code null}.
@@ -48,7 +48,7 @@ public interface RepositoryCache
* Gets the specified data from the cache. <strong>Warning:</strong> The cache will directly return the saved
* reference. If the cached data is to be modified after its retrieval, the caller is responsible to create a copy
* of the returned data and use this instead of the cache record.
- *
+ *
* @param request The repository request from which this cache was retrieved, must not be {@code null}.
* @param key The key to use for lookup of the data, must not be {@code null}.
* @return The requested data or {@code null} if none was present in the cache.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java
index 870e4f6..55f6068 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java
@@ -23,7 +23,7 @@ import java.util.List;
/**
* Collects basic settings to access the repository system.
- *
+ *
* @author Benjamin Bentmann
*/
public interface RepositoryRequest
@@ -31,14 +31,14 @@ public interface RepositoryRequest
/**
* Indicates whether network access to remote repositories has been disabled.
- *
+ *
* @return {@code true} if remote access has been disabled, {@code false} otherwise.
*/
boolean isOffline();
/**
* Enables/disables network access to remote repositories.
- *
+ *
* @param offline {@code true} to disable remote access, {@code false} to allow network access.
* @return This request, never {@code null}.
*/
@@ -47,7 +47,7 @@ public interface RepositoryRequest
/**
* Indicates whether remote repositories should be re-checked for updated artifacts/metadata regardless of their
* configured update policy.
- *
+ *
* @return {@code true} if remote repositories should be re-checked for updated artifacts/metadata, {@code false}
* otherwise.
*/
@@ -55,7 +55,7 @@ public interface RepositoryRequest
/**
* Enables/disabled forced checks for updated artifacts/metadata on remote repositories.
- *
+ *
* @param forceUpdate {@code true} to forcibly check the remote repositories for updated artifacts/metadata, {@code
* false} to use the update policy configured on each repository.
* @return This request, never {@code null}.
@@ -64,14 +64,14 @@ public interface RepositoryRequest
/**
* Gets the local repository to use.
- *
+ *
* @return The local repository to use or {@code null} if not set.
*/
ArtifactRepository getLocalRepository();
/**
* Sets the local repository to use.
- *
+ *
* @param localRepository The local repository to use.
* @return This request, never {@code null}.
*/
@@ -79,14 +79,14 @@ public interface RepositoryRequest
/**
* Gets the remote repositories to use.
- *
+ *
* @return The remote repositories to use, never {@code null}.
*/
List<ArtifactRepository> getRemoteRepositories();
/**
* Sets the remote repositories to use.
- *
+ *
* @param remoteRepositories The remote repositories to use.
* @return This request, never {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
index 58e3c5a..e1e5fe3 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
@@ -56,7 +56,7 @@ public abstract class AbstractRepositoryMetadata
}
public String getLocalFilename( ArtifactRepository repository )
- {
+ {
return "maven-metadata-" + repository.getKey() + ".xml";
}
@@ -208,7 +208,7 @@ public abstract class AbstractRepositoryMetadata
AbstractRepositoryMetadata repoMetadata = (AbstractRepositoryMetadata) metadata;
this.metadata.merge( repoMetadata.getMetadata() );
}
-
+
public void merge( ArtifactMetadata metadata )
{
// TODO: not sure that it should assume this, maybe the calls to addMetadata should pre-merge, then artifact replaces?
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index f8c55ac..6a1578d 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -34,7 +34,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* Handles deserialization of metadata from some kind of textual format like XML.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = MetadataReader.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java
index 8240cf5..e3e141b 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java
@@ -23,7 +23,7 @@ import java.io.IOException;
/**
* Signals a failure to parse the metadata due to invalid syntax (e.g. non-wellformed XML or unknown elements).
- *
+ *
* @author Benjamin Bentmann
*/
public class MetadataParseException
@@ -42,7 +42,7 @@ public class MetadataParseException
/**
* 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 MetadataParseException
/**
* 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 MetadataParseException
/**
* 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 MetadataParseException
/**
* 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-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
index 890b466..050ec47 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
@@ -61,9 +61,9 @@ public class ArtifactResolutionRequest
// Needs to go away
private List<ResolutionListener> listeners = new ArrayList<ResolutionListener>();
- // This is like a filter but overrides all transitive versions
+ // This is like a filter but overrides all transitive versions
private Map<String, Artifact> managedVersionMap;
-
+
private boolean resolveRoot = true;
private boolean resolveTransitively = false;
@@ -141,7 +141,7 @@ public class ArtifactResolutionRequest
/**
* Gets the artifact filter that controls traversal of the dependency graph.
- *
+ *
* @return The filter used to determine which of the artifacts in the dependency graph should be traversed or
* {@code null} to collect all transitive dependencies.
*/
@@ -160,7 +160,7 @@ public class ArtifactResolutionRequest
/**
* Gets the artifact filter that controls downloading of artifact files. This filter operates on those artifacts
* that have been included by the {@link #getCollectionFilter()}.
- *
+ *
* @return The filter used to determine which of the artifacts should have their files resolved or {@code null} to
* resolve the files for all collected artifacts.
*/
@@ -182,12 +182,12 @@ public class ArtifactResolutionRequest
}
public ArtifactResolutionRequest setListeners( List<ResolutionListener> listeners )
- {
+ {
this.listeners = listeners;
-
+
return this;
}
-
+
public ArtifactResolutionRequest addListener( ResolutionListener listener )
{
listeners.add( listener );
@@ -210,26 +210,26 @@ public class ArtifactResolutionRequest
public ArtifactResolutionRequest setResolveRoot( boolean resolveRoot )
{
this.resolveRoot = resolveRoot;
-
+
return this;
}
-
+
public boolean isResolveRoot()
{
return resolveRoot;
- }
+ }
public ArtifactResolutionRequest setResolveTransitively( boolean resolveDependencies )
{
this.resolveTransitively = resolveDependencies;
-
+
return this;
}
-
+
public boolean isResolveTransitively()
{
return resolveTransitively;
- }
+ }
public String toString()
{
@@ -239,7 +239,7 @@ public class ArtifactResolutionRequest
.append( artifactDependencies ).append( "\n" )
.append( "localRepository: " ).append( localRepository ).append( "\n" )
.append( "remoteRepositories: " ).append( remoteRepositories ).append( "\n" );
-
+
return sb.toString();
}
@@ -322,8 +322,8 @@ public class ArtifactResolutionRequest
// Used by Tycho and will break users and force them to upgrade to Maven 3.1 so we should really leave
// this here, possibly indefinitely.
//
- public ArtifactResolutionRequest setCache( RepositoryCache cache )
- {
- return this;
- }
+ public ArtifactResolutionRequest setCache( RepositoryCache cache )
+ {
+ return this;
+ }
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
index d6f97d8..5c6689d 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
@@ -35,7 +35,7 @@ import org.apache.maven.artifact.Artifact;
public class AndArtifactFilter
implements ArtifactFilter
{
- private Set<ArtifactFilter> filters;
+ private Set<ArtifactFilter> filters;
public AndArtifactFilter()
{
@@ -46,7 +46,7 @@ public class AndArtifactFilter
{
this.filters = new LinkedHashSet<ArtifactFilter>( filters );
}
-
+
public boolean include( Artifact artifact )
{
boolean include = true;
@@ -86,14 +86,14 @@ public class AndArtifactFilter
{
return true;
}
-
+
if ( !( obj instanceof AndArtifactFilter ) )
{
return false;
}
-
+
AndArtifactFilter other = (AndArtifactFilter) obj;
-
+
return filters.equals( other.filters );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
index 1a6b8a8..fb0afcf 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
@@ -28,7 +28,7 @@ import java.util.Set;
* scopes and their associated implied scopes, so that the user can filter apply a series of implication rules in a
* single step. This should be a more efficient implementation of multiple standard {@link ScopeArtifactFilter}
* instances ORed together.
- *
+ *
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author jdcasey
*/
@@ -40,7 +40,7 @@ public class CumulativeScopeArtifactFilter
/**
* Create a new filter with the specified scopes and their implied scopes enabled.
- *
+ *
* @param scopes The scopes to enable, along with all implied scopes, may be {@code null}.
*/
public CumulativeScopeArtifactFilter( Collection<String> scopes )
@@ -52,7 +52,7 @@ public class CumulativeScopeArtifactFilter
/**
* Creates a new filter that combines the specified filters.
- *
+ *
* @param filters The filters to combine, may be {@code null}.
*/
public CumulativeScopeArtifactFilter( CumulativeScopeArtifactFilter... filters )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
index 45ce845..c3dc981 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
@@ -73,14 +73,14 @@ public class ExclusionSetFilter
{
return true;
}
-
+
if ( !( obj instanceof ExclusionSetFilter ) )
{
return false;
}
-
+
ExclusionSetFilter other = (ExclusionSetFilter) obj;
-
+
return excludes.equals( other.excludes );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
index aeeb3c7..403e125 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
@@ -68,19 +68,19 @@ public class IncludesArtifactFilter
{
int hash = 17;
hash = hash * 31 + patterns.hashCode();
-
+
return hash;
}
@Override
public boolean equals( Object obj )
{
- if ( this == obj )
+ if ( this == obj )
{
return true;
}
- // make sure IncludesArtifactFilter is not equal ExcludesArtifactFilter!
+ // make sure IncludesArtifactFilter is not equal ExcludesArtifactFilter!
if ( obj == null || getClass() != obj.getClass() )
{
return false;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 80aee22..839c089 100644
--- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -79,7 +79,7 @@ public class MavenRepositorySystem
@Requirement
private ArtifactHandlerManager artifactHandlerManager;
-
+
@Requirement
private ArtifactResolver artifactResolver;
@@ -91,7 +91,7 @@ public class MavenRepositorySystem
@Requirement
private SettingsDecrypter settingsDecrypter;
-
+
// DefaultProjectBuilder
public Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type )
{
@@ -600,7 +600,7 @@ public class MavenRepositorySystem
return repository;
}
-
+
// ArtifactFactory
private Artifact XcreateArtifact( String groupId, String artifactId, String version, String scope, String type )
{
@@ -694,5 +694,5 @@ public class MavenRepositorySystem
return new DefaultArtifact( groupId, artifactId, versionRange, desiredScope, type, classifier, handler,
optional );
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java
index 742b80f..f658eb4 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java
@@ -23,7 +23,7 @@ import java.io.File;
/**
* Describes a constituent of a class realm.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ClassRealmConstituent
@@ -31,42 +31,42 @@ public interface ClassRealmConstituent
/**
* Gets the group id of the constituent's artifact.
- *
+ *
* @return The group id, never {@code null}.
*/
String getGroupId();
/**
* Gets the artifact id of the constituent's artifact.
- *
+ *
* @return The artifact id, never {@code null}.
*/
String getArtifactId();
/**
* Gets the type of the constituent's artifact.
- *
+ *
* @return The type, never {@code null}.
*/
String getType();
/**
* Gets the classifier of the constituent's artifact.
- *
+ *
* @return The classifier or an empty string, never {@code null}.
*/
String getClassifier();
/**
* Gets the version of the constituent's artifact.
- *
+ *
* @return The version, never {@code null}.
*/
String getVersion();
/**
* Gets the file of the constituent's artifact.
- *
+ *
* @return The file, never {@code null}.
*/
File getFile();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java
index 9391f6a..e5d1514 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java
@@ -31,7 +31,7 @@ import org.eclipse.aether.artifact.Artifact;
* Manages the class realms used by Maven. <strong>Warning:</strong> This is an internal utility interface that is only
* public for technical reasons, it is not part of the public API. In particular, this interface can be changed or
* deleted without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ClassRealmManager
@@ -39,21 +39,21 @@ public interface ClassRealmManager
/**
* Gets the class realm hosting the Maven core.
- *
+ *
* @return The class realm hosting the Maven core, never {@code null}.
*/
ClassRealm getCoreRealm();
/**
* Gets the class realm exposing the Maven API. This is basically a restricted view on the Maven core realm.
- *
+ *
* @return The class realm exposing the Maven API, never {@code null}.
*/
ClassRealm getMavenApiRealm();
/**
* Creates a new class realm for the specified project and its build extensions.
- *
+ *
* @param model The model of the project for which to create a realm, must not be {@code null}.
* @param artifacts The artifacts to add to the class realm, may be {@code null}. Unresolved artifacts (i.e. with a
* missing file) will automatically be excluded from the realm.
@@ -63,7 +63,7 @@ public interface ClassRealmManager
/**
* Creates a new class realm for the specified build extension.
- *
+ *
* @param extension The extension plugin for which to create a realm, must not be {@code null}.
* @param artifacts The artifacts to add to the class realm, may be {@code null}. Unresolved artifacts (i.e. with a
* missing file) will automatically be excluded from the realm.
@@ -73,7 +73,7 @@ public interface ClassRealmManager
/**
* Creates a new class realm for the specified plugin.
- *
+ *
* @param plugin The plugin for which to create a realm, must not be {@code null}.
* @param parent The parent realm for the new realm, may be {@code null}.
* @param parentImports The packages/types to import from the parent realm, may be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
index d882c99..b0229b9 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java
@@ -25,7 +25,7 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm;
/**
* ClassRealmManagerDelegate is used to perform addition configuration of
* class realms created by ClassRealmManager.
- *
+ *
* @author igor
*/
public interface ClassRealmManagerDelegate
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java
index 24f3819..9b62108 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java
@@ -24,7 +24,7 @@ import java.util.Map;
/**
* Describes the requirements for a new class realm.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ClassRealmRequest
@@ -58,14 +58,14 @@ public interface ClassRealmRequest
/**
* Gets the type of the class realm.
- *
+ *
* @return The type of the class realm, never {@code null}.
*/
RealmType getType();
/**
* Gets the parent class realm (if any).
- *
+ *
* @return The parent class realm or {@code null} if using the default parent.
*/
ClassLoader getParent();
@@ -78,21 +78,21 @@ public interface ClassRealmRequest
/**
* Gets the packages/types to import from the parent realm.
- *
+ *
* @return The modifiable list of packages/types to import from the parent realm, never {@code null}.
*/
List<String> getParentImports();
/**
* Gets the packages/types to import from foreign realms.
- *
+ *
* @return The modifiable map of packages/types to import from foreign realms, never {@code null}.
*/
Map<String, ClassLoader> getForeignImports();
/**
* Gets the constituents for the class realm.
- *
+ *
* @return The modifiable list of constituents for the class realm, never {@code null}.
*/
List<ClassRealmConstituent> getConstituents();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index b718ef1..3584d53 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -51,7 +51,7 @@ import org.eclipse.aether.artifact.Artifact;
* Manages the class realms used by Maven. <strong>Warning:</strong> This is an internal utility class that is only
* public for technical reasons, it is not part of the public API. In particular, this class can be changed or deleted
* without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ClassRealmManager.class )
@@ -227,7 +227,7 @@ public class DefaultClassRealmManager
/**
* Creates a new class realm with the specified parent and imports.
- *
+ *
* @param baseRealmId The base id to use for the new realm, must not be {@code null}.
* @param type The type of the class realm, must not be {@code null}.
* @param parent The parent realm for the new realm, may be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java b/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java
index b723464..9859f58 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java
@@ -23,7 +23,7 @@ import java.io.File;
/**
* A path translator that resolves relative paths against a specific base directory.
- *
+ *
* @author Benjamin Bentmann
*/
public class BasedirBeanConfigurationPathTranslator
@@ -34,7 +34,7 @@ public class BasedirBeanConfigurationPathTranslator
/**
* Creates a new path translator using the specified base directory.
- *
+ *
* @param basedir The base directory to resolve relative paths against, may be {@code null} to disable path
* translation.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java
index 1d8c57f..3d10ed4 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java
@@ -21,7 +21,7 @@ package org.apache.maven.configuration;
/**
* Thrown when a bean couldn't be configured.
- *
+ *
* @author Benjamin Bentmann
*/
public class BeanConfigurationException
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java
index bfa53c7..3966339 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java
@@ -24,7 +24,7 @@ import java.io.File;
/**
* Postprocesses filesystem paths. For instance, a path translator might want to resolve relative paths given in the
* bean configuration against some base directory.
- *
+ *
* @author Benjamin Bentmann
*/
public interface BeanConfigurationPathTranslator
@@ -32,7 +32,7 @@ public interface BeanConfigurationPathTranslator
/**
* Translates the specified path.
- *
+ *
* @param path The path to translate, may be {@code null}.
* @return The translated path or {@code null} if none.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java
index 6f3f2fe..d19aa20 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java
@@ -21,7 +21,7 @@ package org.apache.maven.configuration;
/**
* A request to configure a bean from some configuration in the POM or similar.
- *
+ *
* @author Benjamin Bentmann
*/
public interface BeanConfigurationRequest
@@ -29,14 +29,14 @@ public interface BeanConfigurationRequest
/**
* Gets the bean to configure. Eventually, a valid request must have a bean set.
- *
+ *
* @return The bean to configure, or {@code null} if none.
*/
Object getBean();
/**
* Sets the bean to configure. Eventually, a valid request must have a bean set.
- *
+ *
* @param bean The bean to configure, may be {@code null}.
* @return This request for chaining, never {@code null}.
*/
@@ -44,7 +44,7 @@ public interface BeanConfigurationRequest
/**
* Gets the configuration to unmarshal into the bean.
- *
+ *
* @return The configuration to unmarshal into the bean or {@code null} if none.
*/
Object getConfiguration();
@@ -53,7 +53,7 @@ public interface BeanConfigurationRequest
* Sets the configuration to unmarshal into the bean. The configuration should be taken from
* {@link org.apache.maven.model.ConfigurationContainer#getConfiguration()} or a similar source.
* Fully equivalent to {@code setConfiguration(configuration, null)}.
- *
+ *
* @param configuration The configuration to unmarshal, may be {@code null}.
* @return This request for chaining, never {@code null}.
*/
@@ -62,9 +62,9 @@ public interface BeanConfigurationRequest
/**
* Sets the configuration to unmarshal into the bean. The configuration should be taken from
* {@link org.apache.maven.model.ConfigurationContainer#getConfiguration()} or a similar source.
- * If {@code element} is not {@code null}, child configuration element with the specified name will
+ * If {@code element} is not {@code null}, child configuration element with the specified name will
* be unmarshaled.
- *
+ *
* @param configuration The configuration to unmarshal, may be {@code null}.
* @param element Configuration element name to unmarshal or {@code null} to unmarshal entire configuration.
* @return This request for chaining, never {@code null}.
@@ -72,10 +72,10 @@ public interface BeanConfigurationRequest
BeanConfigurationRequest setConfiguration( Object configuration, String element );
/**
- * Returns configuration element name or {@code null}.
- *
+ * Returns configuration element name or {@code null}.
+ *
* @see #setConfiguration(Object, String)
- *
+ *
* @return Configuration element name or {@code null}
*/
String getConfigurationElement();
@@ -83,7 +83,7 @@ public interface BeanConfigurationRequest
/**
* Gets the class loader from which to load any types referenced by the configuration. If unset, the class loader of
* the bean class will be used.
- *
+ *
* @return The class loader to load referenced types from or {@code null} if unset.
*/
ClassLoader getClassLoader();
@@ -91,7 +91,7 @@ public interface BeanConfigurationRequest
/**
* Sets the class loader from which to load any types referenced by the configuration. If unset, the class loader of
* the bean class will be used.
- *
+ *
* @param classLoader The class loader to load referenced types from, may be {@code null}.
* @return This request for chaining, never {@code null}.
*/
@@ -99,14 +99,14 @@ public interface BeanConfigurationRequest
/**
* Gets the optional preprocessor for configuration values.
- *
+ *
* @return The preprocessor for configuration values or {@code null} if none.
*/
BeanConfigurationValuePreprocessor getValuePreprocessor();
/**
* Sets the optional preprocessor for configuration values.
- *
+ *
* @param valuePreprocessor The preprocessor for configuration values, may be {@code null} if unneeded.
* @return This request for chaining, never {@code null}.
*/
@@ -114,14 +114,14 @@ public interface BeanConfigurationRequest
/**
* Gets the optional path translator for configuration values unmarshalled to files.
- *
+ *
* @return The path translator for files or {@code null} if none.
*/
BeanConfigurationPathTranslator getPathTranslator();
/**
* Sets the optional path translator for configuration values unmarshalled to files.
- *
+ *
* @param pathTranslator The path translator for files, may be {@code null} if unneeded.
* @return This request for chaining, never {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java
index e00194e..63f8517 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java
@@ -22,7 +22,7 @@ package org.apache.maven.configuration;
/**
* Preprocesses a value from a bean configuration before the bean configurator unmarshals it into a bean property. A
* common use case for such preprocessing is the evaluation of variables within the configuration value.
- *
+ *
* @author Benjamin Bentmann
*/
public interface BeanConfigurationValuePreprocessor
@@ -33,7 +33,7 @@ public interface BeanConfigurationValuePreprocessor
* requirement) for the preprocessor to resolve the value to a compatible value or a (string) value than can be
* unmarshalled into that type. The preprocessor is not required to perform any type conversion but should rather
* filter out incompatible values from its result.
- *
+ *
* @param value The configuration value to preprocess, must not be {@code null}.
* @param type The target type of the value, may be {@code null}.
* @return The processed configuration value or {@code null} if none.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java
index 74993be..36d23ec 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java
@@ -24,7 +24,7 @@ package org.apache.maven.configuration;
* similar to the way Maven configures plugins from the POM, i.e. some configuration like {@code <param>value</param>}
* is mapped to an equally named property of the bean and converted. The properties of the bean are supposed to either
* have a public setter or be backed by an equally named field (of any visibility).
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
@@ -33,7 +33,7 @@ public interface BeanConfigurator
/**
* Performs the specified bean configuration.
- *
+ *
* @param request The configuration request that specifies the bean and the configuration to process, must not be
* {@code null}.
* @throws BeanConfigurationException If the bean configuration could not be successfully processed.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java b/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java
index ab46c18..32def48 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java
@@ -28,7 +28,7 @@ import org.codehaus.plexus.util.StringUtils;
/**
* A basic bean configuration request.
- *
+ *
* @author Benjamin Bentmann
*/
public class DefaultBeanConfigurationRequest
@@ -83,7 +83,7 @@ public class DefaultBeanConfigurationRequest
/**
* Sets the configuration to the configuration taken from the specified build plugin in the POM. First, the build
* plugins will be searched for the specified plugin, if that fails, the plugin management section will be searched.
- *
+ *
* @param model The POM to extract the plugin configuration from, may be {@code null}.
* @param pluginGroupId The group id of the plugin whose configuration should be used, must not be {@code null} or
* empty.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
index 32b8ae4..3d3def6 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
@@ -40,7 +40,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* <strong>Warning:</strong> This is an internal class that is only public for technical reasons, it is not part of the
* public API. In particular, this class can be changed or deleted without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = BeanConfigurator.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
index a183b82..4284fce 100644
--- a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
+++ b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
@@ -37,7 +37,7 @@ public interface EventSpy
/**
* Gets key-value pairs providing information about the Maven runtime.
- *
+ *
* @return The key-value pairs, never {@code null}.
*/
Map<String, Object> getData();
@@ -46,7 +46,7 @@ public interface EventSpy
/**
* Initializes the spy.
- *
+ *
* @param context The event spy context, never {@code null}.
*/
void init( Context context )
@@ -54,7 +54,7 @@ public interface EventSpy
/**
* Notifies the spy of some build event/operation.
- *
+ *
* @param event The event, never {@code null}.
* @see org.apache.maven.settings.building.SettingsBuildingRequest
* @see org.apache.maven.settings.building.SettingsBuildingResult
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
index 945edf6..47865f6 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
+++ b/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
@@ -24,7 +24,7 @@ package org.apache.maven.exception;
*
* @since 3.0-alpha-3
*/
-public interface ExceptionHandler
+public interface ExceptionHandler
{
ExceptionSummary handleException( Throwable e );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java b/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java
index 82da4dc..bf8f62b 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java
@@ -23,7 +23,7 @@ import org.apache.maven.project.MavenProject;
/**
* Summarizes the result of a failed project build in the reactor.
- *
+ *
* @author Benjamin Bentmann
*/
public class BuildFailure
@@ -37,7 +37,7 @@ public class BuildFailure
/**
* Creates a new build summary for the specified project.
- *
+ *
* @param project The project being summarized, must not be {@code null}.
* @param time The build time of the project in milliseconds.
* @param cause The cause of the build failure, may be {@code null}.
@@ -50,7 +50,7 @@ public class BuildFailure
/**
* Gets the cause of the build failure.
- *
+ *
* @return The cause of the build failure or {@code null} if unknown.
*/
public Throwable getCause()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java b/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java
index 6d9d7d7..3d0e8bd 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java
@@ -23,7 +23,7 @@ import org.apache.maven.project.MavenProject;
/**
* Summarizes the result of a successful project build in the reactor.
- *
+ *
* @author Benjamin Bentmann
*/
public class BuildSuccess
@@ -32,7 +32,7 @@ public class BuildSuccess
/**
* Creates a new build summary for the specified project.
- *
+ *
* @param project The project being summarized, must not be {@code null}.
* @param time The build time of the project in milliseconds.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java b/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java
index 93754d8..ec23f72 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java
@@ -23,7 +23,7 @@ import org.apache.maven.project.MavenProject;
/**
* Summarizes the result of a project build in the reactor.
- *
+ *
* @author Benjamin Bentmann
*/
public abstract class BuildSummary
@@ -41,7 +41,7 @@ public abstract class BuildSummary
/**
* Creates a new build summary for the specified project.
- *
+ *
* @param project The project being summarized, must not be {@code null}.
* @param time The build time of the project in milliseconds.
*/
@@ -57,7 +57,7 @@ public abstract class BuildSummary
/**
* Gets the project being summarized.
- *
+ *
* @return The project being summarized, never {@code null}.
*/
public MavenProject getProject()
@@ -67,7 +67,7 @@ public abstract class BuildSummary
/**
* Gets the build time of the project in milliseconds.
- *
+ *
* @return The build time of the project in milliseconds.
*/
public long getTime()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 11329d0..df91f82 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -140,7 +140,7 @@ public class DefaultMavenExecutionRequest
/**
* Suppress SNAPSHOT updates.
- *
+ *
* @issue MNG-2681
*/
private boolean noSnapshotUpdates;
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
index df3ee69..de5fa69 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
@@ -132,8 +132,8 @@ public class DefaultMavenExecutionRequestPopulator
}
return request;
- }
-
+ }
+
private void populateDefaultPluginGroups( MavenExecutionRequest request )
{
request.addPluginGroup( "org.apache.maven.plugins" );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java
index 80ec219..0ee7f57 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java
@@ -24,7 +24,7 @@ import org.apache.maven.project.MavenProject;
/**
* Holds data relevant for an execution event.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ExecutionEvent
@@ -56,35 +56,35 @@ public interface ExecutionEvent
/**
* Gets the type of the event.
- *
+ *
* @return The type of the event, never {@code null}.
*/
Type getType();
/**
* Gets the session from which this event originates.
- *
+ *
* @return The current session, never {@code null}.
*/
MavenSession getSession();
/**
* Gets the current project (if any).
- *
+ *
* @return The current project or {@code null} if not applicable.
*/
MavenProject getProject();
/**
* Gets the current mojo execution (if any).
- *
+ *
* @return The current mojo execution or {@code null} if not applicable.
*/
MojoExecution getMojoExecution();
/**
* Gets the exception that caused the event (if any).
- *
+ *
* @return The exception or {@code null} if none.
*/
Exception getException();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java
index 91fa945..ad3f345 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java
@@ -23,7 +23,7 @@ package org.apache.maven.execution;
* Defines events that Maven fires during a build. <strong>Warning:</strong> This interface might be extended in future
* Maven versions to support further events. Hence it is strongly recommended to derive custom listeners from
* {@link AbstractExecutionListener} in order to avoid interoperability problems.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ExecutionListener
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
index dfa20c4..3c99d31 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
@@ -109,7 +109,7 @@ public interface MavenExecutionRequest
/**
* Sets the system properties to use for interpolation and profile activation. The system properties are collected
* from the runtime environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @param systemProperties The system properties, may be {@code null}.
* @return This request, never {@code null}.
*/
@@ -118,7 +118,7 @@ public interface MavenExecutionRequest
/**
* Gets the system properties to use for interpolation and profile activation. The system properties are collected
* from the runtime environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @return The system properties, never {@code null}.
*/
Properties getSystemProperties();
@@ -127,7 +127,7 @@ public interface MavenExecutionRequest
* Sets the user properties to use for interpolation and profile activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @param userProperties The user properties, may be {@code null}.
* @return This request, never {@code null}.
*/
@@ -137,7 +137,7 @@ public interface MavenExecutionRequest
* Gets the user properties to use for interpolation and profile activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @return The user properties, never {@code null}.
*/
Properties getUserProperties();
@@ -174,7 +174,7 @@ public interface MavenExecutionRequest
/**
* Set's the parallel degree of concurrency used by the build.
- *
+ *
* @param degreeOfConcurrency
*/
void setDegreeOfConcurrency( int degreeOfConcurrency );
@@ -324,7 +324,7 @@ public interface MavenExecutionRequest
* Set a new list of remote repositories to use the execution request. This is necessary if you perform
* transformations on the remote repositories being used. For example if you replace existing repositories with
* mirrors then it's easier to just replace the whole list with a new list of transformed repositories.
- *
+ *
* @param repositories
* @return This request, never {@code null}.
*/
@@ -366,14 +366,14 @@ public interface MavenExecutionRequest
/**
* Controls the {@link Builder} used by Maven by specification of the builder's id.
- *
+ *
* @since 3.2.0
*/
MavenExecutionRequest setBuilderId( String builderId );
/**
* Controls the {@link Builder} used by Maven by specification of the builders id.
- *
+ *
* @since 3.2.0
*/
String getBuilderId();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java
index 3d00012..7c20cb8 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java
@@ -23,7 +23,7 @@ import org.apache.maven.settings.Settings;
/**
* Assists in populating an execution request for invocation of Maven.
- *
+ *
* @author Benjamin Bentmann
*/
public interface MavenExecutionRequestPopulator
@@ -33,7 +33,7 @@ public interface MavenExecutionRequestPopulator
* Copies the values from the given settings into the specified execution request. This method will replace any
* existing values in the execution request that are controlled by the settings. Hence, it is expected that this
* method is called on a new/empty execution request before the caller mutates it to fit its needs.
- *
+ *
* @param request The execution request to populate, must not be {@code null}.
* @param settings The settings to copy into the execution request, may be {@code null}.
* @return The populated execution request, never {@code null}.
@@ -44,7 +44,7 @@ public interface MavenExecutionRequestPopulator
/**
* Injects default values like plugin groups or repositories into the specified execution request.
- *
+ *
* @param request The execution request to populate, must not be {@code null}.
* @return The populated execution request, never {@code null}.
* @throws MavenExecutionRequestPopulationException If the execution request could not be populated.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
index 8adc7ac..cb95fb1 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
@@ -33,7 +33,7 @@ public interface MavenExecutionResult
MavenProject getProject();
MavenExecutionResult setTopologicallySortedProjects( List<MavenProject> projects );
-
+
/**
* @return the sorted list, or an empty list if there are no projects.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index bd60d5e..972ebd6 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -401,13 +401,13 @@ public class MavenSession
}
private Map<String, MavenProject> projectMap;
-
+
public void setProjectMap( Map<String, MavenProject> projectMap )
{
this.projectMap = projectMap;
}
-
- public Map<String, MavenProject> getProjectMap()
+
+ public Map<String, MavenProject> getProjectMap()
{
return projectMap;
}
@@ -423,6 +423,6 @@ public class MavenSession
{
this.allProjects = allProjects;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java
index 2494dea..a8d293d 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java
@@ -26,7 +26,7 @@ import org.apache.maven.project.MavenProject;
/**
* Encapsulates parameters of MojoExecutionListener callback methods and is meant to provide API evolution path should
* it become necessary to introduce new parameters in the existing callbacks in the future.
- *
+ *
* @see MojoExecutionListener
* @see org.apache.maven.execution.scope.WeakMojoExecutionListener
* @since 3.1.2
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java
index 921acc6..c2fb7a1 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java
@@ -23,7 +23,7 @@ import org.apache.maven.plugin.MojoExecutionException;
/**
* Extension point that allows build extensions observe and possibly veto mojo executions.
- *
+ *
* @see org.apache.maven.execution.scope.WeakMojoExecutionListener
* @since 3.1.2
* @provisional This interface is part of work in progress and can be changed or removed without notice.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index bbc1091..1db277d 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -25,7 +25,7 @@ import org.apache.maven.project.MavenProject;
/**
* Describes the inter-dependencies between projects in the reactor.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ProjectDependencyGraph
@@ -34,7 +34,7 @@ public interface ProjectDependencyGraph
/**
* Gets all projects in their intended build order, i.e. after topologically sorting the projects according to their
* inter-dependencies.
- *
+ *
* @return The projects in the build order, never {@code null}.
*/
List<MavenProject> getSortedProjects();
@@ -42,7 +42,7 @@ public interface ProjectDependencyGraph
/**
* Gets the downstream projects of the specified project. A downstream project is a project that directly or
* indirectly depends on the given project.
- *
+ *
* @param project The project whose downstream projects should be retrieved, must not be {@code null}.
* @param transitive A flag whether to retrieve all direct and indirect downstream projects or just the immediate
* downstream projects.
@@ -53,7 +53,7 @@ public interface ProjectDependencyGraph
/**
* Gets the upstream projects of the specified project. An upstream project is a project that directly or indirectly
* is a prerequisite of the given project.
- *
+ *
* @param project The project whose upstream projects should be retrieved, must not be {@code null}.
* @param transitive A flag whether to retrieve all direct and indirect upstream projects or just the immediate
* upstream projects.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java
index 78655f7..fb71078 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java
@@ -27,7 +27,7 @@ import org.apache.maven.project.MavenProject;
/**
* Encapsulates parameters of ProjectExecutionListener callback methods and is meant to provide API evolution path
* should it become necessary to introduce new parameters in the existing callbacks in the future.
- *
+ *
* @see ProjectExecutionListener
* @since 3.1.2
* @provisional This class is part of work in progress and can be changed or removed without notice.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java
index 24c49b9..d7e8918 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java
@@ -23,7 +23,7 @@ import org.apache.maven.lifecycle.LifecycleExecutionException;
/**
* Extension point that allows build extensions observe and possibly veto project build execution.
- *
+ *
* @see ExecutionListener
* @see MojoExecutionListener
* @since 3.1.2
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java b/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java
index c53297c..0dcbd16 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java
@@ -30,7 +30,7 @@ import com.google.inject.ScopeAnnotation;
/**
* Indicates that annotated component should be instantiated before mojo execution starts and discarded after mojo
* execution completes.
- *
+ *
* @author igor
* @since 3.1.2
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
index 89242c0..94e7c10 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
@@ -27,7 +27,7 @@ import org.apache.maven.plugin.MojoExecutionException;
* <p>
* Unlike {@link MojoExecutionListener}, this extension point does not trigger instantiation of the component, hence
* "weak" class name prefix. Only applies to mojo execution scoped components.
- *
+ *
* @see org.apache.maven.execution.MojoExecutionListener
* @since 3.1.2
* @provisional This interface is part of work in progress and can be changed or removed without notice.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index 3705d12..349576c 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -29,7 +29,7 @@ public class LifecycleExecutionException
extends Exception
{
private MavenProject project;
-
+
public LifecycleExecutionException( String message )
{
super( message );
@@ -44,7 +44,7 @@ public class LifecycleExecutionException
{
super( message, cause );
}
-
+
public LifecycleExecutionException( String message, MavenProject project )
{
super( message );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
index c246001..f070198 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
@@ -38,7 +38,7 @@ import org.apache.maven.project.MavenProject;
* <p>
* Implementations of this interface must be annotated with either {@code @Named("lifecycle-id")} or equivalent plexus
* {@code @Component} annotations.
- *
+ *
* @since 3.2.0
* @see org.apache.maven.lifecycle.internal.DefaultLifecycleMappingDelegate
* @author ifedorenko
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java
index d79eaa1..e9ff0c2 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java
@@ -21,7 +21,7 @@ package org.apache.maven.lifecycle;
/**
* Signals a failure to locate a lifecycle.
- *
+ *
* @author Benjamin Bentmann
*/
public class LifecycleNotFoundException
@@ -32,7 +32,7 @@ public class LifecycleNotFoundException
/**
* Creates a new exception to indicate that the specified lifecycle is unknown.
- *
+ *
* @param lifecycleId The identifier of the lifecycle that could not be located, may be {@code null}.
*/
public LifecycleNotFoundException( String lifecycleId )
@@ -43,7 +43,7 @@ public class LifecycleNotFoundException
/**
* Gets the identifier of the lifecycle that was not found.
- *
+ *
* @return The identifier of the lifecycle that was not found, never {@code null}.
*/
public String getLifecycleId()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java
index 86b37db..fab1d2f 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java
@@ -21,7 +21,7 @@ package org.apache.maven.lifecycle;
/**
* Signals a failure to locate the lifecycle for some phase.
- *
+ *
* @author Benjamin Bentmann
*/
public class LifecyclePhaseNotFoundException
@@ -32,7 +32,7 @@ public class LifecyclePhaseNotFoundException
/**
* Creates a new exception to indicate that the specified lifecycle phase is not defined by any known lifecycle.
- *
+ *
* @param message The detail message, may be {@code null}.
* @param lifecyclePhase The name of the lifecycle phase that could not be located, may be {@code null}.
*/
@@ -44,7 +44,7 @@ public class LifecyclePhaseNotFoundException
/**
* Gets the lifecycle phase that was not found.
- *
+ *
* @return The lifecycle phase that was not found, never {@code null}.
*/
public String getLifecyclePhase()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java
index 9919145..571e1d2 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java
@@ -21,7 +21,7 @@ package org.apache.maven.lifecycle;
/**
* Signals a failure to execute a lifecycle phase or mojo because a project is required but not present.
- *
+ *
* @author Benjamin Bentmann
*/
public class MissingProjectException
@@ -30,7 +30,7 @@ public class MissingProjectException
/**
* Creates a new exception.
- *
+ *
* @param message The detail message, may be {@code null}.
*/
public MissingProjectException( String message )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java
index 63ba2ca..2ac9638 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java
@@ -21,7 +21,7 @@ package org.apache.maven.lifecycle;
/**
* Signals a failure to build because no goal was specified.
- *
+ *
* @author Benjamin Bentmann
*/
public class NoGoalSpecifiedException
@@ -30,7 +30,7 @@ public class NoGoalSpecifiedException
/**
* Creates a new exception.
- *
+ *
* @param message The detail message, may be {@code null}.
*/
public NoGoalSpecifiedException( String message )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java
index b5a4ad3..9434a65 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java
@@ -26,7 +26,7 @@ import org.apache.maven.project.MavenProject;
/**
* Holds data relevant for an execution event.
- *
+ *
* @author Benjamin Bentmann
*/
class DefaultExecutionEvent
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java
index 074aba7..bfb98d4 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java
@@ -29,7 +29,7 @@ import org.codehaus.plexus.component.annotations.Component;
* Assists in firing execution events. <strong>Warning:</strong> This is an internal utility class that is only public
* for technical reasons, it is not part of the public API. In particular, this class can be changed or deleted without
* prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ExecutionEventCatapult.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
index 5602a09..c187c1d 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
@@ -170,7 +170,7 @@ public class DefaultLifecycleExecutionPlanCalculator
calculateForkedExecutions( mojoExecution, session, project, new HashSet<MojoDescriptor>() );
}
-
+
public List<MojoExecution> calculateMojoExecutions( MavenSession session, MavenProject project,
List<Object> tasks )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
index 575292b..28377f1 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
@@ -41,7 +41,7 @@ import java.util.List;
/**
* Calculates the task segments in the build
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
* @author Jason van Zyl
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
index bed9a73..18fae7a 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
@@ -28,7 +28,7 @@ import java.util.TreeSet;
/**
* Context of dependency artifacts for a particular project.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
* @author Kristian Rosenvold (class extract only)
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java
index c395868..acff566 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java
@@ -27,7 +27,7 @@ import org.apache.maven.plugin.MojoExecution;
* Assists in firing execution events. <strong>Warning:</strong> This is an internal utility interface that is only
* public for technical reasons, it is not part of the public API. In particular, this interface can be changed or
* deleted without prior notice.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ExecutionEventCatapult
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
index 6ecc3e3..cceffdf 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
@@ -32,7 +32,7 @@ import java.util.List;
* Wraps individual MojoExecutions, containing information about completion status and scheduling.
* <p/>
* NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
- *
+ *
* @since 3.0
* @author Kristian Rosenvold
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java
index ab39971..5c43dbd 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java
@@ -23,7 +23,7 @@ package org.apache.maven.lifecycle.internal;
* A task that is a goal
* <p/>
* TODO: From a concurrecy perspective, this class is not good. The combination of mutable/immutable state is not nice
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
index c9a1947..2edbe75 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
@@ -37,7 +37,7 @@ import java.util.TreeSet;
/**
* Logs debug output from the various lifecycle phases.
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
* @author Jason van Zyl
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index a76461d..c95da2a 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -52,7 +52,7 @@ import org.eclipse.aether.util.filter.ScopeDependencyFilter;
/**
* Resolves dependencies for the artifacts in context of the lifecycle build
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
* @author Jason van Zyl
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
index 5d72ca3..df7f674 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
@@ -38,7 +38,7 @@ import org.codehaus.plexus.component.annotations.Requirement;
/**
* Builds one or more lifecycles for a full module
- *
+ *
* @since 3.0
* @author Benjamin Bentmann
* @author Jason van Zyl
@@ -88,7 +88,7 @@ public class LifecycleModuleBuilder
long buildStartTime = System.currentTimeMillis();
// session may be different from rootSession seeded in DefaultMaven
- // explicitly seed the right session here to make sure it is used by Guice
+ // explicitly seed the right session here to make sure it is used by Guice
sessionScope.enter();
sessionScope.seed( MavenSession.class, session );
try
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
index 3b06c72..cc00ff9 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
@@ -36,7 +36,7 @@ import org.codehaus.plexus.logging.Logger;
/**
* Starts the build life cycle
- *
+ *
* @author Jason van Zyl
* @author Benjamin Bentmann
* @author Kristian Rosenvold
[02/11] maven git commit: Trimmed trailing whitespace
Posted by mi...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
index 7ffd9e2..c5ea338 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Handles conversion of the legacy reporting section into the configuration of the new Maven Site Plugin.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ReportingConverter
@@ -33,7 +33,7 @@ public interface ReportingConverter
/**
* Converts values from model's reporting section into the configuration for the new Maven Site Plugin.
- *
+ *
* @param model The model whose reporting section should be converted, must not be <code>null</code>.
* @param request The model building request that holds further settings, 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/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
index 38421bc..bb6a079 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
@@ -43,7 +43,7 @@ import org.codehaus.plexus.component.annotations.Component;
/**
* Handles profile injection into the model.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ProfileInjector.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
index 80a051a..db2bf62 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
@@ -36,7 +36,7 @@ import org.codehaus.plexus.component.annotations.Requirement;
/**
* Calculates the active profiles among a given collection of profiles.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = ProfileSelector.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java
index fb9ea0c..d501e66 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java
@@ -25,7 +25,7 @@ import java.util.Map;
/**
* Describes the environmental context used to determine the activation status of profiles.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ProfileActivationContext
@@ -33,14 +33,14 @@ public interface ProfileActivationContext
/**
* Gets the identifiers of those profiles that should be activated by explicit demand.
- *
+ *
* @return The identifiers of those profiles to activate, never {@code null}.
*/
List<String> getActiveProfileIds();
/**
* Gets the identifiers of those profiles that should be deactivated by explicit demand.
- *
+ *
* @return The identifiers of those profiles to deactivate, never {@code null}.
*/
List<String> getInactiveProfileIds();
@@ -48,7 +48,7 @@ public interface ProfileActivationContext
/**
* Gets the system properties to use for interpolation and profile activation. The system properties are collected
* from the runtime environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @return The execution properties, never {@code null}.
*/
Map<String, String> getSystemProperties();
@@ -57,14 +57,14 @@ public interface ProfileActivationContext
* Gets the user properties to use for interpolation and profile activation. The user properties have been
* configured directly by the user on his discretion, e.g. via the {@code -Dkey=value} parameter on the command
* line.
- *
+ *
* @return The user properties, never {@code null}.
*/
Map<String, String> getUserProperties();
/**
* Gets the base directory of the current project (if any).
- *
+ *
* @return The base directory of the current project or {@code null} if none.
*/
File getProjectDirectory();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java
index 5c1e8ea..fbd7ddf 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java
@@ -26,7 +26,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Handles profile injection into the model.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ProfileInjector
@@ -35,7 +35,7 @@ public interface ProfileInjector
/**
* Merges values from the specified profile into the given model. Implementations are expected to keep the profile
* and model completely decoupled by injecting deep copies rather than the original objects from the profile.
- *
+ *
* @param model The model into which to merge the values defined by the profile, must not be <code>null</code>.
* @param profile The (read-only) profile whose values should be injected, may be <code>null</code>.
* @param request The model building request that holds further settings, must not be {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java
index f58dcc8..53ea8d9 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java
@@ -27,7 +27,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Calculates the active profiles among a given collection of profiles.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ProfileSelector
@@ -36,7 +36,7 @@ public interface ProfileSelector
/**
* Determines the profiles which are active in the specified activation context. Active profiles will eventually be
* injected into the model.
- *
+ *
* @param profiles The profiles whose activation status should be determined, must not be {@code null}.
* @param context The environmental context used to determine the activation status of a profile, must not be
* {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
index e86f142..b0bda3f 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
@@ -44,7 +44,7 @@ import org.codehaus.plexus.util.StringUtils;
* System properties and request properties.
* <code>${project.basedir}</code> is intentionally not supported as this form would suggest that other
* <code>${project.*}</code> expressions can be used, which is however beyond the design.
- *
+ *
* @author Benjamin Bentmann
* @see ActivationFile
* @see org.apache.maven.model.validation.DefaultModelValidator#validateRawModel
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
index 10747de..4dc5858 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
@@ -34,7 +34,7 @@ import org.codehaus.plexus.component.annotations.Component;
/**
* Determines profile activation based on the version of the current Java runtime.
- *
+ *
* @author Benjamin Bentmann
* @see Activation#getJdk()
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
index b6d3f05..2d53621 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
@@ -29,7 +29,7 @@ import org.codehaus.plexus.util.Os;
/**
* Determines profile activation based on the operating system of the current runtime platform.
- *
+ *
* @author Benjamin Bentmann
* @see ActivationOS
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java
index 57487d4..0547e74 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.profile.ProfileActivationContext;
/**
* Determines whether a profile should be activated.
- *
+ *
* @author Benjamin Bentmann
*/
public interface ProfileActivator
@@ -33,7 +33,7 @@ public interface ProfileActivator
/**
* Determines whether the specified profile is active in the given activator context.
- *
+ *
* @param profile The profile whose activation status should be determined, must not be {@code null}.
* @param context The environmental context used to determine the activation status of the profile, must not be
* {@code null}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
index e8e6e99..9a7c244 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
@@ -32,7 +32,7 @@ import org.codehaus.plexus.util.StringUtils;
/**
* Determines profile activation based on the existence or value of some execution property.
- *
+ *
* @author Benjamin Bentmann
* @see ActivationProperty
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java
index 7324adf..303aff0 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java
@@ -23,7 +23,7 @@ import org.apache.maven.model.Repository;
/**
* Signals an error when adding a repository to the model resolver.
- *
+ *
* @author Benjamin Bentmann
*/
public class InvalidRepositoryException
@@ -37,7 +37,7 @@ public class InvalidRepositoryException
/**
* Creates a new exception with specified detail message and cause for the given repository.
- *
+ *
* @param message The detail message, may be {@code null}.
* @param repository The repository that caused the error, may be {@code null}.
* @param cause The cause, may be {@code null}.
@@ -50,7 +50,7 @@ public class InvalidRepositoryException
/**
* Creates a new exception with specified detail message for the given repository.
- *
+ *
* @param message The detail message, may be {@code null}.
* @param repository The repository that caused the error, may be {@code null}.
*/
@@ -62,7 +62,7 @@ public class InvalidRepositoryException
/**
* Gets the repository that causes this error (if any).
- *
+ *
* @return The repository that causes this error or {@code null} if not known.
*/
public Repository getRepository()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java
index aa48fa2..733a276 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java
@@ -21,7 +21,7 @@ package org.apache.maven.model.resolution;
/**
* Signals an error when resolving the path to an external model.
- *
+ *
* @author Benjamin Bentmann
*/
public class UnresolvableModelException
@@ -45,7 +45,7 @@ public class UnresolvableModelException
/**
* Creates a new exception with specified detail message and cause.
- *
+ *
* @param message The detail message, may be {@code null}.
* @param groupId The group id of the unresolvable model, may be {@code null}.
* @param artifactId The artifact id of the unresolvable model, may be {@code null}.
@@ -63,7 +63,7 @@ public class UnresolvableModelException
/**
* Creates a new exception with specified detail message.
- *
+ *
* @param message The detail message, may be {@code null}.
* @param groupId The group id of the unresolvable model, may be {@code null}.
* @param artifactId The artifact id of the unresolvable model, may be {@code null}.
@@ -79,7 +79,7 @@ public class UnresolvableModelException
/**
* Gets the group id of the unresolvable model.
- *
+ *
* @return The group id of the unresolvable model, can be empty but never {@code null}.
*/
public String getGroupId()
@@ -89,7 +89,7 @@ public class UnresolvableModelException
/**
* Gets the artifact id of the unresolvable model.
- *
+ *
* @return The artifact id of the unresolvable model, can be empty but never {@code null}.
*/
public String getArtifactId()
@@ -99,7 +99,7 @@ public class UnresolvableModelException
/**
* Gets the version of the unresolvable model.
- *
+ *
* @return The version of the unresolvable model, can be empty but never {@code null}.
*/
public String getVersion()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java
index 46d807f..3f44fb7 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java
@@ -23,7 +23,7 @@ import org.apache.maven.model.Model;
/**
* Provides the super POM that all models implicitly inherit from.
- *
+ *
* @author Benjamin Bentmann
*/
public interface SuperPomProvider
@@ -33,7 +33,7 @@ public interface SuperPomProvider
* Gets the super POM for the specified model version. The returned model is supposed to be read-only, i.e. if the
* caller intends to make updates to the model the return value must be cloned before updating to ensure the
* modifications don't affect future retrievals of the super POM.
- *
+ *
* @param version The model version to retrieve the super POM for (e.g. "4.0.0"), must not be {@code null}.
* @return The super POM, never {@code null}.
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index fd66323..6b2a98d 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -747,7 +747,7 @@ public class DefaultModelValidator
}
}
-
+
private boolean validateStringNoExpression( String fieldName, ModelProblemCollector problems, Severity severity,
Version version, String string, InputLocationTracker tracker )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java
index 34bd97a..84e3fad 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java
@@ -25,7 +25,7 @@ import org.apache.maven.model.building.ModelProblemCollector;
/**
* Checks the model for missing or invalid values.
- *
+ *
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*/
public interface ModelValidator
@@ -34,7 +34,7 @@ public interface ModelValidator
/**
* Checks the specified (raw) model for missing or invalid values. The raw model is directly created from the POM
* file and has not been subjected to inheritance, interpolation or profile/default injection.
- *
+ *
* @param model The model to validate, must not be {@code null}.
* @param request The model building request that holds further settings, must not be {@code null}.
* @param problems The container used to collect problems that were encountered, must not be {@code null}.
@@ -44,7 +44,7 @@ public interface ModelValidator
/**
* Checks the specified (effective) model for missing or invalid values. The effective model is fully assembled and
* has undergone inheritance, interpolation and other model operations.
- *
+ *
* @param model The model to validate, must not be {@code null}.
* @param request The model building request that holds further settings, 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/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java
index 06f1b1b..bb0ccff 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java
@@ -27,7 +27,7 @@ import org.apache.maven.model.Model;
/**
* A simple model problem collector for testing the model building components.
- *
+ *
* @author Benjamin Bentmann
*/
public class SimpleProblemCollector
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
index 5d24f18..c4cae3d 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
@@ -38,7 +38,7 @@ import java.util.concurrent.FutureTask;
* @author Benjamin Bentmann
*/
public class StringSearchModelInterpolatorTest
- extends AbstractModelInterpolatorTest
+ extends AbstractModelInterpolatorTest
{
protected ModelInterpolator interpolator;
@@ -81,7 +81,7 @@ public class StringSearchModelInterpolatorTest
final SimpleProblemCollector collector = new SimpleProblemCollector();
interpolator.interpolateObject( values, model, new File( "." ), config, collector );
- assertProblemFree( collector );
+ assertProblemFree( collector );
assertEquals( "value", values[0] );
assertEquals( "value2", values[1] );
@@ -113,7 +113,7 @@ public class StringSearchModelInterpolatorTest
final SimpleProblemCollector collector = new SimpleProblemCollector();
interpolator.interpolateObject( obj, model, new File( "." ), config, collector );
- assertProblemFree( collector );
+ assertProblemFree( collector );
assertEquals( "value", obj.values[0] );
assertEquals( "value2", obj.values[1] );
@@ -167,7 +167,7 @@ public class StringSearchModelInterpolatorTest
final SimpleProblemCollector collector = new SimpleProblemCollector();
interpolator.interpolateObject( obj, model, new File( "." ), config, collector );
- assertProblemFree( collector );
+ assertProblemFree( collector );
assertEquals( "key", obj.values.get( 0 ) );
assertEquals( "value2", obj.values.get( 1 ) );
@@ -192,7 +192,7 @@ public class StringSearchModelInterpolatorTest
final SimpleProblemCollector collector = new SimpleProblemCollector();
interpolator.interpolateObject( obj, model, new File( "." ), config, collector );
- assertProblemFree( collector );
+ assertProblemFree( collector );
assertEquals( "${key}", obj.values.get( 0 ) );
}
@@ -276,7 +276,7 @@ public class StringSearchModelInterpolatorTest
final SimpleProblemCollector collector = new SimpleProblemCollector();
interpolator.interpolateObject( obj, model, new File( "." ), config, collector );
- assertProblemFree( collector );
+ assertProblemFree( collector );
assertEquals( "val", obj.values.get( "key" ) );
assertEquals( "value2", obj.values.get( "key2" ) );
@@ -329,7 +329,7 @@ public class StringSearchModelInterpolatorTest
final SimpleProblemCollector collector = new SimpleProblemCollector();
interpolator.interpolateObject( obj, model, new File( "." ), config, collector );
- assertProblemFree( collector );
+ assertProblemFree( collector );
assertEquals( "value", ( (String[]) obj.values.get( "key" ) )[0] );
assertEquals( "value2", ( (String[]) obj.values.get( "key" ) )[1] );
@@ -460,7 +460,7 @@ public class StringSearchModelInterpolatorTest
return fooBar;
}
}
-
+
public void testFinalFieldsExcludedFromInterpolation()
{
Properties props = new Properties();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java
index 7449c36..0ec3b32 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java
@@ -30,7 +30,7 @@ import org.codehaus.plexus.component.annotations.Component;
/**
* Provides common services to test {@link ProfileActivator} implementations.
- *
+ *
* @author Benjamin Bentmann
*/
public abstract class AbstractProfileActivatorTest<T extends ProfileActivator>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
index e7bfe2c..440f120 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
@@ -26,7 +26,7 @@ import org.apache.maven.model.Profile;
/**
* Tests {@link JdkVersionProfileActivator}.
- *
+ *
* @author Benjamin Bentmann
*/
public class JdkVersionProfileActivatorTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
index 6434864..73ab967 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
@@ -27,7 +27,7 @@ import org.apache.maven.model.Profile;
/**
* Tests {@link PropertyProfileActivator}.
- *
+ *
* @author Benjamin Bentmann
*/
public class PropertyProfileActivatorTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
index ac7ead0..791a318 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
@@ -563,9 +563,9 @@ public class DefaultModelValidatorTest
"'dependencies.dependency.exclusions.exclusion.groupId' for gid:aid:jar" );
assertContains( result.getWarnings().get( 1 ),
"'dependencies.dependency.exclusions.exclusion.artifactId' for gid:aid:jar" );
-
+
// MNG-3832: Aether (part of M3+) supports wildcard expressions for exclusions
-
+
SimpleProblemCollector result_30 = validate( "bad-dependency-exclusion-id.xml" );
assertViolations( result_30, 0, 0, 0 );
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml b/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml
index b050b13..977f5db 100644
--- a/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml
+++ b/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml
@@ -23,7 +23,7 @@ under the License.
<groupId>foo</groupId>
<version>99.44</version>
<packaging>bleh</packaging>
-
+
<modules>
<module>test-module</module>
</modules>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
----------------------------------------------------------------------
diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
index c52dd8e..648607c 100644
--- a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
+++ b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
@@ -4,7 +4,7 @@
* These classes use
* <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/pull/package-summary.html">plexus-utils'
* XML Pull Parser API</a> for their internal XML handling and
- * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomBuilder.html">Xpp3DomBuilder</a> +
+ * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomBuilder.html">Xpp3DomBuilder</a> +
* <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3Dom.html">Xpp3Dom</a> for
* DOM content representation (see <code><configuration></code> elements).
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
index fdaa1d9..f88da58 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code ActivationFile}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ActivationFileTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
index bcc56e8..f0d3045 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code ActivationOS}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ActivationOSTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
index 38b234e..5f5e048 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code ActivationProperty}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ActivationPropertyTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java b/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
index 96550d1..f6d0f91 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Activation}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ActivationTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/BuildTest.java b/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
index 630d812..80a60d5 100644
--- a/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Build}.
- *
+ *
* @author Benjamin Bentmann
*/
public class BuildTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
index 8803364..7194c84 100644
--- a/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code CiManagement}.
- *
+ *
* @author Benjamin Bentmann
*/
public class CiManagementTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java b/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
index d9cd17e..491b99a 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Contributor}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ContributorTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
index f964da4..7702c62 100644
--- a/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code DependencyManagement}.
- *
+ *
* @author Benjamin Bentmann
*/
public class DependencyManagementTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java b/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
index d0e7dd9..ec0a833 100644
--- a/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Dependency}.
- *
+ *
* @author Benjamin Bentmann
*/
public class DependencyTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java b/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
index 1984356..169ec65 100644
--- a/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code DeploymentRepository}.
- *
+ *
* @author Benjamin Bentmann
*/
public class DeploymentRepositoryTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java b/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
index 5c9c480..c0dfe56 100644
--- a/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Developer}.
- *
+ *
* @author Benjamin Bentmann
*/
public class DeveloperTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
index d3110df..0314d61 100644
--- a/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code DistributionManagement}.
- *
+ *
* @author Benjamin Bentmann
*/
public class DistributionManagementTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java b/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
index b80c2e8..6febace 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Exclusion}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ExclusionTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java b/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
index 34afb8e..4b8cd8a 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Extension}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ExtensionTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
index bcd25ec..5e50c15 100644
--- a/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code IssueManagement}.
- *
+ *
* @author Benjamin Bentmann
*/
public class IssueManagementTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java b/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
index 012a5dd..179921b 100644
--- a/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code License}.
- *
+ *
* @author Benjamin Bentmann
*/
public class LicenseTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java b/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
index f702673..6129695 100644
--- a/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code MailingList}.
- *
+ *
* @author Benjamin Bentmann
*/
public class MailingListTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ModelTest.java b/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
index 9fcadfa..c9ec4da 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Model}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ModelTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java b/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
index bbafb6b..4e5d068 100644
--- a/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Notifier}.
- *
+ *
* @author Benjamin Bentmann
*/
public class NotifierTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java b/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
index b7ea28e..48abe77 100644
--- a/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Organization}.
- *
+ *
* @author Benjamin Bentmann
*/
public class OrganizationTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ParentTest.java b/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
index 04f5a74..78d4567 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Parent}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ParentTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
index 08a9531..cbb123d 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code PluginConfiguration}.
- *
+ *
* @author Benjamin Bentmann
*/
public class PluginConfigurationTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
index 8c12773..878298c 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code PluginContainer}.
- *
+ *
* @author Benjamin Bentmann
*/
public class PluginContainerTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
index 72d73fd..e8fff51 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code PluginExecution}.
- *
+ *
* @author Benjamin Bentmann
*/
public class PluginExecutionTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
index fb80a77..571399f 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code PluginManagement}.
- *
+ *
* @author Benjamin Bentmann
*/
public class PluginManagementTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginTest.java b/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
index 6e2d12a..582145e 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Plugin}.
- *
+ *
* @author Benjamin Bentmann
*/
public class PluginTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java b/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
index 7b352e2..727f2c3 100644
--- a/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Prerequisites}.
- *
+ *
* @author Benjamin Bentmann
*/
public class PrerequisitesTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java b/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
index 9085964..512e2a8 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Profile}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ProfileTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java b/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
index 9319d20..265304d 100644
--- a/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Relocation}.
- *
+ *
* @author Benjamin Bentmann
*/
public class RelocationTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java b/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
index 53e8a00..d10cb79 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code ReportPlugin}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ReportPluginTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java b/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
index b3a789a..2f51415 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code ReportSet}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ReportSetTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java b/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
index 46f22a3..dbc0fa2 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Reporting}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ReportingTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java b/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
index f983df9..3ae3435 100644
--- a/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code RepositoryPolicy}.
- *
+ *
* @author Benjamin Bentmann
*/
public class RepositoryPolicyTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java b/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
index 3b27b14..b68b70a 100644
--- a/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Repository}.
- *
+ *
* @author Benjamin Bentmann
*/
public class RepositoryTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java b/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
index 012be55..fa40ab4 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Resource}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ResourceTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/ScmTest.java b/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
index 57dba9c..4d76993 100644
--- a/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Scm}.
- *
+ *
* @author Benjamin Bentmann
*/
public class ScmTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
----------------------------------------------------------------------
diff --git a/maven-model/src/test/java/org/apache/maven/model/SiteTest.java b/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
index 7813670..84896bb 100644
--- a/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
/**
* Tests {@code Site}.
- *
+ *
* @author Benjamin Bentmann
*/
public class SiteTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java
index ab4568c..4d99546 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java
@@ -31,7 +31,7 @@ public class MojoNotFoundException
private String goal;
private PluginDescriptor pluginDescriptor;
-
+
public MojoNotFoundException( String goal, PluginDescriptor pluginDescriptor )
{
super( toMessage( goal, pluginDescriptor ) );
@@ -48,7 +48,7 @@ public class MojoNotFoundException
public PluginDescriptor getPluginDescriptor()
{
return pluginDescriptor;
- }
+ }
private static String toMessage( String goal, PluginDescriptor pluginDescriptor )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
index 7ebb04a..bc2d555 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -291,7 +291,7 @@ public class MojoDescriptor
* resolution, this does not include the download of the files for the dependency artifacts. It is meant for mojos
* that only want to analyze the set of transitive dependencies, in particular during early lifecycle phases where
* full dependency resolution might fail due to projects which haven't been built yet.
- *
+ *
* @return The scope of (transitive) dependencies that should be collected or {@code null} if none.
* @since 3.0-alpha-3
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
index b15f7e0..1d6f1be 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
@@ -251,7 +251,7 @@ public class PluginDescriptor
/**
* The map of artifacts accessible by the versionlessKey, i.e. groupId:artifactId
- *
+ *
* @return a Map of artifacts, never {@code null}
* @see #getArtifacts()
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java b/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
index 5fbf76e..799e3af 100644
--- a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
+++ b/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
@@ -32,7 +32,7 @@ import junit.framework.TestCase;
/**
* Tests {@link PluginDescriptorBuilder}.
- *
+ *
* @author Benjamin Bentmann
*/
public class PluginDescriptorBuilderTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-plugin-api/src/test/resources/plugin.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/test/resources/plugin.xml b/maven-plugin-api/src/test/resources/plugin.xml
index 49db316..6b97211 100644
--- a/maven-plugin-api/src/test/resources/plugin.xml
+++ b/maven-plugin-api/src/test/resources/plugin.xml
@@ -55,7 +55,7 @@ under the License.
<name>finalName</name>
<alias>jarName</alias>
<type>java.lang.String</type>
- <implementation>java.lang.String</implementation>
+ <implementation>java.lang.String</implementation>
<required>false</required>
<editable>true</editable>
<description>parameter-description</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
index 74709ae..29a4318 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
@@ -44,7 +44,7 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
/**
* Builds the effective settings from a user settings file and/or a global settings file.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = SettingsBuilder.class )
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
index cb7d4c5..e728ec5 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
@@ -31,7 +31,7 @@ import org.apache.maven.settings.validation.SettingsValidator;
* is only meant as a utility for developers that want to employ the settings builder outside of the Maven build system,
* Maven plugins should always acquire settings builder instances via dependency injection. Developers might want to
* subclass this factory to provide custom implementations for some of the components used by the settings builder.
- *
+ *
* @author Benjamin Bentmann
*/
public class DefaultSettingsBuilderFactory
@@ -54,7 +54,7 @@ public class DefaultSettingsBuilderFactory
/**
* Creates a new settings builder instance.
- *
+ *
* @return The new settings builder instance, never {@code null}.
*/
public DefaultSettingsBuilder newInstance()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
index 08c93fc..14dc228 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
@@ -24,7 +24,7 @@ import java.util.Properties;
/**
* Collects settings that control building of effective settings.
- *
+ *
* @author Benjamin Bentmann
*/
public class DefaultSettingsBuildingRequest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
index de9d73a..e6d51c9 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
@@ -26,7 +26,7 @@ import org.apache.maven.settings.Settings;
/**
* Collects the output of the settings builder.
- *
+ *
* @author Benjamin Bentmann
*/
class DefaultSettingsBuildingResult
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
index 9f56aef..cf15a03 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
@@ -23,7 +23,7 @@ package org.apache.maven.settings.building;
* Describes a problem that was encountered during settings building. A problem can either be an exception that was
* thrown or a simple string message. In addition, a problem carries a hint about its source, e.g. the settings file
* that exhibits the problem.
- *
+ *
* @author Benjamin Bentmann
*/
public class DefaultSettingsProblem
@@ -44,7 +44,7 @@ public class DefaultSettingsProblem
/**
* Creates a new problem with the specified message and exception.
- *
+ *
* @param message The message describing the problem, may be {@code null}.
* @param severity The severity level of the problem, may be {@code null} to default to
* {@link SettingsProblem.Severity#ERROR}.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
index 75eeec4..bcab779 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
@@ -26,7 +26,7 @@ import org.apache.maven.settings.io.SettingsParseException;
/**
* Collects problems that are encountered during settings building.
- *
+ *
* @author Benjamin Bentmann
*/
class DefaultSettingsProblemCollector
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java
index 80c5e78..a821e08 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java
@@ -26,7 +26,7 @@ import java.io.InputStream;
/**
* Wraps an ordinary {@link File} as a settings source.
- *
+ *
* @author Benjamin Bentmann
*/
public class FileSettingsSource
@@ -37,7 +37,7 @@ public class FileSettingsSource
/**
* Creates a new settings source backed by the specified file.
- *
+ *
* @param settingsFile The settings file, must not be {@code null}.
*/
public FileSettingsSource( File settingsFile )
@@ -62,7 +62,7 @@ public class FileSettingsSource
/**
* Gets the settings file of this model source.
- *
+ *
* @return The underlying settings file, never {@code null}.
*/
public File getSettingsFile()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java
index ed9c986..61e34e9 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java
@@ -21,7 +21,7 @@ package org.apache.maven.settings.building;
/**
* Builds the effective settings from a user settings file and/or a global settings file.
- *
+ *
* @author Benjamin Bentmann
*/
public interface SettingsBuilder
@@ -29,7 +29,7 @@ public interface SettingsBuilder
/**
* Builds the effective settings of the specified settings files.
- *
+ *
* @param request The settings building request that holds the parameters, must not be {@code null}.
* @return The result of the settings building, never {@code null}.
* @throws SettingsBuildingException If the effective settings could not be built.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
index 438e961..f7d48e4 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java
@@ -28,7 +28,7 @@ import java.util.List;
* Signals one ore more errors during settings building. The settings builder tries to collect as many problems as
* possible before eventually failing to provide callers with rich error information. Use {@link #getProblems()} to
* query the details of the failure.
- *
+ *
* @author Benjamin Bentmann
*/
public class SettingsBuildingException
@@ -39,7 +39,7 @@ public class SettingsBuildingException
/**
* Creates a new exception with the specified problems.
- *
+ *
* @param problems The problems that causes this exception, may be {@code null}.
*/
public SettingsBuildingException( List<SettingsProblem> problems )
@@ -55,7 +55,7 @@ public class SettingsBuildingException
/**
* Gets the problems that caused this exception.
- *
+ *
* @return The problems that caused this exception, never {@code null}.
*/
public List<SettingsProblem> getProblems()
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java
index cc76e32..92d87d8 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java
@@ -24,7 +24,7 @@ import java.util.Properties;
/**
* Collects settings that control the building of effective settings.
- *
+ *
* @author Benjamin Bentmann
*/
public interface SettingsBuildingRequest
@@ -32,7 +32,7 @@ public interface SettingsBuildingRequest
/**
* Gets the global settings file.
- *
+ *
* @return The global settings file or {@code null} if none.
*/
File getGlobalSettingsFile();
@@ -40,7 +40,7 @@ public interface SettingsBuildingRequest
/**
* Sets the global settings file. A non-existent settings file is equivalent to empty settings. If both user
* settings and global settings are given, the user settings take precedence.
- *
+ *
* @param globalSettingsFile The global settings file, may be {@code null} to disable global settings.
* @return This request, never {@code null}.
*/
@@ -48,7 +48,7 @@ public interface SettingsBuildingRequest
/**
* Gets the global settings source.
- *
+ *
* @return The global settings source or {@code null} if none.
*/
SettingsSource getGlobalSettingsSource();
@@ -56,7 +56,7 @@ public interface SettingsBuildingRequest
/**
* Sets the global settings source. If both user settings and a global settings are given, the user settings take
* precedence.
- *
+ *
* @param globalSettingsSource The global settings source, may be {@code null} to disable global settings.
* @return This request, never {@code null}.
*/
@@ -64,7 +64,7 @@ public interface SettingsBuildingRequest
/**
* Gets the user settings file.
- *
+ *
* @return The user settings file or {@code null} if none.
*/
File getUserSettingsFile();
@@ -72,7 +72,7 @@ public interface SettingsBuildingRequest
/**
* Sets the user settings file. A non-existent settings file is equivalent to empty settings. If both a user
* settings file and a global settings file are given, the user settings take precedence.
- *
+ *
* @param userSettingsFile The user settings file, may be {@code null} to disable user settings.
* @return This request, never {@code null}.
*/
@@ -80,7 +80,7 @@ public interface SettingsBuildingRequest
/**
* Gets the user settings source.
- *
+ *
* @return The user settings source or {@code null} if none.
*/
SettingsSource getUserSettingsSource();
@@ -88,7 +88,7 @@ public interface SettingsBuildingRequest
/**
* Sets the user settings source. If both user settings and a global settings are given, the user settings take
* precedence.
- *
+ *
* @param userSettingsSource The user settings source, may be {@code null} to disable user settings.
* @return This request, never {@code null}.
*/
@@ -97,7 +97,7 @@ public interface SettingsBuildingRequest
/**
* Gets the system properties to use for interpolation. The system properties are collected from the runtime
* environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @return The system properties, never {@code null}.
*/
Properties getSystemProperties();
@@ -105,7 +105,7 @@ public interface SettingsBuildingRequest
/**
* Sets the system properties to use for interpolation. The system properties are collected from the runtime
* environment like {@link System#getProperties()} and environment variables.
- *
+ *
* @param systemProperties The system properties, may be {@code null}.
* @return This request, never {@code null}.
*/
@@ -114,7 +114,7 @@ public interface SettingsBuildingRequest
/**
* Gets the user properties to use for interpolation. The user properties have been configured directly by the user
* on his discretion, e.g. via the {@code -Dkey=value} parameter on the command line.
- *
+ *
* @return The user properties, never {@code null}.
*/
Properties getUserProperties();
@@ -122,7 +122,7 @@ public interface SettingsBuildingRequest
/**
* Sets the user properties to use for interpolation. The user properties have been configured directly by the user
* on his discretion, e.g. via the {@code -Dkey=value} parameter on the command line.
- *
+ *
* @param userProperties The user properties, 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/building/SettingsBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java
index 3fb6327..43b2359 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java
@@ -25,7 +25,7 @@ import org.apache.maven.settings.Settings;
/**
* Collects the output of the settings builder.
- *
+ *
* @author Benjamin Bentmann
*/
public interface SettingsBuildingResult
@@ -33,7 +33,7 @@ public interface SettingsBuildingResult
/**
* Gets the assembled settings.
- *
+ *
* @return The assembled settings, never {@code null}.
*/
Settings getEffectiveSettings();
@@ -42,7 +42,7 @@ public interface SettingsBuildingResult
* Gets the problems that were encountered during the settings building. Note that only problems of severity
* {@link SettingsProblem.Severity#WARNING} and below are reported here. Problems with a higher severity level cause
* the settings builder to fail with a {@link SettingsBuildingException}.
- *
+ *
* @return The problems that were encountered during the settings building, 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/building/SettingsProblem.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java
index c0798cd..e9e563d 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java
@@ -23,7 +23,7 @@ package org.apache.maven.settings.building;
* Describes a problem that was encountered during settings building. A problem can either be an exception that was
* thrown or a simple string message. In addition, a problem carries a hint about its source, e.g. the settings file
* that exhibits the problem.
- *
+ *
* @author Benjamin Bentmann
*/
public interface SettingsProblem
@@ -46,7 +46,7 @@ public interface SettingsProblem
* creator of the problem, the general expectation is that the hint provides sufficient information to the user to
* track the problem back to its origin. A concrete example for such a source hint can be the file path or URL from
* which the settings were read.
- *
+ *
* @return The hint about the source of the problem or an empty string if unknown, never {@code null}.
*/
String getSource();
@@ -54,7 +54,7 @@ public interface SettingsProblem
/**
* Gets the one-based index of the line containing the problem. The line number should refer to some text file that
* is given by {@link #getSource()}.
- *
+ *
* @return The one-based index of the line containing the problem or a non-positive value if unknown.
*/
int getLineNumber();
@@ -62,7 +62,7 @@ public interface SettingsProblem
/**
* Gets the one-based index of the column containing the problem. The column number should refer to some text file
* that is given by {@link #getSource()}.
- *
+ *
* @return The one-based index of the column containing the problem or non-positive value if unknown.
*/
int getColumnNumber();
@@ -71,28 +71,28 @@ public interface SettingsProblem
* Gets the location of the problem. The location is a user-friendly combination of the values from
* {@link #getSource()}, {@link #getLineNumber()} and {@link #getColumnNumber()}. The exact syntax of the returned
* value is undefined.
- *
+ *
* @return The location of the problem, never {@code null}.
*/
String getLocation();
/**
* Gets the exception that caused this problem (if any).
- *
+ *
* @return The exception that caused this problem or {@code null} if not applicable.
*/
Exception getException();
/**
* Gets the message that describes this problem.
- *
+ *
* @return The message describing this problem, never {@code null}.
*/
String getMessage();
/**
* Gets the severity level of this problem.
- *
+ *
* @return The severity level of this problem, never {@code null}.
*/
Severity getSeverity();
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java
index 74f5659..63869c0 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java
@@ -21,7 +21,7 @@ package org.apache.maven.settings.building;
/**
* Collects problems that are encountered during settings building.
- *
+ *
* @author Benjamin Bentmann
*/
public interface SettingsProblemCollector
@@ -29,7 +29,7 @@ public interface SettingsProblemCollector
/**
* Adds the specified problem.
- *
+ *
* @param severity The severity of the problem, must not be {@code null}.
* @param message The detail message of the problem, may be {@code null}.
* @param line The one-based index of the line containing the problem or {@code -1} if unknown.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java
index 82274e5..3297ab4 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
/**
* Provides access to the contents of settings independently of the backing store (e.g. file system, database, memory).
- *
+ *
* @author Benjamin Bentmann
*/
public interface SettingsSource
@@ -33,7 +33,7 @@ public interface SettingsSource
/**
* Gets a byte stream to the settings contents. Closing the returned stream is the responsibility of the caller.
* Note that each invocation of this method returns a new/fresh stream which represents the entire contents.
- *
+ *
* @return A byte stream to the settings contents, never {@code null}.
*/
InputStream getInputStream()
@@ -42,7 +42,7 @@ public interface SettingsSource
/**
* Provides a user-friendly hint about the location of the settings. This could be a local file path, a URI or just
* an empty string. The intention is to assist users during error reporting.
- *
+ *
* @return A user-friendly hint about the location of the settings, never {@code null}.
*/
String getLocation();