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}.
