From 0e7e3eeb597b92f1394b24e33d5933e995ee8104 Mon Sep 17 00:00:00 2001 From: rfscholte Date: Sat, 18 Mar 2017 12:35:18 +0100 Subject: [PATCH] [MNG-6176] Javadoc errors prevent release with Java 8 Upgrade to modello-1.9.1 Fix javadoc errors in tests --- .../versioning/ComparableVersionTest.java | 2 +- maven-compat/pom.xml | 35 ++++++++++++------- .../LifecycleExecutionPlanCalculatorTest.java | 2 +- .../LifecycleExecutionPlanCalculatorStub.java | 2 +- .../stub/ProjectDependencyGraphStub.java | 5 +-- .../apache/maven/cli/CleanArgumentTest.java | 2 +- .../DefaultInheritanceAssemblerTest.java | 2 +- .../AbstractModelInterpolatorTest.java | 2 +- pom.xml | 6 +++- 9 files changed, 37 insertions(+), 21 deletions(-) diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java index aea98dd16e..875b43e6a3 100644 --- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java +++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java @@ -185,7 +185,7 @@ public void testVersionComparing() /** * Test MNG-5568 edge case - * which was showing transitive inconsistency: since A > B and B > C then we should have A > C + * which was showing transitive inconsistency: since A > B and B > C then we should have A > C * otherwise sorting a list of ComparableVersions() will in some cases throw runtime exception; * see Netbeans issues 240845 and * 226100 diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 2d0ecad048..7af138d2d3 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -113,18 +113,6 @@ under the License. - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - -Xdoclint:none - - - - org.codehaus.plexus @@ -143,4 +131,27 @@ under the License. + + + + javadoc8 + + !1.7 + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + -Xdoclint:none + + + + + + + diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java index a9af5668ed..0e1c3c7304 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java @@ -25,7 +25,7 @@ import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub; /** - * @author Kristian Rosenvold> + * @author Kristian Rosenvold */ public class LifecycleExecutionPlanCalculatorTest extends AbstractCoreMavenComponentTestCase diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java index 43aa47c8f4..90de4d8967 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java @@ -88,7 +88,7 @@ public class LifecycleExecutionPlanCalculatorStub public final static MojoDescriptor SITE_DEPLOY = createMojoDescriptor( "site-deploy" ); /** - * @deprecated instead use {@link #getNumberOfExecutions()} + * @deprecated instead use {@link #getNumberOfExecutions(ProjectBuildList)} */ @Deprecated public int getNumberOfExceutions( ProjectBuildList projectBuildList ) diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java index 7af756d7d5..8df5055272 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java @@ -42,14 +42,15 @@ /** * A stub dependency graph that is custom made for testing concurrent build graph evaluations. - *

+ *

* Implements a graph as follows: * A has no dependencies * B depends on A * C depends on A - * X depends on B & C + * X depends on B & C * Y depends on B * Z depends on C + *

* * @author Kristian Rosenvold */ diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java index 874170e35d..7e2b489fe9 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java @@ -24,7 +24,7 @@ import org.junit.Test; /** - * @author Karl Heinz Marbaise + * @author Karl Heinz Marbaise */ public class CleanArgumentTest { diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java index 1b47ec19b2..372d0a9b73 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java @@ -89,7 +89,7 @@ public void testUrls() } /** - * Flat directory structure: parent & child POMs in sibling directories, child directory == artifactId. + * Flat directory structure: parent & child POMs in sibling directories, child directory == artifactId. * @throws Exception */ public void testFlatUrls() diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java index d8b54b8618..aa09cb0473 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java @@ -68,7 +68,7 @@ protected void assertProblemFree( SimpleProblemCollector collector ) } /** - * @deprecated instead use {@link #assertCollectorState()} + * @deprecated instead use {@link #assertCollectorState(int, int, int, SimpleProblemCollector)} */ @Deprecated protected void assertColllectorState( int numFatals, int numErrors, int numWarnings, diff --git a/pom.xml b/pom.xml index d2b4633803..44c361a062 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ under the License. 2.12 1.4 1.7 - 1.9.0 + 1.9.1 1.3 1.0.3 1.7.22 @@ -650,6 +650,10 @@ under the License. aggregate + + + -Xdoclint:none +