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:22 UTC
[02/11] maven git commit: Trimmed trailing whitespace
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();