Repository: maven Updated Branches: refs/heads/master 354765dd0 -> 5f726e25e
Updated to remove various Javadoc warnings. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5f726e25 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5f726e25 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5f726e25 Branch: refs/heads/master Commit: 5f726e25e7749ad284ca4109715fc755b0bc0986 Parents: 354765d Author: Christian Schulte <schu...@apache.org> Authored: Fri Feb 19 03:07:45 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Fri Feb 19 03:07:45 2016 +0100 ---------------------------------------------------------------------- .../scope/WeakMojoExecutionListener.java | 4 +- .../maven/lifecycle/mapping/Lifecycle.java | 2 - .../maven/model/building/ModelBuilder.java | 6 +-- .../model/building/ModelBuildingRequest.java | 2 - .../org/apache/maven/model/building/Result.java | 47 +++----------------- 5 files changed, 10 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/5f726e25/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 94e7c10..dec48e3 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 @@ -25,8 +25,8 @@ import org.apache.maven.plugin.MojoExecutionException; /** * Extension point that allows build extensions observe and possibly veto mojo executions. * <p> - * Unlike {@link MojoExecutionListener}, this extension point does not trigger instantiation of the component, hence - * "weak" class name prefix. Only applies to mojo execution scoped components. + * 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. * * @see org.apache.maven.execution.MojoExecutionListener * @since 3.1.2 http://git-wip-us.apache.org/repos/asf/maven/blob/5f726e25/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java index c14cf94..ad3e486 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java @@ -75,8 +75,6 @@ public class Lifecycle /** * Method setLifecyclePhases - * - * @param phases */ public void setLifecyclePhases( Map<String, LifecyclePhase> lifecyclePhases ) { http://git-wip-us.apache.org/repos/asf/maven/blob/5f726e25/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 2a49a21..3cce616 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 @@ -56,11 +56,7 @@ public interface ModelBuilder throws ModelBuildingException; /** - * Performs only the part of {@link ModelBuilder#build(ModelBuildingRequest)} that loads the raw model - * - * @param request - * @return - * @throws ModelBuildingException + * Performs only the part of {@link ModelBuilder#build(ModelBuildingRequest)} that loads the raw model. */ Result<? extends Model> buildRawModel( File pomFile, int validationLevel, boolean locationTracking ); http://git-wip-us.apache.org/repos/asf/maven/blob/5f726e25/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 c10274d..8b51d45 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 @@ -73,8 +73,6 @@ public interface ModelBuildingRequest /** * Set raw model. - * - * @param model */ ModelBuildingRequest setRawModel( Model rawModel ); http://git-wip-us.apache.org/repos/asf/maven/blob/5f726e25/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java index 2828874..041b0d6 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java @@ -54,10 +54,7 @@ public class Result<T> { /** - * Success without warnings - * - * @param model - * @return + * Success without warnings. */ public static <T> Result<T> success( T model ) { @@ -65,11 +62,7 @@ public class Result<T> } /** - * Success with warnings - * - * @param model - * @param problems - * @return + * Success with warnings. */ public static <T> Result<T> success( T model, Iterable<? extends ModelProblem> problems ) { @@ -78,11 +71,7 @@ public class Result<T> } /** - * Success with warnings - * - * @param model - * @param results - * @return + * Success with warnings. */ public static <T> Result<T> success( T model, Result<?>... results ) { @@ -90,10 +79,7 @@ public class Result<T> } /** - * Error with problems describing the cause - * - * @param problems - * @return + * Error with problems describing the cause. */ public static <T> Result<T> error( Iterable<? extends ModelProblem> problems ) { @@ -116,11 +102,7 @@ public class Result<T> } /** - * Error with partial result and problems describing the cause - * - * @param model - * @param problems - * @return + * Error with partial result and problems describing the cause. */ public static <T> Result<T> error( T model, Iterable<? extends ModelProblem> problems ) { @@ -128,11 +110,7 @@ public class Result<T> } /** - * New result - determine whether error or success by checking problems for errors - * - * @param model - * @param problems - * @return + * New result - determine whether error or success by checking problems for errors. */ public static <T> Result<T> newResult( T model, Iterable<? extends ModelProblem> problems ) { @@ -142,10 +120,6 @@ public class Result<T> /** * New result consisting of given result and new problem. Convenience for newResult(result.get(), * concat(result.getProblems(),problems)). - * - * @param result - * @param problem - * @return */ public static <T> Result<T> addProblem( Result<T> result, ModelProblem problem ) { @@ -153,11 +127,7 @@ public class Result<T> } /** - * New result that includes the given - * - * @param result - * @param problems - * @return + * New result that includes the given. */ public static <T> Result<T> addProblems( Result<T> result, Iterable<? extends ModelProblem> problems ) { @@ -172,9 +142,6 @@ public class Result<T> /** * Turns the given results into a single result by combining problems and models into single collection. - * - * @param results - * @return */ public static <T> Result<Iterable<T>> newResultSet( Iterable<? extends Result<? extends T>> results ) {
