[MNG-6176] Javadoc errors prevent release with Java 8 Upgrade modello to 1.9.0 Fix invalid Javadoc
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/587317b0 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/587317b0 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/587317b0 Branch: refs/heads/MNG-6169 Commit: 587317b0095fc5d51041fed9e5b4786246a29a7b Parents: 8f025fa Author: rfscholte <rfscho...@apache.org> Authored: Fri Mar 10 16:17:28 2017 +0100 Committer: rfscholte <rfscho...@apache.org> Committed: Fri Mar 10 16:17:28 2017 +0100 ---------------------------------------------------------------------- .../artifact/versioning/ComparableVersion.java | 8 +++--- .../maven/artifact/versioning/VersionRange.java | 5 ++-- maven-compat/pom.xml | 12 +++++++++ .../resolver/ArtifactResolutionResult.java | 13 +++++++--- .../maven/artifact/resolver/ResolutionNode.java | 2 +- .../maven/execution/MojoExecutionEvent.java | 4 ++- .../maven/execution/MojoExecutionListener.java | 4 ++- .../maven/execution/ProjectExecutionEvent.java | 4 ++- .../execution/ProjectExecutionListener.java | 4 ++- .../scope/WeakMojoExecutionListener.java | 3 ++- .../lifecycle/MojoExecutionConfigurator.java | 5 ++-- .../lifecycle/internal/BuildListCalculator.java | 3 ++- ...DefaultLifecycleExecutionPlanCalculator.java | 4 +-- .../DefaultLifecyclePluginAnalyzer.java | 4 +-- .../DefaultLifecycleTaskSegmentCalculator.java | 6 ++--- .../lifecycle/internal/DependencyContext.java | 7 ++--- .../lifecycle/internal/ExecutionPlanItem.java | 5 ++-- .../maven/lifecycle/internal/GoalTask.java | 5 ++-- .../internal/LifecycleDebugLogger.java | 5 ++-- .../internal/LifecycleDependencyResolver.java | 6 ++--- .../LifecycleExecutionPlanCalculator.java | 1 - .../internal/LifecycleModuleBuilder.java | 7 ++--- .../internal/LifecyclePluginResolver.java | 3 +-- .../maven/lifecycle/internal/LifecycleTask.java | 5 ++-- .../LifecycleTaskSegmentCalculator.java | 6 ++--- .../internal/MojoDescriptorCreator.java | 5 ++-- .../maven/lifecycle/internal/MojoExecutor.java | 5 ++-- .../maven/lifecycle/internal/PhaseRecorder.java | 3 +-- .../internal/ProjectArtifactFactory.java | 4 ++- .../lifecycle/internal/ProjectBuildList.java | 5 ++-- .../maven/lifecycle/internal/ProjectIndex.java | 5 ++-- .../lifecycle/internal/ProjectSegment.java | 18 ++++++++----- .../maven/lifecycle/internal/TaskSegment.java | 4 +-- .../lifecycle/internal/builder/Builder.java | 5 ++-- .../ConcurrencyDependencyGraph.java | 5 ++-- .../multithreaded/MultiThreadedBuilder.java | 4 +-- .../multithreaded/ThreadOutputMuxer.java | 8 +++--- .../PluginParameterExpressionEvaluator.java | 2 +- .../internal/DefaultMavenPluginManager.java | 10 +++++--- .../org/apache/maven/project/MavenProject.java | 9 +++---- .../project/RepositorySessionDecorator.java | 2 +- .../maven/repository/ArtifactTransferEvent.java | 4 +-- .../legacy/metadata/ArtifactMetadataSource.java | 6 ++--- .../maven/toolchain/ToolchainPrivate.java | 2 +- .../java/org/apache/maven/cli/MavenCli.java | 4 --- .../maven/cli/event/ExecutionEventLogger.java | 6 +++-- .../model/interpolation/ModelInterpolator.java | 2 -- .../apache/maven/model/merge/ModelMerger.java | 4 +-- maven-model/src/main/mdo/maven.mdo | 14 +++++----- .../org/apache/maven/plugin/AbstractMojo.java | 27 +++++++++----------- .../org/apache/maven/plugin/ContextEnabled.java | 3 +-- .../main/java/org/apache/maven/plugin/Mojo.java | 9 +++---- .../maven/plugin/MojoExecutionException.java | 3 +-- .../maven/plugin/MojoFailureException.java | 3 +-- .../maven/plugin/descriptor/MojoDescriptor.java | 3 +-- .../org/apache/maven/plugin/logging/Log.java | 27 +++++++------------- .../ArtifactDescriptorReaderDelegate.java | 2 +- maven-settings/src/main/mdo/settings.mdo | 2 +- pom.xml | 2 +- 59 files changed, 186 insertions(+), 162 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java ---------------------------------------------------------------------- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index f434ef0..5222871 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -29,9 +29,11 @@ import java.util.Properties; import java.util.Stack; /** + * <p> * Generic implementation of version comparison. - * - * <p>Features: + * </p> + * + * Features: * <ul> * <li>mixing of '<code>-</code>' (hyphen) and '<code>.</code>' (dot) separators,</li> * <li>transition between characters and digits also constitutes a separator: @@ -51,7 +53,7 @@ import java.util.Stack; * Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive), * </li> * <li>a hyphen usually precedes a qualifier, and is always less important than something preceded with a dot.</li> - * </ul></p> + * </ul> * * @see <a href="https://cwiki.apache.org/confluence/display/MAVENOLD/Versioning";>"Versioning" on Maven Wiki</a> * @author <a href="mailto:ken...@apache.org";>Kenney Westerhof</a> http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java ---------------------------------------------------------------------- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java index 502b0e7..56343b2 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java @@ -72,9 +72,10 @@ public class VersionRange } /** + * <p> * Create a version range from a string representation - * <p/> - * Some spec examples are + * </p> + * Some spec examples are: * <ul> * <li><code>1.0</code> Version 1.0</li> * <li><code>[1.0,2.0)</code> Versions 1.0 (included) to 2.0 (not included)</li> http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-compat/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 2b205f7..2d0ecad 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -113,6 +113,18 @@ under the License. </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <!-- There's no maintenance on maven-compat --> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java index b780f50..6de04f3 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java @@ -31,9 +31,14 @@ import org.apache.maven.artifact.versioning.OverConstrainedVersionException; /** * Specific problems during resolution that we want to account for: - * <p/> - * - missing metadata - version range violations - version circular dependencies - missing artifacts - * - network/transfer errors - file system errors: permissions + * <ul> + * <li>missing metadata</li> + * <li>version range violations</li> + * <li>version circular dependencies</li> + * <li>missing artifacts</li> + * <li>network/transfer errors</li> + * <li>file system errors: permissions</li> + * </ul> * * @author Jason van Zyl * TODO carlos: all these possible has*Exceptions and get*Exceptions methods make the clients too @@ -175,7 +180,7 @@ public class ArtifactResolutionResult /** * TODO this needs to accept a {@link OverConstrainedVersionException} as returned by * {@link #getVersionRangeViolation(int)} but it's not used like that in - * {@link DefaultLegacyArtifactCollector} + * DefaultLegacyArtifactCollector */ public ArtifactResolutionResult addVersionRangeViolation( Exception e ) { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java index 3b64eaf..cd824c4 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java @@ -108,7 +108,7 @@ public class ResolutionNode } /** - * @return {@link List} < {@link String} > with artifact ids + * @return {@link List} < {@link String} > with artifact ids * @throws OverConstrainedVersionException */ public List<String> getDependencyTrail() http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java index a8d293d..85a58cb 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java @@ -24,13 +24,15 @@ import org.apache.maven.plugin.MojoExecution; import org.apache.maven.project.MavenProject; /** + * <p> * Encapsulates parameters of MojoExecutionListener callback methods and is meant to provide API evolution path should * it become necessary to introduce new parameters in the existing callbacks in the future. + * </p> + * <strong>Note:</strong> This class is part of work in progress and can be changed or removed without notice. * * @see MojoExecutionListener * @see org.apache.maven.execution.scope.WeakMojoExecutionListener * @since 3.1.2 - * @provisional This class is part of work in progress and can be changed or removed without notice. */ public class MojoExecutionEvent { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java index c2fb7a1..97d6b03 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java @@ -22,11 +22,13 @@ package org.apache.maven.execution; import org.apache.maven.plugin.MojoExecutionException; /** + * <p> * Extension point that allows build extensions observe and possibly veto mojo executions. + * </p> + * <strong>Note:</strong> This interface is part of work in progress and can be changed or removed without notice. * * @see org.apache.maven.execution.scope.WeakMojoExecutionListener * @since 3.1.2 - * @provisional This interface is part of work in progress and can be changed or removed without notice. */ public interface MojoExecutionListener { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java index fb71078..96cb226 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java @@ -25,12 +25,14 @@ import org.apache.maven.plugin.MojoExecution; import org.apache.maven.project.MavenProject; /** + * <p> * Encapsulates parameters of ProjectExecutionListener callback methods and is meant to provide API evolution path * should it become necessary to introduce new parameters in the existing callbacks in the future. + * </p> + * <strong>Note:</strong> This class is part of work in progress and can be changed or removed without notice. * * @see ProjectExecutionListener * @since 3.1.2 - * @provisional This class is part of work in progress and can be changed or removed without notice. */ public class ProjectExecutionEvent { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java index d7e8918..2797425 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java @@ -22,12 +22,14 @@ package org.apache.maven.execution; import org.apache.maven.lifecycle.LifecycleExecutionException; /** + * <p> * Extension point that allows build extensions observe and possibly veto project build execution. + * </p> + * <strong>Note:</strong> This interface is part of work in progress and can be changed or removed without notice. * * @see ExecutionListener * @see MojoExecutionListener * @since 3.1.2 - * @provisional This interface is part of work in progress and can be changed or removed without notice. */ public interface ProjectExecutionListener { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java index 102bc1d..da78de7 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java +++ b/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java @@ -28,10 +28,11 @@ import org.apache.maven.plugin.MojoExecutionException; * Unlike {@link org.apache.maven.execution.MojoExecutionListener}, this extension point does not * trigger instantiation of the component, hence "weak" class name prefix. Only applies to mojo execution * scoped components. + * </p> + * <strong>Note:</strong> This interface is part of work in progress and can be changed or removed without notice. * * @see org.apache.maven.execution.MojoExecutionListener * @since 3.1.2 - * @provisional This interface is part of work in progress and can be changed or removed without notice. */ public interface WeakMojoExecutionListener { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java index b85bac7..c52a440 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java @@ -23,10 +23,11 @@ import org.apache.maven.plugin.MojoExecution; import org.apache.maven.project.MavenProject; /** + * <p> * A MojoExecutionConfigurator is responsible for creating the configuration for Mojo based on configuration for a Mojo * in the MavenProject and the default configuration for the Mojo from the containing plugin's plugin.xml descriptor. - * - * @provisional + * </p> + * <strong>Note:</strong> This interface is part of work in progress and can be changed or removed without notice. * @author Jason van Zyl * @since 3.3.1, MNG-5753 */ http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java index 7fba304..76454f8 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java @@ -29,9 +29,10 @@ import java.util.Collections; import java.util.List; /** + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. + * * @since 3.0 * @author Kristian Rosenvold - * This class is not part of any public api and can be changed or deleted without prior notice. */ @Component( role = BuildListCalculator.class ) public class BuildListCalculator http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java index 46aff9e..1e81b18 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java @@ -62,11 +62,11 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import com.google.common.collect.ImmutableMap; /** + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. + * * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (Extract class) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ @Component( role = LifecycleExecutionPlanCalculator.class ) public class DefaultLifecycleExecutionPlanCalculator http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java index a72ce8e..9e402e6 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java @@ -42,13 +42,13 @@ import java.util.Map; import java.util.Set; /** + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. + * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl * @author jdcasey * @author Kristian Rosenvold (extracted class only) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ @Component( role = LifeCyclePluginAnalyzer.class ) public class DefaultLifecyclePluginAnalyzer http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java index 20e5585..cb49050 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java @@ -40,17 +40,17 @@ import java.util.Arrays; import java.util.List; /** + * <p> * Calculates the task segments in the build + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl * @author jdcasey * @author Kristian Rosenvold (extracted class) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ - @Component( role = LifecycleTaskSegmentCalculator.class ) public class DefaultLifecycleTaskSegmentCalculator implements LifecycleTaskSegmentCalculator http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java index 0e4a708..7ee499f 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java @@ -27,13 +27,14 @@ import java.util.Collections; import java.util.TreeSet; /** + * <p> * Context of dependency artifacts for a particular project. - * + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. + * * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (class extract only) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ // TODO From a concurrency perspective, this class is not good. The combination of mutable/immutable state is not nice public class DependencyContext http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java index 4a404e9..a52eeb0 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java @@ -29,9 +29,10 @@ import java.util.ArrayList; import java.util.List; /** + * <p> * Wraps individual MojoExecutions, containing information about completion status and scheduling. - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Kristian Rosenvold http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java index f166403..abcdda5 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java @@ -20,9 +20,10 @@ package org.apache.maven.lifecycle.internal; */ /** + * <p> * A task that is a goal - * <p/> - * TODO From a concurrency perspective, this class is not good. The combination of mutable/immutable state is not nice + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Benjamin Bentmann http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java index a99fb65..69b7c10 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java @@ -36,14 +36,15 @@ import java.util.Set; import java.util.TreeSet; /** + * <p> * Logs debug output from the various lifecycle phases. + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl * @author Kristian Rosenvold (extracted class only) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ @Component( role = LifecycleDebugLogger.class ) public class LifecycleDebugLogger http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java index 0947ed3..0d42aeb 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java @@ -51,14 +51,14 @@ import org.eclipse.aether.util.filter.AndDependencyFilter; import org.eclipse.aether.util.filter.ScopeDependencyFilter; /** + * <p> * Resolves dependencies for the artifacts in context of the lifecycle build - * + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl * @author Kristian Rosenvold (extracted class) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ @Named public class LifecycleDependencyResolver http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java index 7d35b10..7a8d9c9 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java @@ -39,7 +39,6 @@ import java.util.List; * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (extract interface only) - * <p/> */ public interface LifecycleExecutionPlanCalculator { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java index 343fbf9..548fe6c 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java @@ -37,14 +37,15 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; /** + * <p> * Builds one or more lifecycles for a full module - * + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. + * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl * @author Kristian Rosenvold (extracted class) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ @Component( role = LifecycleModuleBuilder.class ) public class LifecycleModuleBuilder http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java index f02552a..b22e359 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java @@ -34,11 +34,10 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; /** + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (Extract class) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ @Component( role = LifecyclePluginResolver.class ) public class LifecyclePluginResolver http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java index 0b5fff3..56aafd5 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java @@ -20,9 +20,10 @@ package org.apache.maven.lifecycle.internal; */ /** + * <p> * A task that is a lifecycle - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Benjamin Bentmann http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java index a721355..7dd84d8 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java @@ -33,17 +33,17 @@ import org.apache.maven.plugin.version.PluginVersionResolutionException; import java.util.List; /** + * <p> * Calculates the task segments in the build + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl * @author jdcasey * @author Kristian Rosenvold (extracted interface) - * <p/> - * NOTE: This interface is not part of any public api and can be changed or deleted without prior notice. */ - public interface LifecycleTaskSegmentCalculator { List<TaskSegment> calculateTaskSegments( MavenSession session ) http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java index a19467f..edb8dce 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java @@ -49,15 +49,16 @@ import java.util.Collection; import java.util.StringTokenizer; /** + * <p> * Resolves dependencies for the artifacts in context of the lifecycle build + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Benjamin Bentmann * @author Jason van Zyl * @author jdcasey * @author Kristian Rosenvold (extracted class only) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ @Component( role = MojoDescriptorCreator.class ) public class MojoDescriptorCreator http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java index 2e4c117..766aed1 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java @@ -50,13 +50,14 @@ import java.util.Set; import java.util.TreeSet; /** + * <p> * Executes an individual mojo + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @author Jason van Zyl * @author Benjamin Bentmann * @author Kristian Rosenvold - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. * @since 3.0 */ @Component( role = MojoExecutor.class ) http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseRecorder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseRecorder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseRecorder.java index a09a3cb..3316c50 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseRecorder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseRecorder.java @@ -23,11 +23,10 @@ import org.apache.maven.plugin.MojoExecution; import org.apache.maven.project.MavenProject; /** + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ public class PhaseRecorder { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java index b4a8107..8665c80 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java @@ -26,10 +26,12 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.InvalidDependencyVersionException; /** + * <p> * Component interface responsible for creation of MavenProject#dependencyArtifacts instances. + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.2.4 - * @provisional This interface is part of work in progress and can be changed or removed without notice. */ public interface ProjectArtifactFactory { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java index 2d7371b..29a6aa5 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java @@ -33,13 +33,14 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; /** + * <p> * A list of project segments, ordered so that all ProjectSegments from first TaskSegment come before any * subsequent TaskSegments. + * </p> + * <strong>Note:</strong> This interface is part of work in progress and can be changed or removed without notice. * * @since 3.0 * @author Kristian Rosenvold - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ public class ProjectBuildList implements Iterable<ProjectSegment> http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java index aa56d57..1c1cae4 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java @@ -27,13 +27,14 @@ import java.util.List; import java.util.Map; /** + * <p> * Provides the positional index of the project + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (extracted class only) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ // TODO Kristian wonders if this class really is necessary and if it overlaps other concepts. public final class ProjectIndex http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java index 5ef7745..89f8354 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java @@ -27,29 +27,33 @@ import java.util.List; /** * A build context that matches a mavenproject to a given tasksegment, and the session to be used. - * <p/> + * <p> * A note to the reader; - * <p/> + * </p> + * <p> * There are several issues/discussions regarding how "aggregator" plugins should be handled. * Read for instance http://docs.codehaus.org/display/MAVEN/Deterministic+Lifecycle+Planning - * <p/> + * </p> + * <p> * In their current implementation they are "bolted" onto the lifecycle by separating them * into TaskSegments. This class represents the execution context of one such task segment. - * <p/> + * </p> + * <p> * Wise voices have suggested that maybe aggregators shouldn't be bound to the ordinary * lifecycle at all, in which case we wouldn't be needing this class at all ( and * ProjectBuildList.getByTaskSegments). Or maybe they should be introduced in the calculation * of the execution plan instead, which seems much nicer. - * <p/> + * </p> + * <p> * Additionally this class contains a clone of the MavenSession, which is *only* needed * because it has as notion of a "current" project. + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Jason van Zyl * @author Benjamin Bentmann * @author Kristian Rosenvold - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ public final class ProjectSegment { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java index 16eb76a..8a44343 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java @@ -26,11 +26,11 @@ import java.util.List; /** * Describes the required task segment as provided on the maven command line; i.e. "clean jetty:run install" * + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. + * * @since 3.0 * @author Benjamin Bentmann * @author Kristian Rosenvold (extracted class only) - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ public final class TaskSegment { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java index 155abf9..5d78f80 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java @@ -29,11 +29,12 @@ import org.apache.maven.lifecycle.internal.ReactorContext; import org.apache.maven.lifecycle.internal.TaskSegment; /** + * <p> * A {@link Builder} encapsulates a strategy for building a set of Maven projects. The default strategy in Maven builds * the the projects serially, but a {@link Builder} can employ any type of concurrency model to build the projects. - * + * </p> + * <strong>Note:</strong> This interface is part of work in progress and can be changed or removed without notice. * @author jvanzyl - * @provisional */ public interface Builder { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java index 4613165..d7d764e 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java @@ -30,12 +30,13 @@ import java.util.List; import java.util.Set; /** + * <p> * Presents a view of the Dependency Graph that is suited for concurrent building. + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Kristian Rosenvold - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ public class ConcurrencyDependencyGraph { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java index f0fa2ac..072aec8 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java @@ -49,12 +49,12 @@ import org.codehaus.plexus.logging.Logger; * This builder uses a number of threads equal to the minimum of the degree of concurrency (which is the thread count * set with <code>-T</code> on the command-line) and the number of projects to build. As such, building a single project * will always result in a sequential build, regardless of the thread count. + * </p> + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. * * @since 3.0 * @author Kristian Rosenvold * Builds one or more lifecycles for a full module - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ @Component( role = Builder.class, hint = "multithreaded" ) public class MultiThreadedBuilder http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java index 0a99f75..edf8ab6 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java @@ -33,12 +33,12 @@ import org.apache.maven.lifecycle.internal.ProjectBuildList; import org.apache.maven.lifecycle.internal.ProjectSegment; /** + * <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice. + * This class in particular may spontaneously self-combust and be replaced by a plexus-compliant thread aware + * logger implementation at any time. + * * @since 3.0 * @author Kristian Rosenvold - * <p/> - * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. - * This class in particular may spontaneously self-combust and be replaced by a plexus-compliant thread aware - * logger implementation at any time. */ @SuppressWarnings( { "SynchronizationOnLocalVariableOrMethodParameter" } ) public class ThreadOutputMuxer http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java index 984e22a..e701ec1 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java @@ -34,7 +34,7 @@ import org.codehaus.plexus.util.introspection.ReflectionValueExtractor; /** * Evaluator for plugin parameters expressions. Content surrounded by <code>${</code> and <code>}</code> is evaluated. - * Recognized values are:<table border="1"> + * Recognized values are:<table border="1" summary="Expression matrix"> * <tr><th>expression</th> <th></th> <th>evaluation result</th></tr> * <tr><td><code>session</code></td> <td></td> <td>the actual {@link MavenSession}</td></tr> * <tr><td><code>session.*</code></td> <td>(since Maven 3)</td><td></td></tr> http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index 72075fd..612684b 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -121,10 +121,12 @@ public class DefaultMavenPluginManager { /** - * PluginId=>ExtensionRealmCache.CacheRecord map MavenProject context value key. The map is used to ensure the same - * class realm is used to load build extensions and load mojos for extensions=true plugins. - * - * @provisional This is part of internal implementation and may be changed or removed without notice + * <p> + * PluginId => ExtensionRealmCache.CacheRecord map MavenProject context value key. The map is used to ensure the + * same class realm is used to load build extensions and load mojos for extensions=true plugins. + * </p> + * <strong>Note:</strong> This is part of internal implementation and may be changed or removed without notice + * * @since 3.3.0 */ public static final String KEY_EXTENSIONS_REALMS = DefaultMavenPluginManager.class.getName() + "/extensionsRealms"; http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/project/MavenProject.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index cc35a57..80a5193 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -74,11 +74,11 @@ import org.eclipse.aether.repository.RemoteRepository; /** * The concern of the project is provide runtime values based on the model. - * <p/> + * <p> * The values in the model remain untouched but during the process of building a project notions like inheritance and * interpolation can be added. This allows to have an entity which is useful in a runtime while preserving the model so * that it can be marshalled and unmarshalled without being tainted by runtime requirements. - * <p/> + * </p> * <p> * With changes during 3.2.2 release MavenProject is closer to being immutable after construction with the removal of * all components from this class, and the upfront construction taken care of entirely by the @{ProjectBuilder}. There @@ -696,7 +696,7 @@ public class MavenProject * what phases have run dependencies in some scopes won't be included. eg. if only compile phase has run, * dependencies with scope test won't be included. * - * @return {@link Set} < {@link Artifact} > + * @return {@link Set} < {@link Artifact} > * @see #getDependencyArtifacts() to get only direct dependencies */ public Set<Artifact> getArtifacts() @@ -992,7 +992,7 @@ public class MavenProject /** * Direct dependencies that this project has. * - * @return {@link Set} < {@link Artifact} > + * @return {@link Set} < {@link Artifact} > * @see #getArtifacts() to get all transitive dependencies */ @Deprecated @@ -1152,7 +1152,6 @@ public class MavenProject } /** - * @throws CloneNotSupportedException * @since 2.0.9 */ @Override http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java b/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java index 679ee00..82d6c9d 100644 --- a/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java +++ b/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java @@ -24,8 +24,8 @@ import org.eclipse.aether.RepositorySystemSession; /** * Component interface that allows per-project customization of Aether repository system sessions. * + * <strong>Note:</strong> This interface is part of work in progress and can be changed or removed without notice. * @since 3.2.4 - * @provisional This interface is part of work in progress and can be changed or removed without notice. */ public interface RepositorySessionDecorator { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java index 0d31eb2..c8150ec 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java +++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java @@ -122,7 +122,7 @@ public class ArtifactTransferEvent * Returns the request type. * * @return Returns the request type. The Request type is one of - * <code>TransferEvent.REQUEST_GET<code> or <code>TransferEvent.REQUEST_PUT<code> + * <code>TransferEvent.REQUEST_GET</code> or <code>TransferEvent.REQUEST_PUT</code> */ public int getRequestType() { @@ -134,7 +134,7 @@ public class ArtifactTransferEvent * * @param requestType The requestType to set. * The Request type value should be either - * <code>TransferEvent.REQUEST_GET<code> or <code>TransferEvent.REQUEST_PUT<code>. + * <code>TransferEvent.REQUEST_GET</code> or <code>TransferEvent.REQUEST_PUT</code>. * @throws IllegalArgumentException when */ public void setRequestType( final int requestType ) http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java index aaa0ee3..e46e33b 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java @@ -48,8 +48,8 @@ public interface ArtifactMetadataSource * are needed, for instance the following code will work * <code>artifactFactory.createProjectArtifact( "org.apache.maven", "maven", "" )</code> * @param localRepository local repository - * @param remoteRepositories remote repositories, {@link List} $lt; {@link ArtifactRepository} > - * @return {@link List} $lt; {@link ArtifactVersion} > + * @param remoteRepositories remote repositories, {@link List} $lt; {@link ArtifactRepository} > + * @return {@link List} $lt; {@link ArtifactVersion} > * @throws ArtifactMetadataRetrievalException * in case of error while retrieving repository metadata from the repository. */ @@ -66,7 +66,7 @@ public interface ArtifactMetadataSource * <code>artifactFactory.createProjectArtifact( "org.apache.maven", "maven", "" )</code> * @param localRepository local repository * @param remoteRepository remote repository - * @return {@link List} $lt; {@link ArtifactVersion} > + * @return {@link List} $lt; {@link ArtifactVersion} > * @throws ArtifactMetadataRetrievalException * in case of error while retrieving repository metadata from the repository. */ http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java index 756cd95..3b73910 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java @@ -34,7 +34,7 @@ public interface ToolchainPrivate /** * Let the toolchain decide if it matches requirements defined * in the toolchain plugin configuration. - * @param requirements Map<String, String> key value pair, may not be {@code null} + * @param requirements Map<String, String> key value pair, may not be {@code null} * @return {@code true} if the requirements match, otherwise {@code false} */ boolean matchesRequirements( Map<String, String> requirements ); http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 8d38ab0..f3ae923 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -117,7 +117,6 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; /** * @author Jason van Zyl - * @noinspection UseOfSystemOutOrSystemErr, ACCESS_STATIC_VIA_INSTANCE */ public class MavenCli { @@ -195,9 +194,6 @@ public class MavenCli System.exit( result ); } - /** - * @noinspection ConfusingMainMethod - */ public static int main( String[] args, ClassWorld classWorld ) { MavenCli cli = new MavenCli(); http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java index 76327ea..2a089df 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java @@ -291,10 +291,12 @@ public class ExecutionEventLogger } } + // CHECKSTYLE_OFF: LineLength /** - * <pre>>>> mojo-artifactId:version:goal (mojo-executionId) > :forked-goal @ project-artifactId >>></pre> - * <pre>>>> mojo-artifactId:version:goal (mojo-executionId) > [lifecycle]phase @ project-artifactId >>></pre> + * <pre>>>> mojo-artifactId:version:goal (mojo-executionId) > :forked-goal @ project-artifactId >>></pre> + * <pre>>>> mojo-artifactId:version:goal (mojo-executionId) > [lifecycle]phase @ project-artifactId >>></pre> */ + // CHECKSTYLE_ON: LineLength @Override public void forkStarted( ExecutionEvent event ) { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java index d2b01c1..3b80c34 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java @@ -30,8 +30,6 @@ import java.io.File; * calculated from the elements of the model itself and the execution properties from the building request. * * @author jdcasey - * <p/> - * Created on Feb 2, 2005 */ public interface ModelInterpolator { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java ---------------------------------------------------------------------- diff --git a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java index 6bdb54f..fbc056e 100644 --- a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java +++ b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java @@ -74,9 +74,9 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; * This is a hand-crafted prototype of the default model merger that should eventually be generated by Modello by a new * Java plugin. Code structure to merge source (read-only) object into the target object is:<ul> * <li><code>merge<i>Classname</i>( <i>Classname</i> target, <i>Classname</i> source, boolean sourceDominant, - * Map<Object, Object> context )</code> for each model class</li> + * Map<Object, Object> context )</code> for each model class</li> * <li><code>merge<i>Classname</i>_<i>FieldName</i>( <i>Classname</i> target, <i>Classname</i> source, boolean - * sourceDominant, Map<Object, Object> context )</code> for each field of each model class</li> + * sourceDominant, Map<Object, Object> context )</code> for each field of each model class</li> * <li><code>Object get<i>Classname</i>Key( <i>Classname</i> <i>classname</i> )</code> * for each class that is used in a list</li> * </ul> http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-model/src/main/mdo/maven.mdo ---------------------------------------------------------------------- diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 945ae03..de800d9 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -245,7 +245,7 @@ <description> <![CDATA[ The URL to the project's homepage. - <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) ]]> </description> <type>String</type> @@ -2142,7 +2142,7 @@ <a href="https://maven.apache.org/scm/scm-url-format.html";>URL format</a> and <a href="https://maven.apache.org/scm/scms-overview.html";>list of supported SCMs</a>. This connection is read-only. - <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) ]]> </description> <type>String</type> @@ -2154,7 +2154,7 @@ <![CDATA[ Just like <code>connection</code>, but for developers, i.e. this scm connection will not be read only. - <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) ]]> </description> <type>String</type> @@ -2172,7 +2172,7 @@ <description> <![CDATA[ The URL to the project's browsable SCM repository, such as ViewVC or Fisheye. - <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) ]]> </description> <type>String</type> @@ -2605,7 +2605,7 @@ <description> <![CDATA[ The url of the location where website is deployed, in the form <code>protocol://hostname/path</code>. - <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) ]]> </description> <type>String</type> @@ -3282,7 +3282,7 @@ <description><![CDATA[This is the file specification used to activate the profile. The <code>missing</code> value is the location of a file that needs to exist, and if it doesn't, the profile will be activated. On the other hand, <code>exists</code> will test for the existence of the file and if it is - there, the profile will be activated.<br/> + there, the profile will be activated.<br> Variable interpolation for these file specifications is limited to <code>${basedir}</code>, System properties and request properties.]]></description> <fields> @@ -3484,7 +3484,7 @@ <defaultValue>2.0</defaultValue> <description><![CDATA[ For a plugin project (packaging is <code>maven-plugin</code>), the minimum version of - Maven required to use the resulting plugin.<br /> + Maven required to use the resulting plugin.<br> In Maven 2, this was also specifying the minimum version of Maven required to build a project, but this usage is <b>deprecated</b> in Maven 3 and not checked any more: use the <a href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html";>Maven Enforcer Plugin's http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java index 43fffb5..f85e7f3 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java @@ -26,21 +26,18 @@ import org.apache.maven.plugin.logging.SystemStreamLog; /** * Abstract class to provide most of the infrastructure required to implement a <code>Mojo</code> except for - * the execute method. - * <br/> + * the execute method.<br> * The implementation should have a <code>goal</code> annotation in the class-level javadoc annotation: * <pre> * /** * * @goal goalName * */ * </pre> - * + * <p> * There are also a number of class-level javadoc annotations which can be used to control how and when the * <code>Mojo</code> is executed: - * <br/> - * <br/> - * - * <table border="1"> + * </p> + * <table border="1" summary="class-level doclettags"> * <tr bgcolor="#CCCCCC"> * <th>Descriptor Element</th> * <th>Annotation</th> @@ -73,7 +70,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * <td>The configurator type to use when injecting parameter values into this Mojo. The value is normally * deduced from the Mojo's implementation language, but can be specified to allow a custom * ComponentConfigurator implementation to be used. - * <br/> + * <br> * <i>NOTE: This will only be used in very special cases, using a highly controlled vocabulary of possible * values. (Elements like this are why it's a good idea to use the descriptor tools.)</i> * </td> @@ -83,7 +80,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * <td>@phase <phaseName></td> * <td>No</td> * <td>Binds this Mojo to a particular phase of the standard build lifecycle, if specified. - * <br/> + * <br> * <i>NOTE: This is only required if this Mojo is to participate in the standard build process.</i> * </td> * </tr> @@ -106,7 +103,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * <td>No</td> * <td>Flags this Mojo as requiring the dependencies in the specified scope (or an implied scope) to be * resolved before it can execute. - * <br/> + * <br> * <i>NOTE: Currently supports <b>compile</b>, <b>runtime</b>, and <b>test</b> scopes.</i> * </td> * </tr> @@ -114,9 +111,8 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * <td>description</td> * <td>none (detected)</td> * <td>No</td> - * <td>The description of this Mojo's functionality. <i>Using the toolset, this will be the class-level - * Javadoc description provided. - * <br/> + * <td>The description of this Mojo's functionality. Using the toolset, this will be the class-level + * Javadoc description provided.<br> * <i>NOTE: While this is not a required part of the Mojo specification, it <b>SHOULD</b> be provided to * enable future tool support for browsing, etc. and for clarity.</i> * </td> @@ -127,7 +123,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * <td>No</td> * <td>Specifications for the parameters which this Mojo uses will be provided in <b>parameter</b> sub-elements * in this section. - * <br/> + * <br> * <i>NOTE: Parameters are discussed in more detail below.</i> * </td> * </tr> @@ -159,9 +155,10 @@ public abstract class AbstractMojo } /** + * <p> * Returns the logger that has been injected into this mojo. If no logger has been setup yet, a * <code>SystemStreamLog</code> logger will be created and returned. - * <br/><br/> + * </p> * <strong>Note:</strong> * The logger returned by this method must not be cached in an instance field during the construction of the mojo. * This would cause the mojo to use a wrongly configured default logger when being run by Maven. The proper logger http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-plugin-api/src/main/java/org/apache/maven/plugin/ContextEnabled.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/ContextEnabled.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/ContextEnabled.java index d63cb49..6851698 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/ContextEnabled.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/ContextEnabled.java @@ -23,8 +23,7 @@ import java.util.Map; /** * Interface to allow <code>Mojos</code> to communicate with each others <code>Mojos</code>, other than - * project's source root and project's attachment. - * <br/> + * project's source root and project's attachment.<br> * The plugin manager would pull the context out of the plugin container context, and populate it into the Mojo. * * @author jdcasey http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java index 73e46fc..7cbef91 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java @@ -23,11 +23,9 @@ import org.apache.maven.plugin.logging.Log; /** * This interface forms the contract required for <code>Mojos</code> to interact with the <code>Maven</code> - * infrastructure. - * <br/> + * infrastructure.<br> * It features an <code>execute()</code> method, which triggers the Mojo's build-process behavior, and can throw - * a MojoExecutionException or MojoFailureException if error conditions occur. - * <br/> + * a MojoExecutionException or MojoFailureException if error conditions occur.<br> * Also included is the <code>setLog(...)</code> method, which simply allows Maven to inject a logging mechanism which * will allow the Mojo to communicate to the outside world through standard Maven channels. * @@ -39,8 +37,7 @@ public interface Mojo String ROLE = Mojo.class.getName(); /** - * Perform whatever build-process behavior this <code>Mojo</code> implements. - * <br/> + * Perform whatever build-process behavior this <code>Mojo</code> implements.<br> * This is the main trigger for the <code>Mojo</code> inside the <code>Maven</code> system, and allows * the <code>Mojo</code> to communicate errors. * http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java index b440af0..4d8c416 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java @@ -20,8 +20,7 @@ package org.apache.maven.plugin; */ /** - * An exception occurring during the execution of a plugin. - * <br/> + * An exception occurring during the execution of a plugin.<br> * Throwing this exception causes a "BUILD ERROR" message to be displayed. * * @author Brett Porter http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoFailureException.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoFailureException.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoFailureException.java index 28dc43d..342d081 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoFailureException.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoFailureException.java @@ -20,8 +20,7 @@ package org.apache.maven.plugin; */ /** - * An exception occurring during the execution of a plugin (such as a compilation failure). - * <br/> + * An exception occurring during the execution of a plugin (such as a compilation failure).<br> * Throwing this exception causes a "BUILD FAILURE" message to be displayed. * * @author Brett Porter http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/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 e89abed..a15bdcf 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 @@ -30,8 +30,7 @@ import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; /** - * The bean containing the Mojo descriptor. - * <br/> + * The bean containing the Mojo descriptor.<br> * For more information about the usage tag, have a look to: * <a href="https://maven.apache.org/developers/mojo-api-specification.html";> * https://maven.apache.org/developers/mojo-api-specification.html</a> http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java ---------------------------------------------------------------------- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java index 8d3bf1f..0a13bef 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java @@ -21,8 +21,7 @@ package org.apache.maven.plugin.logging; /** * This interface supplies the API for providing feedback to the user from the <code>Mojo</code>, using standard - * <code>Maven</code> channels. - * <br/> + * <code>Maven</code> channels.<br> * There should be no big surprises here, although you may notice that the methods accept * <code>java.lang.CharSequence</code> rather than <code>java.lang.String</code>. This is provided mainly as a * convenience, to enable developers to pass things like <code>java.lang.StringBuffer</code> directly into the logger, @@ -45,8 +44,7 @@ public interface Log void debug( CharSequence content ); /** - * Send a message (and accompanying exception) to the user in the <b>debug</b> error level. - * <br/> + * Send a message (and accompanying exception) to the user in the <b>debug</b> error level.<br> * The error's stacktrace will be output when this error level is enabled. * * @param content @@ -55,8 +53,7 @@ public interface Log void debug( CharSequence content, Throwable error ); /** - * Send an exception to the user in the <b>debug</b> error level. - * <br/> + * Send an exception to the user in the <b>debug</b> error level.<br> * The stack trace for this exception will be output when this error level is enabled. * * @param error @@ -76,8 +73,7 @@ public interface Log void info( CharSequence content ); /** - * Send a message (and accompanying exception) to the user in the <b>info</b> error level. - * <br/> + * Send a message (and accompanying exception) to the user in the <b>info</b> error level.<br> * The error's stacktrace will be output when this error level is enabled. * * @param content @@ -86,8 +82,7 @@ public interface Log void info( CharSequence content, Throwable error ); /** - * Send an exception to the user in the <b>info</b> error level. - * <br/> + * Send an exception to the user in the <b>info</b> error level.<br> * The stack trace for this exception will be output when this error level is enabled. * * @param error @@ -107,8 +102,7 @@ public interface Log void warn( CharSequence content ); /** - * Send a message (and accompanying exception) to the user in the <b>warn</b> error level. - * <br/> + * Send a message (and accompanying exception) to the user in the <b>warn</b> error level.<br> * The error's stacktrace will be output when this error level is enabled. * * @param content @@ -117,8 +111,7 @@ public interface Log void warn( CharSequence content, Throwable error ); /** - * Send an exception to the user in the <b>warn</b> error level. - * <br/> + * Send an exception to the user in the <b>warn</b> error level.<br> * The stack trace for this exception will be output when this error level is enabled. * * @param error @@ -138,8 +131,7 @@ public interface Log void error( CharSequence content ); /** - * Send a message (and accompanying exception) to the user in the <b>error</b> error level. - * <br/> + * Send a message (and accompanying exception) to the user in the <b>error</b> error level.<br> * The error's stacktrace will be output when this error level is enabled. * * @param content @@ -148,8 +140,7 @@ public interface Log void error( CharSequence content, Throwable error ); /** - * Send an exception to the user in the <b>error</b> error level. - * <br/> + * Send an exception to the user in the <b>error</b> error level.<br> * The stack trace for this exception will be output when this error level is enabled. * * @param error http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java ---------------------------------------------------------------------- diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java index 53c0475..42060b4 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java @@ -46,8 +46,8 @@ import org.eclipse.aether.resolution.ArtifactDescriptorResult; /** * Populates Aether {@link ArtifactDescriptorResult} from Maven project {@link Model}. * + * <strong>Note:</strong> This class is part of work in progress and can be changed or removed without notice. * @since 3.2.4 - * @provisional This class is part of work in progress and can be changed or removed without notice. */ public class ArtifactDescriptorReaderDelegate { http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/maven-settings/src/main/mdo/settings.mdo ---------------------------------------------------------------------- diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-settings/src/main/mdo/settings.mdo index 0d32e40..813ebc4 100644 --- a/maven-settings/src/main/mdo/settings.mdo +++ b/maven-settings/src/main/mdo/settings.mdo @@ -120,7 +120,7 @@ <required>true</required> <description> <![CDATA[ - The local repository.<br /><b>Default value is:</b> <tt>${user.home}/.m2/repository</tt> + The local repository.<br><b>Default value is:</b> <tt>${user.home}/.m2/repository</tt> ]]> </description> <type>String</type> http://git-wip-us.apache.org/repos/asf/maven/blob/587317b0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ba06feb..d2b4633 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ under the License. <wagonVersion>2.12</wagonVersion> <securityDispatcherVersion>1.4</securityDispatcherVersion> <cipherVersion>1.7</cipherVersion> - <modelloVersion>1.8.3</modelloVersion> + <modelloVersion>1.9.0</modelloVersion> <jxpathVersion>1.3</jxpathVersion> <resolverVersion>1.0.3</resolverVersion> <slf4jVersion>1.7.22</slf4jVersion>
